diff options
| author | Matthew Netsch <quic_mnetsch@quicinc.com> | 2022-01-21 12:33:04 -0500 |
|---|---|---|
| committer | Matthew Netsch <quic_mnetsch@quicinc.com> | 2022-01-21 12:33:04 -0500 |
| commit | b34acd3efdbaac3568d827599d62b7d8d735bd5f (patch) | |
| tree | e7ae4e2db7180a69acbaa05246149b7b7b6b4780 /framework | |
| parent | d2752a84f1132c452ccec2482ffa1753249ef58c (diff) | |
| parent | bc4bebe859bdafea64f3ae5ac19ccdbdfa5bfdbe (diff) | |
| download | VK-GL-CTS-b34acd3efdbaac3568d827599d62b7d8d735bd5f.tar.gz VK-GL-CTS-b34acd3efdbaac3568d827599d62b7d8d735bd5f.tar.bz2 VK-GL-CTS-b34acd3efdbaac3568d827599d62b7d8d735bd5f.zip | |
Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/vulkan-cts-1.2.6
Change-Id: If56557dcb21ca8bfd90acbb2fffbd3f8ceed16f2
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/common/tcuRasterizationVerifier.hpp | 6 | ||||
| -rw-r--r-- | framework/delibs/debase/deDefs.h | 2 | ||||
| -rw-r--r-- | framework/opengl/gluShaderLibrary.cpp | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/framework/common/tcuRasterizationVerifier.hpp b/framework/common/tcuRasterizationVerifier.hpp index e79b26bc4..2fcbee76a 100644 --- a/framework/common/tcuRasterizationVerifier.hpp +++ b/framework/common/tcuRasterizationVerifier.hpp @@ -66,6 +66,12 @@ struct TriangleSceneSpec tcu::Vec4 positions[3]; tcu::Vec4 colors[3]; bool sharedEdge[3]; // !< is the edge i -> i+1 shared with another scene triangle + SceneTriangle() + { + // Other members are initialized in Vector constructor + for (int i = 0; i < 3; i++) + sharedEdge[i] = false; + } }; std::vector<SceneTriangle> triangles; diff --git a/framework/delibs/debase/deDefs.h b/framework/delibs/debase/deDefs.h index 628967082..fa1956762 100644 --- a/framework/delibs/debase/deDefs.h +++ b/framework/delibs/debase/deDefs.h @@ -385,6 +385,8 @@ DE_INLINE deBool deGetTrue (void) { return DE_TRUE; } # define DE_UNUSED_FUNCTION #endif +DE_INLINE const char* deFatalStr (const char* reason) { DE_ASSERT(0); return reason; } + #ifdef __cplusplus } #endif diff --git a/framework/opengl/gluShaderLibrary.cpp b/framework/opengl/gluShaderLibrary.cpp index 293c91980..347ce4cec 100644 --- a/framework/opengl/gluShaderLibrary.cpp +++ b/framework/opengl/gluShaderLibrary.cpp @@ -1316,7 +1316,7 @@ void ShaderParser::parsePipelineProgram (ProgramSpecification& program) case TOKEN_TESSELLATION_EVALUATION: program.sources.sources[SHADERTYPE_TESSELLATION_EVALUATION].push_back(source); break; case TOKEN_GEOMETRY: program.sources.sources[SHADERTYPE_GEOMETRY].push_back(source); break; default: - parseError(DE_FALSE); + DE_FATAL("Unreachable"); } } else @@ -1418,7 +1418,7 @@ void ShaderParser::parseShaderCase (vector<tcu::TestNode*>& shaderNodeList) } default: - parseError(DE_FALSE); + DE_FATAL("Unreachable"); } } else if (m_curToken == TOKEN_VERSION) |