Mesa (9.0): mesa: Don't set dispatch pointers for glPointParameter[if][v] in ES2
Ian Romanick
idr at kemper.freedesktop.org
Fri Sep 28 18:06:54 UTC 2012
Module: Mesa
Branch: 9.0
Commit: 7dc8dc0f7cb21b23190f59ec2fc61fbf8b1556ae
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7dc8dc0f7cb21b23190f59ec2fc61fbf8b1556ae
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Wed Sep 5 14:01:42 2012 -0700
mesa: Don't set dispatch pointers for glPointParameter[if][v] in ES2
NOTE: This is a candidate for the 9.0 branch
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
(cherry picked from commit 1c0a44aaf5c095ca261d1ce11bb8a67dbbce54a2)
---
src/mesa/main/api_exec.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index e922c23..5e06ba0 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -448,8 +448,10 @@ _mesa_create_exec_table(struct gl_context *ctx)
/* 54. GL_EXT_point_parameters */
#if _HAVE_FULL_GL
- SET_PointParameterfEXT(exec, _mesa_PointParameterf);
- SET_PointParameterfvEXT(exec, _mesa_PointParameterfv);
+ if (ctx->API != API_OPENGLES2) {
+ SET_PointParameterfEXT(exec, _mesa_PointParameterf);
+ SET_PointParameterfvEXT(exec, _mesa_PointParameterfv);
+ }
#endif
/* 95. GL_ARB_ES2_compatibility */
@@ -551,8 +553,10 @@ _mesa_create_exec_table(struct gl_context *ctx)
/* 262. GL_NV_point_sprite */
#if _HAVE_FULL_GL
- SET_PointParameteriNV(exec, _mesa_PointParameteri);
- SET_PointParameterivNV(exec, _mesa_PointParameteriv);
+ if (_mesa_is_desktop_gl(ctx)) {
+ SET_PointParameteriNV(exec, _mesa_PointParameteri);
+ SET_PointParameterivNV(exec, _mesa_PointParameteriv);
+ }
#endif
/* 268. GL_EXT_stencil_two_side */
More information about the mesa-commit
mailing list