Mesa (master): meta: Don't try to enable FF texturing when we' re using GLSL.
Eric Anholt
anholt at kemper.freedesktop.org
Fri Feb 14 20:10:14 UTC 2014
Module: Mesa
Branch: master
Commit: 1020d8937ef52725cc5adafc12465f6332815e82
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1020d8937ef52725cc5adafc12465f6332815e82
Author: Eric Anholt <eric at anholt.net>
Date: Wed Feb 5 15:45:25 2014 -0800
meta: Don't try to enable FF texturing when we're using GLSL.
On a core context, this would throw an error.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/mesa/drivers/common/meta_blit.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/mesa/drivers/common/meta_blit.c b/src/mesa/drivers/common/meta_blit.c
index 456fa16..a2b284b 100644
--- a/src/mesa/drivers/common/meta_blit.c
+++ b/src/mesa/drivers/common/meta_blit.c
@@ -211,7 +211,7 @@ blitframebuffer_texture(struct gl_context *ctx,
GL_SKIP_DECODE_EXT);
}
- if (ctx->API == API_OPENGL_COMPAT || ctx->API == API_OPENGLES) {
+ if (!glsl_version) {
_mesa_TexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
_mesa_set_enable(ctx, target, GL_TRUE);
}
@@ -393,10 +393,7 @@ _mesa_meta_BlitFramebuffer(struct gl_context *ctx,
}
- /* glEnable() in gles2 and gles3 doesn't allow GL_TEXTURE_{1D, 2D, etc.}
- * tokens.
- */
- if (_mesa_is_desktop_gl(ctx) || ctx->API == API_OPENGLES)
+ if (!use_glsl_version)
_mesa_set_enable(ctx, tex->Target, GL_TRUE);
if (mask & GL_COLOR_BUFFER_BIT) {
@@ -490,7 +487,7 @@ _mesa_meta_BlitFramebuffer(struct gl_context *ctx,
/* XXX can't easily do stencil */
}
- if (_mesa_is_desktop_gl(ctx) || ctx->API == API_OPENGLES)
+ if (!use_glsl_version)
_mesa_set_enable(ctx, tex->Target, GL_FALSE);
_mesa_meta_end(ctx);
More information about the mesa-commit
mailing list