mesa: Branch 'master' - 2 commits

[Ian Romanick]

 src/mesa/glapi/glapi.c |    2 --
 1 files changed, 2 deletions(-)

New commits:
diff-tree a4b344baa2484c65a1618f3cce3a94c91dea8ef7 (from parents)
Merge: f0bcee5db0523edaacbd1fb0eaa74b435ae7c188 440759c2cdfdd9a7fbc6500fca2afa519126c1a7
Author: Ian Romanick <idr at us.ibm.com>
Date:   Tue Feb 20 15:19:23 2007 -0800

    Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/mesa/mesa

diff-tree f0bcee5db0523edaacbd1fb0eaa74b435ae7c188 (from 1e2b46963595e02172b4d651cc8a219e9f5c8176)
Author: Ian Romanick <idr at us.ibm.com>
Date:   Tue Feb 20 15:18:53 2007 -0800

    Delete two invalid assertions.
    
    These two assertions are invalid for a couple reasons.  Primarily,
    when this code is compiled into the X-server, the symbols
    "glSecondaryColor3fEXT" and "glPointParameterivNV" do not exist.

diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c
index d1ccc5f..348f12b 100644
--- a/src/mesa/glapi/glapi.c
+++ b/src/mesa/glapi/glapi.c
@@ -1003,7 +1003,6 @@ _glapi_check_table(const struct _glapi_t
       GLuint offset = (secondaryColor3fFunc - (char *) table) / sizeof(void *);
       assert(secondaryColor3fOffset == _gloffset_SecondaryColor3fEXT);
       assert(secondaryColor3fOffset == offset);
-      assert(_glapi_get_proc_address("glSecondaryColor3fEXT") == (_glapi_proc) &glSecondaryColor3fEXT);
    }
    {
       GLuint pointParameterivOffset = _glapi_get_proc_offset("glPointParameterivNV");
@@ -1011,7 +1010,6 @@ _glapi_check_table(const struct _glapi_t
       GLuint offset = (pointParameterivFunc - (char *) table) / sizeof(void *);
       assert(pointParameterivOffset == _gloffset_PointParameterivNV);
       assert(pointParameterivOffset == offset);
-      assert(_glapi_get_proc_address("glPointParameterivNV") == (_glapi_proc) &glPointParameterivNV);
    }
    {
       GLuint setFenceOffset = _glapi_get_proc_offset("glSetFenceNV");