summaryrefslogtreecommitdiff
path: root/executor
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2020-07-10 10:23:16 -0500
committerAlexander Galazin <Alexander.Galazin@arm.com>2020-07-13 03:05:00 -0400
commitbfb5c1954b482e802f9f51290687e56e89b7dafb (patch)
treed8132f12a6f39976d096811d393a35aeb127ed49 /executor
parentbcde35fcacb41a0e5fdb0b6ecf9093316f4c6b45 (diff)
downloadVK-GL-CTS-bfb5c1954b482e802f9f51290687e56e89b7dafb.tar.gz
VK-GL-CTS-bfb5c1954b482e802f9f51290687e56e89b7dafb.tar.bz2
VK-GL-CTS-bfb5c1954b482e802f9f51290687e56e89b7dafb.zip
Be consistent about the capitalization of Raygen
Some places we use "Raygen" and others "RayGen". This CL standardizes everything on "Raygen" and fixes issues where testlog-to-xml fails to parse the qpa files generated by test runs. Change-Id: I0701039a28942a39a399def808e4dd1a5a878a7a
Diffstat (limited to 'executor')
-rw-r--r--executor/xeTestLogWriter.cpp2
-rw-r--r--executor/xeTestResultParser.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/executor/xeTestLogWriter.cpp b/executor/xeTestLogWriter.cpp
index 81c634c33..c7e389a52 100644
--- a/executor/xeTestLogWriter.cpp
+++ b/executor/xeTestLogWriter.cpp
@@ -302,7 +302,7 @@ static void writeResultItem (const ri::Item& item, xml::Writer& dst)
case ri::Shader::SHADERTYPE_TESS_CONTROL: tagName = "TessControlShader"; break;
case ri::Shader::SHADERTYPE_TESS_EVALUATION: tagName = "TessEvaluationShader"; break;
case ri::Shader::SHADERTYPE_COMPUTE: tagName = "ComputeShader"; break;
- case ri::Shader::SHADERTYPE_RAYGEN: tagName = "RayGenShader"; break;
+ case ri::Shader::SHADERTYPE_RAYGEN: tagName = "RaygenShader"; break;
case ri::Shader::SHADERTYPE_ANY_HIT: tagName = "AnyHitShader"; break;
case ri::Shader::SHADERTYPE_CLOSEST_HIT: tagName = "ClosestHitShader"; break;
case ri::Shader::SHADERTYPE_MISS: tagName = "MissShader"; break;
diff --git a/executor/xeTestResultParser.cpp b/executor/xeTestResultParser.cpp
index 8c310b762..b14e7b288 100644
--- a/executor/xeTestResultParser.cpp
+++ b/executor/xeTestResultParser.cpp
@@ -113,7 +113,7 @@ static const EnumMapEntry s_resultItemMap[] =
{ 0x235a931c, "TessControlShader", ri::TYPE_SHADER },
{ 0xa1bf7153, "TessEvaluationShader", ri::TYPE_SHADER },
{ 0x6c1415d9, "ComputeShader", ri::TYPE_SHADER },
- { 0xd8e56b02, "RayGenShader", ri::TYPE_SHADER },
+ { 0x68738b22, "RaygenShader", ri::TYPE_SHADER },
{ 0x51d29ce9, "AnyHitShader", ri::TYPE_SHADER },
{ 0x8c64a6be, "ClosestHitShader", ri::TYPE_SHADER },
{ 0xb30ed398, "MissShader", ri::TYPE_SHADER },
@@ -155,7 +155,7 @@ static const EnumMapEntry s_shaderTypeFromTagMap[] =
{ 0x235a931c, "TessControlShader", ri::Shader::SHADERTYPE_TESS_CONTROL },
{ 0xa1bf7153, "TessEvaluationShader", ri::Shader::SHADERTYPE_TESS_EVALUATION },
{ 0x6c1415d9, "ComputeShader", ri::Shader::SHADERTYPE_COMPUTE },
- { 0xd8e56b02, "RayGenShader", ri::Shader::SHADERTYPE_RAYGEN },
+ { 0x68738b22, "RaygenShader", ri::Shader::SHADERTYPE_RAYGEN },
{ 0x51d29ce9, "AnyHitShader", ri::Shader::SHADERTYPE_ANY_HIT },
{ 0x8c64a6be, "ClosestHitShader", ri::Shader::SHADERTYPE_CLOSEST_HIT },
{ 0xb30ed398, "MissShader", ri::Shader::SHADERTYPE_MISS },