diff options
| author | Paul Berry <[email protected]> | 2012-10-30 14:03:28 -0700 |
|---|---|---|
| committer | Paul Berry <[email protected]> | 2012-11-06 12:57:39 -0800 |
| commit | 5708e2711366e4dd1f19275c943b04706fd9c633 (patch) | |
| tree | 2d937547be5bab79c2024924bd0d4d9dc82c2ca4 /src/mesa/main/tests/dispatch_sanity.cpp | |
| parent | 0d61f879a1f2e6bb37368731a29d5267e1c25195 (diff) | |
dispatch: Remove a few FEATURE_ES1 conditionals.
This allows the GLES1.1 dispatch sanity test to be run on all builds,
even builds that do not include GLES1 support.
Reviewed-by: Jordan Justen <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/mesa/main/tests/dispatch_sanity.cpp')
| -rw-r--r-- | src/mesa/main/tests/dispatch_sanity.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp index d198d9539aa..b0475da1a5b 100644 --- a/src/mesa/main/tests/dispatch_sanity.cpp +++ b/src/mesa/main/tests/dispatch_sanity.cpp @@ -74,13 +74,10 @@ struct function { }; extern const struct function gl_core_functions_possible[]; +extern const struct function gles11_functions_possible[]; extern const struct function gles2_functions_possible[]; extern const struct function gles3_functions_possible[]; -#if FEATURE_ES1 -extern const struct function gles11_functions_possible[]; -#endif /* FEATURE_ES1 */ - class DispatchSanity_test : public ::testing::Test { public: virtual void SetUp(); @@ -177,14 +174,12 @@ TEST_F(DispatchSanity_test, GL31_CORE) validate_nops(&ctx); } -#if FEATURE_ES1 TEST_F(DispatchSanity_test, GLES11) { SetUpCtx(API_OPENGLES, 11); validate_functions(&ctx, gles11_functions_possible); validate_nops(&ctx); } -#endif /* FEATURE_ES1 */ TEST_F(DispatchSanity_test, GLES2) { @@ -898,7 +893,6 @@ const struct function gl_core_functions_possible[] = { { NULL, 0, -1 } }; -#if FEATURE_ES1 const struct function gles11_functions_possible[] = { { "glActiveTexture", 11, _gloffset_ActiveTextureARB }, { "glAlphaFunc", 11, _gloffset_AlphaFunc }, @@ -1092,7 +1086,6 @@ const struct function gles11_functions_possible[] = { { "glViewport", 11, _gloffset_Viewport }, { NULL, 0, -1 } }; -#endif /* FEATURE_ES1 */ const struct function gles2_functions_possible[] = { { "glActiveTexture", 20, _gloffset_ActiveTextureARB }, |