summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Berry <stereotype441@gmail.com>2012-10-03 14:20:17 -0700
committerIan Romanick <ian.d.romanick@intel.com>2012-10-05 15:55:47 -0700
commit78c9adb17e158ef40f03b5041803991ea8a0aa27 (patch)
tree5f8a30c0d1614d15f3f0c8ec0d09731521281993
parente1cb50b15dbb75d1ba0fe184d05be7d302b058ee (diff)
mesa: don't enable glVertexPointer() when using API_OPENGLES2.
This function is only present in GLES1 and in the OpenGL compatibility profile. Fixes the following "make check" failure: [----------] 1 test from DispatchSanity_test [ RUN ] DispatchSanity_test.GLES2 Mesa warning: couldn't open libtxc_dxtn.so, software DXTn compression/decompression unavailable dispatch_sanity.cpp:122: Failure Value of: table[i] Actual: 0x4de54e Expected: (_glapi_proc) _mesa_generic_nop Which is: 0x41af72 i = 321 [ FAILED ] DispatchSanity_test.GLES2 (4 ms) [----------] 1 test from DispatchSanity_test (4 ms total) NOTE: This is a candidate for stable release branches. Reviewed-by: Oliver McFadden <oliver.mcfadden@linux.intel.com> Tested-by: Oliver McFadden <oliver.mcfadden@linux.intel.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit 8f0b81bf7ddcdf5715a3e00af67395b91f27a243)
-rw-r--r--src/mesa/main/api_exec.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 30b1fb38b18..31fc2709f6f 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -353,8 +353,6 @@ _mesa_create_exec_table(struct gl_context *ctx)
SET_NormalPointer(exec, _mesa_NormalPointer);
SET_PrioritizeTextures(exec, _mesa_PrioritizeTextures);
SET_TexCoordPointer(exec, _mesa_TexCoordPointer);
- }
- if (ctx->API != API_OPENGL_CORE) {
SET_VertexPointer(exec, _mesa_VertexPointer);
}
#endif