Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2018-07-27 18:50:14 +0300
committerClément Foucault <foucault.clem@gmail.com>2018-07-27 18:51:26 +0300
commitbdbc6fafc038afdffdb4d040ea692f15f31a0048 (patch)
treed069c62689621567fa2e25e88139a1bdd9538e2b
parent5c9754c3aa3f2cb9922d76cb73611cd01192895f (diff)
GPUTexture: Fix wrong texture size check
-rw-r--r--source/blender/gpu/intern/gpu_texture.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/gpu/intern/gpu_texture.c b/source/blender/gpu/intern/gpu_texture.c
index e5073196a52..a5dfb6a6b73 100644
--- a/source/blender/gpu/intern/gpu_texture.c
+++ b/source/blender/gpu/intern/gpu_texture.c
@@ -436,9 +436,9 @@ static bool gpu_texture_try_alloc(
case GL_PROXY_TEXTURE_2D_ARRAY:
/* HACK: Some driver wrongly check GL_PROXY_TEXTURE_2D_ARRAY as a GL_PROXY_TEXTURE_3D
* checking all dimensions against GPU_max_texture_layers (see T55888). */
- return (tex->w < GPU_max_texture_size()) &&
- (tex->h < GPU_max_texture_size()) &&
- (tex->d < GPU_max_texture_layers());
+ return (tex->w > 0) && (tex->w <= GPU_max_texture_size()) &&
+ (tex->h > 0) && (tex->h <= GPU_max_texture_size()) &&
+ (tex->d > 0) && (tex->d <= GPU_max_texture_layers());
case GL_PROXY_TEXTURE_3D:
glTexImage3D(proxy, 0, internalformat, tex->w, tex->h, tex->d, 0, data_format, data_type, NULL);
break;