{ 0x6c1415d9, "ComputeShader", ri::TYPE_SHADER },
{ 0x72863a54, "ShaderProgram", ri::TYPE_SHADERPROGRAM },
{ 0xb4efc08d, "ShaderSource", ri::TYPE_SHADERSOURCE },
+ { 0xaee4380a, "SpirVAssemblySource", ri::TYPE_SPIRVSOURCE },
{ 0xff265913, "InfoLog", ri::TYPE_INFOLOG },
{ 0x84159b73, "EglConfig", ri::TYPE_EGLCONFIG },
{ 0xdd34391f, "EglConfigSet", ri::TYPE_EGLCONFIGSET },
{ 0x0b7db0d4, "0.3.0", TESTLOGVERSION_0_3_0 },
{ 0x0b7db0d5, "0.3.1", TESTLOGVERSION_0_3_1 },
{ 0x0b7db0d6, "0.3.2", TESTLOGVERSION_0_3_2 },
- { 0x0b7db0d7, "0.3.3", TESTLOGVERSION_0_3_3 }
+ { 0x0b7db0d7, "0.3.3", TESTLOGVERSION_0_3_3 },
+ { 0x0b7db0d8, "0.3.4", TESTLOGVERSION_0_3_4 }
};
static const EnumMapEntry s_sampleValueTagMap[] =
case ri::TYPE_SHADER:
{
if (parentType != ri::TYPE_SHADERPROGRAM)
- throw TestResultParseError("<VertexShader> outside of <ShaderProgram>");
+ throw TestResultParseError(string("<") + elemName + "> outside of <ShaderProgram>");
ri::Shader* shader = curList->allocItem<ri::Shader>();
break;
}
+ case ri::TYPE_SPIRVSOURCE:
+ {
+ if (parentType != ri::TYPE_SHADERPROGRAM)
+ throw TestResultParseError(string("<") + elemName + "> outside of <ShaderProgram>");
+ item = curList->allocItem<ri::SpirVSource>();
+ break;
+ }
+
case ri::TYPE_SHADERSOURCE:
if (parentType == ri::TYPE_SHADER)
item = &static_cast<ri::Shader*>(parentItem)->source;
m_xmlParser.appendDataStr(static_cast<ri::ShaderSource*>(curItem)->source);
break;
+ case ri::TYPE_SPIRVSOURCE:
+ m_xmlParser.appendDataStr(static_cast<ri::SpirVSource*>(curItem)->source);
+ break;
+
case ri::TYPE_INFOLOG:
m_xmlParser.appendDataStr(static_cast<ri::InfoLog*>(curItem)->log);
break;