From: Jordan Justen <jordan.l.justen@intel.com>
Date: Wed, 24 Oct 2012 01:00:11 +0000 (-0700)
Subject: dispatch_sanity test: allow newer functions to be set to NOP
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=83b6a7cdaa86e2859177abab0e0117f208ddbe6c;p=mesa.git

dispatch_sanity test: allow newer functions to be set to NOP

If a GL function was introduced in a later GL version than the
context we are testing, then it is okay if it is set to the
_mesa_generic_nop function.

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
---

diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp
index 474413cbf57..a54653b8028 100644
--- a/src/mesa/main/tests/dispatch_sanity.cpp
+++ b/src/mesa/main/tests/dispatch_sanity.cpp
@@ -117,6 +117,12 @@ validate_functions(struct gl_context *ctx, const struct function *function_table
    _glapi_proc *table = (_glapi_proc *) ctx->Exec;
 
    for (unsigned i = 0; function_table[i].name != NULL; i++) {
+      /* The context version is >= the GL version where the
+         function was introduced. Therefore, the function cannot
+         be set to the nop function.
+       */
+      bool cant_be_nop = ctx->Version >= function_table[i].Version;
+
       const int offset = (function_table[i].offset != -1)
          ? function_table[i].offset
          : _glapi_get_proc_offset(function_table[i].name);
@@ -126,9 +132,11 @@ validate_functions(struct gl_context *ctx, const struct function *function_table
       ASSERT_EQ(offset,
                 _glapi_get_proc_offset(function_table[i].name))
          << "Function: " << function_table[i].name;
-      EXPECT_NE((_glapi_proc) _mesa_generic_nop, table[offset])
-         << "Function: " << function_table[i].name
-         << " at offset " << offset;
+      if (cant_be_nop) {
+         EXPECT_NE((_glapi_proc) _mesa_generic_nop, table[offset])
+            << "Function: " << function_table[i].name
+            << " at offset " << offset;
+      }
 
       table[offset] = (_glapi_proc) _mesa_generic_nop;
    }