[Piglit] [PATCH 03/49] Generators: gen_shader_image_load_store_tests: remove duplicate tests

[Dylan Baker]

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). It does, however update the extensions_defined
generator to set it's required GLSL version to 1.50, like the
shader_image_load_store generator did.

Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
 generated_tests/gen_extensions_defined.py            |  2 +-
 generated_tests/gen_shader_image_load_store_tests.py | 17 -----------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/generated_tests/gen_extensions_defined.py b/generated_tests/gen_extensions_defined.py
index 9d89e04..8e4b44e 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", "150"),
     ("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 c30dac1..11e1e0a 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', """\
-- 
2.9.0