From faaa44521f7f42eb59b244ca1f4d1aa94ef05677 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C5=82awomir=20Cygan?= Date: Fri, 26 Feb 2021 13:34:23 +0100 Subject: [PATCH] Fix reordering vertices in geometry shader in ray_query AS test This fixes the shader to write reordered vertice data into sequential (unordered) store image indices The change from 48f12336 was incomplete and misses the change to the image store indices. Components: Vulkan VK-GL-CTS Issue: 2764 Affects: dEQP-VK.ray_query.acceleration_structures.*.geometry_shader.* Change-Id: Ifd51d77e94c607e860e5c9efdefe2cb5a5ee97ff --- .../vulkan/ray_query/vktRayQueryAccelerationStructuresTests.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/external/vulkancts/modules/vulkan/ray_query/vktRayQueryAccelerationStructuresTests.cpp b/external/vulkancts/modules/vulkan/ray_query/vktRayQueryAccelerationStructuresTests.cpp index 7dd1f2e..4e52016 100644 --- a/external/vulkancts/modules/vulkan/ray_query/vktRayQueryAccelerationStructuresTests.cpp +++ b/external/vulkancts/modules/vulkan/ray_query/vktRayQueryAccelerationStructuresTests.cpp @@ -1794,8 +1794,8 @@ void RayQueryASBasicTestCase::initPrograms (SourceCollections& programCollection " vec3 origin = vec3(gl_in[i].gl_Position.x + 0.5, gl_in[i].gl_Position.y + 0.5, 0.5);\n" " uvec4 hitValue = uvec4(0,0,0,0);\n" << rayQueryTest[m_data.bottomTestType] << - " imageStore(result, ivec3(gl_PrimitiveIDIn, i, 0), uvec4(hitValue.x, 0, 0, 0));\n" - " imageStore(result, ivec3(gl_PrimitiveIDIn, i, 1), uvec4(hitValue.y, 0, 0, 0));\n" + " imageStore(result, ivec3(gl_PrimitiveIDIn, j, 0), uvec4(hitValue.x, 0, 0, 0));\n" + " imageStore(result, ivec3(gl_PrimitiveIDIn, j, 1), uvec4(hitValue.y, 0, 0, 0));\n" " gl_Position = gl_in[i].gl_Position;\n" " EmitVertex();\n" " }\n" -- 2.7.4