summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2016-05-27 21:40:19 +0200
committerMarek Olšák <marek.olsak@amd.com>2016-05-29 14:24:23 +0200
commit04a78068ff6a1399cd6891b4ef34a480de28b07c (patch)
treed12ef1d53ebb943a4cf63f3932889cc0da618dbd
parent60341ddd5cb8bed72c693b5d1df95ad8bda85d0d (diff)
downloadexternal_mesa3d-04a78068ff6a1399cd6891b4ef34a480de28b07c.zip
external_mesa3d-04a78068ff6a1399cd6891b4ef34a480de28b07c.tar.gz
external_mesa3d-04a78068ff6a1399cd6891b4ef34a480de28b07c.tar.bz2
mesa: skip level checking for FramebufferTexture*D if texture is zero
From the OpenGL 4.5 core spec: "An INVALID_VALUE error is generated if texture is not zero and level is not a supported texture level for textarget, as described above." Other FramebufferTexture functions already do the right thing. This fixes the main menu in F1 2015. Cc: 11.1 11.2 <mesa-stable@lists.freedesktop.org> Reviewed-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--src/mesa/main/fbobject.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 44696c0..fa5baa3 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -3240,10 +3240,10 @@ framebuffer_texture_with_dims(int dims, GLenum target,
if ((dims == 3) && !check_layer(ctx, texObj->Target, layer, caller))
return;
- }
- if (!check_level(ctx, textarget, level, caller))
- return;
+ if (!check_level(ctx, textarget, level, caller))
+ return;
+ }
_mesa_framebuffer_texture(ctx, fb, attachment, texObj, textarget, level,
layer, GL_FALSE, caller);