tests: Fix shader unit tests

tests/display/glsl_bad.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 
 // Uniform inputs
 uniform mat4 p3d_ModelViewProjectionMatrix;

tests/display/glsl_include.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 
 #extension GL_GOOGLE_include_directive : require
 

tests/display/glsl_simple.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 
 void main() {
   gl_FragColor = vec4(0, 0, 0, 1);

tests/display/glsl_simple.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 
 // Uniform inputs
 uniform mat4 p3d_ModelViewProjectionMatrix;

tests/display/test_glsl_shader.py

@@ -357,7 +357,7 @@ def test_glsl_uint(gsg):
     run_glsl_test(gsg, code, preamble, inputs)
 
 
[email protected](reason="https://github.com/KhronosGroup/SPIRV-Tools/issues/3387")
+#@pytest.mark.xfail(reason="https://github.com/KhronosGroup/SPIRV-Tools/issues/3387")
 def test_glsl_bool(gsg):
     flags = dict(
         flag1=False,

tests/gobj/test_shader.py

@@ -62,7 +62,7 @@ def test_shader_load_compute(vfs, ramdir):
     comp_file = Filename(ramdir, "shader.glsl")
 
     # Now write some actual content to the shader file.
-    vfs.write_file(comp_file, b"#version 420\nvoid main() {}\n", False)
+    vfs.write_file(comp_file, b"#version 420\n#extension GL_ARB_compute_shader : require\nvoid main() {}\n", False)
 
     shad1 = Shader.load_compute(Shader.SL_GLSL, comp_file)
     assert shad1 is not None
@@ -76,7 +76,7 @@ def test_shader_load_compute(vfs, ramdir):
     # After waiting a second to make the timestamp different, modify the
     # shader and load again, it should result in a different object now
     time.sleep(1.0)
-    vfs.write_file(comp_file, b"#version 420\nuniform int a;void main() {}\n", False)
+    vfs.write_file(comp_file, b"#version 420\n#extension GL_ARB_compute_shader : require\nuniform int a;void main() {}\n", False)
 
     shad2 = Shader.load_compute(Shader.SL_GLSL, comp_file)
 

tests/shaderpipeline/test_shadercompiler.py

@@ -5,6 +5,7 @@ def test_shadercompiler_glsl_empty(compiler_glsl):
     assert not compiler_glsl.compile_now(
         core.ShaderModule.Stage.vertex,
         core.StringStream(b''),
+        'created-shader',
     )
 
 
@@ -19,6 +20,7 @@ def test_shadercompiler_glsl_simple(compiler_glsl):
     module = compiler_glsl.compile_now(
         core.ShaderModule.Stage.vertex,
         core.StringStream(code.encode('ascii')),
+        'created-shader',
     )
     assert module
     assert module.stage == core.ShaderModule.Stage.vertex
@@ -35,6 +37,7 @@ def test_shadercompiler_glsl_invalid_version(compiler_glsl):
     assert not compiler_glsl.compile_now(
         core.ShaderModule.Stage.vertex,
         core.StringStream(code.encode('ascii')),
+        'created-shader',
     )
 
 
@@ -53,6 +56,7 @@ def test_shadercompiler_glsl150_bitcast(compiler_glsl):
     assert not compiler_glsl.compile_now(
         core.ShaderModule.Stage.vertex,
         core.StringStream(code.encode('ascii')),
+        'created-shader',
     )
 
 
@@ -72,6 +76,7 @@ def test_shadercompiler_glsl150_bitcast_extension1(compiler_glsl):
     assert compiler_glsl.compile_now(
         core.ShaderModule.Stage.vertex,
         core.StringStream(code.encode('ascii')),
+        'created-shader',
     )
 
 
@@ -91,6 +96,7 @@ def test_shadercompiler_glsl150_bitcast_extension2(compiler_glsl):
     assert compiler_glsl.compile_now(
         core.ShaderModule.Stage.vertex,
         core.StringStream(code.encode('ascii')),
+        'created-shader',
     )
 
 
@@ -109,6 +115,7 @@ def test_shadercompiler_glsl330_bitcast(compiler_glsl):
     assert compiler_glsl.compile_now(
         core.ShaderModule.Stage.vertex,
         core.StringStream(code.encode('ascii')),
+        'created-shader',
     )
 
 
@@ -126,6 +133,7 @@ def test_shadercompiler_glsl150_explicit_attrib_location(compiler_glsl):
     assert not compiler_glsl.compile_now(
         core.ShaderModule.Stage.vertex,
         core.StringStream(code.encode('ascii')),
+        'created-shader',
     )
 
 
@@ -144,6 +152,7 @@ def test_shadercompiler_glsl150_explicit_attrib_location_extension(compiler_glsl
     module = compiler_glsl.compile_now(
         core.ShaderModule.Stage.vertex,
         core.StringStream(code.encode('ascii')),
+        'created-shader',
     )
     assert module
     assert len(module.inputs) == 1
@@ -165,6 +174,7 @@ def test_shadercompiler_glsl330_explicit_attrib_location(compiler_glsl):
     module = compiler_glsl.compile_now(
         core.ShaderModule.Stage.vertex,
         core.StringStream(code.encode('ascii')),
+        'created-shader',
     )
     assert module
     assert len(module.inputs) == 1