Commit 8fed1f71 by Geoff Lang

Fix signed/unsigned missmatch on 32-bit builds.

BUG=angle:681 Change-Id: I6144359acd1611a13b0a582d3a31019138bb941c Reviewed-on: https://chromium-review.googlesource.com/239844Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent ed409f93
...@@ -800,7 +800,7 @@ gl::Error TextureD3D_2D::setStorage(GLenum target, size_t levels, GLenum interna ...@@ -800,7 +800,7 @@ gl::Error TextureD3D_2D::setStorage(GLenum target, size_t levels, GLenum interna
{ {
ASSERT(GL_TEXTURE_2D && size.depth == 1); ASSERT(GL_TEXTURE_2D && size.depth == 1);
for (int level = 0; level < levels; level++) for (size_t level = 0; level < levels; level++)
{ {
gl::Extents levelSize(std::max(1, size.width >> level), gl::Extents levelSize(std::max(1, size.width >> level),
std::max(1, size.height >> level), std::max(1, size.height >> level),
...@@ -1334,7 +1334,7 @@ gl::Error TextureD3D_Cube::setStorage(GLenum target, size_t levels, GLenum inter ...@@ -1334,7 +1334,7 @@ gl::Error TextureD3D_Cube::setStorage(GLenum target, size_t levels, GLenum inter
ASSERT(size.width == size.height); ASSERT(size.width == size.height);
ASSERT(size.depth == 1); ASSERT(size.depth == 1);
for (int level = 0; level < levels; level++) for (size_t level = 0; level < levels; level++)
{ {
GLsizei mipSize = std::max(1, size.width >> level); GLsizei mipSize = std::max(1, size.width >> level);
for (int faceIndex = 0; faceIndex < 6; faceIndex++) for (int faceIndex = 0; faceIndex < 6; faceIndex++)
...@@ -1920,7 +1920,7 @@ gl::Error TextureD3D_3D::setStorage(GLenum target, size_t levels, GLenum interna ...@@ -1920,7 +1920,7 @@ gl::Error TextureD3D_3D::setStorage(GLenum target, size_t levels, GLenum interna
{ {
ASSERT(target == GL_TEXTURE_3D); ASSERT(target == GL_TEXTURE_3D);
for (int level = 0; level < levels; level++) for (size_t level = 0; level < levels; level++)
{ {
gl::Extents levelSize(std::max(1, size.width >> level), gl::Extents levelSize(std::max(1, size.width >> level),
std::max(1, size.height >> level), std::max(1, size.height >> level),
...@@ -2454,7 +2454,7 @@ gl::Error TextureD3D_2DArray::setStorage(GLenum target, size_t levels, GLenum in ...@@ -2454,7 +2454,7 @@ gl::Error TextureD3D_2DArray::setStorage(GLenum target, size_t levels, GLenum in
deleteImages(); deleteImages();
for (int level = 0; level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; level++) for (size_t level = 0; level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; level++)
{ {
gl::Extents levelLayerSize(std::max(1, size.width >> level), gl::Extents levelLayerSize(std::max(1, size.width >> level),
std::max(1, size.height >> level), std::max(1, size.height >> level),
......
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