diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2016-06-22 17:50:53 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2016-08-05 10:44:36 -0700 |
| commit | 5207d4c0c373f46d9a54f03f1fa87c52f2a8e1ea (patch) | |
| tree | 0db019c9ff58d4bf2fe118e9a1bc2af7c910bf04 /generated_tests | |
| parent | 33e51571e481aa123232bc96488b029aea988180 (diff) | |
Generators: gen_shader_image_load_store_tests: remove duplicate tests
This generator produces preprocessor defines tests, which are duplicated
by the gen_extensions_defined generator. It makes sense to me to let the
defines generator own this functionality (it's very minor anyway).
This also changes the version required in extensions defined to 130, per
the spec "OpenGL 3.0 and GLSL 1.30 are required."
Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Diffstat (limited to 'generated_tests')
| -rw-r--r-- | generated_tests/gen_extensions_defined.py | 2 | ||||
| -rw-r--r-- | generated_tests/gen_shader_image_load_store_tests.py | 17 |
2 files changed, 1 insertions, 18 deletions
diff --git a/generated_tests/gen_extensions_defined.py b/generated_tests/gen_extensions_defined.py index 9d89e04c1..d42e6add3 100644 --- a/generated_tests/gen_extensions_defined.py +++ b/generated_tests/gen_extensions_defined.py @@ -91,7 +91,7 @@ EXTENSIONS = [ ("GL_ARB_shader_atomic_counter_ops", "140"), ("GL_ARB_viewport_array", "110"), ("GL_ARB_compute_shader", "110"), - ("GL_ARB_shader_image_load_store", "110"), + ("GL_ARB_shader_image_load_store", "130"), ("GL_ARB_shader_image_size", "110"), ("GL_ARB_shader_texture_image_samples", "110"), # That is what the original hand written test required. diff --git a/generated_tests/gen_shader_image_load_store_tests.py b/generated_tests/gen_shader_image_load_store_tests.py index c30dac164..11e1e0ae0 100644 --- a/generated_tests/gen_shader_image_load_store_tests.py +++ b/generated_tests/gen_shader_image_load_store_tests.py @@ -281,23 +281,6 @@ image_types = [ def main(): """Main function.""" # - # Test the preprocessor defines. - # - gen('preprocessor', """\ - ${header('pass')} - - #if !defined GL_ARB_shader_image_load_store - # error GL_ARB_shader_image_load_store is not defined - #elif GL_ARB_shader_image_load_store != 1 - # error GL_ARB_shader_image_load_store is not equal to 1 - #endif - - void main() - { - } - """, shader_stages) - - # # Test the early_fragment_tests layout qualifier. # gen('early-fragment-tests', """\ |