From 875a15018865dbf171d3ca0ba7292346fb1b6739 Mon Sep 17 00:00:00 2001 From: Daniel Koch Date: Tue, 27 Oct 2020 18:56:01 -0400 Subject: [PATCH] Update glslang and deps for latest rebase Also includes support for new ignoreIntersectionEXT and terminateRayEXT terminators and updates affected shaders. Component: Framework, Vulkan Affected tests: dEQP-VK.ray_tracing_pipeline.* dEQP-VK.ray_query.* Change-Id: I9114e0637fa3d4bac3afc6af5d02f573270eb709 --- external/fetch_sources.py | 6 +++--- .../vulkancts/modules/vulkan/ray_tracing/vktRayTracingMiscTests.cpp | 2 +- .../vulkan/ray_tracing/vktRayTracingTraversalControlTests.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/external/fetch_sources.py b/external/fetch_sources.py index 7c4d768..aaea479 100644 --- a/external/fetch_sources.py +++ b/external/fetch_sources.py @@ -316,18 +316,18 @@ PACKAGES = [ GitRepo( "https://gitlab.khronos.org/spirv/spirv-tools.git", "git@gitlab.khronos.org:spirv/spirv-tools.git", - "99fc7c2911066cf7173e69bb86aa187383e016a0", + "c8ff6a73641b7ac0f38934cf02155126c3d6a514", "spirv-tools"), GitRepo( "https://gitlab.khronos.org/GLSL/glslang.git", "git@gitlab.khronos.org:GLSL/glslang.git", - "6545ca467032a1ef3ba30d5da662be41b23f89c0", + "2f5eb50edb115775458b8e61ac8571d80d4486d6", "glslang", removeTags = ["master-tot"]), GitRepo( "https://gitlab.khronos.org/spirv/SPIRV-Headers.git", "git@gitlab.khronos.org:spirv/SPIRV-Headers.git", - "bc3fc6ce4f83c35f7844ccff6b33e33e2161a8fe", + "3d7545903e312fd90b5f6a26badf90b9295c7655", "spirv-headers"), GitRepo( "https://github.com/google/amber.git", diff --git a/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingMiscTests.cpp b/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingMiscTests.cpp index 8e7ad86..ec64223 100644 --- a/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingMiscTests.cpp +++ b/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingMiscTests.cpp @@ -6876,7 +6876,7 @@ public: " if ((gl_RayTmaxEXT > 0.6) && (gl_RayTmaxEXT < 0.8))\n" " {\n" " atomicAdd(rayToHitProps[nRay].nHitsRejected, 1);\n" - " ignoreIntersectionEXT();\n" // reportIntersectionEXT should return false + " ignoreIntersectionEXT;\n" // reportIntersectionEXT should return false " }\n" " else if ((gl_RayTmaxEXT > 0.1) && (gl_RayTmaxEXT < 0.3))\n" " {\n" diff --git a/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingTraversalControlTests.cpp b/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingTraversalControlTests.cpp index 4a26126..a9db911 100644 --- a/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingTraversalControlTests.cpp +++ b/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingTraversalControlTests.cpp @@ -346,7 +346,7 @@ bool SingleSquareConfiguration::verifyImage (BufferWithMemory* resultBuffer, Con hitValue1 = missValue1; // no chit - results should report miss value break; case HSTT_AHIT_TERMINATE_RAY: - hitValue0 = tcu::UVec4(1, 0, 0, 0); // ahit should return 1. If it returned 2, then terminateRayEXT() did not terminate ahit shader + hitValue0 = tcu::UVec4(1, 0, 0, 0); // ahit should return 1. If it returned 2, then terminateRayEXT did not terminate ahit shader hitValue1 = tcu::UVec4(3, 0, 0, 0); // chit returns 3 break; default: @@ -522,7 +522,7 @@ void TraversalControlTestCase::initPrograms (SourceCollections& programCollectio "void main()\n" "{\n" " hitValue.x = 1;\n" - " ignoreIntersectionEXT();\n" + " ignoreIntersectionEXT;\n" " hitValue.x = 2;\n" "}\n"; @@ -538,7 +538,7 @@ void TraversalControlTestCase::initPrograms (SourceCollections& programCollectio "void main()\n" "{\n" " hitValue.x = 1;\n" - " terminateRayEXT();\n" + " terminateRayEXT;\n" " hitValue.x = 2;\n" "}\n"; -- 2.7.4