Commit 0b7e5d8c by Geoff Lang

Fix 64-bit warnings.

BUG=angle:631 Change-Id: I76439ca2549916d594a54a4a9a35387d80b023ba Reviewed-on: https://chromium-review.googlesource.com/207441Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent c0b9ef4b
...@@ -252,9 +252,9 @@ inline void GenerateMip(size_t sourceWidth, size_t sourceHeight, size_t sourceDe ...@@ -252,9 +252,9 @@ inline void GenerateMip(size_t sourceWidth, size_t sourceHeight, size_t sourceDe
const uint8_t *sourceData, size_t sourceRowPitch, size_t sourceDepthPitch, const uint8_t *sourceData, size_t sourceRowPitch, size_t sourceDepthPitch,
uint8_t *destData, size_t destRowPitch, size_t destDepthPitch) uint8_t *destData, size_t destRowPitch, size_t destDepthPitch)
{ {
size_t mipWidth = std::max(1U, sourceWidth >> 1); size_t mipWidth = std::max<size_t>(1, sourceWidth >> 1);
size_t mipHeight = std::max(1U, sourceHeight >> 1); size_t mipHeight = std::max<size_t>(1, sourceHeight >> 1);
size_t mipDepth = std::max(1U, sourceDepth >> 1); size_t mipDepth = std::max<size_t>(1, sourceDepth >> 1);
priv::MipGenerationFunction generationFunction = priv::GetMipGenerationFunction<T>(sourceWidth, sourceHeight, sourceDepth); priv::MipGenerationFunction generationFunction = priv::GetMipGenerationFunction<T>(sourceWidth, sourceHeight, sourceDepth);
ASSERT(generationFunction != NULL); ASSERT(generationFunction != NULL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment