mesa: don't enable glVertexPointer() when using API_OPENGLES2.
authorPaul Berry <stereotype441@gmail.com>
Wed, 3 Oct 2012 21:20:17 +0000 (14:20 -0700)
committerPaul Berry <stereotype441@gmail.com>
Thu, 4 Oct 2012 19:46:42 +0000 (12:46 -0700)
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>
src/mesa/main/api_exec.c

index ddf7c7fc119192a8b9c10a69ba8b7d03468d9445..f42da94381af0bf8214582bac9feb44e4497cf8b 100644 (file)
@@ -335,8 +335,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