[Piglit] [PATCH] vulkan/vkrunner: Use the new alternative names for setting uniforms
Neil Roberts
nroberts at igalia.com
Tue Feb 19 15:28:56 UTC 2019
Since VkRunner commit 6b1d2f51efad6, there are now alternative names
for the commands for setting push constants and UBO data. These names
are a bit less confusing so this patch converts all of the VkRunner
test scripts to use them.
---
.../face-forward-double.vk_shader_test | 80 +++++++++----------
.../glsl450/frexp-double.vk_shader_test | 24 +++---
.../glsl450/isinf-double.vk_shader_test | 16 ++--
.../glsl450/reflect-double.vk_shader_test | 32 ++++----
.../glsl450/refract-double.vk_shader_test | 80 +++++++++----------
.../fs-large-local-array-vec2.vk_shader_test | 4 +-
.../fs-large-local-array-vec3.vk_shader_test | 4 +-
.../fs-large-local-array-vec4.vk_shader_test | 4 +-
.../fs-large-local-array.vk_shader_test | 4 +-
...-multiple-large-local-array.vk_shader_test | 4 +-
10 files changed, 126 insertions(+), 126 deletions(-)
diff --git a/tests/vulkan/glsl450/face-forward-double.vk_shader_test b/tests/vulkan/glsl450/face-forward-double.vk_shader_test
index 3ad439059..0ed305b26 100644
--- a/tests/vulkan/glsl450/face-forward-double.vk_shader_test
+++ b/tests/vulkan/glsl450/face-forward-double.vk_shader_test
@@ -30,59 +30,59 @@ main()
clear color 0.0 0.0 1.0 0.0
clear
-uniform dvec2 0 -0.10000000000000001 -1.2
-uniform dvec2 16 -0.10000000000000001 -1.2
-uniform dvec2 32 -0.10000000000000001 -1.2
-uniform dvec2 64 0.10000000000000001 1.2
-uniform double 48 1.2041594578792297e-05
+push dvec2 0 -0.10000000000000001 -1.2
+push dvec2 16 -0.10000000000000001 -1.2
+push dvec2 32 -0.10000000000000001 -1.2
+push dvec2 64 0.10000000000000001 1.2
+push double 48 1.2041594578792297e-05
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
-uniform dvec2 0 -0.10000000000000001 -1.2
-uniform dvec2 16 -0.10000000000000001 -1.2
-uniform dvec2 32 -0.41999999999999998 0.47999999999999998
-uniform dvec2 64 -0.10000000000000001 -1.2
-uniform double 48 1.2041594578792297e-05
+push dvec2 0 -0.10000000000000001 -1.2
+push dvec2 16 -0.10000000000000001 -1.2
+push dvec2 32 -0.41999999999999998 0.47999999999999998
+push dvec2 64 -0.10000000000000001 -1.2
+push double 48 1.2041594578792297e-05
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
-uniform dvec2 0 -0.10000000000000001 -1.2
-uniform dvec2 16 -0.41999999999999998 0.47999999999999998
-uniform dvec2 32 -0.10000000000000001 -1.2
-uniform dvec2 64 -0.10000000000000001 -1.2
-uniform double 48 1.2041594578792297e-05
+push dvec2 0 -0.10000000000000001 -1.2
+push dvec2 16 -0.41999999999999998 0.47999999999999998
+push dvec2 32 -0.10000000000000001 -1.2
+push dvec2 64 -0.10000000000000001 -1.2
+push double 48 1.2041594578792297e-05
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
-uniform dvec2 0 -0.10000000000000001 -1.2
-uniform dvec2 16 -0.41999999999999998 0.47999999999999998
-uniform dvec2 32 -0.41999999999999998 0.47999999999999998
-uniform dvec2 64 0.10000000000000001 1.2
-uniform double 48 1.2041594578792297e-05
+push dvec2 0 -0.10000000000000001 -1.2
+push dvec2 16 -0.41999999999999998 0.47999999999999998
+push dvec2 32 -0.41999999999999998 0.47999999999999998
+push dvec2 64 0.10000000000000001 1.2
+push double 48 1.2041594578792297e-05
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
-uniform dvec2 0 -0.41999999999999998 0.47999999999999998
-uniform dvec2 16 -0.10000000000000001 -1.2
-uniform dvec2 32 -0.10000000000000001 -1.2
-uniform dvec2 64 0.41999999999999998 -0.47999999999999998
-uniform double 48 6.3780874876407897e-06
+push dvec2 0 -0.41999999999999998 0.47999999999999998
+push dvec2 16 -0.10000000000000001 -1.2
+push dvec2 32 -0.10000000000000001 -1.2
+push dvec2 64 0.41999999999999998 -0.47999999999999998
+push double 48 6.3780874876407897e-06
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
-uniform dvec2 0 -0.41999999999999998 0.47999999999999998
-uniform dvec2 16 -0.10000000000000001 -1.2
-uniform dvec2 32 -0.41999999999999998 0.47999999999999998
-uniform dvec2 64 -0.41999999999999998 0.47999999999999998
-uniform double 48 6.3780874876407897e-06
+push dvec2 0 -0.41999999999999998 0.47999999999999998
+push dvec2 16 -0.10000000000000001 -1.2
+push dvec2 32 -0.41999999999999998 0.47999999999999998
+push dvec2 64 -0.41999999999999998 0.47999999999999998
+push double 48 6.3780874876407897e-06
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
-uniform dvec2 0 -0.41999999999999998 0.47999999999999998
-uniform dvec2 16 -0.41999999999999998 0.47999999999999998
-uniform dvec2 32 -0.10000000000000001 -1.2
-uniform dvec2 64 -0.41999999999999998 0.47999999999999998
-uniform double 48 6.3780874876407897e-06
+push dvec2 0 -0.41999999999999998 0.47999999999999998
+push dvec2 16 -0.41999999999999998 0.47999999999999998
+push dvec2 32 -0.10000000000000001 -1.2
+push dvec2 64 -0.41999999999999998 0.47999999999999998
+push double 48 6.3780874876407897e-06
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
-uniform dvec2 0 -0.41999999999999998 0.47999999999999998
-uniform dvec2 16 -0.41999999999999998 0.47999999999999998
-uniform dvec2 32 -0.41999999999999998 0.47999999999999998
-uniform dvec2 64 0.41999999999999998 -0.47999999999999998
-uniform double 48 6.3780874876407897e-06
+push dvec2 0 -0.41999999999999998 0.47999999999999998
+push dvec2 16 -0.41999999999999998 0.47999999999999998
+push dvec2 32 -0.41999999999999998 0.47999999999999998
+push dvec2 64 0.41999999999999998 -0.47999999999999998
+push double 48 6.3780874876407897e-06
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/vulkan/glsl450/frexp-double.vk_shader_test b/tests/vulkan/glsl450/frexp-double.vk_shader_test
index 1fbae50b1..3bacca76e 100644
--- a/tests/vulkan/glsl450/frexp-double.vk_shader_test
+++ b/tests/vulkan/glsl450/frexp-double.vk_shader_test
@@ -34,28 +34,28 @@ void main()
}
[test]
-uniform dvec4 0 0.0 -0.0 0.5 -0.5
-uniform dvec4 32 0.0 -0.0 0.5 -0.5
-uniform ivec4 64 0 0 0 0
+push dvec4 0 0.0 -0.0 0.5 -0.5
+push dvec4 32 0.0 -0.0 0.5 -0.5
+push ivec4 64 0 0 0 0
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
-uniform dvec4 0 0.49 1.0 25.0 100
-uniform dvec4 32 0.98 0.5 0.78125 0.78125
-uniform ivec4 64 -1 1 5 7
+push dvec4 0 0.49 1.0 25.0 100
+push dvec4 32 0.98 0.5 0.78125 0.78125
+push ivec4 64 -1 1 5 7
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Test FLT_MIN/MAX in doubles
-uniform dvec4 0 1.1754943508222875e-38 -1.1754943508222875e-38 3.4028234699999998e+38 -3.4028234699999998e+38
-uniform dvec4 32 0.5 -0.5 0.99999994145762339 -0.99999994145762339
-uniform ivec4 64 -125 -125 128 128
+push dvec4 0 1.1754943508222875e-38 -1.1754943508222875e-38 3.4028234699999998e+38 -3.4028234699999998e+38
+push dvec4 32 0.5 -0.5 0.99999994145762339 -0.99999994145762339
+push ivec4 64 -125 -125 128 128
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
# Test DBL_MIN/MAX
-uniform dvec4 0 2.2250738585072014e-308 -2.2250738585072014e-308 1.7976931348623157e+308 -1.7976931348623157e+308
-uniform dvec4 32 0.5 -0.5 0.99999999999999989 -0.99999999999999989
-uniform ivec4 64 -1021 -1021 1024 1024
+push dvec4 0 2.2250738585072014e-308 -2.2250738585072014e-308 1.7976931348623157e+308 -1.7976931348623157e+308
+push dvec4 32 0.5 -0.5 0.99999999999999989 -0.99999999999999989
+push ivec4 64 -1021 -1021 1024 1024
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/vulkan/glsl450/isinf-double.vk_shader_test b/tests/vulkan/glsl450/isinf-double.vk_shader_test
index 2c6169929..bd3d155a7 100644
--- a/tests/vulkan/glsl450/isinf-double.vk_shader_test
+++ b/tests/vulkan/glsl450/isinf-double.vk_shader_test
@@ -65,17 +65,17 @@ main()
clear color 0.0 0.0 1.0 0.0
clear
-uniform double 0 0.0
-uniform dvec4 32 1.0 1.0 -1.0 -1.0
-uniform vec4 64 1.0 1000.0 1000.0 1.0
-uniform dvec4 96 0.0 1.0 1.0 0.0
+push double 0 0.0
+push dvec4 32 1.0 1.0 -1.0 -1.0
+push vec4 64 1.0 1000.0 1000.0 1.0
+push dvec4 96 0.0 1.0 1.0 0.0
draw rect -1 -1 2 2
probe all rgba 0.0 0.0 0.0 0.0
clear
-uniform double 0 0.0
-uniform dvec4 32 -1.0 -1.0 1.0 1.0
-uniform vec4 64 1000.0 1.0 1.0 1000.0
-uniform dvec4 96 1.0 0.0 0.0 1.0
+push double 0 0.0
+push dvec4 32 -1.0 -1.0 1.0 1.0
+push vec4 64 1000.0 1.0 1.0 1000.0
+push dvec4 96 1.0 0.0 0.0 1.0
draw rect -1 -1 2 2
probe all rgba 0.0 0.0 0.0 0.0
diff --git a/tests/vulkan/glsl450/reflect-double.vk_shader_test b/tests/vulkan/glsl450/reflect-double.vk_shader_test
index 4c1d48480..8bb45a5ef 100644
--- a/tests/vulkan/glsl450/reflect-double.vk_shader_test
+++ b/tests/vulkan/glsl450/reflect-double.vk_shader_test
@@ -29,27 +29,27 @@ main()
clear color 0.0 0.0 1.0 0.0
clear
-uniform dvec2 0 -0.10000000000000001 -1.2
-uniform dvec2 16 -0.083045479853739973 -0.99654575824487956
-uniform dvec2 48 0.099999999999999978 1.1999999999999995
-uniform double 32 1.2041594578792292e-05
+push dvec2 0 -0.10000000000000001 -1.2
+push dvec2 16 -0.083045479853739973 -0.99654575824487956
+push dvec2 48 0.099999999999999978 1.1999999999999995
+push double 32 1.2041594578792292e-05
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
-uniform dvec2 0 -0.10000000000000001 -1.2
-uniform dvec2 16 -0.65850460786851817 0.75257669470687794
-uniform dvec2 48 -1.2026548672566375 0.060176991150442838
-uniform double 32 1.2041594578792299e-05
+push dvec2 0 -0.10000000000000001 -1.2
+push dvec2 16 -0.65850460786851817 0.75257669470687794
+push dvec2 48 -1.2026548672566375 0.060176991150442838
+push double 32 1.2041594578792299e-05
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
-uniform dvec2 0 -0.41999999999999998 0.47999999999999998
-uniform dvec2 16 -0.083045479853739973 -0.99654575824487956
-uniform dvec2 48 -0.49365517241379309 -0.40386206896551724
-uniform double 32 6.3780874876407897e-06
+push dvec2 0 -0.41999999999999998 0.47999999999999998
+push dvec2 16 -0.083045479853739973 -0.99654575824487956
+push dvec2 48 -0.49365517241379309 -0.40386206896551724
+push double 32 6.3780874876407897e-06
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
-uniform dvec2 0 -0.41999999999999998 0.47999999999999998
-uniform dvec2 16 -0.65850460786851817 0.75257669470687794
-uniform dvec2 48 0.42000000000000032 -0.48000000000000043
-uniform double 32 6.3780874876407965e-06
+push dvec2 0 -0.41999999999999998 0.47999999999999998
+push dvec2 16 -0.65850460786851817 0.75257669470687794
+push dvec2 48 0.42000000000000032 -0.48000000000000043
+push double 32 6.3780874876407965e-06
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/vulkan/glsl450/refract-double.vk_shader_test b/tests/vulkan/glsl450/refract-double.vk_shader_test
index 3db728a9d..b19217355 100644
--- a/tests/vulkan/glsl450/refract-double.vk_shader_test
+++ b/tests/vulkan/glsl450/refract-double.vk_shader_test
@@ -30,59 +30,59 @@ main()
clear color 0.0 0.0 1.0 0.0
clear
-uniform dvec2 0 -0.083045479853739973 -0.99654575824487956
-uniform dvec2 16 -0.083045479853739973 -0.99654575824487956
-uniform float 32 0.5
-uniform dvec2 48 0.083045479853739973 0.99654575824487956
-uniform double 40 9.9999999999999991e-06
+push dvec2 0 -0.083045479853739973 -0.99654575824487956
+push dvec2 16 -0.083045479853739973 -0.99654575824487956
+push float 32 0.5
+push dvec2 48 0.083045479853739973 0.99654575824487956
+push double 40 9.9999999999999991e-06
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
-uniform dvec2 0 -0.083045479853739973 -0.99654575824487956
-uniform dvec2 16 -0.083045479853739973 -0.99654575824487956
-uniform float 32 2.0
-uniform dvec2 48 0.08304547985373989 0.99654575824487868
-uniform double 40 9.9999999999999907e-06
+push dvec2 0 -0.083045479853739973 -0.99654575824487956
+push dvec2 16 -0.083045479853739973 -0.99654575824487956
+push float 32 2.0
+push dvec2 48 0.08304547985373989 0.99654575824487868
+push double 40 9.9999999999999907e-06
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
-uniform dvec2 0 -0.083045479853739973 -0.99654575824487956
-uniform dvec2 16 -0.65850460786851817 0.75257669470687794
-uniform float 32 0.5
-uniform dvec2 48 0.34406582839171168 -0.93894552862939029
-uniform double 40 1.0000000000000001e-05
+push dvec2 0 -0.083045479853739973 -0.99654575824487956
+push dvec2 16 -0.65850460786851817 0.75257669470687794
+push float 32 0.5
+push dvec2 48 0.34406582839171168 -0.93894552862939029
+push double 40 1.0000000000000001e-05
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
-uniform dvec2 0 -0.083045479853739973 -0.99654575824487956
-uniform dvec2 16 -0.65850460786851817 0.75257669470687794
-uniform float 32 2.0
-uniform dvec2 48 -0.0 -0.0
-uniform double 40 0.0
+push dvec2 0 -0.083045479853739973 -0.99654575824487956
+push dvec2 16 -0.65850460786851817 0.75257669470687794
+push float 32 2.0
+push dvec2 48 -0.0 -0.0
+push double 40 0.0
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
-uniform dvec2 0 -0.65850460786851817 0.75257669470687794
-uniform dvec2 16 -0.083045479853739973 -0.99654575824487956
-uniform float 32 0.5
-uniform dvec2 48 -0.28062487247894746 0.95981752481717819
-uniform double 40 1.0000000000000001e-05
+push dvec2 0 -0.65850460786851817 0.75257669470687794
+push dvec2 16 -0.083045479853739973 -0.99654575824487956
+push float 32 0.5
+push dvec2 48 -0.28062487247894746 0.95981752481717819
+push double 40 1.0000000000000001e-05
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
-uniform dvec2 0 -0.65850460786851817 0.75257669470687794
-uniform dvec2 16 -0.083045479853739973 -0.99654575824487956
-uniform float 32 2.0
-uniform dvec2 48 -0.0 0.0
-uniform double 40 0.0
+push dvec2 0 -0.65850460786851817 0.75257669470687794
+push dvec2 16 -0.083045479853739973 -0.99654575824487956
+push float 32 2.0
+push dvec2 48 -0.0 0.0
+push double 40 0.0
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
-uniform dvec2 0 -0.65850460786851817 0.75257669470687794
-uniform dvec2 16 -0.65850460786851817 0.75257669470687794
-uniform float 32 0.5
-uniform dvec2 48 0.65850460786851817 -0.75257669470687782
-uniform double 40 1.0000000000000001e-05
+push dvec2 0 -0.65850460786851817 0.75257669470687794
+push dvec2 16 -0.65850460786851817 0.75257669470687794
+push float 32 0.5
+push dvec2 48 0.65850460786851817 -0.75257669470687782
+push double 40 1.0000000000000001e-05
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
-uniform dvec2 0 -0.65850460786851817 0.75257669470687794
-uniform dvec2 16 -0.65850460786851817 0.75257669470687794
-uniform float 32 2.0
-uniform dvec2 48 0.65850460786851905 -0.75257669470687905
-uniform double 40 1.0000000000000016e-05
+push dvec2 0 -0.65850460786851817 0.75257669470687794
+push dvec2 16 -0.65850460786851817 0.75257669470687794
+push float 32 2.0
+push dvec2 48 0.65850460786851905 -0.75257669470687905
+push double 40 1.0000000000000016e-05
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/vulkan/shaders/fs-large-local-array-vec2.vk_shader_test b/tests/vulkan/shaders/fs-large-local-array-vec2.vk_shader_test
index 6fbf71d50..12a3f2f06 100644
--- a/tests/vulkan/shaders/fs-large-local-array-vec2.vk_shader_test
+++ b/tests/vulkan/shaders/fs-large-local-array-vec2.vk_shader_test
@@ -28,11 +28,11 @@ void main()
clear color 1.0 0.0 0.0 1.0
clear
-uniform ubo 5 uint 0 19
+ubo 5 subdata uint 0 19
draw rect -1 -1 2 2
probe all rgba 0.0 0.0 0.0 1.0
clear
-uniform ubo 5 uint 0 20
+ubo 5 subdata uint 0 20
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/vulkan/shaders/fs-large-local-array-vec3.vk_shader_test b/tests/vulkan/shaders/fs-large-local-array-vec3.vk_shader_test
index 8c00bc720..76603302a 100644
--- a/tests/vulkan/shaders/fs-large-local-array-vec3.vk_shader_test
+++ b/tests/vulkan/shaders/fs-large-local-array-vec3.vk_shader_test
@@ -28,11 +28,11 @@ void main()
clear color 1.0 0.0 0.0 1.0
clear
-uniform ubo 5 uint 0 19
+ubo 5 subdata uint 0 19
draw rect -1 -1 2 2
probe all rgba 0.0 0.0 0.0 1.0
clear
-uniform ubo 5 uint 0 20
+ubo 5 subdata uint 0 20
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/vulkan/shaders/fs-large-local-array-vec4.vk_shader_test b/tests/vulkan/shaders/fs-large-local-array-vec4.vk_shader_test
index 6239bfee6..8804b5ed8 100644
--- a/tests/vulkan/shaders/fs-large-local-array-vec4.vk_shader_test
+++ b/tests/vulkan/shaders/fs-large-local-array-vec4.vk_shader_test
@@ -28,11 +28,11 @@ void main()
clear color 1.0 0.0 0.0 1.0
clear
-uniform ubo 5 uint 0 19
+ubo 5 subdata uint 0 19
draw rect -1 -1 2 2
probe all rgba 0.0 0.0 0.0 1.0
clear
-uniform ubo 5 uint 0 20
+ubo 5 subdata uint 0 20
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/vulkan/shaders/fs-large-local-array.vk_shader_test b/tests/vulkan/shaders/fs-large-local-array.vk_shader_test
index c62109ee1..f37a14556 100644
--- a/tests/vulkan/shaders/fs-large-local-array.vk_shader_test
+++ b/tests/vulkan/shaders/fs-large-local-array.vk_shader_test
@@ -37,11 +37,11 @@ void main()
clear color 1.0 0.0 0.0 1.0
clear
-uniform ubo 5 uint 0 19
+ubo 5 subdata uint 0 19
draw rect -1 -1 2 2
probe all rgba 0.0 0.0 0.0 1.0
clear
-uniform ubo 5 uint 0 20
+ubo 5 subdata uint 0 20
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
diff --git a/tests/vulkan/shaders/fs-multiple-large-local-array.vk_shader_test b/tests/vulkan/shaders/fs-multiple-large-local-array.vk_shader_test
index 658027876..40597c022 100644
--- a/tests/vulkan/shaders/fs-multiple-large-local-array.vk_shader_test
+++ b/tests/vulkan/shaders/fs-multiple-large-local-array.vk_shader_test
@@ -30,11 +30,11 @@ void main()
clear color 1.0 0.0 0.0 1.0
clear
-uniform ubo 5 uint 0 19
+ubo 5 subdata uint 0 19
draw rect -1 -1 2 2
probe all rgba 0.0 0.0 0.0 1.0
clear
-uniform ubo 5 uint 0 20
+ubo 5 subdata uint 0 20
draw rect -1 -1 2 2
probe all rgba 0.0 1.0 0.0 1.0
--
2.17.2
More information about the Piglit
mailing list