diff options
Diffstat (limited to 'tests/pipeline')
7 files changed, 19 insertions, 17 deletions
diff --git a/tests/pipeline/rasterization/get-attribute-at-vertex-nv.slang.glsl b/tests/pipeline/rasterization/get-attribute-at-vertex-nv.slang.glsl index 1da5f4f8a..1897c6467 100644 --- a/tests/pipeline/rasterization/get-attribute-at-vertex-nv.slang.glsl +++ b/tests/pipeline/rasterization/get-attribute-at-vertex-nv.slang.glsl @@ -7,13 +7,13 @@ layout(row_major) uniform; layout(row_major) buffer; pervertexNV layout(location = 0) -in vec4 _S1[3]; +in vec4 color_0[3]; layout(location = 0) -out vec4 _S2; +out vec4 result_0; void main() { - _S2 = gl_BaryCoordNV.x * ((_S1)[(0U)]) + gl_BaryCoordNV.y * ((_S1)[(1U)]) + gl_BaryCoordNV.z * ((_S1)[(2U)]); + result_0 = gl_BaryCoordNV.x * ((color_0)[(0U)]) + gl_BaryCoordNV.y * ((color_0)[(1U)]) + gl_BaryCoordNV.z * ((color_0)[(2U)]); return; } diff --git a/tests/pipeline/rasterization/get-attribute-at-vertex.slang.glsl b/tests/pipeline/rasterization/get-attribute-at-vertex.slang.glsl index d8710eed0..5c3ac8286 100644 --- a/tests/pipeline/rasterization/get-attribute-at-vertex.slang.glsl +++ b/tests/pipeline/rasterization/get-attribute-at-vertex.slang.glsl @@ -7,13 +7,13 @@ layout(row_major) uniform; layout(row_major) buffer; pervertexEXT layout(location = 0) -in vec4 _S1[3]; +in vec4 color_0[3]; layout(location = 0) -out vec4 _S2; +out vec4 result_0; void main() { - _S2 = gl_BaryCoordEXT.x * ((_S1)[(0U)]) + gl_BaryCoordEXT.y * ((_S1)[(1U)]) + gl_BaryCoordEXT.z * ((_S1)[(2U)]); + result_0 = gl_BaryCoordEXT.x * ((color_0)[(0U)]) + gl_BaryCoordEXT.y * ((color_0)[(1U)]) + gl_BaryCoordEXT.z * ((color_0)[(2U)]); return; } diff --git a/tests/pipeline/rasterization/mesh/component-write.slang.glsl b/tests/pipeline/rasterization/mesh/component-write.slang.glsl index 143947504..acadf0385 100644 --- a/tests/pipeline/rasterization/mesh/component-write.slang.glsl +++ b/tests/pipeline/rasterization/mesh/component-write.slang.glsl @@ -5,7 +5,7 @@ layout(row_major) buffer; const vec2 positions_0[3] = { vec2(0.0, -0.5), vec2(0.5, 0.5), vec2(-0.5, 0.5) }; const vec3 colors_0[3] = { vec3(1.0, 1.0, 0.0), vec3(0.0, 1.0, 1.0), vec3(1.0, 0.0, 1.0) }; layout(location = 0) -out vec3 _S1[3]; +out vec3 verts_color_0[3]; out gl_MeshPerVertexEXT @@ -26,7 +26,7 @@ void main() if(gl_LocalInvocationIndex < 3U) { gl_MeshVerticesEXT[gl_LocalInvocationIndex].gl_Position = vec4(positions_0[gl_LocalInvocationIndex], 0.0, 1.0); - _S1[gl_LocalInvocationIndex] = colors_0[gl_LocalInvocationIndex]; + verts_color_0[gl_LocalInvocationIndex] = colors_0[gl_LocalInvocationIndex]; } else { diff --git a/tests/pipeline/rasterization/mesh/hlsl-syntax.slang.glsl b/tests/pipeline/rasterization/mesh/hlsl-syntax.slang.glsl index 5e059a8a3..01e29f879 100644 --- a/tests/pipeline/rasterization/mesh/hlsl-syntax.slang.glsl +++ b/tests/pipeline/rasterization/mesh/hlsl-syntax.slang.glsl @@ -5,7 +5,7 @@ layout(row_major) buffer; const vec3 colors_0[3] = { vec3(1.0, 1.0, 0.0), vec3(0.0, 1.0, 1.0), vec3(1.0, 0.0, 1.0) }; const vec2 positions_0[3] = { vec2(0.0, -0.5), vec2(0.5, 0.5), vec2(-0.5, 0.5) }; layout(location = 0) -out vec3 _S1[3]; +out vec3 verts_color_0[3]; out gl_MeshPerVertexEXT { @@ -19,7 +19,7 @@ void foo_0(uint _S2) if(_S2 < 3U) { gl_MeshVerticesEXT[_S2].gl_Position = vec4(positions_0[_S2], 0.0, 1.0); - _S1[_S2] = colors_0[_S2]; + verts_color_0[_S2] = colors_0[_S2]; } else { diff --git a/tests/pipeline/rasterization/mesh/nested-component-write.slang.glsl b/tests/pipeline/rasterization/mesh/nested-component-write.slang.glsl index 4c70955a1..a372a868b 100644 --- a/tests/pipeline/rasterization/mesh/nested-component-write.slang.glsl +++ b/tests/pipeline/rasterization/mesh/nested-component-write.slang.glsl @@ -3,7 +3,7 @@ layout(row_major) uniform; layout(row_major) buffer; layout(location = 0) -out vec3 _S1[3]; +out vec3 verts_foo_bar_baz_color_0[3]; out gl_MeshPerVertexEXT { @@ -20,7 +20,7 @@ void main() if(gl_LocalInvocationIndex < 3U) { gl_MeshVerticesEXT[gl_LocalInvocationIndex].gl_Position = vec4(0.00000000000000000000, 0.00000000000000000000, 0.00000000000000000000, 1.00000000000000000000); - _S1[gl_LocalInvocationIndex] = vec3(1.00000000000000000000, 2.00000000000000000000, 3.00000000000000000000); + verts_foo_bar_baz_color_0[gl_LocalInvocationIndex] = vec3(1.00000000000000000000, 2.00000000000000000000, 3.00000000000000000000); } else { diff --git a/tests/pipeline/rasterization/mesh/passing-outputs.slang b/tests/pipeline/rasterization/mesh/passing-outputs.slang index 321c1179e..20e6abe0b 100644 --- a/tests/pipeline/rasterization/mesh/passing-outputs.slang +++ b/tests/pipeline/rasterization/mesh/passing-outputs.slang @@ -2,7 +2,7 @@ // This tests that writing to individual components of the output struct works -//TEST:CROSS_COMPILE:-target spirv-assembly -entry main -stage mesh -profile glsl_450+spirv_1_4 +//TEST:SIMPLE(filecheck=SPIRV): -target spirv-assembly -entry main -stage mesh -profile glsl_450+spirv_1_4 // DXC is stricter than we are about passing references to individual mesh shader outputs // We could get around this by doing what we do for GLSL, i.e. use a temporary @@ -10,6 +10,8 @@ // after the function call. //TEST_DISABLED:CROSS_COMPILE:-target dxil-assembly -entry main -stage mesh -profile sm_6_6 +// SPIRV: OpEntryPoint MeshEXT %main + const static uint MAX_VERTS = 3; const static uint MAX_PRIMS = 1; diff --git a/tests/pipeline/rasterization/mesh/primitive-output.slang.glsl b/tests/pipeline/rasterization/mesh/primitive-output.slang.glsl index cfe266bec..3623cb8a8 100644 --- a/tests/pipeline/rasterization/mesh/primitive-output.slang.glsl +++ b/tests/pipeline/rasterization/mesh/primitive-output.slang.glsl @@ -7,7 +7,7 @@ const vec3 colors_0[3] = { vec3(1.0, 1.0, 0.0), vec3(0.0, 1.0, 1.0), vec3(1.0, out uvec3 gl_PrimitiveTriangleIndicesEXT[1]; layout(location = 0) -out vec3 _S1[3]; +out vec3 verts_color_0[3]; out gl_MeshPerVertexEXT { @@ -15,7 +15,7 @@ out gl_MeshPerVertexEXT } gl_MeshVerticesEXT[3]; perprimitiveEXT layout(location = 1) -out vec3 _S2[1]; +out vec3 primitives_triangleNormal_0[1]; perprimitiveEXT out gl_MeshPerPrimitiveEXT { @@ -34,7 +34,7 @@ void main() if(gl_LocalInvocationIndex < 3U) { gl_MeshVerticesEXT[gl_LocalInvocationIndex].gl_Position = vec4(positions_0[gl_LocalInvocationIndex], 0.0, 1.0); - _S1[gl_LocalInvocationIndex] = colors_0[gl_LocalInvocationIndex]; + verts_color_0[gl_LocalInvocationIndex] = colors_0[gl_LocalInvocationIndex]; } else { @@ -43,7 +43,7 @@ void main() if(gl_LocalInvocationIndex < 1U) { gl_PrimitiveTriangleIndicesEXT[gl_LocalInvocationIndex] = uvec3(0U, 1U, 2U); - _S2[gl_LocalInvocationIndex] = vec3(0.0, 0.0, 1.0); + primitives_triangleNormal_0[gl_LocalInvocationIndex] = vec3(0.0, 0.0, 1.0); gl_MeshPrimitivesEXT[gl_LocalInvocationIndex].gl_PrimitiveID = int(gl_LocalInvocationIndex); gl_MeshPrimitivesEXT[gl_LocalInvocationIndex].gl_CullPrimitiveEXT = false; } |