Mesa (master): meta: add support for using API_OPENGL_CORE
Jordan Justen
jljusten at kemper.freedesktop.org
Tue Jul 31 05:51:44 UTC 2012
Module: Mesa
Branch: master
Commit: 0f099df5672a68cf165f550278831356c903515f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0f099df5672a68cf165f550278831356c903515f
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Tue Jul 24 14:51:05 2012 -0700
meta: add support for using API_OPENGL_CORE
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
---
src/mesa/drivers/common/meta.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index bf4d718..6846bbc 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -1848,7 +1848,7 @@ meta_glsl_clear_init(struct gl_context *ctx, struct clear_state *clear)
clear->ColorLocation = _mesa_GetUniformLocationARB(clear->ShaderProg,
"color");
- if (ctx->API == API_OPENGL && ctx->Const.GLSLVersion >= 130) {
+ if (_mesa_is_desktop_gl(ctx) && ctx->Const.GLSLVersion >= 130) {
vs = compile_shader_with_debug(ctx, GL_VERTEX_SHADER, vs_int_source);
fs = compile_shader_with_debug(ctx, GL_FRAGMENT_SHADER, fs_int_source);
More information about the mesa-commit
mailing list