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

diff --git a/executor/xeTestLogWriter.cpp b/executor/xeTestLogWriter.cpp
index 81c634c3336b53c04b79efa56ad7945949d3998a..c7e389a52a6c3a883172153e760b14ab03b4d49b 100644 (file)
--- 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 8c310b762e126e473cd757c86a7f9bb35947d693..b14e7b288d22a197e7a26ae5f311ce414daae718 100644 (file)
--- 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                             },