Extend existing RT cull ray flags tests to also use rayQueryGetRayFlagsEXT ()

Changed tests:

dEQP-VK.ray_query.ray_flags.*

Components: Vulkan
VK-GL-CTS issue: 2549

Change-Id: I28b9979f192a0eb9b37e1567b438d1a1a0e7a60a

diff --git a/external/vulkancts/modules/vulkan/ray_query/vktRayQueryCullRayFlagsTests.cpp b/external/vulkancts/modules/vulkan/ray_query/vktRayQueryCullRayFlagsTests.cpp
index 41d403f..152dfe0 100644 (file)
--- a/external/vulkancts/modules/vulkan/ray_query/vktRayQueryCullRayFlagsTests.cpp
+++ b/external/vulkancts/modules/vulkan/ray_query/vktRayQueryCullRayFlagsTests.cpp
@@ -1258,18 +1258,24 @@ void RayQueryCullRayFlagsTestCase::initPrograms (SourceCollections& programColle
                        "  rayQueryInitializeEXT(rq, rqTopLevelAS, rqFlags, 0xFF, origin, tmin, direct, tmax);\n"
                        "  if(rayQueryProceedEXT(rq))\n"
                        "  {\n"
-                       "    if (rayQueryGetIntersectionTypeEXT(rq, false)==gl_RayQueryCandidateIntersectionTriangleEXT)"
+                       "    if (rayQueryGetRayFlagsEXT(rq) == rqFlags)\n"
                        "    {\n"
-                       "      hitValue.x = 1;\n"
-                       "      hitValue.y = 1;\n"
+                       "      if (rayQueryGetIntersectionTypeEXT(rq, false)==gl_RayQueryCandidateIntersectionTriangleEXT)"
+                       "      {\n"
+                       "        hitValue.x = 1;\n"
+                       "        hitValue.y = 1;\n"
+                       "      }\n"
                        "    }\n"
                        "  }\n"
                        "  else\n"
                        "  {\n"
-                       "    if (rayQueryGetIntersectionTypeEXT(rq, true)==gl_RayQueryCommittedIntersectionTriangleEXT)\n"
+                       "    if (rayQueryGetRayFlagsEXT(rq) == rqFlags)\n"
                        "    {\n"
-                       "      hitValue.x = 2;\n"
-                       "      hitValue.y = 2;\n"
+                       "      if (rayQueryGetIntersectionTypeEXT(rq, true)==gl_RayQueryCommittedIntersectionTriangleEXT)\n"
+                       "      {\n"
+                       "        hitValue.x = 2;\n"
+                       "        hitValue.y = 2;\n"
+                       "      }\n"
                        "    }\n"
                        "  }\n";
                rayQueryTest.push_back(css.str());
@@ -1286,17 +1292,20 @@ void RayQueryCullRayFlagsTestCase::initPrograms (SourceCollections& programColle
                        "  rayQueryInitializeEXT(rq, rqTopLevelAS, rqFlags, 0xFF, origin, tmin, direct, tmax);\n"
                        "  if(rayQueryProceedEXT(rq))\n"
                        "  {\n"
-                       "    if (rayQueryGetIntersectionTypeEXT(rq, false)==gl_RayQueryCandidateIntersectionAABBEXT)\n"
+                       "    if (rayQueryGetRayFlagsEXT(rq) == rqFlags)\n"
                        "    {\n"
-                       "      if(rayQueryGetIntersectionCandidateAABBOpaqueEXT(rq))\n"
+                       "      if (rayQueryGetIntersectionTypeEXT(rq, false)==gl_RayQueryCandidateIntersectionAABBEXT)\n"
                        "      {\n"
-                       "        hitValue.x = 2;\n"
-                       "        hitValue.y = 2;\n"
-                       "      }\n"
-                       "      else\n"
-                       "      {\n"
-                       "        hitValue.x = 1;\n"
-                       "        hitValue.y = 1;\n"
+                       "        if(rayQueryGetIntersectionCandidateAABBOpaqueEXT(rq))\n"
+                       "        {\n"
+                       "          hitValue.x = 2;\n"
+                       "          hitValue.y = 2;\n"
+                       "        }\n"
+                       "        else\n"
+                       "        {\n"
+                       "          hitValue.x = 1;\n"
+                       "          hitValue.y = 1;\n"
+                       "        }\n"
                        "      }\n"
                        "    }\n"
                        "  }\n";