Mesa (master): dispatch_sanity test: allow newer functions to be set to NOP
Jordan Justen
jljusten at kemper.freedesktop.org
Sat Nov 3 18:17:41 UTC 2012
Module: Mesa
Branch: master
Commit: 83b6a7cdaa86e2859177abab0e0117f208ddbe6c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=83b6a7cdaa86e2859177abab0e0117f208ddbe6c
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Tue Oct 23 18:00:11 2012 -0700
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 at intel.com>
Reviewed-by: Paul Berry <stereotype441 at gmail.com>
---
src/mesa/main/tests/dispatch_sanity.cpp | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp
index 474413c..a54653b 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;
}
More information about the mesa-commit
mailing list