[Mesa-dev] [PATCH] CopyTexImage: Don't check sRGB vs LINEAR for desktop GL

Jordan Justen jordan.l.justen at intel.com
Mon Feb 11 15:39:25 PST 2013


In OpenGL 4.3, new language was added that would require
this check. But, if this check results in broken applications
then perhaps it will be reversed.

For now, remove this check and re-evaluate when
desktop GL 4.3 is closer.

NOTE: This is a candidate for the 9.1 branch.

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Cc: Török Edwin <edwin+ml-mesadev at etorok.net>
Cc: Ian Romanick <idr at freedesktop.org>
---
 src/mesa/main/teximage.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 9283ece..db09ace 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2454,9 +2454,7 @@ copytexture_error_check( struct gl_context *ctx, GLuint dimensions,
       }
    }
 
-   if ((_mesa_is_desktop_gl(ctx) &&
-        ctx->Extensions.ARB_framebuffer_object) ||
-       _mesa_is_gles3(ctx)) {
+   if (_mesa_is_gles3(ctx)) {
       bool rb_is_srgb = false;
       bool dst_is_srgb = false;
 
-- 
1.7.10.4



More information about the mesa-dev mailing list