summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2012-09-05 14:01:42 -0700
committerIan Romanick <[email protected]>2012-09-28 10:19:55 -0700
commit7dc8dc0f7cb21b23190f59ec2fc61fbf8b1556ae (patch)
tree2bf5abaebc15e7b59b7ef299a60fb43fe2819c5d /src
parent961567d0fe29915b9b5ed0be9970d180a18eea4e (diff)
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 <[email protected]> Reviewed-by: Eric Anholt <[email protected]> (cherry picked from commit 1c0a44aaf5c095ca261d1ce11bb8a67dbbce54a2)
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/api_exec.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index e922c239126..5e06ba0af11 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 */