Module: Mesa
Branch: master
Commit: 04a78068ff6a1399cd6891b4ef34a480de28b07c
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=04a78068ff6a1399cd6891b4ef34a480de28b07c

Author: Marek Olšák <[email protected]>
Date:   Fri May 27 21:40:19 2016 +0200

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 <[email protected]>
Reviewed-by: Dave Airlie <[email protected]>

---

 src/mesa/main/fbobject.c | 6 +++---
 1 file 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);

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to