summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2022-03-02 17:38:48 -0800
committerMatt Turner <mattst88@gmail.com>2022-12-10 19:56:22 +0000
commit70fcf4a81b2e602d54d4fa21ca8451174480ac7b (patch)
treeb3964e52af7f9cece58d77bbb84a0e44622e2948
parent391d419b1653cf1527ee3ef1b9c1af9bf52dfa28 (diff)
shaders: Add missing extension requirements in Dolphin shaders
Discovered when an experiment resulted in a driver that only gave OpenGL 3.0 without GL_ARB_uniform_buffer_object. All changes made with this script: for ext in GL_ARB_shader_image_load_store \ GL_ARB_shader_storage_buffer_object \ GL_ARB_shading_language_420pack \ GL_ARB_uniform_buffer_object \ GL_ARB_explicit_attrib_location do egrep -lr "extension[[:space:]]+${ext}.*enable" . |\ while read s; do # If the shader already has the requirement, skip if grep -A10 '[[]require]' $s | grep -q ^$ext ; then continue fi # If the shader has ifdefs for the extension, skip if egrep -q "#[[:space:]]*if.*${ext}" $s; then continue fi sed --in-place -e "s/\(^GLSL >.*$\)/\1\n${ext}/" $s done done
-rw-r--r--shaders/dolphin/efb2ram.shader_test2
-rw-r--r--shaders/dolphin/efb2tex.shader_test2
-rw-r--r--shaders/dolphin/format_changes.1.shader_test2
-rw-r--r--shaders/dolphin/format_changes.2.shader_test2
-rw-r--r--shaders/dolphin/mkwii.1.shader_test2
-rw-r--r--shaders/dolphin/mkwii.2.shader_test2
-rw-r--r--shaders/dolphin/nsmbw.1.shader_test2
-rw-r--r--shaders/dolphin/nsmbw.2.shader_test2
-rw-r--r--shaders/dolphin/realxfb.shader_test2
-rw-r--r--shaders/dolphin/smg.1.shader_test3
-rw-r--r--shaders/dolphin/smg.2.shader_test2
-rw-r--r--shaders/dolphin/ubershaders/102.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/111.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/12.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/120.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/129.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/138.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/147.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/156.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/165.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/174.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/183.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/192.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/201.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/21.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/210.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/219.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/228.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/237.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/3.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/30.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/39.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/48.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/57.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/66.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/75.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/84.shader_test3
-rw-r--r--shaders/dolphin/ubershaders/93.shader_test3
38 files changed, 104 insertions, 0 deletions
diff --git a/shaders/dolphin/efb2ram.shader_test b/shaders/dolphin/efb2ram.shader_test
index d1e72a8..6cbe081 100644
--- a/shaders/dolphin/efb2ram.shader_test
+++ b/shaders/dolphin/efb2ram.shader_test
@@ -1,5 +1,7 @@
[require]
GLSL >= 1.30
+GL_ARB_uniform_buffer_object
+GL_ARB_shading_language_420pack
[vertex shader]
#version 130
diff --git a/shaders/dolphin/efb2tex.shader_test b/shaders/dolphin/efb2tex.shader_test
index 1a457aa..3591f0b 100644
--- a/shaders/dolphin/efb2tex.shader_test
+++ b/shaders/dolphin/efb2tex.shader_test
@@ -1,5 +1,7 @@
[require]
GLSL >= 1.30
+GL_ARB_uniform_buffer_object
+GL_ARB_shading_language_420pack
[vertex shader]
#version 130
diff --git a/shaders/dolphin/format_changes.1.shader_test b/shaders/dolphin/format_changes.1.shader_test
index 2b09fd9..431d96e 100644
--- a/shaders/dolphin/format_changes.1.shader_test
+++ b/shaders/dolphin/format_changes.1.shader_test
@@ -1,5 +1,7 @@
[require]
GLSL >= 1.30
+GL_ARB_uniform_buffer_object
+GL_ARB_shading_language_420pack
[vertex shader]
#version 130
diff --git a/shaders/dolphin/format_changes.2.shader_test b/shaders/dolphin/format_changes.2.shader_test
index 86b5c5f..150ef22 100644
--- a/shaders/dolphin/format_changes.2.shader_test
+++ b/shaders/dolphin/format_changes.2.shader_test
@@ -1,5 +1,7 @@
[require]
GLSL >= 1.30
+GL_ARB_uniform_buffer_object
+GL_ARB_shading_language_420pack
[vertex shader]
#version 130
diff --git a/shaders/dolphin/mkwii.1.shader_test b/shaders/dolphin/mkwii.1.shader_test
index e933133..2087bce 100644
--- a/shaders/dolphin/mkwii.1.shader_test
+++ b/shaders/dolphin/mkwii.1.shader_test
@@ -1,5 +1,7 @@
[require]
GLSL >= 1.30
+GL_ARB_uniform_buffer_object
+GL_ARB_shading_language_420pack
[vertex shader]
#version 130
diff --git a/shaders/dolphin/mkwii.2.shader_test b/shaders/dolphin/mkwii.2.shader_test
index 881c5bb..f4316f4 100644
--- a/shaders/dolphin/mkwii.2.shader_test
+++ b/shaders/dolphin/mkwii.2.shader_test
@@ -1,5 +1,7 @@
[require]
GLSL >= 1.30
+GL_ARB_uniform_buffer_object
+GL_ARB_shading_language_420pack
[vertex shader]
#version 130
diff --git a/shaders/dolphin/nsmbw.1.shader_test b/shaders/dolphin/nsmbw.1.shader_test
index b9bbdc1..850d6fd 100644
--- a/shaders/dolphin/nsmbw.1.shader_test
+++ b/shaders/dolphin/nsmbw.1.shader_test
@@ -1,5 +1,7 @@
[require]
GLSL >= 1.30
+GL_ARB_uniform_buffer_object
+GL_ARB_shading_language_420pack
[vertex shader]
#version 130
diff --git a/shaders/dolphin/nsmbw.2.shader_test b/shaders/dolphin/nsmbw.2.shader_test
index ccb1c97..76662e4 100644
--- a/shaders/dolphin/nsmbw.2.shader_test
+++ b/shaders/dolphin/nsmbw.2.shader_test
@@ -1,5 +1,7 @@
[require]
GLSL >= 1.30
+GL_ARB_uniform_buffer_object
+GL_ARB_shading_language_420pack
[vertex shader]
#version 130
diff --git a/shaders/dolphin/realxfb.shader_test b/shaders/dolphin/realxfb.shader_test
index eb243fe..d50e59b 100644
--- a/shaders/dolphin/realxfb.shader_test
+++ b/shaders/dolphin/realxfb.shader_test
@@ -1,5 +1,7 @@
[require]
GLSL >= 1.30
+GL_ARB_uniform_buffer_object
+GL_ARB_shading_language_420pack
[vertex shader]
#version 130
diff --git a/shaders/dolphin/smg.1.shader_test b/shaders/dolphin/smg.1.shader_test
index 11cd3f9..8abb653 100644
--- a/shaders/dolphin/smg.1.shader_test
+++ b/shaders/dolphin/smg.1.shader_test
@@ -1,6 +1,9 @@
// added layout for both ocol0 + ocol1 to force use of GL_ARB_blend_func_extended
[require]
GLSL >= 1.30
+GL_ARB_explicit_attrib_location
+GL_ARB_uniform_buffer_object
+GL_ARB_shading_language_420pack
[fragment shader]
#version 130
diff --git a/shaders/dolphin/smg.2.shader_test b/shaders/dolphin/smg.2.shader_test
index 8b8a1f9..a465e58 100644
--- a/shaders/dolphin/smg.2.shader_test
+++ b/shaders/dolphin/smg.2.shader_test
@@ -1,5 +1,7 @@
[require]
GLSL >= 1.30
+GL_ARB_uniform_buffer_object
+GL_ARB_shading_language_420pack
[fragment shader]
#version 130
diff --git a/shaders/dolphin/ubershaders/102.shader_test b/shaders/dolphin/ubershaders/102.shader_test
index d7cb63a..82e6ffa 100644
--- a/shaders/dolphin/ubershaders/102.shader_test
+++ b/shaders/dolphin/ubershaders/102.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/111.shader_test b/shaders/dolphin/ubershaders/111.shader_test
index 205246b..bb0bbc7 100644
--- a/shaders/dolphin/ubershaders/111.shader_test
+++ b/shaders/dolphin/ubershaders/111.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/12.shader_test b/shaders/dolphin/ubershaders/12.shader_test
index d61a2c3..f797cab 100644
--- a/shaders/dolphin/ubershaders/12.shader_test
+++ b/shaders/dolphin/ubershaders/12.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/120.shader_test b/shaders/dolphin/ubershaders/120.shader_test
index a10c631..cca2508 100644
--- a/shaders/dolphin/ubershaders/120.shader_test
+++ b/shaders/dolphin/ubershaders/120.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/129.shader_test b/shaders/dolphin/ubershaders/129.shader_test
index 6f74f99..f78d4db 100644
--- a/shaders/dolphin/ubershaders/129.shader_test
+++ b/shaders/dolphin/ubershaders/129.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/138.shader_test b/shaders/dolphin/ubershaders/138.shader_test
index 88a4074..4fcc1e0 100644
--- a/shaders/dolphin/ubershaders/138.shader_test
+++ b/shaders/dolphin/ubershaders/138.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/147.shader_test b/shaders/dolphin/ubershaders/147.shader_test
index 7e44656..97f8549 100644
--- a/shaders/dolphin/ubershaders/147.shader_test
+++ b/shaders/dolphin/ubershaders/147.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/156.shader_test b/shaders/dolphin/ubershaders/156.shader_test
index f2e532e..66a4d85 100644
--- a/shaders/dolphin/ubershaders/156.shader_test
+++ b/shaders/dolphin/ubershaders/156.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/165.shader_test b/shaders/dolphin/ubershaders/165.shader_test
index 560e074..b7291d5 100644
--- a/shaders/dolphin/ubershaders/165.shader_test
+++ b/shaders/dolphin/ubershaders/165.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/174.shader_test b/shaders/dolphin/ubershaders/174.shader_test
index 4fc32ba..6262b26 100644
--- a/shaders/dolphin/ubershaders/174.shader_test
+++ b/shaders/dolphin/ubershaders/174.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/183.shader_test b/shaders/dolphin/ubershaders/183.shader_test
index a4a8ee6..33a6cf4 100644
--- a/shaders/dolphin/ubershaders/183.shader_test
+++ b/shaders/dolphin/ubershaders/183.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/192.shader_test b/shaders/dolphin/ubershaders/192.shader_test
index ff28abd..d6cd9e4 100644
--- a/shaders/dolphin/ubershaders/192.shader_test
+++ b/shaders/dolphin/ubershaders/192.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/201.shader_test b/shaders/dolphin/ubershaders/201.shader_test
index 7509f2e..ddd101e 100644
--- a/shaders/dolphin/ubershaders/201.shader_test
+++ b/shaders/dolphin/ubershaders/201.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/21.shader_test b/shaders/dolphin/ubershaders/21.shader_test
index 4490850..9436c11 100644
--- a/shaders/dolphin/ubershaders/21.shader_test
+++ b/shaders/dolphin/ubershaders/21.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/210.shader_test b/shaders/dolphin/ubershaders/210.shader_test
index 1299ee0..09312e2 100644
--- a/shaders/dolphin/ubershaders/210.shader_test
+++ b/shaders/dolphin/ubershaders/210.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/219.shader_test b/shaders/dolphin/ubershaders/219.shader_test
index 0ae96ed..8ad17b8 100644
--- a/shaders/dolphin/ubershaders/219.shader_test
+++ b/shaders/dolphin/ubershaders/219.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/228.shader_test b/shaders/dolphin/ubershaders/228.shader_test
index b87278e..d2f563b 100644
--- a/shaders/dolphin/ubershaders/228.shader_test
+++ b/shaders/dolphin/ubershaders/228.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/237.shader_test b/shaders/dolphin/ubershaders/237.shader_test
index 78c9356..d437cc8 100644
--- a/shaders/dolphin/ubershaders/237.shader_test
+++ b/shaders/dolphin/ubershaders/237.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/3.shader_test b/shaders/dolphin/ubershaders/3.shader_test
index f3256f8..7ae5a18 100644
--- a/shaders/dolphin/ubershaders/3.shader_test
+++ b/shaders/dolphin/ubershaders/3.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/30.shader_test b/shaders/dolphin/ubershaders/30.shader_test
index ddbc48a..dcf0fd8 100644
--- a/shaders/dolphin/ubershaders/30.shader_test
+++ b/shaders/dolphin/ubershaders/30.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/39.shader_test b/shaders/dolphin/ubershaders/39.shader_test
index 19b90c0..15123b0 100644
--- a/shaders/dolphin/ubershaders/39.shader_test
+++ b/shaders/dolphin/ubershaders/39.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/48.shader_test b/shaders/dolphin/ubershaders/48.shader_test
index 8e27f9f..5656893 100644
--- a/shaders/dolphin/ubershaders/48.shader_test
+++ b/shaders/dolphin/ubershaders/48.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/57.shader_test b/shaders/dolphin/ubershaders/57.shader_test
index 7372be8..f4baa10 100644
--- a/shaders/dolphin/ubershaders/57.shader_test
+++ b/shaders/dolphin/ubershaders/57.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/66.shader_test b/shaders/dolphin/ubershaders/66.shader_test
index 098f3ec..144f26d 100644
--- a/shaders/dolphin/ubershaders/66.shader_test
+++ b/shaders/dolphin/ubershaders/66.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/75.shader_test b/shaders/dolphin/ubershaders/75.shader_test
index db64b36..1a159a8 100644
--- a/shaders/dolphin/ubershaders/75.shader_test
+++ b/shaders/dolphin/ubershaders/75.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/84.shader_test b/shaders/dolphin/ubershaders/84.shader_test
index 2c4511c..6ba538b 100644
--- a/shaders/dolphin/ubershaders/84.shader_test
+++ b/shaders/dolphin/ubershaders/84.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400
diff --git a/shaders/dolphin/ubershaders/93.shader_test b/shaders/dolphin/ubershaders/93.shader_test
index 42c01d2..6a76ceb 100644
--- a/shaders/dolphin/ubershaders/93.shader_test
+++ b/shaders/dolphin/ubershaders/93.shader_test
@@ -1,5 +1,8 @@
[require]
GLSL >= 4.00
+GL_ARB_shading_language_420pack
+GL_ARB_shader_storage_buffer_object
+GL_ARB_shader_image_load_store
[vertex shader]
#version 400