diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-06 08:33:58 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-06 08:33:58 +0100 |
| commit | ebb6162f9cbc1af0fac0b670b5aa38c8bb7a7446 (patch) | |
| tree | 30d7b35b3c3d34b4539b57e1d92951ac5c8a3dfe /mesalib/src/mesa/main/teximage.c | |
| parent | 68320ff05946f092b6836754c6267b1dff2f4633 (diff) | |
| parent | ada3d2c30b5a7a1a79e128b7326d50c3bab77a8a (diff) | |
| download | vcxsrv-ebb6162f9cbc1af0fac0b670b5aa38c8bb7a7446.tar.gz vcxsrv-ebb6162f9cbc1af0fac0b670b5aa38c8bb7a7446.tar.bz2 vcxsrv-ebb6162f9cbc1af0fac0b670b5aa38c8bb7a7446.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/teximage.c')
| -rw-r--r-- | mesalib/src/mesa/main/teximage.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c index d11425d5e..018aca063 100644 --- a/mesalib/src/mesa/main/teximage.c +++ b/mesalib/src/mesa/main/teximage.c @@ -1179,7 +1179,7 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level, switch (target) { case GL_PROXY_TEXTURE_1D: maxSize = 1 << (ctx->Const.MaxTextureLevels - 1); - if (width < 2 * border || width > 2 + maxSize) + if (width < 2 * border || width > maxSize) return GL_FALSE; if (level >= ctx->Const.MaxTextureLevels) return GL_FALSE; @@ -1191,9 +1191,9 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level, case GL_PROXY_TEXTURE_2D: maxSize = 1 << (ctx->Const.MaxTextureLevels - 1); - if (width < 2 * border || width > 2 + maxSize) + if (width < 2 * border || width > maxSize) return GL_FALSE; - if (height < 2 * border || height > 2 + maxSize) + if (height < 2 * border || height > maxSize) return GL_FALSE; if (level >= ctx->Const.MaxTextureLevels) return GL_FALSE; @@ -1207,11 +1207,11 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level, case GL_PROXY_TEXTURE_3D: maxSize = 1 << (ctx->Const.Max3DTextureLevels - 1); - if (width < 2 * border || width > 2 + maxSize) + if (width < 2 * border || width > maxSize) return GL_FALSE; - if (height < 2 * border || height > 2 + maxSize) + if (height < 2 * border || height > maxSize) return GL_FALSE; - if (depth < 2 * border || depth > 2 + maxSize) + if (depth < 2 * border || depth > maxSize) return GL_FALSE; if (level >= ctx->Const.Max3DTextureLevels) return GL_FALSE; @@ -1237,9 +1237,9 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level, case GL_PROXY_TEXTURE_CUBE_MAP_ARB: maxSize = 1 << (ctx->Const.MaxCubeTextureLevels - 1); - if (width < 2 * border || width > 2 + maxSize) + if (width < 2 * border || width > maxSize) return GL_FALSE; - if (height < 2 * border || height > 2 + maxSize) + if (height < 2 * border || height > maxSize) return GL_FALSE; if (level >= ctx->Const.MaxCubeTextureLevels) return GL_FALSE; @@ -1253,7 +1253,7 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level, case GL_PROXY_TEXTURE_1D_ARRAY_EXT: maxSize = 1 << (ctx->Const.MaxTextureLevels - 1); - if (width < 2 * border || width > 2 + maxSize) + if (width < 2 * border || width > maxSize) return GL_FALSE; if (height < 1 || height > ctx->Const.MaxArrayTextureLayers) return GL_FALSE; @@ -1267,9 +1267,9 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level, case GL_PROXY_TEXTURE_2D_ARRAY_EXT: maxSize = 1 << (ctx->Const.MaxTextureLevels - 1); - if (width < 2 * border || width > 2 + maxSize) + if (width < 2 * border || width > maxSize) return GL_FALSE; - if (height < 2 * border || height > 2 + maxSize) + if (height < 2 * border || height > maxSize) return GL_FALSE; if (depth < 1 || depth > ctx->Const.MaxArrayTextureLayers) return GL_FALSE; |