Mesa (master): mesa shaderapi: don't enable various functions for GL CORE

Jordan Justen jljusten at kemper.freedesktop.org
Sat Nov 3 18:17:40 UTC 2012


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

Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Tue Oct 23 18:13:32 2012 -0700

mesa shaderapi: don't enable various functions for GL CORE

These EXT_separate_shader_objects function will no longer be
enabled for CORE profiles:
* UseShaderProgramEXT
* ActiveProgramEXT
* CreateShaderProgramEXT

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Paul Berry <stereotype441 at gmail.com>

---

 src/mesa/main/shaderapi.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index ec1559d..75c4c66 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -1736,7 +1736,9 @@ _mesa_init_shader_dispatch(const struct gl_context *ctx,
 
    if (_mesa_is_desktop_gl(ctx)) {
       SET_ProgramParameteriARB(exec, _mesa_ProgramParameteriARB);
+   }
 
+   if (ctx->API == API_OPENGL) {
       SET_UseShaderProgramEXT(exec, _mesa_UseShaderProgramEXT);
       SET_ActiveProgramEXT(exec, _mesa_ActiveProgramEXT);
       SET_CreateShaderProgramEXT(exec, _mesa_CreateShaderProgramEXT);




More information about the mesa-commit mailing list