From 78c9adb17e158ef40f03b5041803991ea8a0aa27 Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Wed, 3 Oct 2012 14:20:17 -0700 Subject: 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 Tested-by: Oliver McFadden Reviewed-by: Ian Romanick (cherry picked from commit 8f0b81bf7ddcdf5715a3e00af67395b91f27a243) --- src/mesa/main/api_exec.c | 2 -- 1 file changed, 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 -- cgit v1.2.3