diff options
175 files changed, 2553 insertions, 1241 deletions
diff --git a/external/amber/CMakeLists.txt b/external/amber/CMakeLists.txt index f6d089908..5610303ac 100644 --- a/external/amber/CMakeLists.txt +++ b/external/amber/CMakeLists.txt @@ -9,4 +9,12 @@ set(AMBER_ENABLE_SHARED_CRT TRUE) set(AMBER_ENABLE_RTTI TRUE CACHE BOOL "Enable runtime type information" FORCE) set(Vulkan-Headers_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../vulkancts/framework/vulkan/) +if (DE_COMPILER_IS_CLANG) + # Fixed upstream in 4d0115cccfcb3b73d20b6513b1c40748e6403c50 + add_compile_options(-Wno-suggest-destructor-override) +elseif (DE_COMPILER_IS_GCC) + # Fixed upstream in aa69a0ac23ea7f68dd32bbef210546a5d84c1734 + add_compile_options(-Wno-uninitialized) +endif () + add_subdirectory(src) diff --git a/external/openglcts/modules/common/glcContext.cpp b/external/openglcts/modules/common/glcContext.cpp index c1551c9c8..72527960d 100644 --- a/external/openglcts/modules/common/glcContext.cpp +++ b/external/openglcts/modules/common/glcContext.cpp @@ -57,7 +57,7 @@ void Context::createRenderContext(glu::ContextType& contextType, glu::ContextFla if (m_testCtx.getCommandLine().getRunMode() != tcu::RUNMODE_EXECUTE) { - // \todo [2016-11-16 pyry] Create DummyRenderContext instead to allow generating all case lists + // \todo [2016-11-16 pyry] Create EmptyRenderContext instead to allow generating all case lists // on a system that doesn't support some GL(ES) versions. renderCfg.surfaceType = glu::RenderConfig::SURFACETYPE_OFFSCREEN_GENERIC; } diff --git a/external/openglcts/modules/common/glcShaderStructTests.cpp b/external/openglcts/modules/common/glcShaderStructTests.cpp index afc6c638b..cb392eea7 100644 --- a/external/openglcts/modules/common/glcShaderStructTests.cpp +++ b/external/openglcts/modules/common/glcShaderStructTests.cpp @@ -983,7 +983,7 @@ namespace SETUNIFORM(loc, 1, vec.getPtr()); \ CHECK_SET_UNIFORM(name); \ } \ - struct SetUniform##VECTYPE##Dummy_s \ + struct SetUniform##VECTYPE##Unused_s \ { \ int unused; \ } @@ -996,7 +996,7 @@ namespace SETUNIFORM(loc, arraySize, vec->getPtr()); \ CHECK_SET_UNIFORM(name); \ } \ - struct SetUniformPtr##VECTYPE##Dummy_s \ + struct SetUniformPtr##VECTYPE##Unused_s \ { \ int unused; \ } diff --git a/external/openglcts/modules/gl/gl3cCommonBugsTests.cpp b/external/openglcts/modules/gl/gl3cCommonBugsTests.cpp index 927a7d168..4493b5c48 100644 --- a/external/openglcts/modules/gl/gl3cCommonBugsTests.cpp +++ b/external/openglcts/modules/gl/gl3cCommonBugsTests.cpp @@ -290,7 +290,7 @@ void InputVariablesCannotBeModifiedTest::deinit() } /* for (all created shader objects) */ } -/** Dummy init function */ +/** Empty init function */ void InputVariablesCannotBeModifiedTest::init() { /* Left blank on purpose */ @@ -1043,7 +1043,7 @@ void InvalidUseCasesForAllNotFuncsAndExclMarkOpTest::deinit() } } -/** Dummy init function */ +/** Empty init function */ void InvalidUseCasesForAllNotFuncsAndExclMarkOpTest::init() { /* Left blank on purpose */ @@ -1243,7 +1243,7 @@ void InvalidVSInputsTest::deinit() } } -/** Dummy init function */ +/** Empty init function */ void InvalidVSInputsTest::init() { /* Left blank on purpose */ @@ -1481,7 +1481,7 @@ void ParenthesisInLayoutQualifierIntegerValuesTest::deinit() } } -/** Dummy init function */ +/** Empty init function */ void ParenthesisInLayoutQualifierIntegerValuesTest::init() { /* Left blank on purpose */ @@ -2383,7 +2383,7 @@ void PerVertexValidationTest::getTestIterationProperties(glu::ContextType contex } /* switch (iteration) */ } -/** Returns a dummy vertex shader body, with main() entry-point using code passed by +/** Returns a vertex shader body, with main() entry-point using code passed by * the @param main_body argument. * * @param context_type Running rendering context's type. @@ -2457,7 +2457,7 @@ std::string PerVertexValidationTest::getVertexShaderBody(glu::ContextType contex return vs_body_sstream.str(); } -/** Dummy init function */ +/** Empty init function */ void PerVertexValidationTest::init() { /* Left blank on purpose */ @@ -5531,7 +5531,7 @@ bool ReservedNamesTest::isStructAllowed(_shader_type shader_type, _language_feat return structAllowed; } -/** Dummy init function */ +/** Empty init function */ void ReservedNamesTest::init() { /* Left blank on purpose */ @@ -5747,7 +5747,7 @@ void SparseBuffersWithCopyOpsTest::deinit() } } -/** Dummy init function */ +/** Empty init function */ void SparseBuffersWithCopyOpsTest::init() { /* Nothing to do here */ diff --git a/external/openglcts/modules/gl/gl3cCullDistanceTests.cpp b/external/openglcts/modules/gl/gl3cCullDistanceTests.cpp index 6673b2608..48e8d4e3c 100644 --- a/external/openglcts/modules/gl/gl3cCullDistanceTests.cpp +++ b/external/openglcts/modules/gl/gl3cCullDistanceTests.cpp @@ -2827,7 +2827,7 @@ tcu::TestNode::IterateResult CullDistance::FunctionalTest::iterate() if (clipdistances_array_size == 0 && culldistances_array_size == 0) { - /* Skip the dummy iteration */ + /* Skip the empty iteration */ continue; } diff --git a/external/openglcts/modules/gl/gl3cTransformFeedbackOverflowQueryTests.cpp b/external/openglcts/modules/gl/gl3cTransformFeedbackOverflowQueryTests.cpp index fc9f5a33a..c3b2ad750 100644 --- a/external/openglcts/modules/gl/gl3cTransformFeedbackOverflowQueryTests.cpp +++ b/external/openglcts/modules/gl/gl3cTransformFeedbackOverflowQueryTests.cpp @@ -973,8 +973,8 @@ protected: } } - /* Dummy vertex shader. */ - const char* dummyVsh() + /* Minimal vertex shader. */ + const char* minimalVsh() { return "#version 150 core\n" "void main() {\n" @@ -982,8 +982,8 @@ protected: "}\n"; } - /* Dummy fragment shader */ - const char* dummyFsh() + /* Minimal fragment shader */ + const char* minimalFsh() { return "#version 150 core\n" "void main() {}\n"; @@ -1014,7 +1014,7 @@ protected: // Setup checker program m_checker_program = - new glu::ShaderProgram(m_context.getRenderContext(), glu::makeVtxFragSources(dummyVsh(), dummyFsh())); + new glu::ShaderProgram(m_context.getRenderContext(), glu::makeVtxFragSources(minimalVsh(), minimalFsh())); if (!m_checker_program->isOk()) { TCU_FAIL("Checker program compilation failed"); diff --git a/external/openglcts/modules/gl/gl4cDirectStateAccessBuffersTests.cpp b/external/openglcts/modules/gl/gl4cDirectStateAccessBuffersTests.cpp index 7d1405e08..751b2f08e 100644 --- a/external/openglcts/modules/gl/gl4cDirectStateAccessBuffersTests.cpp +++ b/external/openglcts/modules/gl/gl4cDirectStateAccessBuffersTests.cpp @@ -2630,7 +2630,7 @@ bool ErrorsTest::TestErrorsOfClearNamedBufferData() /* Common variables. */ glw::GLuint buffer = 0; - glw::GLbyte dummy_data = 0; + glw::GLbyte unused_data = 0; try { @@ -2638,7 +2638,7 @@ bool ErrorsTest::TestErrorsOfClearNamedBufferData() gl.createBuffers(1, &buffer); GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateBuffers failed."); - m_pNamedBufferStorage(buffer, sizeof(dummy_data), &dummy_data, + m_pNamedBufferStorage(buffer, sizeof(unused_data), &unused_data, GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glNamedBufferStorage failed."); @@ -2651,7 +2651,7 @@ bool ErrorsTest::TestErrorsOfClearNamedBufferData() ; /* Test. */ - m_pClearNamedBufferData(not_a_buffer_name, GL_R8, GL_RED, GL_UNSIGNED_BYTE, &dummy_data); + m_pClearNamedBufferData(not_a_buffer_name, GL_R8, GL_RED, GL_UNSIGNED_BYTE, &unused_data); is_ok &= ErrorCheckAndLog("glClearNamedBufferData", GL_INVALID_OPERATION, " if buffer is not the name of an existing buffer object."); @@ -2678,7 +2678,7 @@ bool ErrorsTest::TestErrorsOfClearNamedBufferData() ; /* Test. */ - m_pClearNamedBufferData(buffer, invalid_internal_format, GL_RED, GL_UNSIGNED_BYTE, &dummy_data); + m_pClearNamedBufferData(buffer, invalid_internal_format, GL_RED, GL_UNSIGNED_BYTE, &unused_data); is_ok &= ErrorCheckAndLog("glClearNamedBufferData", GL_INVALID_ENUM, " if internal format is not one of the valid sized internal formats " @@ -2694,7 +2694,7 @@ bool ErrorsTest::TestErrorsOfClearNamedBufferData() (void)(glw::GLbyte*) m_pMapNamedBuffer(buffer, GL_READ_ONLY); GLU_EXPECT_NO_ERROR(gl.getError(), "glMapNamedBuffer failed."); - m_pClearNamedBufferData(buffer, GL_R8, GL_RED, GL_UNSIGNED_BYTE, &dummy_data); + m_pClearNamedBufferData(buffer, GL_R8, GL_RED, GL_UNSIGNED_BYTE, &unused_data); is_ok &= ErrorCheckAndLog("glClearNamedBufferData", GL_INVALID_OPERATION, " if any part of the specified range of the buffer" @@ -2707,10 +2707,10 @@ bool ErrorsTest::TestErrorsOfClearNamedBufferData() /* Test of mapped buffer clear error behavior verification (glMapNamedBufferRange version). */ { - (void)(glw::GLbyte*) m_pMapNamedBufferRange(buffer, 0, sizeof(dummy_data), GL_MAP_READ_BIT); + (void)(glw::GLbyte*) m_pMapNamedBufferRange(buffer, 0, sizeof(unused_data), GL_MAP_READ_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glMapNamedBuffer failed."); - m_pClearNamedBufferData(buffer, GL_R8, GL_RED, GL_UNSIGNED_BYTE, &dummy_data); + m_pClearNamedBufferData(buffer, GL_R8, GL_RED, GL_UNSIGNED_BYTE, &unused_data); is_ok &= ErrorCheckAndLog("glClearNamedBufferData", GL_INVALID_OPERATION, " if any part of the specified range of the buffer" @@ -2724,10 +2724,10 @@ bool ErrorsTest::TestErrorsOfClearNamedBufferData() /* Test of persistently mapped buffer clear error with behavior verification (glMapNamedBufferRange version). */ { (void)(glw::GLbyte*) - m_pMapNamedBufferRange(buffer, 0, sizeof(dummy_data), GL_MAP_READ_BIT | GL_MAP_PERSISTENT_BIT); + m_pMapNamedBufferRange(buffer, 0, sizeof(unused_data), GL_MAP_READ_BIT | GL_MAP_PERSISTENT_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glMapNamedBuffer failed."); - m_pClearNamedBufferData(buffer, GL_R8, GL_RED, GL_UNSIGNED_BYTE, &dummy_data); + m_pClearNamedBufferData(buffer, GL_R8, GL_RED, GL_UNSIGNED_BYTE, &unused_data); is_ok &= ErrorCheckAndLog("glClearNamedBufferData", GL_NO_ERROR, " if any part of the specified range of the buffer" @@ -2758,7 +2758,7 @@ bool ErrorsTest::TestErrorsOfClearNamedBufferData() ; /* Test. */ - m_pClearNamedBufferData(buffer, GL_R8, invalid_format, GL_UNSIGNED_BYTE, &dummy_data); + m_pClearNamedBufferData(buffer, GL_R8, invalid_format, GL_UNSIGNED_BYTE, &unused_data); is_ok &= ErrorCheckAndLog( "glClearNamedBufferData", GL_INVALID_VALUE, @@ -2788,7 +2788,7 @@ bool ErrorsTest::TestErrorsOfClearNamedBufferData() ; /* Test. */ - m_pClearNamedBufferData(buffer, GL_R8, GL_RED, invalid_type, &dummy_data); + m_pClearNamedBufferData(buffer, GL_R8, GL_RED, invalid_type, &unused_data); is_ok &= ErrorCheckAndLog( "glClearNamedBufferData", GL_INVALID_VALUE, @@ -2863,7 +2863,7 @@ bool ErrorsTest::TestErrorsOfClearNamedBufferSubData() /* Common variables. */ glw::GLuint buffer = 0; - glw::GLubyte dummy_data[4] = {}; + glw::GLubyte unused_data[4] = {}; try { @@ -2871,7 +2871,7 @@ bool ErrorsTest::TestErrorsOfClearNamedBufferSubData() gl.createBuffers(1, &buffer); GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateBuffers failed."); - m_pNamedBufferStorage(buffer, sizeof(dummy_data), &dummy_data, + m_pNamedBufferStorage(buffer, sizeof(unused_data), &unused_data, GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glNamedBuffeStorage failed."); @@ -2884,8 +2884,8 @@ bool ErrorsTest::TestErrorsOfClearNamedBufferSubData() ; /* Test. */ - m_pClearNamedBufferSubData(not_a_buffer_name, GL_R8, 0, sizeof(dummy_data), GL_RGBA, GL_UNSIGNED_BYTE, - &dummy_data); + m_pClearNamedBufferSubData(not_a_buffer_name, GL_R8, 0, sizeof(unused_data), GL_RGBA, GL_UNSIGNED_BYTE, + &unused_data); is_ok &= ErrorCheckAndLog("glClearNamedBufferSubData", GL_INVALID_OPERATION, " if buffer is not the name of an existing buffer object."); @@ -2912,7 +2912,7 @@ bool ErrorsTest::TestErrorsOfClearNamedBufferSubData() ; /* Test. */ - m_pClearNamedBufferData(buffer, invalid_internal_format, GL_RGBA, GL_UNSIGNED_BYTE, &dummy_data); + m_pClearNamedBufferData(buffer, invalid_internal_format, GL_RGBA, GL_UNSIGNED_BYTE, &unused_data); is_ok &= ErrorCheckAndLog("glClearNamedBufferSubData", GL_INVALID_ENUM, " if internal format is not one of the valid sized internal formats " @@ -2926,8 +2926,8 @@ bool ErrorsTest::TestErrorsOfClearNamedBufferSubData() /* Test incorrect offset alignment error behavior. */ { /* Test. */ - m_pClearNamedBufferSubData(buffer, GL_RGBA8, sizeof(dummy_data[0]), sizeof(dummy_data), GL_RGBA, - GL_UNSIGNED_BYTE, &dummy_data); + m_pClearNamedBufferSubData(buffer, GL_RGBA8, sizeof(unused_data[0]), sizeof(unused_data), GL_RGBA, + GL_UNSIGNED_BYTE, &unused_data); is_ok &= ErrorCheckAndLog("glClearNamedBufferSubData", GL_INVALID_VALUE, "if offset is not multiples of the number of basic machine units (GLubyte)" @@ -2936,8 +2936,8 @@ bool ErrorsTest::TestErrorsOfClearNamedBufferSubData() /* Test incorrect range alignment error behavior. */ { - m_pClearNamedBufferSubData(buffer, GL_RGBA8, 0, sizeof(dummy_data) - sizeof(dummy_data[0]), GL_RGBA, - GL_UNSIGNED_BYTE, &dummy_data); + m_pClearNamedBufferSubData(buffer, GL_RGBA8, 0, sizeof(unused_data) - sizeof(unused_data[0]), GL_RGBA, + GL_UNSIGNED_BYTE, &unused_data); is_ok &= ErrorCheckAndLog("glClearNamedBufferSubData", GL_INVALID_VALUE, "if range is not multiples of the number of basic machine units (GLubyte)" @@ -2947,7 +2947,7 @@ bool ErrorsTest::TestErrorsOfClearNamedBufferSubData() /* Test negative offset error behavior. */ { /* Test. */ - m_pClearNamedBufferSubData(buffer, GL_R8, -1, sizeof(dummy_data), GL_RGBA, GL_UNSIGNED_BYTE, &dummy_data); + m_pClearNamedBufferSubData(buffer, GL_R8, -1, sizeof(unused_data), GL_RGBA, GL_UNSIGNED_BYTE, &unused_data); is_ok &= ErrorCheckAndLog("glClearNamedBufferSubData", GL_INVALID_VALUE, " if offset or size is negative."); } @@ -2955,8 +2955,8 @@ bool ErrorsTest::TestErrorsOfClearNamedBufferSubData() /* Test negative size error behavior. */ { /* Test. */ - m_pClearNamedBufferSubData(buffer, GL_R8, 0, -((glw::GLsizei)sizeof(dummy_data)), GL_RGBA, GL_UNSIGNED_BYTE, - &dummy_data); + m_pClearNamedBufferSubData(buffer, GL_R8, 0, -((glw::GLsizei)sizeof(unused_data)), GL_RGBA, GL_UNSIGNED_BYTE, + &unused_data); is_ok &= ErrorCheckAndLog("glClearNamedBufferSubData", GL_INVALID_VALUE, " if offset or size is negative."); } @@ -2964,8 +2964,8 @@ bool ErrorsTest::TestErrorsOfClearNamedBufferSubData() /* Test size overflow error behavior. */ { /* Test. */ - m_pClearNamedBufferSubData(buffer, GL_R8, 0, 2 * sizeof(dummy_data), GL_RGBA, GL_UNSIGNED_BYTE, - &dummy_data); + m_pClearNamedBufferSubData(buffer, GL_R8, 0, 2 * sizeof(unused_data), GL_RGBA, GL_UNSIGNED_BYTE, + &unused_data); is_ok &= ErrorCheckAndLog( "glClearNamedBufferSubData", GL_INVALID_VALUE, @@ -2977,7 +2977,7 @@ bool ErrorsTest::TestErrorsOfClearNamedBufferSubData() (void)(glw::GLbyte*) m_pMapNamedBuffer(buffer, GL_READ_ONLY); GLU_EXPECT_NO_ERROR(gl.getError(), "glMapNamedBuffer failed."); - m_pClearNamedBufferSubData(buffer, GL_R8, 0, sizeof(dummy_data), GL_RGBA, GL_UNSIGNED_BYTE, &dummy_data); + m_pClearNamedBufferSubData(buffer, GL_R8, 0, sizeof(unused_data), GL_RGBA, GL_UNSIGNED_BYTE, &unused_data); is_ok &= ErrorCheckAndLog("glClearNamedBufferSubData", GL_INVALID_OPERATION, " if any part of the specified range of the buffer" @@ -2990,10 +2990,10 @@ bool ErrorsTest::TestErrorsOfClearNamedBufferSubData() /* Test of mapped buffer clear error behavior verification (glMapNamedBufferRange version). */ { - (void)(glw::GLbyte*) m_pMapNamedBufferRange(buffer, 0, sizeof(dummy_data), GL_MAP_READ_BIT); + (void)(glw::GLbyte*) m_pMapNamedBufferRange(buffer, 0, sizeof(unused_data), GL_MAP_READ_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glMapNamedBuffer failed."); - m_pClearNamedBufferSubData(buffer, GL_R8, 0, sizeof(dummy_data), GL_RGBA, GL_UNSIGNED_BYTE, &dummy_data); + m_pClearNamedBufferSubData(buffer, GL_R8, 0, sizeof(unused_data), GL_RGBA, GL_UNSIGNED_BYTE, &unused_data); is_ok &= ErrorCheckAndLog("glClearNamedBufferSubData", GL_INVALID_OPERATION, " if any part of the specified range of the buffer" @@ -3007,10 +3007,10 @@ bool ErrorsTest::TestErrorsOfClearNamedBufferSubData() /* Test of persistently mapped buffer clear error with behavior verification (glMapNamedBufferRange version). */ { (void)(glw::GLbyte*) - m_pMapNamedBufferRange(buffer, 0, sizeof(dummy_data), GL_MAP_READ_BIT | GL_MAP_PERSISTENT_BIT); + m_pMapNamedBufferRange(buffer, 0, sizeof(unused_data), GL_MAP_READ_BIT | GL_MAP_PERSISTENT_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glMapNamedBuffer failed."); - m_pClearNamedBufferSubData(buffer, GL_R8, 0, sizeof(dummy_data), GL_RGBA, GL_UNSIGNED_BYTE, &dummy_data); + m_pClearNamedBufferSubData(buffer, GL_R8, 0, sizeof(unused_data), GL_RGBA, GL_UNSIGNED_BYTE, &unused_data); is_ok &= ErrorCheckAndLog("glClearNamedBufferSubData", GL_NO_ERROR, " if any part of the specified range of the buffer" @@ -3041,8 +3041,8 @@ bool ErrorsTest::TestErrorsOfClearNamedBufferSubData() ; /* Test. */ - m_pClearNamedBufferSubData(buffer, GL_R8, 0, sizeof(dummy_data), invalid_format, GL_UNSIGNED_BYTE, - &dummy_data); + m_pClearNamedBufferSubData(buffer, GL_R8, 0, sizeof(unused_data), invalid_format, GL_UNSIGNED_BYTE, + &unused_data); is_ok &= ErrorCheckAndLog( "glClearNamedBufferSubData", GL_INVALID_VALUE, @@ -3072,7 +3072,7 @@ bool ErrorsTest::TestErrorsOfClearNamedBufferSubData() ; /* Test. */ - m_pClearNamedBufferSubData(buffer, GL_R8, 0, sizeof(dummy_data), GL_RGBA, invalid_type, &dummy_data); + m_pClearNamedBufferSubData(buffer, GL_R8, 0, sizeof(unused_data), GL_RGBA, invalid_type, &unused_data); is_ok &= ErrorCheckAndLog( "glClearNamedBufferSubData", GL_INVALID_VALUE, @@ -3140,7 +3140,7 @@ bool ErrorsTest::TestErrorsOfCopyNamedBufferSubData() /* Common variables. */ glw::GLuint buffer_r = 0; glw::GLuint buffer_w = 0; - glw::GLubyte dummy_data[4] = {}; + glw::GLubyte unused_data[4] = {}; try { @@ -3148,14 +3148,14 @@ bool ErrorsTest::TestErrorsOfCopyNamedBufferSubData() gl.createBuffers(1, &buffer_r); GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateBuffers failed."); - m_pNamedBufferStorage(buffer_r, sizeof(dummy_data), &dummy_data, + m_pNamedBufferStorage(buffer_r, sizeof(unused_data), &unused_data, GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glNamedBuffeStorage failed."); gl.createBuffers(1, &buffer_w); GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateBuffers failed."); - m_pNamedBufferStorage(buffer_w, sizeof(dummy_data), &dummy_data, + m_pNamedBufferStorage(buffer_w, sizeof(unused_data), &unused_data, GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glNamedBuffeStorage failed."); @@ -3168,12 +3168,12 @@ bool ErrorsTest::TestErrorsOfCopyNamedBufferSubData() ; /* Test. */ - m_pCopyNamedBufferSubData(not_a_buffer_name, buffer_w, 0, 0, sizeof(dummy_data)); + m_pCopyNamedBufferSubData(not_a_buffer_name, buffer_w, 0, 0, sizeof(unused_data)); is_ok &= ErrorCheckAndLog("glCopyNamedBufferSubData", GL_INVALID_OPERATION, " if readBuffer is not the name of an existing buffer object."); - m_pCopyNamedBufferSubData(buffer_r, not_a_buffer_name, 0, 0, sizeof(dummy_data)); + m_pCopyNamedBufferSubData(buffer_r, not_a_buffer_name, 0, 0, sizeof(unused_data)); is_ok &= ErrorCheckAndLog("glCopyNamedBufferSubData", GL_INVALID_OPERATION, " if writeBuffer is not the name of an existing buffer object."); @@ -3182,7 +3182,7 @@ bool ErrorsTest::TestErrorsOfCopyNamedBufferSubData() /* Test negative read offset error behavior. */ { /* Test. */ - m_pCopyNamedBufferSubData(buffer_r, buffer_w, -1, 0, sizeof(dummy_data)); + m_pCopyNamedBufferSubData(buffer_r, buffer_w, -1, 0, sizeof(unused_data)); is_ok &= ErrorCheckAndLog("glCopyNamedBufferSubData", GL_INVALID_VALUE, "if readOffset is negative."); } @@ -3190,7 +3190,7 @@ bool ErrorsTest::TestErrorsOfCopyNamedBufferSubData() /* Test negative write offset error behavior. */ { /* Test. */ - m_pCopyNamedBufferSubData(buffer_r, buffer_w, 0, -1, sizeof(dummy_data)); + m_pCopyNamedBufferSubData(buffer_r, buffer_w, 0, -1, sizeof(unused_data)); is_ok &= ErrorCheckAndLog("glCopyNamedBufferSubData", GL_INVALID_VALUE, "if writeOffset is negative."); } @@ -3206,7 +3206,7 @@ bool ErrorsTest::TestErrorsOfCopyNamedBufferSubData() /* Test overflow size error behavior. */ { /* Test. */ - m_pCopyNamedBufferSubData(buffer_r, buffer_w, 0, 0, 2 * sizeof(dummy_data)); + m_pCopyNamedBufferSubData(buffer_r, buffer_w, 0, 0, 2 * sizeof(unused_data)); is_ok &= ErrorCheckAndLog("glCopyNamedBufferSubData", GL_INVALID_VALUE, " if size is greater than the size of the source buffer object."); @@ -3215,7 +3215,7 @@ bool ErrorsTest::TestErrorsOfCopyNamedBufferSubData() /* Test overflow read offset and size error behavior. */ { /* Test. */ - m_pCopyNamedBufferSubData(buffer_r, buffer_w, sizeof(dummy_data) / 2, 0, sizeof(dummy_data)); + m_pCopyNamedBufferSubData(buffer_r, buffer_w, sizeof(unused_data) / 2, 0, sizeof(unused_data)); is_ok &= ErrorCheckAndLog("glCopyNamedBufferSubData", GL_INVALID_VALUE, " if readOffset+size is greater than the size of the source buffer object."); @@ -3224,7 +3224,7 @@ bool ErrorsTest::TestErrorsOfCopyNamedBufferSubData() /* Test overflow write offset and size error behavior. */ { /* Test. */ - m_pCopyNamedBufferSubData(buffer_r, buffer_w, 0, sizeof(dummy_data) / 2, sizeof(dummy_data)); + m_pCopyNamedBufferSubData(buffer_r, buffer_w, 0, sizeof(unused_data) / 2, sizeof(unused_data)); is_ok &= ErrorCheckAndLog("glCopyNamedBufferSubData", GL_INVALID_VALUE, " if writeOffset+size is greater than the size of the source buffer object."); @@ -3233,7 +3233,7 @@ bool ErrorsTest::TestErrorsOfCopyNamedBufferSubData() /* Test same buffer overlapping error behavior. */ { /* Test. */ - m_pCopyNamedBufferSubData(buffer_w, buffer_w, 0, 0, sizeof(dummy_data)); + m_pCopyNamedBufferSubData(buffer_w, buffer_w, 0, 0, sizeof(unused_data)); is_ok &= ErrorCheckAndLog("glCopyNamedBufferSubData", GL_INVALID_VALUE, " if the source and destination are the same buffer object, and the ranges" @@ -3245,7 +3245,7 @@ bool ErrorsTest::TestErrorsOfCopyNamedBufferSubData() (void)(glw::GLbyte*) m_pMapNamedBuffer(buffer_r, GL_READ_ONLY); GLU_EXPECT_NO_ERROR(gl.getError(), "glMapNamedBuffer failed."); - m_pCopyNamedBufferSubData(buffer_r, buffer_w, 0, 0, sizeof(dummy_data)); + m_pCopyNamedBufferSubData(buffer_r, buffer_w, 0, 0, sizeof(unused_data)); is_ok &= ErrorCheckAndLog("glCopyNamedBufferSubData", GL_INVALID_OPERATION, " if the source buffer object is mapped with MapBuffer."); @@ -3259,7 +3259,7 @@ bool ErrorsTest::TestErrorsOfCopyNamedBufferSubData() (void)(glw::GLbyte*) m_pMapNamedBuffer(buffer_w, GL_READ_ONLY); GLU_EXPECT_NO_ERROR(gl.getError(), "glMapNamedBuffer failed."); - m_pCopyNamedBufferSubData(buffer_r, buffer_w, 0, 0, sizeof(dummy_data)); + m_pCopyNamedBufferSubData(buffer_r, buffer_w, 0, 0, sizeof(unused_data)); is_ok &= ErrorCheckAndLog("glCopyNamedBufferSubData", GL_INVALID_OPERATION, " if the destination buffer object is mapped with MapBuffer."); @@ -3270,10 +3270,10 @@ bool ErrorsTest::TestErrorsOfCopyNamedBufferSubData() /* Test of mapped read buffer copy error behavior verification (glMapNamedBufferRange version). */ { - (void)(glw::GLbyte*) m_pMapNamedBufferRange(buffer_r, 0, sizeof(dummy_data), GL_MAP_READ_BIT); + (void)(glw::GLbyte*) m_pMapNamedBufferRange(buffer_r, 0, sizeof(unused_data), GL_MAP_READ_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glMapNamedBuffer failed."); - m_pCopyNamedBufferSubData(buffer_r, buffer_w, 0, 0, sizeof(dummy_data)); + m_pCopyNamedBufferSubData(buffer_r, buffer_w, 0, 0, sizeof(unused_data)); is_ok &= ErrorCheckAndLog("glCopyNamedBufferSubData", GL_INVALID_OPERATION, " if the source buffer object is mapped with MapBuffer."); @@ -3284,10 +3284,10 @@ bool ErrorsTest::TestErrorsOfCopyNamedBufferSubData() /* Test of mapped write buffer copy error behavior verification (glMapNamedBufferRange version). */ { - (void)(glw::GLbyte*) m_pMapNamedBufferRange(buffer_w, 0, sizeof(dummy_data), GL_MAP_READ_BIT); + (void)(glw::GLbyte*) m_pMapNamedBufferRange(buffer_w, 0, sizeof(unused_data), GL_MAP_READ_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glMapNamedBuffer failed."); - m_pCopyNamedBufferSubData(buffer_r, buffer_w, 0, 0, sizeof(dummy_data)); + m_pCopyNamedBufferSubData(buffer_r, buffer_w, 0, 0, sizeof(unused_data)); is_ok &= ErrorCheckAndLog("glCopyNamedBufferSubData", GL_INVALID_OPERATION, " if the destination buffer object is mapped with MapBuffer."); @@ -3299,10 +3299,10 @@ bool ErrorsTest::TestErrorsOfCopyNamedBufferSubData() /* Test of persistently mapped read buffer copy error with behavior verification. */ { (void)(glw::GLbyte*) - m_pMapNamedBufferRange(buffer_r, 0, sizeof(dummy_data), GL_MAP_READ_BIT | GL_MAP_PERSISTENT_BIT); + m_pMapNamedBufferRange(buffer_r, 0, sizeof(unused_data), GL_MAP_READ_BIT | GL_MAP_PERSISTENT_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glMapNamedBuffer failed."); - m_pCopyNamedBufferSubData(buffer_r, buffer_w, 0, 0, sizeof(dummy_data)); + m_pCopyNamedBufferSubData(buffer_r, buffer_w, 0, 0, sizeof(unused_data)); is_ok &= ErrorCheckAndLog("glCopyNamedBufferSubData", GL_NO_ERROR, " if the source buffer object is mapped using " @@ -3316,10 +3316,10 @@ bool ErrorsTest::TestErrorsOfCopyNamedBufferSubData() /* Test of persistently mapped write buffer copy error with behavior verification. */ { (void)(glw::GLbyte*) - m_pMapNamedBufferRange(buffer_w, 0, sizeof(dummy_data), GL_MAP_READ_BIT | GL_MAP_PERSISTENT_BIT); + m_pMapNamedBufferRange(buffer_w, 0, sizeof(unused_data), GL_MAP_READ_BIT | GL_MAP_PERSISTENT_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glMapNamedBuffer failed."); - m_pCopyNamedBufferSubData(buffer_r, buffer_w, 0, 0, sizeof(dummy_data)); + m_pCopyNamedBufferSubData(buffer_r, buffer_w, 0, 0, sizeof(unused_data)); GLU_EXPECT_NO_ERROR(gl.getError(), "glMapNamedBuffer failed."); is_ok &= ErrorCheckAndLog("glCopyNamedBufferSubData", GL_NO_ERROR, @@ -3419,7 +3419,7 @@ bool ErrorsTest::TestErrorsOfFlushMappedNamedBufferRange() /* Common variables. */ glw::GLuint buffer = 0; - glw::GLubyte dummy_data[4] = {}; + glw::GLubyte unused_data[4] = {}; try { @@ -3427,7 +3427,7 @@ bool ErrorsTest::TestErrorsOfFlushMappedNamedBufferRange() gl.createBuffers(1, &buffer); GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateBuffers failed."); - m_pNamedBufferStorage(buffer, sizeof(dummy_data), &dummy_data, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT); + m_pNamedBufferStorage(buffer, sizeof(unused_data), &unused_data, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glNamedBuffeStorage failed."); /* Test invalid buffer name flush error behavior. */ @@ -3448,7 +3448,7 @@ bool ErrorsTest::TestErrorsOfFlushMappedNamedBufferRange() /* Test negative offset flush error behavior. */ { (void)(glw::GLbyte*) - m_pMapNamedBufferRange(buffer, 0, sizeof(dummy_data), GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT); + m_pMapNamedBufferRange(buffer, 0, sizeof(unused_data), GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glMapNamedBuffer failed."); m_pFlushMappedNamedBufferRange(buffer, -1, 1); @@ -3462,7 +3462,7 @@ bool ErrorsTest::TestErrorsOfFlushMappedNamedBufferRange() /* Test negative length flush error behavior. */ { (void)(glw::GLbyte*) - m_pMapNamedBufferRange(buffer, 0, sizeof(dummy_data), GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT); + m_pMapNamedBufferRange(buffer, 0, sizeof(unused_data), GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glMapNamedBuffer failed."); m_pFlushMappedNamedBufferRange(buffer, 0, -1); @@ -3475,11 +3475,11 @@ bool ErrorsTest::TestErrorsOfFlushMappedNamedBufferRange() /* Test length exceeds the mapping size flush error behavior. */ { - (void)(glw::GLbyte*) - m_pMapNamedBufferRange(buffer, 0, sizeof(dummy_data) / 2, GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT); + (void)(glw::GLbyte*) m_pMapNamedBufferRange(buffer, 0, sizeof(unused_data) / 2, + GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glMapNamedBuffer failed."); - m_pFlushMappedNamedBufferRange(buffer, 0, sizeof(dummy_data)); + m_pFlushMappedNamedBufferRange(buffer, 0, sizeof(unused_data)); is_ok &= ErrorCheckAndLog("glFlushMappedNamedBufferRange", GL_INVALID_VALUE, " if length exceeds the size of the mapping."); @@ -3491,10 +3491,10 @@ bool ErrorsTest::TestErrorsOfFlushMappedNamedBufferRange() /* Test offset + length exceeds the mapping size flush error behavior. */ { (void)(glw::GLbyte*) - m_pMapNamedBufferRange(buffer, 0, sizeof(dummy_data), GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT); + m_pMapNamedBufferRange(buffer, 0, sizeof(unused_data), GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glMapNamedBuffer failed."); - m_pFlushMappedNamedBufferRange(buffer, 1, sizeof(dummy_data)); + m_pFlushMappedNamedBufferRange(buffer, 1, sizeof(unused_data)); is_ok &= ErrorCheckAndLog("glFlushMappedNamedBufferRange", GL_INVALID_VALUE, " if offset + length exceeds the size of the mapping."); @@ -3505,7 +3505,7 @@ bool ErrorsTest::TestErrorsOfFlushMappedNamedBufferRange() /* Test not mapped buffer flush error behavior. */ { - m_pFlushMappedNamedBufferRange(buffer, 0, sizeof(dummy_data)); + m_pFlushMappedNamedBufferRange(buffer, 0, sizeof(unused_data)); is_ok &= ErrorCheckAndLog("glFlushMappedNamedBufferRange", GL_INVALID_OPERATION, " if the buffer object is not mapped."); @@ -3513,10 +3513,10 @@ bool ErrorsTest::TestErrorsOfFlushMappedNamedBufferRange() /* Test buffer flush without the MAP_FLUSH_EXPLICIT_BIT error behavior. */ { - (void)(glw::GLbyte*) m_pMapNamedBufferRange(buffer, 0, sizeof(dummy_data), GL_MAP_WRITE_BIT); + (void)(glw::GLbyte*) m_pMapNamedBufferRange(buffer, 0, sizeof(unused_data), GL_MAP_WRITE_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glMapNamedBuffer failed."); - m_pFlushMappedNamedBufferRange(buffer, 0, sizeof(dummy_data)); + m_pFlushMappedNamedBufferRange(buffer, 0, sizeof(unused_data)); is_ok &= ErrorCheckAndLog("glFlushMappedNamedBufferRange", GL_INVALID_OPERATION, " if the buffer is mapped without the MAP_FLUSH_EXPLICIT_BIT flag."); @@ -3571,7 +3571,7 @@ bool ErrorsTest::TestErrorsOfGetNamedBufferParameter() /* Common variables. */ glw::GLuint buffer = 0; - glw::GLubyte dummy_data[4] = {}; + glw::GLubyte unused_data[4] = {}; try { @@ -3579,7 +3579,7 @@ bool ErrorsTest::TestErrorsOfGetNamedBufferParameter() gl.createBuffers(1, &buffer); GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateBuffers failed."); - m_pNamedBufferStorage(buffer, sizeof(dummy_data), &dummy_data, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT); + m_pNamedBufferStorage(buffer, sizeof(unused_data), &unused_data, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glNamedBuffeStorage failed."); /* Test invalid buffer name in GetNamedBufferParameteriv function error behavior. */ @@ -3713,7 +3713,7 @@ bool ErrorsTest::TestErrorsOfGetNamedBufferPointerv() /* Common variables. */ glw::GLuint buffer = 0; - glw::GLubyte dummy_data[4] = {}; + glw::GLubyte unused_data[4] = {}; try { @@ -3721,7 +3721,7 @@ bool ErrorsTest::TestErrorsOfGetNamedBufferPointerv() gl.createBuffers(1, &buffer); GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateBuffers failed."); - m_pNamedBufferStorage(buffer, sizeof(dummy_data), &dummy_data, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT); + m_pNamedBufferStorage(buffer, sizeof(unused_data), &unused_data, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glNamedBuffeStorage failed."); /* Test invalid buffer name in GetNamedBufferPointerv function error behavior. */ @@ -3789,7 +3789,7 @@ bool ErrorsTest::TestErrorsOfGetNamedBufferSubData() /* Common variables. */ glw::GLuint buffer = 0; - glw::GLubyte dummy_data[4] = {}; + glw::GLubyte unused_data[4] = {}; try { @@ -3797,7 +3797,7 @@ bool ErrorsTest::TestErrorsOfGetNamedBufferSubData() gl.createBuffers(1, &buffer); GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateBuffers failed."); - m_pNamedBufferStorage(buffer, sizeof(dummy_data), &dummy_data, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT); + m_pNamedBufferStorage(buffer, sizeof(unused_data), &unused_data, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glNamedBuffeStorage failed."); /* Test invalid buffer name in pGetNamedBufferSubData function error behavior. */ @@ -3809,10 +3809,10 @@ bool ErrorsTest::TestErrorsOfGetNamedBufferSubData() ; /* Query storage. */ - glw::GLubyte dummy_data_query[sizeof(dummy_data) / sizeof(dummy_data[0])] = {}; + glw::GLubyte unused_data_query[sizeof(unused_data) / sizeof(unused_data[0])] = {}; /* Test. */ - m_pGetNamedBufferSubData(not_a_buffer_name, 0, sizeof(dummy_data_query), dummy_data_query); + m_pGetNamedBufferSubData(not_a_buffer_name, 0, sizeof(unused_data_query), unused_data_query); is_ok &= ErrorCheckAndLog("glGetNamedBufferSubData", GL_INVALID_OPERATION, " if buffer is not the name of an existing buffer object."); @@ -3821,10 +3821,10 @@ bool ErrorsTest::TestErrorsOfGetNamedBufferSubData() /* Test negative offset error behavior. */ { /* Query storage. */ - glw::GLubyte dummy_data_query[sizeof(dummy_data) / sizeof(dummy_data[0])] = {}; + glw::GLubyte unused_data_query[sizeof(unused_data) / sizeof(unused_data[0])] = {}; /* Test. */ - m_pGetNamedBufferSubData(buffer, -1, sizeof(dummy_data_query), dummy_data_query); + m_pGetNamedBufferSubData(buffer, -1, sizeof(unused_data_query), unused_data_query); is_ok &= ErrorCheckAndLog("glGetNamedBufferSubData", GL_INVALID_VALUE, " if offset is negative."); } @@ -3832,10 +3832,10 @@ bool ErrorsTest::TestErrorsOfGetNamedBufferSubData() /* Test negative size error behavior. */ { /* Query storage. */ - glw::GLubyte dummy_data_query[sizeof(dummy_data) / sizeof(dummy_data[0])] = {}; + glw::GLubyte unused_data_query[sizeof(unused_data) / sizeof(unused_data[0])] = {}; /* Test. */ - m_pGetNamedBufferSubData(buffer, 0, -1, dummy_data_query); + m_pGetNamedBufferSubData(buffer, 0, -1, unused_data_query); is_ok &= ErrorCheckAndLog("glGetNamedBufferSubData", GL_INVALID_VALUE, " if size is negative."); } @@ -3843,10 +3843,10 @@ bool ErrorsTest::TestErrorsOfGetNamedBufferSubData() /* Test size overflow error behavior. */ { /* Query storage. */ - glw::GLubyte dummy_data_query[sizeof(dummy_data) / sizeof(dummy_data[0])] = {}; + glw::GLubyte unused_data_query[sizeof(unused_data) / sizeof(unused_data[0])] = {}; /* Test. */ - m_pGetNamedBufferSubData(buffer, 0, 2 * sizeof(dummy_data_query), dummy_data_query); + m_pGetNamedBufferSubData(buffer, 0, 2 * sizeof(unused_data_query), unused_data_query); is_ok &= ErrorCheckAndLog("glGetNamedBufferSubData", GL_INVALID_VALUE, " if size is greater than the value of BUFFER_SIZE for the buffer object."); @@ -3855,10 +3855,11 @@ bool ErrorsTest::TestErrorsOfGetNamedBufferSubData() /* Test offset+size overflow error behavior. */ { /* Query storage. */ - glw::GLubyte dummy_data_query[sizeof(dummy_data) / sizeof(dummy_data[0])] = {}; + glw::GLubyte unused_data_query[sizeof(unused_data) / sizeof(unused_data[0])] = {}; /* Test. */ - m_pGetNamedBufferSubData(buffer, sizeof(dummy_data_query) / 2, sizeof(dummy_data_query), dummy_data_query); + m_pGetNamedBufferSubData(buffer, sizeof(unused_data_query) / 2, sizeof(unused_data_query), + unused_data_query); is_ok &= ErrorCheckAndLog("glGetNamedBufferSubData", GL_INVALID_VALUE, @@ -3868,10 +3869,10 @@ bool ErrorsTest::TestErrorsOfGetNamedBufferSubData() /* Test offset overflow error behavior. */ { /* Query storage. */ - glw::GLubyte dummy_data_query[sizeof(dummy_data) / sizeof(dummy_data[0])] = {}; + glw::GLubyte unused_data_query[sizeof(unused_data) / sizeof(unused_data[0])] = {}; /* Test. */ - m_pGetNamedBufferSubData(buffer, sizeof(dummy_data_query) + 1, 0, dummy_data_query); + m_pGetNamedBufferSubData(buffer, sizeof(unused_data_query) + 1, 0, unused_data_query); is_ok &= ErrorCheckAndLog("glGetNamedBufferSubData", GL_INVALID_VALUE, " if offset is greater than the value of BUFFER_SIZE for the buffer object."); @@ -3880,13 +3881,13 @@ bool ErrorsTest::TestErrorsOfGetNamedBufferSubData() /* Test mapped buffer query error behavior. */ { /* Query storage. */ - glw::GLubyte dummy_data_query[sizeof(dummy_data) / sizeof(dummy_data[0])] = {}; + glw::GLubyte unused_data_query[sizeof(unused_data) / sizeof(unused_data[0])] = {}; /* Test. */ (void)(glw::GLbyte*) m_pMapNamedBuffer(buffer, GL_WRITE_ONLY); GLU_EXPECT_NO_ERROR(gl.getError(), "glMapNamedBuffer failed."); - m_pGetNamedBufferSubData(buffer, 0, sizeof(dummy_data_query), dummy_data_query); + m_pGetNamedBufferSubData(buffer, 0, sizeof(unused_data_query), unused_data_query); is_ok &= ErrorCheckAndLog("glGetNamedBufferSubData", GL_INVALID_OPERATION, " if the buffer object is mapped with MapBufferRange."); @@ -3898,13 +3899,13 @@ bool ErrorsTest::TestErrorsOfGetNamedBufferSubData() /* Test mapped buffer query error behavior. */ { /* Query storage. */ - glw::GLubyte dummy_data_query[sizeof(dummy_data) / sizeof(dummy_data[0])] = {}; + glw::GLubyte unused_data_query[sizeof(unused_data) / sizeof(unused_data[0])] = {}; /* Test. */ - (void)(glw::GLbyte*) m_pMapNamedBufferRange(buffer, 0, sizeof(dummy_data), GL_MAP_WRITE_BIT); + (void)(glw::GLbyte*) m_pMapNamedBufferRange(buffer, 0, sizeof(unused_data), GL_MAP_WRITE_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glMapNamedBuffer failed."); - m_pGetNamedBufferSubData(buffer, 0, sizeof(dummy_data_query), dummy_data_query); + m_pGetNamedBufferSubData(buffer, 0, sizeof(unused_data_query), unused_data_query); is_ok &= ErrorCheckAndLog("glGetNamedBufferSubData", GL_INVALID_OPERATION, " if the buffer object is mapped with MapBufferRange."); @@ -3916,14 +3917,14 @@ bool ErrorsTest::TestErrorsOfGetNamedBufferSubData() /* Test persistently mapped buffer query behavior. */ { /* Query storage. */ - glw::GLubyte dummy_data_query[sizeof(dummy_data) / sizeof(dummy_data[0])] = {}; + glw::GLubyte unused_data_query[sizeof(unused_data) / sizeof(unused_data[0])] = {}; /* Test. */ (void)(glw::GLbyte*) - m_pMapNamedBufferRange(buffer, 0, sizeof(dummy_data), GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT); + m_pMapNamedBufferRange(buffer, 0, sizeof(unused_data), GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glMapNamedBuffer failed."); - m_pGetNamedBufferSubData(buffer, 0, sizeof(dummy_data_query), dummy_data_query); + m_pGetNamedBufferSubData(buffer, 0, sizeof(unused_data_query), unused_data_query); is_ok &= ErrorCheckAndLog( "glGetNamedBufferSubData", GL_NO_ERROR, @@ -3978,7 +3979,7 @@ bool ErrorsTest::TestErrorsOfMapNamedBuffer() /* Common variables. */ glw::GLuint buffer = 0; - glw::GLubyte dummy_data[4] = {}; + glw::GLubyte unused_data[4] = {}; try { @@ -3986,7 +3987,7 @@ bool ErrorsTest::TestErrorsOfMapNamedBuffer() gl.createBuffers(1, &buffer); GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateBuffers failed."); - m_pNamedBufferStorage(buffer, sizeof(dummy_data), &dummy_data, GL_MAP_READ_BIT | GL_MAP_PERSISTENT_BIT); + m_pNamedBufferStorage(buffer, sizeof(unused_data), &unused_data, GL_MAP_READ_BIT | GL_MAP_PERSISTENT_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glNamedBuffeStorage failed."); /* Test invalid buffer name error behavior. */ @@ -4115,7 +4116,7 @@ bool ErrorsTest::TestErrorsOfMapNamedBufferRange() /* Common variables. */ glw::GLuint buffer = 0; glw::GLuint buffer_special_flags = 0; - glw::GLubyte dummy_data[4] = {}; + glw::GLubyte unused_data[4] = {}; try { @@ -4123,7 +4124,7 @@ bool ErrorsTest::TestErrorsOfMapNamedBufferRange() gl.createBuffers(1, &buffer); GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateBuffers failed."); - m_pNamedBufferStorage(buffer, sizeof(dummy_data), &dummy_data, + m_pNamedBufferStorage(buffer, sizeof(unused_data), &unused_data, GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glNamedBuffeStorage failed."); @@ -4136,7 +4137,7 @@ bool ErrorsTest::TestErrorsOfMapNamedBufferRange() ; /* Test. */ - m_pMapNamedBufferRange(not_a_buffer_name, 0, sizeof(dummy_data), GL_MAP_READ_BIT); + m_pMapNamedBufferRange(not_a_buffer_name, 0, sizeof(unused_data), GL_MAP_READ_BIT); is_ok &= ErrorCheckAndLog("glMapNamedBufferRange", GL_INVALID_OPERATION, " if buffer is not the name of an existing buffer object."); @@ -4144,7 +4145,7 @@ bool ErrorsTest::TestErrorsOfMapNamedBufferRange() /* Test negative offset error behavior. */ { - glw::GLvoid* mapped_data = m_pMapNamedBufferRange(buffer, -1, sizeof(dummy_data), GL_MAP_READ_BIT); + glw::GLvoid* mapped_data = m_pMapNamedBufferRange(buffer, -1, sizeof(unused_data), GL_MAP_READ_BIT); is_ok &= ErrorCheckAndLog("glMapNamedBufferRange", GL_INVALID_VALUE, " if offset is negative."); @@ -4174,7 +4175,7 @@ bool ErrorsTest::TestErrorsOfMapNamedBufferRange() /* Test length overflow error behavior. */ { - glw::GLvoid* mapped_data = m_pMapNamedBufferRange(buffer, 0, sizeof(dummy_data) * 2, GL_MAP_READ_BIT); + glw::GLvoid* mapped_data = m_pMapNamedBufferRange(buffer, 0, sizeof(unused_data) * 2, GL_MAP_READ_BIT); is_ok &= ErrorCheckAndLog("glMapNamedBufferRange", GL_INVALID_VALUE, " if length is greater than the value of BUFFER_SIZE" @@ -4193,7 +4194,7 @@ bool ErrorsTest::TestErrorsOfMapNamedBufferRange() /* Test (offset+length) overflow error behavior. */ { glw::GLvoid* mapped_data = - m_pMapNamedBufferRange(buffer, sizeof(dummy_data) / 2, sizeof(dummy_data), GL_MAP_READ_BIT); + m_pMapNamedBufferRange(buffer, sizeof(unused_data) / 2, sizeof(unused_data), GL_MAP_READ_BIT); is_ok &= ErrorCheckAndLog("glMapNamedBufferRange", GL_INVALID_VALUE, " if offset+length is greater than the value of BUFFER_SIZE" @@ -4226,11 +4227,11 @@ bool ErrorsTest::TestErrorsOfMapNamedBufferRange() /* Test mapping of mapped buffer error behavior. */ { - m_pMapNamedBufferRange(buffer, 0, sizeof(dummy_data), GL_MAP_READ_BIT); + m_pMapNamedBufferRange(buffer, 0, sizeof(unused_data), GL_MAP_READ_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glMapNamedBuffer."); glw::GLvoid* subsequent_mapped_data = - m_pMapNamedBufferRange(buffer, 0, sizeof(dummy_data), GL_MAP_READ_BIT); + m_pMapNamedBufferRange(buffer, 0, sizeof(unused_data), GL_MAP_READ_BIT); is_ok &= ErrorCheckAndLog("glMapNamedBufferRange", GL_INVALID_OPERATION, " if the buffer object is in a mapped state."); @@ -4253,7 +4254,7 @@ bool ErrorsTest::TestErrorsOfMapNamedBufferRange() /* Test access flag read and write bits are not set error behavior. */ { - glw::GLvoid* mapped_data = m_pMapNamedBufferRange(buffer, 0, sizeof(dummy_data), 0); + glw::GLvoid* mapped_data = m_pMapNamedBufferRange(buffer, 0, sizeof(unused_data), 0); is_ok &= ErrorCheckAndLog("glMapNamedBufferRange", GL_INVALID_OPERATION, " if neither MAP_READ_BIT nor MAP_WRITE_BIT is set."); @@ -4281,7 +4282,7 @@ bool ErrorsTest::TestErrorsOfMapNamedBufferRange() for (glw::GLuint i = 0; i < read_access_invalid_flags_count; ++i) { - glw::GLvoid* mapped_data = m_pMapNamedBufferRange(buffer, 0, sizeof(dummy_data), + glw::GLvoid* mapped_data = m_pMapNamedBufferRange(buffer, 0, sizeof(unused_data), GL_MAP_READ_BIT | read_access_invalid_flags[i]); is_ok &= @@ -4300,7 +4301,7 @@ bool ErrorsTest::TestErrorsOfMapNamedBufferRange() /* Test access flush bit without write bit error behavior. */ { glw::GLvoid* mapped_data = - m_pMapNamedBufferRange(buffer, 0, sizeof(dummy_data), GL_MAP_READ_BIT | GL_MAP_FLUSH_EXPLICIT_BIT); + m_pMapNamedBufferRange(buffer, 0, sizeof(unused_data), GL_MAP_READ_BIT | GL_MAP_FLUSH_EXPLICIT_BIT); is_ok &= ErrorCheckAndLog("glMapNamedBufferRange", GL_INVALID_OPERATION, " if MAP_FLUSH_EXPLICIT_BIT is set and MAP_WRITE_BIT is not set."); @@ -4334,12 +4335,12 @@ bool ErrorsTest::TestErrorsOfMapNamedBufferRange() gl.createBuffers(1, &buffer_special_flags); GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateBuffers failed."); - m_pNamedBufferStorage(buffer_special_flags, sizeof(dummy_data), &dummy_data, buffer_flags[i]); + m_pNamedBufferStorage(buffer_special_flags, sizeof(unused_data), &unused_data, buffer_flags[i]); GLU_EXPECT_NO_ERROR(gl.getError(), "glNamedBuffeStorage failed."); /* Test mapping. */ glw::GLvoid* mapped_data = - m_pMapNamedBufferRange(buffer_special_flags, 0, sizeof(dummy_data), mapping_flags[i]); + m_pMapNamedBufferRange(buffer_special_flags, 0, sizeof(unused_data), mapping_flags[i]); is_ok &= ErrorCheckAndLog("glMapNamedBufferRange", GL_INVALID_OPERATION, mapping_flags_log[i]); @@ -4418,7 +4419,7 @@ bool ErrorsTest::TestErrorsOfNamedBufferData() /* Common variables. */ glw::GLuint buffer = 0; glw::GLuint immutable_buffer = 0; - glw::GLubyte dummy_data[4] = {}; + glw::GLubyte unused_data[4] = {}; std::stack<glw::GLuint> too_much_buffers; try @@ -4430,7 +4431,7 @@ bool ErrorsTest::TestErrorsOfNamedBufferData() gl.createBuffers(1, &immutable_buffer); GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateBuffers failed."); - m_pNamedBufferStorage(immutable_buffer, sizeof(dummy_data), &dummy_data, GL_MAP_READ_BIT); + m_pNamedBufferStorage(immutable_buffer, sizeof(unused_data), &unused_data, GL_MAP_READ_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glNamedBuffeStorage failed."); /* Test invalid buffer name error behavior. */ @@ -4442,7 +4443,7 @@ bool ErrorsTest::TestErrorsOfNamedBufferData() ; /* Test. */ - m_pNamedBufferData(not_a_buffer_name, sizeof(dummy_data), dummy_data, GL_DYNAMIC_COPY); + m_pNamedBufferData(not_a_buffer_name, sizeof(unused_data), unused_data, GL_DYNAMIC_COPY); is_ok &= ErrorCheckAndLog("glNamedBufferData", GL_INVALID_OPERATION, " if buffer is not the name of an existing buffer object."); @@ -4464,7 +4465,7 @@ bool ErrorsTest::TestErrorsOfNamedBufferData() ; /* Test. */ - m_pNamedBufferData(buffer, sizeof(dummy_data), dummy_data, invalid_usage); + m_pNamedBufferData(buffer, sizeof(unused_data), unused_data, invalid_usage); is_ok &= ErrorCheckAndLog("glNamedBufferData", GL_INVALID_ENUM, @@ -4474,14 +4475,14 @@ bool ErrorsTest::TestErrorsOfNamedBufferData() /* Test negative size error behavior. */ { - m_pNamedBufferData(buffer, -1, dummy_data, GL_DYNAMIC_COPY); + m_pNamedBufferData(buffer, -1, unused_data, GL_DYNAMIC_COPY); is_ok &= ErrorCheckAndLog("glNamedBufferData", GL_INVALID_VALUE, " if size is negative."); } /* Test immutable buffer error behavior. */ { - m_pNamedBufferData(immutable_buffer, sizeof(dummy_data) / 2, dummy_data, GL_DYNAMIC_COPY); + m_pNamedBufferData(immutable_buffer, sizeof(unused_data) / 2, unused_data, GL_DYNAMIC_COPY); is_ok &= ErrorCheckAndLog("glNamedBufferData", GL_INVALID_OPERATION, " if the BUFFER_IMMUTABLE_STORAGE flag of the buffer object is TRUE."); @@ -4560,7 +4561,7 @@ bool ErrorsTest::TestErrorsOfNamedBufferStorage() /* Common variables. */ glw::GLuint buffer = 0; - glw::GLubyte dummy_data[4] = {}; + glw::GLubyte unused_data[4] = {}; std::stack<glw::GLuint> too_much_buffers; try @@ -4574,7 +4575,7 @@ bool ErrorsTest::TestErrorsOfNamedBufferStorage() ; /* Test. */ - m_pNamedBufferStorage(not_a_buffer_name, sizeof(dummy_data), dummy_data, GL_MAP_WRITE_BIT); + m_pNamedBufferStorage(not_a_buffer_name, sizeof(unused_data), unused_data, GL_MAP_WRITE_BIT); is_ok &= ErrorCheckAndLog("glNamedBufferStorage", GL_INVALID_OPERATION, " if buffer is not the name of an existing buffer object."); @@ -4587,12 +4588,12 @@ bool ErrorsTest::TestErrorsOfNamedBufferStorage() GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateBuffers failed."); /* Test negative size. */ - m_pNamedBufferStorage(buffer, -1, dummy_data, GL_DYNAMIC_COPY); + m_pNamedBufferStorage(buffer, -1, unused_data, GL_DYNAMIC_COPY); is_ok &= ErrorCheckAndLog("glNamedBufferStorage", GL_INVALID_VALUE, " if size is negative."); /* Test zero size. */ - m_pNamedBufferStorage(buffer, 0, dummy_data, GL_DYNAMIC_COPY); + m_pNamedBufferStorage(buffer, 0, unused_data, GL_DYNAMIC_COPY); is_ok &= ErrorCheckAndLog("glNamedBufferStorage", GL_INVALID_VALUE, " if size zero."); @@ -4642,7 +4643,7 @@ bool ErrorsTest::TestErrorsOfNamedBufferStorage() GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateBuffers failed."); /* Test invalid bit. */ - m_pNamedBufferStorage(buffer, sizeof(dummy_data), dummy_data, possibly_invalid_bit); + m_pNamedBufferStorage(buffer, sizeof(unused_data), unused_data, possibly_invalid_bit); is_ok &= ErrorCheckAndLog("glNamedBufferStorage", GL_INVALID_VALUE, @@ -4666,7 +4667,7 @@ bool ErrorsTest::TestErrorsOfNamedBufferStorage() GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateBuffers failed."); /* Test. */ - m_pNamedBufferStorage(buffer, sizeof(dummy_data), dummy_data, GL_MAP_PERSISTENT_BIT); + m_pNamedBufferStorage(buffer, sizeof(unused_data), unused_data, GL_MAP_PERSISTENT_BIT); is_ok &= ErrorCheckAndLog("glNamedBufferStorage", GL_INVALID_VALUE, " if flags contains MAP_PERSISTENT_BIT " "but does not contain at least one of " @@ -4687,7 +4688,7 @@ bool ErrorsTest::TestErrorsOfNamedBufferStorage() GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateBuffers failed."); /* Test. */ - m_pNamedBufferStorage(buffer, sizeof(dummy_data), dummy_data, + m_pNamedBufferStorage(buffer, sizeof(unused_data), unused_data, GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_COHERENT_BIT); is_ok &= @@ -4768,7 +4769,7 @@ bool ErrorsTest::TestErrorsOfNamedBufferSubData() /* Common variables. */ glw::GLuint buffer = 0; glw::GLuint immutable_storage_buffer = 0; - glw::GLubyte dummy_data[4] = {}; + glw::GLubyte unused_data[4] = {}; try { @@ -4776,14 +4777,14 @@ bool ErrorsTest::TestErrorsOfNamedBufferSubData() gl.createBuffers(1, &buffer); GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateBuffers failed."); - m_pNamedBufferStorage(buffer, sizeof(dummy_data), &dummy_data, + m_pNamedBufferStorage(buffer, sizeof(unused_data), &unused_data, GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_DYNAMIC_STORAGE_BIT | GL_MAP_PERSISTENT_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glNamedBuffeStorage failed."); gl.createBuffers(1, &immutable_storage_buffer); GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateBuffers failed."); - m_pNamedBufferStorage(immutable_storage_buffer, sizeof(dummy_data), &dummy_data, GL_MAP_READ_BIT); + m_pNamedBufferStorage(immutable_storage_buffer, sizeof(unused_data), &unused_data, GL_MAP_READ_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glNamedBuffeStorage failed."); /* Test invalid buffer name error behavior. */ @@ -4795,7 +4796,7 @@ bool ErrorsTest::TestErrorsOfNamedBufferSubData() ; /* Test. */ - m_pNamedBufferSubData(not_a_buffer_name, 0, sizeof(dummy_data), &dummy_data); + m_pNamedBufferSubData(not_a_buffer_name, 0, sizeof(unused_data), &unused_data); is_ok &= ErrorCheckAndLog("glNamedBufferSubData", GL_INVALID_OPERATION, " if buffer is not the name of an existing buffer object."); @@ -4804,7 +4805,7 @@ bool ErrorsTest::TestErrorsOfNamedBufferSubData() /* Test negative offset error behavior. */ { /* Test. */ - m_pNamedBufferSubData(buffer, -1, sizeof(dummy_data), &dummy_data); + m_pNamedBufferSubData(buffer, -1, sizeof(unused_data), &unused_data); is_ok &= ErrorCheckAndLog("glNamedBufferSubData", GL_INVALID_VALUE, " if offset or size is negative."); } @@ -4812,7 +4813,7 @@ bool ErrorsTest::TestErrorsOfNamedBufferSubData() /* Test negative size error behavior. */ { /* Test. */ - m_pNamedBufferSubData(buffer, 0, -1, &dummy_data); + m_pNamedBufferSubData(buffer, 0, -1, &unused_data); is_ok &= ErrorCheckAndLog("glNamedBufferSubData", GL_INVALID_VALUE, " if offset or size is negative."); } @@ -4820,7 +4821,7 @@ bool ErrorsTest::TestErrorsOfNamedBufferSubData() /* Test size overflow error behavior. */ { /* Test. */ - m_pNamedBufferSubData(buffer, 0, sizeof(dummy_data) * 2, &dummy_data); + m_pNamedBufferSubData(buffer, 0, sizeof(unused_data) * 2, &unused_data); is_ok &= ErrorCheckAndLog( "glNamedBufferSubData", GL_INVALID_VALUE, @@ -4830,7 +4831,7 @@ bool ErrorsTest::TestErrorsOfNamedBufferSubData() /* Test offset+size overflow error behavior. */ { /* Test. */ - m_pNamedBufferSubData(buffer, sizeof(dummy_data) / 2, sizeof(dummy_data), &dummy_data); + m_pNamedBufferSubData(buffer, sizeof(unused_data) / 2, sizeof(unused_data), &unused_data); is_ok &= ErrorCheckAndLog( "glNamedBufferSubData", GL_INVALID_VALUE, @@ -4842,7 +4843,7 @@ bool ErrorsTest::TestErrorsOfNamedBufferSubData() (void)(glw::GLbyte*) m_pMapNamedBuffer(buffer, GL_READ_ONLY); GLU_EXPECT_NO_ERROR(gl.getError(), "glMapNamedBuffer failed."); - m_pNamedBufferSubData(buffer, 0, sizeof(dummy_data), &dummy_data); + m_pNamedBufferSubData(buffer, 0, sizeof(unused_data), &unused_data); is_ok &= ErrorCheckAndLog("glNamedBufferSubData", GL_INVALID_OPERATION, " if any part of the specified range of the buffer" @@ -4855,10 +4856,10 @@ bool ErrorsTest::TestErrorsOfNamedBufferSubData() /* Test of mapped buffer subdata error behavior verification (with glMapBufferRange). */ { - (void)(glw::GLbyte*) m_pMapNamedBufferRange(buffer, 0, sizeof(dummy_data), GL_MAP_READ_BIT); + (void)(glw::GLbyte*) m_pMapNamedBufferRange(buffer, 0, sizeof(unused_data), GL_MAP_READ_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glMapNamedBuffer failed."); - m_pNamedBufferSubData(buffer, 0, sizeof(dummy_data), &dummy_data); + m_pNamedBufferSubData(buffer, 0, sizeof(unused_data), &unused_data); is_ok &= ErrorCheckAndLog("glNamedBufferSubData", GL_INVALID_OPERATION, " if any part of the specified range of the buffer" @@ -4872,10 +4873,10 @@ bool ErrorsTest::TestErrorsOfNamedBufferSubData() /* Test of persistently mapped buffer clear error with behavior verification. */ { (void)(glw::GLbyte*) - m_pMapNamedBufferRange(buffer, 0, sizeof(dummy_data), GL_MAP_READ_BIT | GL_MAP_PERSISTENT_BIT); + m_pMapNamedBufferRange(buffer, 0, sizeof(unused_data), GL_MAP_READ_BIT | GL_MAP_PERSISTENT_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glMapNamedBuffer failed."); - m_pNamedBufferSubData(buffer, 0, sizeof(dummy_data), &dummy_data); + m_pNamedBufferSubData(buffer, 0, sizeof(unused_data), &unused_data); is_ok &= ErrorCheckAndLog("glNamedBufferSubData", GL_NO_ERROR, " if any part of the specified range of the buffer" @@ -4889,7 +4890,7 @@ bool ErrorsTest::TestErrorsOfNamedBufferSubData() /* Test DYNAMIC_STORAGE_BIT bit off immutable buffer not set error behavior. */ { /* Test. */ - m_pNamedBufferSubData(immutable_storage_buffer, 0, sizeof(dummy_data), &dummy_data); + m_pNamedBufferSubData(immutable_storage_buffer, 0, sizeof(unused_data), &unused_data); is_ok &= ErrorCheckAndLog("glNamedBufferSubData", GL_INVALID_OPERATION, " if the value of the BUFFER_IMMUTABLE_STORAGE flag of the buffer object is TRUE" @@ -4900,7 +4901,7 @@ bool ErrorsTest::TestErrorsOfNamedBufferSubData() /* Test DYNAMIC_STORAGE_BIT bit off immutable buffer set no error behavior. */ { /* Test. */ - m_pNamedBufferSubData(buffer, 0, sizeof(dummy_data), &dummy_data); + m_pNamedBufferSubData(buffer, 0, sizeof(unused_data), &unused_data); is_ok &= ErrorCheckAndLog("glNamedBufferSubData", GL_NO_ERROR, " if the value of the BUFFER_IMMUTABLE_STORAGE flag of the buffer object is TRUE" @@ -4957,7 +4958,7 @@ bool ErrorsTest::TestErrorsOfUnmapNamedBuffer() /* Common variables. */ glw::GLuint buffer = 0; - glw::GLubyte dummy_data[4] = {}; + glw::GLubyte unused_data[4] = {}; try { @@ -4965,7 +4966,7 @@ bool ErrorsTest::TestErrorsOfUnmapNamedBuffer() gl.createBuffers(1, &buffer); GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateBuffers failed."); - m_pNamedBufferStorage(buffer, sizeof(dummy_data), &dummy_data, + m_pNamedBufferStorage(buffer, sizeof(unused_data), &unused_data, GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_DYNAMIC_STORAGE_BIT | GL_MAP_PERSISTENT_BIT); GLU_EXPECT_NO_ERROR(gl.getError(), "glNamedBuffeStorage failed."); diff --git a/external/openglcts/modules/gl/gl4cDirectStateAccessFramebuffersAndRenderbuffersTests.cpp b/external/openglcts/modules/gl/gl4cDirectStateAccessFramebuffersAndRenderbuffersTests.cpp index 838cc066c..1ed28d8a3 100644 --- a/external/openglcts/modules/gl/gl4cDirectStateAccessFramebuffersAndRenderbuffersTests.cpp +++ b/external/openglcts/modules/gl/gl4cDirectStateAccessFramebuffersAndRenderbuffersTests.cpp @@ -6627,19 +6627,19 @@ tcu::TestNode::IterateResult GetParameterErrorsTest::iterate() /* Prepare objects. */ PrepareObjects(); - glw::GLint return_values_dummy_storage[4]; + glw::GLint return_values_unused_storage[4]; /* Check that INVALID_OPERATION is generated by GetNamedFramebufferParameteriv if framebuffer is not zero or the name of an existing framebuffer object. */ - gl.getNamedFramebufferParameteriv(m_fbo_invalid, GL_SAMPLES, return_values_dummy_storage); + gl.getNamedFramebufferParameteriv(m_fbo_invalid, GL_SAMPLES, return_values_unused_storage); is_ok &= ExpectError(GL_INVALID_OPERATION, "GetNamedFramebufferParameteriv", "framebuffer is not zero or the name of an existing framebuffer object."); /* Check that INVALID_ENUM is generated by GetNamedFramebufferParameteriv if pname is not one of the accepted parameter names. */ - gl.getNamedFramebufferParameteriv(m_fbo_valid, m_parameter_invalid, return_values_dummy_storage); + gl.getNamedFramebufferParameteriv(m_fbo_valid, m_parameter_invalid, return_values_unused_storage); is_ok &= ExpectError(GL_INVALID_ENUM, "GetNamedFramebufferParameteriv", "pname is not one of the accepted parameter names."); @@ -6648,7 +6648,7 @@ tcu::TestNode::IterateResult GetParameterErrorsTest::iterate() queried, and pname is not one of DOUBLEBUFFER, IMPLEMENTATION_COLOR_READ_FORMAT, IMPLEMENTATION_COLOR_READ_TYPE, SAMPLES, SAMPLE_BUFFERS or STEREO. */ - gl.getNamedFramebufferParameteriv(0, GL_FRAMEBUFFER_DEFAULT_WIDTH, return_values_dummy_storage); + gl.getNamedFramebufferParameteriv(0, GL_FRAMEBUFFER_DEFAULT_WIDTH, return_values_unused_storage); is_ok &= ExpectError(GL_INVALID_OPERATION, "GetNamedFramebufferParameteriv", "a default framebuffer is queried, and pname is not one of DOUBLEBUFFER, " @@ -6841,13 +6841,13 @@ tcu::TestNode::IterateResult GetAttachmentParameterErrorsTest::iterate() /* Prepare objects. */ PrepareObjects(); - glw::GLint return_values_dummy_storage[4]; + glw::GLint return_values_unused_storage[4]; /* Check that GL_INVALID_OPERATION is generated by GetNamedFramebufferAttachmentParameteriv if framebuffer is not zero or the name of an existing framebuffer object. */ gl.getNamedFramebufferAttachmentParameteriv( - m_fbo_invalid, GL_COLOR_ATTACHMENT0, GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE, return_values_dummy_storage); + m_fbo_invalid, GL_COLOR_ATTACHMENT0, GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE, return_values_unused_storage); is_ok &= ExpectError(GL_INVALID_OPERATION, "GetNamedFramebufferAttachmentParameteriv", "framebuffer is not zero or the name of an existing framebuffer object."); @@ -6856,7 +6856,7 @@ tcu::TestNode::IterateResult GetAttachmentParameterErrorsTest::iterate() GetNamedFramebufferAttachmentParameteriv if pname is not valid for the value of GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, as described above. */ gl.getNamedFramebufferAttachmentParameteriv( - m_fbo_valid, GL_COLOR_ATTACHMENT0, GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL, return_values_dummy_storage); + m_fbo_valid, GL_COLOR_ATTACHMENT0, GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL, return_values_unused_storage); is_ok &= ExpectError( GL_INVALID_ENUM, "GetNamedFramebufferAttachmentParameteriv", @@ -6866,7 +6866,7 @@ tcu::TestNode::IterateResult GetAttachmentParameterErrorsTest::iterate() is not one of the attachments in table 9.2 (COLOR_ATTACHMENTi, DEPTH_ATTACHMENT, STENCIL_ATTACHMENT, DEPTH_STENCIL_ATTACHMENT), and attachment is not COLOR_ATTACHMENTm where m is greater than or equal to the value of MAX_COLOR_ATTACHMENTS. */ gl.getNamedFramebufferAttachmentParameteriv( - m_fbo_valid, m_attachment_invalid, GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE, return_values_dummy_storage); + m_fbo_valid, m_attachment_invalid, GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE, return_values_unused_storage); is_ok &= ExpectError( GL_INVALID_ENUM, "GetNamedFramebufferAttachmentParameteriv", @@ -6878,7 +6878,7 @@ tcu::TestNode::IterateResult GetAttachmentParameterErrorsTest::iterate() FRAMEBUFFER_ATTACHMENT_OBJECT_NAME or FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE. */ gl.getNamedFramebufferAttachmentParameteriv( - m_fbo_valid, GL_COLOR_ATTACHMENT1, GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE, return_values_dummy_storage); + m_fbo_valid, GL_COLOR_ATTACHMENT1, GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE, return_values_unused_storage); is_ok &= ExpectError(GL_INVALID_OPERATION, "GetNamedFramebufferAttachmentParameteriv", "the value of FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE is GL_NONE and pname is not " @@ -6889,7 +6889,7 @@ tcu::TestNode::IterateResult GetAttachmentParameterErrorsTest::iterate() DEPTH_STENCIL_ATTACHMENT and pname is FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE. */ gl.getNamedFramebufferAttachmentParameteriv(m_fbo_valid, GL_DEPTH_STENCIL_ATTACHMENT, GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE, - return_values_dummy_storage); + return_values_unused_storage); is_ok &= ExpectError(GL_INVALID_OPERATION, "GetNamedFramebufferAttachmentParameteriv", @@ -6899,7 +6899,7 @@ tcu::TestNode::IterateResult GetAttachmentParameterErrorsTest::iterate() queried and attachment is not one the values FRONT, FRONT_LEFT, FRONT_RIGHT, BACK, BACK_LEFT, BACK_RIGHT, DEPTH, STENCIL. */ gl.getNamedFramebufferAttachmentParameteriv( - 0, m_default_attachment_invalid, GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE, return_values_dummy_storage); + 0, m_default_attachment_invalid, GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE, return_values_unused_storage); is_ok &= ExpectError(GL_INVALID_ENUM, "GetNamedFramebufferAttachmentParameteriv", "the default framebuffer is queried and attachment is not one the values FRONT, " @@ -6910,7 +6910,7 @@ tcu::TestNode::IterateResult GetAttachmentParameterErrorsTest::iterate() equal to the value of MAX_COLOR_ATTACHMENTS. */ gl.getNamedFramebufferAttachmentParameteriv(m_fbo_valid, GL_COLOR_ATTACHMENT0 + m_max_color_attachments, GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE, - return_values_dummy_storage); + return_values_unused_storage); is_ok &= ExpectError(GL_INVALID_OPERATION, "GetNamedFramebufferAttachmentParameteriv", "a framebuffer object is bound to target and attachment is COLOR_ATTACHMENTm where m is " @@ -6918,7 +6918,7 @@ tcu::TestNode::IterateResult GetAttachmentParameterErrorsTest::iterate() gl.getNamedFramebufferAttachmentParameteriv(m_fbo_valid, GL_COLOR_ATTACHMENT0 + m_max_color_attachments + 1, GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE, - return_values_dummy_storage); + return_values_unused_storage); is_ok &= ExpectError(GL_INVALID_OPERATION, "GetNamedFramebufferAttachmentParameteriv", "a framebuffer object is bound to target and attachment is COLOR_ATTACHMENTm where m is " @@ -9619,12 +9619,12 @@ tcu::TestNode::IterateResult GetParameterErrorsTest::iterate() /* Prepare objects. */ PrepareObjects(); - glw::GLint return_value_dummy_storage; + glw::GLint return_value_unused_storage; /* Check that INVALID_OPERATION is generated by GetNamedRenderbufferParameteriv if renderbuffer is not the name of an existing renderbuffer object. */ - gl.getNamedRenderbufferParameteriv(m_rbo_invalid, GL_RENDERBUFFER_WIDTH, &return_value_dummy_storage); + gl.getNamedRenderbufferParameteriv(m_rbo_invalid, GL_RENDERBUFFER_WIDTH, &return_value_unused_storage); is_ok &= ExpectError(GL_INVALID_OPERATION, "GetNamedRenderbufferParameteriv", "renderbuffer is not the name of an existing renderbuffer object."); @@ -9632,7 +9632,7 @@ tcu::TestNode::IterateResult GetParameterErrorsTest::iterate() /* Check that INVALID_ENUM is generated by GetNamedRenderbufferParameteriv if parameter name is not one of the accepted parameter names described in specification. */ - gl.getNamedRenderbufferParameteriv(m_rbo_valid, m_parameter_invalid, &return_value_dummy_storage); + gl.getNamedRenderbufferParameteriv(m_rbo_valid, m_parameter_invalid, &return_value_unused_storage); is_ok &= ExpectError(GL_INVALID_ENUM, "GetNamedRenderbufferParameteriv", "parameter name is not one of the accepted parameter names described in specification."); diff --git a/external/openglcts/modules/gl/gl4cDirectStateAccessVertexArraysTests.cpp b/external/openglcts/modules/gl/gl4cDirectStateAccessVertexArraysTests.cpp index 9e0ba0d4a..73ffa7171 100644 --- a/external/openglcts/modules/gl/gl4cDirectStateAccessVertexArraysTests.cpp +++ b/external/openglcts/modules/gl/gl4cDirectStateAccessVertexArraysTests.cpp @@ -5462,7 +5462,7 @@ tcu::TestNode::IterateResult GetVertexArrayIndexedErrorsTest::iterate() glw::GLuint vao = 0; glw::GLuint not_a_vao = 0; - /* Dummy storage. */ + /* Unused storage. */ glw::GLint storage = 0; glw::GLint64 storage64 = 0; diff --git a/external/openglcts/modules/gl/gl4cDirectStateAccessXFBTests.cpp b/external/openglcts/modules/gl/gl4cDirectStateAccessXFBTests.cpp index 026fda09a..b6003a683 100644 --- a/external/openglcts/modules/gl/gl4cDirectStateAccessXFBTests.cpp +++ b/external/openglcts/modules/gl/gl4cDirectStateAccessXFBTests.cpp @@ -1123,7 +1123,7 @@ bool ErrorsTest::testQueriesForInvalidNameOfObject() while (GL_TRUE == gl.isTransformFeedback(++invalid_name)) ; - /* Dummy storage. */ + /* unused storage. */ glw::GLint buffer = 314159; glw::GLint64 buffer64 = 314159; @@ -1249,7 +1249,7 @@ bool ErrorsTest::testGetTransformFeedbackivQueryForInvalidParameterName() /* Generating invalid parameter name. */ glw::GLuint invalid_parameter_name = 0; - /* Dummy storage. */ + /* Unused storage. */ glw::GLint buffer = 314159; /* Error variable. */ @@ -1319,7 +1319,7 @@ bool ErrorsTest::testGetTransformFeedbacki_vQueryForInvalidParameterName() /* Generating invalid parameter name. */ glw::GLuint invalid_parameter_name = 0; - /* Dummy storage. */ + /* Unused storage. */ glw::GLint buffer = 314159; /* Error variable. */ @@ -1390,7 +1390,7 @@ bool ErrorsTest::testGetTransformFeedbacki64_vQueryForInvalidParameterName() /* Generating invalid parameter name. */ glw::GLuint invalid_parameter_name = 0; - /* Dummy storage. */ + /* Unused storage. */ glw::GLint64 buffer = 314159; /* Error variable. */ @@ -1467,7 +1467,7 @@ bool ErrorsTest::testIndexedQueriesForInvalidBindingPoint() gl.createTransformFeedbacks(1, &xfb); GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateTransformFeedbacks have failed"); - /* Dummy storage. */ + /* Unused storage. */ glw::GLint buffer = 314159; glw::GLint64 buffer64 = 314159; @@ -1959,7 +1959,7 @@ bool FunctionalTest::testTransformFeedbackStatus(glw::GLenum parameter_name, glw /* Shortcut for GL functionality */ const glw::Functions& gl = m_context.getRenderContext().getFunctions(); - /* Dummy storage. */ + /* Unused storage. */ glw::GLint value = 314159; /* Test of GetTransformFeedbackiv. */ diff --git a/external/openglcts/modules/gl/gl4cES31CompatibilityTests.cpp b/external/openglcts/modules/gl/gl4cES31CompatibilityTests.cpp index cb625dc12..f3974a482 100644 --- a/external/openglcts/modules/gl/gl4cES31CompatibilityTests.cpp +++ b/external/openglcts/modules/gl/gl4cES31CompatibilityTests.cpp @@ -671,7 +671,7 @@ const glw::GLchar* gl4cts::es31compatibility::ShaderFunctionalCompatibilityTest: const glw::GLchar* gl4cts::es31compatibility::ShaderFunctionalCompatibilityTest::s_vertex_shader_body = "\n" - "out highp float dummy;\n" + "out highp float vout;\n" "\n" "void main()\n" "{\n" @@ -691,12 +691,12 @@ const glw::GLchar* gl4cts::es31compatibility::ShaderFunctionalCompatibilityTest: " break;\n" " }\n" "\n" - " dummy = float(gl_VertexID % 4);\n /* Always less than 4. */" + " vout = float(gl_VertexID % 4);\n /* Always less than 4. */" "}\n"; const glw::GLchar* gl4cts::es31compatibility::ShaderFunctionalCompatibilityTest::s_fragment_shader_body = "\n" - "in highp float dummy;\n" + "in highp float vout;\n" "\n" "out highp vec4 result;\n" "\n" @@ -704,7 +704,7 @@ const glw::GLchar* gl4cts::es31compatibility::ShaderFunctionalCompatibilityTest: "{\n" " TTYPE a = LEFT;\n" " TTYPE b = RIGHT;\n" - " BTYPE c = BDATA && BTYPE(dummy < 4.0);\n /* Making sure that expression is not compile time constant. */" + " BTYPE c = BDATA && BTYPE(vout < 4.0);\n /* Making sure that expression is not compile time constant. */" "\n" " TTYPE mixed = mix(a, b, c);\n" "\n" diff --git a/external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.cpp b/external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.cpp index bb5a99be4..febbdc2c2 100644 --- a/external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.cpp +++ b/external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.cpp @@ -8864,15 +8864,15 @@ std::string UniformBlockLayoutQualifierConflictTest::getShaderSource(GLuint "layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;\n" "\n" "LAYOUTuniform Block {\n" - " layout(offset = 16) vec4 boy;\n" - " layout(align = 64) vec4 man;\n" + " layout(offset = 16) vec4 b;\n" + " layout(align = 64) vec4 a;\n" "} uni_block;\n" "\n" "writeonly uniform image2D uni_image;\n" "\n" "void main()\n" "{\n" - " vec4 result = uni_block.boy + uni_block.man;\n" + " vec4 result = uni_block.b + uni_block.a;\n" "\n" " imageStore(uni_image, ivec2(gl_GlobalInvocationID.xy), result);\n" "}\n" @@ -8881,8 +8881,8 @@ std::string UniformBlockLayoutQualifierConflictTest::getShaderSource(GLuint "#extension GL_ARB_enhanced_layouts : require\n" "\n" "LAYOUTuniform Block {\n" - " layout(offset = 16) vec4 boy;\n" - " layout(align = 64) vec4 man;\n" + " layout(offset = 16) vec4 b;\n" + " layout(align = 64) vec4 a;\n" "} uni_block;\n" "\n" "in vec4 gs_fs;\n" @@ -8890,7 +8890,7 @@ std::string UniformBlockLayoutQualifierConflictTest::getShaderSource(GLuint "\n" "void main()\n" "{\n" - " fs_out = gs_fs + uni_block.boy + uni_block.man;\n" + " fs_out = gs_fs + uni_block.b + uni_block.a;\n" "}\n" "\n"; static const GLchar* gs = "#version 430 core\n" @@ -8900,8 +8900,8 @@ std::string UniformBlockLayoutQualifierConflictTest::getShaderSource(GLuint "layout(triangle_strip, max_vertices = 4) out;\n" "\n" "LAYOUTuniform Block {\n" - " layout(offset = 16) vec4 boy;\n" - " layout(align = 64) vec4 man;\n" + " layout(offset = 16) vec4 b;\n" + " layout(align = 64) vec4 a;\n" "} uni_block;\n" "\n" "in vec4 tes_gs[];\n" @@ -8909,16 +8909,16 @@ std::string UniformBlockLayoutQualifierConflictTest::getShaderSource(GLuint "\n" "void main()\n" "{\n" - " gs_fs = tes_gs[0] + uni_block.boy + uni_block.man;\n" + " gs_fs = tes_gs[0] + uni_block.b + uni_block.a;\n" " gl_Position = vec4(-1, -1, 0, 1);\n" " EmitVertex();\n" - " gs_fs = tes_gs[0] + uni_block.boy + uni_block.man;\n" + " gs_fs = tes_gs[0] + uni_block.b + uni_block.a;\n" " gl_Position = vec4(-1, 1, 0, 1);\n" " EmitVertex();\n" - " gs_fs = tes_gs[0] + uni_block.boy + uni_block.man;\n" + " gs_fs = tes_gs[0] + uni_block.b + uni_block.a;\n" " gl_Position = vec4(1, -1, 0, 1);\n" " EmitVertex();\n" - " gs_fs = tes_gs[0] + uni_block.boy + uni_block.man;\n" + " gs_fs = tes_gs[0] + uni_block.b + uni_block.a;\n" " gl_Position = vec4(1, 1, 0, 1);\n" " EmitVertex();\n" "}\n" @@ -8930,8 +8930,8 @@ std::string UniformBlockLayoutQualifierConflictTest::getShaderSource(GLuint "layout(vertices = 1) out;\n" "\n" "LAYOUTuniform Block {\n" - " layout(offset = 16) vec4 boy;\n" - " layout(align = 64) vec4 man;\n" + " layout(offset = 16) vec4 b;\n" + " layout(align = 64) vec4 a;\n" "} uni_block;\n" "\n" "in vec4 vs_tcs[];\n" @@ -8940,7 +8940,7 @@ std::string UniformBlockLayoutQualifierConflictTest::getShaderSource(GLuint "void main()\n" "{\n" "\n" - " tcs_tes[gl_InvocationID] = vs_tcs[gl_InvocationID] + uni_block.boy + uni_block.man;\n" + " tcs_tes[gl_InvocationID] = vs_tcs[gl_InvocationID] + uni_block.b + uni_block.a;\n" "\n" " gl_TessLevelOuter[0] = 1.0;\n" " gl_TessLevelOuter[1] = 1.0;\n" @@ -8956,8 +8956,8 @@ std::string UniformBlockLayoutQualifierConflictTest::getShaderSource(GLuint "layout(isolines, point_mode) in;\n" "\n" "LAYOUTuniform Block {\n" - " layout(offset = 16) vec4 boy;\n" - " layout(align = 64) vec4 man;\n" + " layout(offset = 16) vec4 b;\n" + " layout(align = 64) vec4 a;\n" "} uni_block;\n" "\n" "in vec4 tcs_tes[];\n" @@ -8965,15 +8965,15 @@ std::string UniformBlockLayoutQualifierConflictTest::getShaderSource(GLuint "\n" "void main()\n" "{\n" - " tes_gs = tcs_tes[0] + uni_block.boy + uni_block.man;\n" + " tes_gs = tcs_tes[0] + uni_block.b + uni_block.a;\n" "}\n" "\n"; static const GLchar* vs = "#version 430 core\n" "#extension GL_ARB_enhanced_layouts : require\n" "\n" "LAYOUTuniform Block {\n" - " layout(offset = 16) vec4 boy;\n" - " layout(align = 64) vec4 man;\n" + " layout(offset = 16) vec4 b;\n" + " layout(align = 64) vec4 a;\n" "} uni_block;\n" "\n" "in vec4 in_vs;\n" @@ -8981,7 +8981,7 @@ std::string UniformBlockLayoutQualifierConflictTest::getShaderSource(GLuint "\n" "void main()\n" "{\n" - " vs_tcs = in_vs + uni_block.boy + uni_block.man;\n" + " vs_tcs = in_vs + uni_block.b + uni_block.a;\n" "}\n" "\n"; @@ -9626,8 +9626,8 @@ std::string UniformBlockMemberOverlappingOffsetsTest::getShaderSource(GLuint "layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;\n" "\n" "layout (std140) uniform Block {\n" - " layout (offset = BOY_OFFSET) BOY_TYPE boy;\n" - " layout (offset = MAN_OFFSET) MAN_TYPE man;\n" + " layout (offset = B_OFFSET) B_TYPE b;\n" + " layout (offset = A_OFFSET) A_TYPE a;\n" "} block;\n" "\n" "writeonly uniform image2D uni_image;\n" @@ -9636,8 +9636,8 @@ std::string UniformBlockMemberOverlappingOffsetsTest::getShaderSource(GLuint "{\n" " vec4 result = vec4(1, 0, 0.5, 1);\n" "\n" - " if ((BOY_TYPE(1) == block.boy) ||\n" - " (MAN_TYPE(0) == block.man) )\n" + " if ((B_TYPE(1) == block.b) ||\n" + " (A_TYPE(0) == block.a) )\n" " {\n" " result = vec4(1, 1, 1, 1);\n" " }\n" @@ -9660,8 +9660,8 @@ std::string UniformBlockMemberOverlappingOffsetsTest::getShaderSource(GLuint "#extension GL_ARB_enhanced_layouts : require\n" "\n" "layout (std140) uniform Block {\n" - " layout (offset = BOY_OFFSET) BOY_TYPE boy;\n" - " layout (offset = MAN_OFFSET) MAN_TYPE man;\n" + " layout (offset = B_OFFSET) B_TYPE b;\n" + " layout (offset = A_OFFSET) A_TYPE a;\n" "} block;\n" "\n" "in vec4 gs_fs;\n" @@ -9669,8 +9669,8 @@ std::string UniformBlockMemberOverlappingOffsetsTest::getShaderSource(GLuint "\n" "void main()\n" "{\n" - " if ((BOY_TYPE(1) == block.boy) ||\n" - " (MAN_TYPE(0) == block.man) )\n" + " if ((B_TYPE(1) == block.b) ||\n" + " (A_TYPE(0) == block.a) )\n" " {\n" " fs_out = vec4(1, 1, 1, 1);\n" " }\n" @@ -9710,8 +9710,8 @@ std::string UniformBlockMemberOverlappingOffsetsTest::getShaderSource(GLuint "layout(triangle_strip, max_vertices = 4) out;\n" "\n" "layout (std140) uniform Block {\n" - " layout (offset = BOY_OFFSET) BOY_TYPE boy;\n" - " layout (offset = MAN_OFFSET) MAN_TYPE man;\n" + " layout (offset = B_OFFSET) B_TYPE b;\n" + " layout (offset = A_OFFSET) A_TYPE a;\n" "} block;\n" "\n" "in vec4 tes_gs[];\n" @@ -9719,8 +9719,8 @@ std::string UniformBlockMemberOverlappingOffsetsTest::getShaderSource(GLuint "\n" "void main()\n" "{\n" - " if ((BOY_TYPE(1) == block.boy) ||\n" - " (MAN_TYPE(0) == block.man) )\n" + " if ((B_TYPE(1) == block.b) ||\n" + " (A_TYPE(0) == block.a) )\n" " {\n" " gs_fs = vec4(1, 1, 1, 1);\n" " }\n" @@ -9766,8 +9766,8 @@ std::string UniformBlockMemberOverlappingOffsetsTest::getShaderSource(GLuint "layout(vertices = 1) out;\n" "\n" "layout (std140) uniform Block {\n" - " layout (offset = BOY_OFFSET) BOY_TYPE boy;\n" - " layout (offset = MAN_OFFSET) MAN_TYPE man;\n" + " layout (offset = B_OFFSET) B_TYPE b;\n" + " layout (offset = A_OFFSET) A_TYPE a;\n" "} block;\n" "\n" "in vec4 vs_tcs[];\n" @@ -9775,8 +9775,8 @@ std::string UniformBlockMemberOverlappingOffsetsTest::getShaderSource(GLuint "\n" "void main()\n" "{\n" - " if ((BOY_TYPE(1) == block.boy) ||\n" - " (MAN_TYPE(0) == block.man) )\n" + " if ((B_TYPE(1) == block.b) ||\n" + " (A_TYPE(0) == block.a) )\n" " {\n" " tcs_tes[gl_InvocationID] = vec4(1, 1, 1, 1);\n" " }\n" @@ -9811,8 +9811,8 @@ std::string UniformBlockMemberOverlappingOffsetsTest::getShaderSource(GLuint "layout(isolines, point_mode) in;\n" "\n" "layout (std140) uniform Block {\n" - " layout (offset = BOY_OFFSET) BOY_TYPE boy;\n" - " layout (offset = MAN_OFFSET) MAN_TYPE man;\n" + " layout (offset = B_OFFSET) B_TYPE b;\n" + " layout (offset = A_OFFSET) A_TYPE a;\n" "} block;\n" "\n" "in vec4 tcs_tes[];\n" @@ -9820,8 +9820,8 @@ std::string UniformBlockMemberOverlappingOffsetsTest::getShaderSource(GLuint "\n" "void main()\n" "{\n" - " if ((BOY_TYPE(1) == block.boy) ||\n" - " (MAN_TYPE(0) == block.man) )\n" + " if ((B_TYPE(1) == block.b) ||\n" + " (A_TYPE(0) == block.a) )\n" " {\n" " tes_gs = vec4(1, 1, 1, 1);\n" " }\n" @@ -9844,8 +9844,8 @@ std::string UniformBlockMemberOverlappingOffsetsTest::getShaderSource(GLuint "#extension GL_ARB_enhanced_layouts : require\n" "\n" "layout (std140) uniform Block {\n" - " layout (offset = BOY_OFFSET) BOY_TYPE boy;\n" - " layout (offset = MAN_OFFSET) MAN_TYPE man;\n" + " layout (offset = B_OFFSET) B_TYPE b;\n" + " layout (offset = A_OFFSET) A_TYPE a;\n" "} block;\n" "\n" "in vec4 in_vs;\n" @@ -9853,8 +9853,8 @@ std::string UniformBlockMemberOverlappingOffsetsTest::getShaderSource(GLuint "\n" "void main()\n" "{\n" - " if ((BOY_TYPE(1) == block.boy) ||\n" - " (MAN_TYPE(0) == block.man) )\n" + " if ((B_TYPE(1) == block.b) ||\n" + " (A_TYPE(0) == block.a) )\n" " {\n" " vs_tcs = vec4(1, 1, 1, 1);\n" " }\n" @@ -9869,12 +9869,12 @@ std::string UniformBlockMemberOverlappingOffsetsTest::getShaderSource(GLuint if (test_case.m_stage == stage) { GLchar buffer[16]; - const GLuint boy_offset = test_case.m_boy_offset; - const Utils::Type& boy_type = test_case.m_boy_type; - const GLchar* boy_type_name = boy_type.GetGLSLTypeName(); - const GLuint man_offset = test_case.m_man_offset; - const Utils::Type& man_type = test_case.m_man_type; - const GLchar* man_type_name = man_type.GetGLSLTypeName(); + const GLuint b_offset = test_case.m_b_offset; + const Utils::Type& b_type = test_case.m_b_type; + const GLchar* b_type_name = b_type.GetGLSLTypeName(); + const GLuint a_offset = test_case.m_a_offset; + const Utils::Type& a_type = test_case.m_a_type; + const GLchar* a_type_name = a_type.GetGLSLTypeName(); size_t position = 0; switch (stage) @@ -9901,14 +9901,14 @@ std::string UniformBlockMemberOverlappingOffsetsTest::getShaderSource(GLuint TCU_FAIL("Invalid enum"); } - sprintf(buffer, "%d", boy_offset); - Utils::replaceToken("BOY_OFFSET", position, buffer, source); - Utils::replaceToken("BOY_TYPE", position, boy_type_name, source); - sprintf(buffer, "%d", man_offset); - Utils::replaceToken("MAN_OFFSET", position, buffer, source); - Utils::replaceToken("MAN_TYPE", position, man_type_name, source); - Utils::replaceToken("BOY_TYPE", position, boy_type_name, source); - Utils::replaceToken("MAN_TYPE", position, man_type_name, source); + sprintf(buffer, "%d", b_offset); + Utils::replaceToken("B_OFFSET", position, buffer, source); + Utils::replaceToken("B_TYPE", position, b_type_name, source); + sprintf(buffer, "%d", a_offset); + Utils::replaceToken("A_OFFSET", position, buffer, source); + Utils::replaceToken("A_TYPE", position, a_type_name, source); + Utils::replaceToken("B_TYPE", position, b_type_name, source); + Utils::replaceToken("A_TYPE", position, a_type_name, source); } else { @@ -9948,8 +9948,8 @@ std::string UniformBlockMemberOverlappingOffsetsTest::getTestCaseName(GLuint tes std::stringstream stream; testCase& test_case = m_test_cases[test_case_index]; - stream << "Type: " << test_case.m_boy_type.GetGLSLTypeName() << ", offset: " << test_case.m_boy_offset - << ". Type: " << test_case.m_man_type.GetGLSLTypeName() << ", offset: " << test_case.m_man_offset; + stream << "Type: " << test_case.m_b_type.GetGLSLTypeName() << ", offset: " << test_case.m_b_offset + << ". Type: " << test_case.m_a_type.GetGLSLTypeName() << ", offset: " << test_case.m_a_offset; return stream.str(); } @@ -10000,20 +10000,20 @@ void UniformBlockMemberOverlappingOffsetsTest::testInit() for (GLuint i = 0; i < n_types; ++i) { - const Utils::Type& boy_type = getType(i); - const GLuint boy_size = boy_type.GetActualAlignment(1 /* align */, false /* is_array*/); + const Utils::Type& b_type = getType(i); + const GLuint b_size = b_type.GetActualAlignment(1 /* align */, false /* is_array*/); for (GLuint j = 0; j < n_types; ++j) { - const Utils::Type& man_type = getType(j); - const GLuint man_align = man_type.GetBaseAlignment(false); - const GLuint man_size = man_type.GetActualAlignment(1 /* align */, false /* is_array*/); + const Utils::Type& a_type = getType(j); + const GLuint a_align = a_type.GetBaseAlignment(false); + const GLuint a_size = a_type.GetActualAlignment(1 /* align */, false /* is_array*/); - const GLuint boy_offset = lcm(boy_size, man_size); - const GLuint man_after_start = boy_offset + 1; - const GLuint man_after_off = man_type.GetActualOffset(man_after_start, man_size); - const GLuint man_before_start = boy_offset - man_align; - const GLuint man_before_off = man_type.GetActualOffset(man_before_start, man_size); + const GLuint b_offset = lcm(b_size, a_size); + const GLuint a_after_start = b_offset + 1; + const GLuint a_after_off = a_type.GetActualOffset(a_after_start, a_size); + const GLuint a_before_start = b_offset - a_align; + const GLuint a_before_off = a_type.GetActualOffset(a_before_start, a_size); for (GLuint stage = 0; stage < Utils::Shader::STAGE_MAX; ++stage) { @@ -10022,24 +10022,24 @@ void UniformBlockMemberOverlappingOffsetsTest::testInit() continue; } - if ((boy_offset > man_before_off) && (boy_offset < man_before_off + man_size)) + if ((b_offset > a_before_off) && (b_offset < a_before_off + a_size)) { - testCase test_case = { boy_offset, boy_type, man_before_off, man_type, + testCase test_case = { b_offset, b_type, a_before_off, a_type, (Utils::Shader::STAGES)stage }; m_test_cases.push_back(test_case); } - if ((boy_offset < man_after_off) && (boy_offset + boy_size > man_after_off)) + if ((b_offset < a_after_off) && (b_offset + b_size > a_after_off)) { - testCase test_case = { boy_offset, boy_type, man_after_off, man_type, + testCase test_case = { b_offset, b_type, a_after_off, a_type, (Utils::Shader::STAGES)stage }; m_test_cases.push_back(test_case); } - /* Boy offset, should be fine for both types */ - testCase test_case = { boy_offset, boy_type, boy_offset, man_type, (Utils::Shader::STAGES)stage }; + /* b offset, should be fine for both types */ + testCase test_case = { b_offset, b_type, b_offset, a_type, (Utils::Shader::STAGES)stage }; m_test_cases.push_back(test_case); } @@ -10121,8 +10121,8 @@ std::string UniformBlockMemberAlignNonPowerOf2Test::getShaderSource(GLuint test_ "layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;\n" "\n" "layout (std140) uniform Block {\n" - " vec4 boy;\n" - " layout (align = ALIGN) TYPE man;\n" + " vec4 b;\n" + " layout (align = ALIGN) TYPE a;\n" "} block;\n" "\n" "writeonly uniform image2D uni_image;\n" @@ -10131,9 +10131,9 @@ std::string UniformBlockMemberAlignNonPowerOf2Test::getShaderSource(GLuint test_ "{\n" " vec4 result = vec4(1, 0, 0.5, 1);\n" "\n" - " if (TYPE(0) == block.man)\n" + " if (TYPE(0) == block.a)\n" " {\n" - " result = vec4(1, 1, 1, 1) - block.boy;\n" + " result = vec4(1, 1, 1, 1) - block.b;\n" " }\n" "\n" " imageStore(uni_image, ivec2(gl_GlobalInvocationID.xy), result);\n" @@ -10154,8 +10154,8 @@ std::string UniformBlockMemberAlignNonPowerOf2Test::getShaderSource(GLuint test_ "#extension GL_ARB_enhanced_layouts : require\n" "\n" "layout (std140) uniform Block {\n" - " vec4 boy;\n" - " layout (align = ALIGN) TYPE man;\n" + " vec4 b;\n" + " layout (align = ALIGN) TYPE a;\n" "} block;\n" "\n" "in vec4 gs_fs;\n" @@ -10163,9 +10163,9 @@ std::string UniformBlockMemberAlignNonPowerOf2Test::getShaderSource(GLuint test_ "\n" "void main()\n" "{\n" - " if (TYPE(0) == block.man)\n" + " if (TYPE(0) == block.a)\n" " {\n" - " fs_out = block.boy;\n" + " fs_out = block.b;\n" " }\n" "\n" " fs_out += gs_fs;\n" @@ -10203,8 +10203,8 @@ std::string UniformBlockMemberAlignNonPowerOf2Test::getShaderSource(GLuint test_ "layout(triangle_strip, max_vertices = 4) out;\n" "\n" "layout (std140) uniform Block {\n" - " vec4 boy;\n" - " layout (align = ALIGN) TYPE man;\n" + " vec4 b;\n" + " layout (align = ALIGN) TYPE a;\n" "} block;\n" "\n" "in vec4 tes_gs[];\n" @@ -10212,9 +10212,9 @@ std::string UniformBlockMemberAlignNonPowerOf2Test::getShaderSource(GLuint test_ "\n" "void main()\n" "{\n" - " if (TYPE(0) == block.man)\n" + " if (TYPE(0) == block.a)\n" " {\n" - " gs_fs = block.boy;\n" + " gs_fs = block.b;\n" " }\n" "\n" " gs_fs += tes_gs[0];\n" @@ -10258,8 +10258,8 @@ std::string UniformBlockMemberAlignNonPowerOf2Test::getShaderSource(GLuint test_ "layout(vertices = 1) out;\n" "\n" "layout (std140) uniform Block {\n" - " vec4 boy;\n" - " layout (align = ALIGN) TYPE man;\n" + " vec4 b;\n" + " layout (align = ALIGN) TYPE a;\n" "} block;\n" "\n" "in vec4 vs_tcs[];\n" @@ -10267,9 +10267,9 @@ std::string UniformBlockMemberAlignNonPowerOf2Test::getShaderSource(GLuint test_ "\n" "void main()\n" "{\n" - " if (TYPE(0) == block.man)\n" + " if (TYPE(0) == block.a)\n" " {\n" - " tcs_tes[gl_InvocationID] = block.boy;\n" + " tcs_tes[gl_InvocationID] = block.b;\n" " }\n" "\n" "\n" @@ -10302,8 +10302,8 @@ std::string UniformBlockMemberAlignNonPowerOf2Test::getShaderSource(GLuint test_ "layout(isolines, point_mode) in;\n" "\n" "layout (std140) uniform Block {\n" - " vec4 boy;\n" - " layout (align = ALIGN) TYPE man;\n" + " vec4 b;\n" + " layout (align = ALIGN) TYPE a;\n" "} block;\n" "\n" "in vec4 tcs_tes[];\n" @@ -10311,9 +10311,9 @@ std::string UniformBlockMemberAlignNonPowerOf2Test::getShaderSource(GLuint test_ "\n" "void main()\n" "{\n" - " if (TYPE(0) == block.man)\n" + " if (TYPE(0) == block.a)\n" " {\n" - " tes_gs = block.boy;\n" + " tes_gs = block.b;\n" " }\n" "\n" " tes_gs += tcs_tes[0];\n" @@ -10334,8 +10334,8 @@ std::string UniformBlockMemberAlignNonPowerOf2Test::getShaderSource(GLuint test_ "#extension GL_ARB_enhanced_layouts : require\n" "\n" "layout (std140) uniform Block {\n" - " vec4 boy;\n" - " layout (align = ALIGN) TYPE man;\n" + " vec4 b;\n" + " layout (align = ALIGN) TYPE a;\n" "} block;\n" "\n" "in vec4 in_vs;\n" @@ -10343,9 +10343,9 @@ std::string UniformBlockMemberAlignNonPowerOf2Test::getShaderSource(GLuint test_ "\n" "void main()\n" "{\n" - " if (TYPE(0) == block.man)\n" + " if (TYPE(0) == block.a)\n" " {\n" - " vs_tcs = block.boy;\n" + " vs_tcs = block.b;\n" " }\n" "\n" " vs_tcs += in_vs;\n" @@ -10861,15 +10861,15 @@ std::string SSBLayoutQualifierConflictTest::getShaderSource(GLuint test_case_ind "layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;\n" "\n" "layout (QUALIFIERbinding = BINDING) buffer cs_Block {\n" - " layout(offset = 16) vec4 boy;\n" - " layout(align = 64) vec4 man;\n" + " layout(offset = 16) vec4 b;\n" + " layout(align = 64) vec4 a;\n" "} uni_block;\n" "\n" "writeonly uniform image2D uni_image;\n" "\n" "void main()\n" "{\n" - " vec4 result = uni_block.boy + uni_block.man;\n" + " vec4 result = uni_block.b + uni_block.a;\n" "\n" " imageStore(uni_image, ivec2(gl_GlobalInvocationID.xy), result);\n" "}\n" @@ -10878,8 +10878,8 @@ std::string SSBLayoutQualifierConflictTest::getShaderSource(GLuint test_case_ind "#extension GL_ARB_enhanced_layouts : require\n" "\n" "layout (QUALIFIERbinding = BINDING) buffer Block {\n" - " layout(offset = 16) vec4 boy;\n" - " layout(align = 64) vec4 man;\n" + " layout(offset = 16) vec4 b;\n" + " layout(align = 64) vec4 a;\n" "} uni_block;\n" "\n" "in vec4 gs_fs;\n" @@ -10887,7 +10887,7 @@ std::string SSBLayoutQualifierConflictTest::getShaderSource(GLuint test_case_ind "\n" "void main()\n" "{\n" - " fs_out = gs_fs + uni_block.boy + uni_block.man;\n" + " fs_out = gs_fs + uni_block.b + uni_block.a;\n" "}\n" "\n"; static const GLchar* gs = "#version 430 core\n" @@ -10897,8 +10897,8 @@ std::string SSBLayoutQualifierConflictTest::getShaderSource(GLuint test_case_ind "layout(triangle_strip, max_vertices = 4) out;\n" "\n" "layout (QUALIFIERbinding = BINDING) buffer gs_Block {\n" - " layout(offset = 16) vec4 boy;\n" - " layout(align = 64) vec4 man;\n" + " layout(offset = 16) vec4 b;\n" + " layout(align = 64) vec4 a;\n" "} uni_block;\n" "\n" "in vec4 tes_gs[];\n" @@ -10906,16 +10906,16 @@ std::string SSBLayoutQualifierConflictTest::getShaderSource(GLuint test_case_ind "\n" "void main()\n" "{\n" - " gs_fs = tes_gs[0] + uni_block.boy + uni_block.man;\n" + " gs_fs = tes_gs[0] + uni_block.b + uni_block.a;\n" " gl_Position = vec4(-1, -1, 0, 1);\n" " EmitVertex();\n" - " gs_fs = tes_gs[0] + uni_block.boy + uni_block.man;\n" + " gs_fs = tes_gs[0] + uni_block.b + uni_block.a;\n" " gl_Position = vec4(-1, 1, 0, 1);\n" " EmitVertex();\n" - " gs_fs = tes_gs[0] + uni_block.boy + uni_block.man;\n" + " gs_fs = tes_gs[0] + uni_block.b + uni_block.a;\n" " gl_Position = vec4(1, -1, 0, 1);\n" " EmitVertex();\n" - " gs_fs = tes_gs[0] + uni_block.boy + uni_block.man;\n" + " gs_fs = tes_gs[0] + uni_block.b + uni_block.a;\n" " gl_Position = vec4(1, 1, 0, 1);\n" " EmitVertex();\n" "}\n" @@ -10927,8 +10927,8 @@ std::string SSBLayoutQualifierConflictTest::getShaderSource(GLuint test_case_ind "layout(vertices = 1) out;\n" "\n" "layout (QUALIFIERbinding = BINDING) buffer tcs_Block {\n" - " layout(offset = 16) vec4 boy;\n" - " layout(align = 64) vec4 man;\n" + " layout(offset = 16) vec4 b;\n" + " layout(align = 64) vec4 a;\n" "} uni_block;\n" "\n" "in vec4 vs_tcs[];\n" @@ -10937,7 +10937,7 @@ std::string SSBLayoutQualifierConflictTest::getShaderSource(GLuint test_case_ind "void main()\n" "{\n" "\n" - " tcs_tes[gl_InvocationID] = vs_tcs[gl_InvocationID] + uni_block.boy + uni_block.man;\n" + " tcs_tes[gl_InvocationID] = vs_tcs[gl_InvocationID] + uni_block.b + uni_block.a;\n" "\n" " gl_TessLevelOuter[0] = 1.0;\n" " gl_TessLevelOuter[1] = 1.0;\n" @@ -10953,8 +10953,8 @@ std::string SSBLayoutQualifierConflictTest::getShaderSource(GLuint test_case_ind "layout(isolines, point_mode) in;\n" "\n" "layout (QUALIFIERbinding = BINDING) buffer tes_Block {\n" - " layout(offset = 16) vec4 boy;\n" - " layout(align = 64) vec4 man;\n" + " layout(offset = 16) vec4 b;\n" + " layout(align = 64) vec4 a;\n" "} uni_block;\n" "\n" "in vec4 tcs_tes[];\n" @@ -10962,15 +10962,15 @@ std::string SSBLayoutQualifierConflictTest::getShaderSource(GLuint test_case_ind "\n" "void main()\n" "{\n" - " tes_gs = tcs_tes[0] + uni_block.boy + uni_block.man;\n" + " tes_gs = tcs_tes[0] + uni_block.b + uni_block.a;\n" "}\n" "\n"; static const GLchar* vs = "#version 430 core\n" "#extension GL_ARB_enhanced_layouts : require\n" "\n" "layout (QUALIFIERbinding = BINDING) buffer vs_Block {\n" - " layout(offset = 16) vec4 boy;\n" - " layout(align = 64) vec4 man;\n" + " layout(offset = 16) vec4 b;\n" + " layout(align = 64) vec4 a;\n" "} uni_block;\n" "\n" "in vec4 in_vs;\n" @@ -10978,7 +10978,7 @@ std::string SSBLayoutQualifierConflictTest::getShaderSource(GLuint test_case_ind "\n" "void main()\n" "{\n" - " vs_tcs = in_vs + uni_block.boy + uni_block.man;\n" + " vs_tcs = in_vs + uni_block.b + uni_block.a;\n" "}\n" "\n"; @@ -11587,8 +11587,8 @@ std::string SSBMemberOverlappingOffsetsTest::getShaderSource(GLuint test_case_in "layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;\n" "\n" "layout (std140) buffer Block {\n" - " layout (offset = BOY_OFFSET) BOY_TYPE boy;\n" - " layout (offset = MAN_OFFSET) MAN_TYPE man;\n" + " layout (offset = B_OFFSET) B_TYPE b;\n" + " layout (offset = A_OFFSET) A_TYPE a;\n" "} block;\n" "\n" "writeonly uniform image2D uni_image;\n" @@ -11597,8 +11597,8 @@ std::string SSBMemberOverlappingOffsetsTest::getShaderSource(GLuint test_case_in "{\n" " vec4 result = vec4(1, 0, 0.5, 1);\n" "\n" - " if ((BOY_TYPE(1) == block.boy) ||\n" - " (MAN_TYPE(0) == block.man) )\n" + " if ((B_TYPE(1) == block.b) ||\n" + " (A_TYPE(0) == block.a) )\n" " {\n" " result = vec4(1, 1, 1, 1);\n" " }\n" @@ -11621,8 +11621,8 @@ std::string SSBMemberOverlappingOffsetsTest::getShaderSource(GLuint test_case_in "#extension GL_ARB_enhanced_layouts : require\n" "\n" "layout (std140) buffer Block {\n" - " layout (offset = BOY_OFFSET) BOY_TYPE boy;\n" - " layout (offset = MAN_OFFSET) MAN_TYPE man;\n" + " layout (offset = B_OFFSET) B_TYPE b;\n" + " layout (offset = A_OFFSET) A_TYPE a;\n" "} block;\n" "\n" "in vec4 gs_fs;\n" @@ -11630,8 +11630,8 @@ std::string SSBMemberOverlappingOffsetsTest::getShaderSource(GLuint test_case_in "\n" "void main()\n" "{\n" - " if ((BOY_TYPE(1) == block.boy) ||\n" - " (MAN_TYPE(0) == block.man) )\n" + " if ((B_TYPE(1) == block.b) ||\n" + " (A_TYPE(0) == block.a) )\n" " {\n" " fs_out = vec4(1, 1, 1, 1);\n" " }\n" @@ -11671,8 +11671,8 @@ std::string SSBMemberOverlappingOffsetsTest::getShaderSource(GLuint test_case_in "layout(triangle_strip, max_vertices = 4) out;\n" "\n" "layout (std140) buffer Block {\n" - " layout (offset = BOY_OFFSET) BOY_TYPE boy;\n" - " layout (offset = MAN_OFFSET) MAN_TYPE man;\n" + " layout (offset = B_OFFSET) B_TYPE b;\n" + " layout (offset = A_OFFSET) A_TYPE a;\n" "} block;\n" "\n" "in vec4 tes_gs[];\n" @@ -11680,8 +11680,8 @@ std::string SSBMemberOverlappingOffsetsTest::getShaderSource(GLuint test_case_in "\n" "void main()\n" "{\n" - " if ((BOY_TYPE(1) == block.boy) ||\n" - " (MAN_TYPE(0) == block.man) )\n" + " if ((B_TYPE(1) == block.b) ||\n" + " (A_TYPE(0) == block.a) )\n" " {\n" " gs_fs = vec4(1, 1, 1, 1);\n" " }\n" @@ -11727,8 +11727,8 @@ std::string SSBMemberOverlappingOffsetsTest::getShaderSource(GLuint test_case_in "layout(vertices = 1) out;\n" "\n" "layout (std140) buffer Block {\n" - " layout (offset = BOY_OFFSET) BOY_TYPE boy;\n" - " layout (offset = MAN_OFFSET) MAN_TYPE man;\n" + " layout (offset = B_OFFSET) B_TYPE b;\n" + " layout (offset = A_OFFSET) A_TYPE a;\n" "} block;\n" "\n" "in vec4 vs_tcs[];\n" @@ -11736,8 +11736,8 @@ std::string SSBMemberOverlappingOffsetsTest::getShaderSource(GLuint test_case_in "\n" "void main()\n" "{\n" - " if ((BOY_TYPE(1) == block.boy) ||\n" - " (MAN_TYPE(0) == block.man) )\n" + " if ((B_TYPE(1) == block.b) ||\n" + " (A_TYPE(0) == block.a) )\n" " {\n" " tcs_tes[gl_InvocationID] = vec4(1, 1, 1, 1);\n" " }\n" @@ -11772,8 +11772,8 @@ std::string SSBMemberOverlappingOffsetsTest::getShaderSource(GLuint test_case_in "layout(isolines, point_mode) in;\n" "\n" "layout (std140) buffer Block {\n" - " layout (offset = BOY_OFFSET) BOY_TYPE boy;\n" - " layout (offset = MAN_OFFSET) MAN_TYPE man;\n" + " layout (offset = B_OFFSET) B_TYPE b;\n" + " layout (offset = A_OFFSET) A_TYPE a;\n" "} block;\n" "\n" "in vec4 tcs_tes[];\n" @@ -11781,8 +11781,8 @@ std::string SSBMemberOverlappingOffsetsTest::getShaderSource(GLuint test_case_in "\n" "void main()\n" "{\n" - " if ((BOY_TYPE(1) == block.boy) ||\n" - " (MAN_TYPE(0) == block.man) )\n" + " if ((B_TYPE(1) == block.b) ||\n" + " (A_TYPE(0) == block.a) )\n" " {\n" " tes_gs = vec4(1, 1, 1, 1);\n" " }\n" @@ -11805,8 +11805,8 @@ std::string SSBMemberOverlappingOffsetsTest::getShaderSource(GLuint test_case_in "#extension GL_ARB_enhanced_layouts : require\n" "\n" "layout (std140) buffer Block {\n" - " layout (offset = BOY_OFFSET) BOY_TYPE boy;\n" - " layout (offset = MAN_OFFSET) MAN_TYPE man;\n" + " layout (offset = B_OFFSET) B_TYPE b;\n" + " layout (offset = A_OFFSET) A_TYPE a;\n" "} block;\n" "\n" "in vec4 in_vs;\n" @@ -11814,8 +11814,8 @@ std::string SSBMemberOverlappingOffsetsTest::getShaderSource(GLuint test_case_in "\n" "void main()\n" "{\n" - " if ((BOY_TYPE(1) == block.boy) ||\n" - " (MAN_TYPE(0) == block.man) )\n" + " if ((B_TYPE(1) == block.b) ||\n" + " (A_TYPE(0) == block.a) )\n" " {\n" " vs_tcs = vec4(1, 1, 1, 1);\n" " }\n" @@ -11830,13 +11830,13 @@ std::string SSBMemberOverlappingOffsetsTest::getShaderSource(GLuint test_case_in if (test_case.m_stage == stage) { GLchar buffer[16]; - const GLuint boy_offset = test_case.m_boy_offset; - const Utils::Type& boy_type = test_case.m_boy_type; - const GLchar* boy_type_name = boy_type.GetGLSLTypeName(); - const GLuint man_offset = test_case.m_man_offset; - const Utils::Type& man_type = test_case.m_man_type; - const GLchar* man_type_name = man_type.GetGLSLTypeName(); - size_t position = 0; + const GLuint b_offset = test_case.m_b_offset; + const Utils::Type& b_type = test_case.m_b_type; + const GLchar* b_type_name = b_type.GetGLSLTypeName(); + const GLuint a_offset = test_case.m_a_offset; + const Utils::Type& a_type = test_case.m_a_type; + const GLchar* a_type_name = a_type.GetGLSLTypeName(); + size_t position = 0; switch (stage) { @@ -11862,14 +11862,14 @@ std::string SSBMemberOverlappingOffsetsTest::getShaderSource(GLuint test_case_in TCU_FAIL("Invalid enum"); } - sprintf(buffer, "%d", boy_offset); - Utils::replaceToken("BOY_OFFSET", position, buffer, source); - Utils::replaceToken("BOY_TYPE", position, boy_type_name, source); - sprintf(buffer, "%d", man_offset); - Utils::replaceToken("MAN_OFFSET", position, buffer, source); - Utils::replaceToken("MAN_TYPE", position, man_type_name, source); - Utils::replaceToken("BOY_TYPE", position, boy_type_name, source); - Utils::replaceToken("MAN_TYPE", position, man_type_name, source); + sprintf(buffer, "%d", b_offset); + Utils::replaceToken("B_OFFSET", position, buffer, source); + Utils::replaceToken("B_TYPE", position, b_type_name, source); + sprintf(buffer, "%d", a_offset); + Utils::replaceToken("A_OFFSET", position, buffer, source); + Utils::replaceToken("A_TYPE", position, a_type_name, source); + Utils::replaceToken("B_TYPE", position, b_type_name, source); + Utils::replaceToken("A_TYPE", position, a_type_name, source); } else { @@ -11966,8 +11966,8 @@ std::string SSBMemberAlignNonPowerOf2Test::getShaderSource(GLuint test_case_inde "layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;\n" "\n" "layout (std140) buffer Block {\n" - " vec4 boy;\n" - " layout (align = ALIGN) TYPE man;\n" + " vec4 b;\n" + " layout (align = ALIGN) TYPE a;\n" "} block;\n" "\n" "writeonly uniform image2D uni_image;\n" @@ -11976,9 +11976,9 @@ std::string SSBMemberAlignNonPowerOf2Test::getShaderSource(GLuint test_case_inde "{\n" " vec4 result = vec4(1, 0, 0.5, 1);\n" "\n" - " if (TYPE(0) == block.man)\n" + " if (TYPE(0) == block.a)\n" " {\n" - " result = vec4(1, 1, 1, 1) - block.boy;\n" + " result = vec4(1, 1, 1, 1) - block.b;\n" " }\n" "\n" " imageStore(uni_image, ivec2(gl_GlobalInvocationID.xy), result);\n" @@ -11999,8 +11999,8 @@ std::string SSBMemberAlignNonPowerOf2Test::getShaderSource(GLuint test_case_inde "#extension GL_ARB_enhanced_layouts : require\n" "\n" "layout (std140) buffer Block {\n" - " vec4 boy;\n" - " layout (align = ALIGN) TYPE man;\n" + " vec4 b;\n" + " layout (align = ALIGN) TYPE a;\n" "} block;\n" "\n" "in vec4 gs_fs;\n" @@ -12008,9 +12008,9 @@ std::string SSBMemberAlignNonPowerOf2Test::getShaderSource(GLuint test_case_inde "\n" "void main()\n" "{\n" - " if (TYPE(0) == block.man)\n" + " if (TYPE(0) == block.a)\n" " {\n" - " fs_out = block.boy;\n" + " fs_out = block.b;\n" " }\n" "\n" " fs_out += gs_fs;\n" @@ -12048,8 +12048,8 @@ std::string SSBMemberAlignNonPowerOf2Test::getShaderSource(GLuint test_case_inde "layout(triangle_strip, max_vertices = 4) out;\n" "\n" "layout (std140) buffer Block {\n" - " vec4 boy;\n" - " layout (align = ALIGN) TYPE man;\n" + " vec4 b;\n" + " layout (align = ALIGN) TYPE a;\n" "} block;\n" "\n" "in vec4 tes_gs[];\n" @@ -12057,9 +12057,9 @@ std::string SSBMemberAlignNonPowerOf2Test::getShaderSource(GLuint test_case_inde "\n" "void main()\n" "{\n" - " if (TYPE(0) == block.man)\n" + " if (TYPE(0) == block.a)\n" " {\n" - " gs_fs = block.boy;\n" + " gs_fs = block.b;\n" " }\n" "\n" " gs_fs += tes_gs[0];\n" @@ -12103,8 +12103,8 @@ std::string SSBMemberAlignNonPowerOf2Test::getShaderSource(GLuint test_case_inde "layout(vertices = 1) out;\n" "\n" "layout (std140) buffer Block {\n" - " vec4 boy;\n" - " layout (align = ALIGN) TYPE man;\n" + " vec4 b;\n" + " layout (align = ALIGN) TYPE a;\n" "} block;\n" "\n" "in vec4 vs_tcs[];\n" @@ -12112,9 +12112,9 @@ std::string SSBMemberAlignNonPowerOf2Test::getShaderSource(GLuint test_case_inde "\n" "void main()\n" "{\n" - " if (TYPE(0) == block.man)\n" + " if (TYPE(0) == block.a)\n" " {\n" - " tcs_tes[gl_InvocationID] = block.boy;\n" + " tcs_tes[gl_InvocationID] = block.b;\n" " }\n" "\n" "\n" @@ -12147,8 +12147,8 @@ std::string SSBMemberAlignNonPowerOf2Test::getShaderSource(GLuint test_case_inde "layout(isolines, point_mode) in;\n" "\n" "layout (std140) buffer Block {\n" - " vec4 boy;\n" - " layout (align = ALIGN) TYPE man;\n" + " vec4 b;\n" + " layout (align = ALIGN) TYPE a;\n" "} block;\n" "\n" "in vec4 tcs_tes[];\n" @@ -12156,9 +12156,9 @@ std::string SSBMemberAlignNonPowerOf2Test::getShaderSource(GLuint test_case_inde "\n" "void main()\n" "{\n" - " if (TYPE(0) == block.man)\n" + " if (TYPE(0) == block.a)\n" " {\n" - " tes_gs = block.boy;\n" + " tes_gs = block.b;\n" " }\n" "\n" " tes_gs += tcs_tes[0];\n" @@ -12179,8 +12179,8 @@ std::string SSBMemberAlignNonPowerOf2Test::getShaderSource(GLuint test_case_inde "#extension GL_ARB_enhanced_layouts : require\n" "\n" "layout (std140) buffer Block {\n" - " vec4 boy;\n" - " layout (align = ALIGN) TYPE man;\n" + " vec4 b;\n" + " layout (align = ALIGN) TYPE a;\n" "} block;\n" "\n" "in vec4 in_vs;\n" @@ -12188,9 +12188,9 @@ std::string SSBMemberAlignNonPowerOf2Test::getShaderSource(GLuint test_case_inde "\n" "void main()\n" "{\n" - " if (TYPE(0) == block.man)\n" + " if (TYPE(0) == block.a)\n" " {\n" - " vs_tcs = block.boy;\n" + " vs_tcs = block.b;\n" " }\n" "\n" " vs_tcs += in_vs;\n" diff --git a/external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.hpp b/external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.hpp index a0e154a47..5756cb65e 100644 --- a/external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.hpp +++ b/external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.hpp @@ -1513,8 +1513,8 @@ private: * Test following code snippet with all shader stages: * * layout(QUALIFIER) uniform Block { - * layout(offset = 16) vec4 boy; - * layout(align = 48) vec4 man; + * layout(offset = 16) vec4 b; + * layout(align = 48) vec4 a; * }; * * Test following block qualifiers and all types: @@ -1642,8 +1642,8 @@ protected: * Use following code snippet: * * layout (std140) uniform Block { - * layout (offset = boy_offset) boy_type boy; - * layout (offset = man_offset) man_type man; + * layout (offset = b_offset) b_type b; + * layout (offset = a_offset) a_type a; * }; * * It is expected that overlapping members will cause compilation failure. @@ -1689,10 +1689,10 @@ protected: /* Protected types */ struct testCase { - glw::GLuint m_boy_offset; - Utils::Type m_boy_type; - glw::GLuint m_man_offset; - Utils::Type m_man_type; + glw::GLuint m_b_offset; + Utils::Type m_b_type; + glw::GLuint m_a_offset; + Utils::Type m_a_type; Utils::Shader::STAGES m_stage; }; @@ -1711,11 +1711,11 @@ protected: * Test following code snippet: * * layout (std140, offset = 8) uniform Block { - * vec4 boy; - * layout (align = man_alignment) type man; + * vec4 b; + * layout (align = a_alignment) type a; * }; * - * It is expected that compilation will fail whenever man_alignment is not + * It is expected that compilation will fail whenever a_alignment is not * a power of 2. * * Test all alignment in range <0, sizeof(dmat4)>. Test all shader stages. diff --git a/external/openglcts/modules/gl/gl4cGPUShaderFP64Tests.cpp b/external/openglcts/modules/gl/gl4cGPUShaderFP64Tests.cpp index 5e6efe633..bebac249e 100644 --- a/external/openglcts/modules/gl/gl4cGPUShaderFP64Tests.cpp +++ b/external/openglcts/modules/gl/gl4cGPUShaderFP64Tests.cpp @@ -5316,27 +5316,27 @@ void GPUShaderFP64Test3::testInit() /* Uniform block declaration with std140 offsets calculated * | align | loc_req | begins | ends | offset in bytes | imp | - * ivec3 dummy1[3] | 4 | 12 | 0 | 12 | 0 | | + * ivec3 unused1[3] | 4 | 12 | 0 | 12 | 0 | | * double double_value | 2 | 2 | 12 | 14 | 48 | XXX | - * bool dummy2 | 1 | 1 | 14 | 15 | 56 | | + * bool unused2 | 1 | 1 | 14 | 15 | 56 | | * dvec2 dvec2_value | 4 | 4 | 16 | 20 | 64 | XXX | - * bvec3 dummy3 | 4 | 4 | 20 | 24 | 80 | | + * bvec3 unused3 | 4 | 4 | 20 | 24 | 80 | | * dvec3 dvec3_value | 8 | 8 | 24 | 32 | 96 | XXX | - * int dummy4[3] | 4 | 12 | 32 | 44 | 128 | | + * int unused4[3] | 4 | 12 | 32 | 44 | 128 | | * dvec4 dvec4_value | 8 | 8 | 48 | 56 | 192 | XXX | - * bool dummy5 | 1 | 1 | 56 | 57 | 224 | | - * bool dummy6[2] | 4 | 8 | 60 | 68 | 240 | | + * bool unused5 | 1 | 1 | 56 | 57 | 224 | | + * bool unused6[2] | 4 | 8 | 60 | 68 | 240 | | * dmat2 dmat2_value | 4 | 8 | 68 | 76 | 272 | XXX | * dmat3 dmat3_value | 8 | 24 | 80 | 104 | 320 | XXX | - * bool dummy7 | 1 | 1 | 104 | 105 | 416 | | + * bool unused7 | 1 | 1 | 104 | 105 | 416 | | * dmat4 dmat4_value | 8 | 32 | 112 | 144 | 448 | XXX | * dmat2x3 dmat2x3_value | 8 | 16 | 144 | 160 | 576 | XXX | - * uvec3 dummy8 | 4 | 4 | 160 | 164 | 640 | | + * uvec3 unused8 | 4 | 4 | 160 | 164 | 640 | | * dmat2x4 dmat2x4_value | 8 | 16 | 168 | 184 | 672 | XXX | * dmat3x2 dmat3x2_value | 4 | 12 | 184 | 196 | 736 | XXX | - * bool dummy9 | 1 | 1 | 196 | 197 | 784 | | + * bool unused9 | 1 | 1 | 196 | 197 | 784 | | * dmat3x4 dmat3x4_value | 8 | 24 | 200 | 224 | 800 | XXX | - * int dummy10 | 1 | 1 | 224 | 225 | 896 | | + * int unused10 | 1 | 1 | 224 | 225 | 896 | | * dmat4x2 dmat4x2_value | 4 | 16 | 228 | 244 | 912 | XXX | * dmat4x3 dmat4x3_value | 8 | 32 | 248 | 280 | 992 | XXX | */ @@ -5702,27 +5702,27 @@ void GPUShaderFP64Test3::writeUniformBlock(std::ostream& stream, uniformDataLayo stream << "layout(" << layout << ") uniform " << m_uniform_block_name << "\n" "{\n" - " ivec3 dummy1[3];\n" + " ivec3 unused1[3];\n" " double double_value;\n" - " bool dummy2;\n" + " bool unused2;\n" " dvec2 dvec2_value;\n" - " bvec3 dummy3;\n" + " bvec3 unused3;\n" " dvec3 dvec3_value;\n" - " int dummy4[3];\n" + " int unused4[3];\n" " dvec4 dvec4_value;\n" - " bool dummy5;\n" - " bool dummy6[2];\n" + " bool unused5;\n" + " bool unused6[2];\n" " dmat2 dmat2_value;\n" " dmat3 dmat3_value;\n" - " bool dummy7;\n" + " bool unused7;\n" " dmat4 dmat4_value;\n" " dmat2x3 dmat2x3_value;\n" - " uvec3 dummy8;\n" + " uvec3 unused8;\n" " dmat2x4 dmat2x4_value;\n" " dmat3x2 dmat3x2_value;\n" - " bool dummy9;\n" + " bool unused9;\n" " dmat3x4 dmat3x4_value;\n" - " int dummy10;\n" + " int unused10;\n" " dmat4x2 dmat4x2_value;\n" " dmat4x3 dmat4x3_value;\n" "} " @@ -10319,7 +10319,6 @@ void GPUShaderFP64Test7::releaseXFBVaryingNames() void GPUShaderFP64Test7::setInputAttributeValues(const _variables& variables) { const glw::Functions& gl = m_context.getRenderContext().getFunctions(); - unsigned int counter = 6; for (_variables_const_iterator variable_iterator = variables.begin(); variable_iterator != variables.end(); variable_iterator++) @@ -10391,8 +10390,6 @@ void GPUShaderFP64Test7::setInputAttributeValues(const _variables& variables) /* Make sure VAAs are disabled */ gl.disableVertexAttribArray(variable.attribute_location + index); GLU_EXPECT_NO_ERROR(gl.getError(), "glDisableVertexAttribArray() call failed."); - - counter += n_components; } /* for (all array indices) */ } /* for (all variables) */ } diff --git a/external/openglcts/modules/gl/gl4cGPUShaderFP64Tests.hpp b/external/openglcts/modules/gl/gl4cGPUShaderFP64Tests.hpp index 5477afb27..c554d3afc 100644 --- a/external/openglcts/modules/gl/gl4cGPUShaderFP64Tests.hpp +++ b/external/openglcts/modules/gl/gl4cGPUShaderFP64Tests.hpp @@ -552,27 +552,27 @@ private: * in a named uniform block. * The following members should be defined in the block: * - * ivec3 dummy1[3]; + * ivec3 unused1[3]; * double double_value; - * bool dummy2; + * bool unused2; * dvec2 dvec2_value; - * bvec3 dummy3; + * bvec3 unused3; * dvec3 dvec3_value; - * int dummy4[3]; + * int unused4[3]; * dvec4 dvec4_value; - * bool dummy5; - * bool dummy6[2]; + * bool unused5; + * bool unused6[2]; * dmat2 dmat2_value; * dmat3 dmat3_value; - * bool dummy7; + * bool unused7; * dmat4 dmat4_value; * dmat2x3 dmat2x3_value; - * uvec3 dummy8; + * uvec3 unused8; * dmat2x4 dmat2x4_value; * dmat3x2 dmat3x2_value; - * bool dummy9; + * bool unused9; * dmat3x4 dmat3x4_value; - * int dummy10; + * int unused10; * dmat4x2 dmat4x2_value; * dmat4x3 dmat4x3_value; * diff --git a/external/openglcts/modules/gl/gl4cPipelineStatisticsQueryTests.cpp b/external/openglcts/modules/gl/gl4cPipelineStatisticsQueryTests.cpp index 2827f362f..67e9db580 100644 --- a/external/openglcts/modules/gl/gl4cPipelineStatisticsQueryTests.cpp +++ b/external/openglcts/modules/gl/gl4cPipelineStatisticsQueryTests.cpp @@ -74,7 +74,7 @@ namespace glcts { -const char* PipelineStatisticsQueryUtilities::dummy_cs_code = +const char* PipelineStatisticsQueryUtilities::minimal_cs_code = "#version 430\n" "\n" "layout(local_size_x=1, local_size_y = 1, local_size_z = 1) in;\n" @@ -85,7 +85,8 @@ const char* PipelineStatisticsQueryUtilities::dummy_cs_code = "{\n" " atomicCounterIncrement(test_counter);\n" "}\n"; -const char* PipelineStatisticsQueryUtilities::dummy_cs_code_arb = + +const char* PipelineStatisticsQueryUtilities::minimal_cs_code_arb = "#version 330\n" "#extension GL_ARB_compute_shader : require\n" "#extension GL_ARB_shader_atomic_counters : require\n" @@ -98,7 +99,7 @@ const char* PipelineStatisticsQueryUtilities::dummy_cs_code_arb = "{\n" " atomicCounterIncrement(test_counter);\n" "}\n"; -const char* PipelineStatisticsQueryUtilities::dummy_fs_code = "#version 130\n" +const char* PipelineStatisticsQueryUtilities::minimal_fs_code = "#version 130\n" "\n" "out vec4 result;\n" "\n" @@ -106,7 +107,7 @@ const char* PipelineStatisticsQueryUtilities::dummy_fs_code = "#version 130\n" "{\n" " result = gl_FragCoord;\n" "}\n"; -const char* PipelineStatisticsQueryUtilities::dummy_tc_code = +const char* PipelineStatisticsQueryUtilities::minimal_tc_code = "#version 400\n" "\n" "layout(vertices = 3) out;\n" @@ -121,7 +122,7 @@ const char* PipelineStatisticsQueryUtilities::dummy_tc_code = " gl_TessLevelOuter[2] = 5.0;\n" " gl_TessLevelOuter[3] = 6.0;\n" "}\n"; -const char* PipelineStatisticsQueryUtilities::dummy_te_code = +const char* PipelineStatisticsQueryUtilities::minimal_te_code = "#version 400\n" "\n" "layout(triangles) in;\n" @@ -130,7 +131,7 @@ const char* PipelineStatisticsQueryUtilities::dummy_te_code = "{\n" " gl_Position = gl_TessCoord.xyxy * gl_in[gl_PrimitiveID].gl_Position;\n" "}\n"; -const char* PipelineStatisticsQueryUtilities::dummy_vs_code = "#version 130\n" +const char* PipelineStatisticsQueryUtilities::minimal_vs_code = "#version 130\n" "\n" "in vec4 position;\n" "\n" @@ -1935,7 +1936,7 @@ void PipelineStatisticsQueryTestFunctionalBase::deinit() deinitObjects(); } -/** Dummy method that should be overloaded by inheriting methods. +/** Empty method that should be overloaded by inheriting methods. * * The method can be thought as of a placeholder for code that deinitializes * test-specific GL objects. @@ -1980,7 +1981,7 @@ void PipelineStatisticsQueryTestFunctionalBase::initFBO() GLU_EXPECT_NO_ERROR(gl.getError(), "glViewport() call failed."); } -/** A dummy method, which can be thought of as a placeholder to initialize +/** An empty method, which can be thought of as a placeholder to initialize * test-specific GL objects. **/ void PipelineStatisticsQueryTestFunctionalBase::initObjects() @@ -3506,10 +3507,10 @@ void PipelineStatisticsQueryTestFunctional3::initObjects() const glw::Functions& gl = m_context.getRenderContext().getFunctions(); buildProgram(DE_NULL, /* cs_body */ - PipelineStatisticsQueryUtilities::dummy_fs_code, DE_NULL, /* gs_body */ + PipelineStatisticsQueryUtilities::minimal_fs_code, DE_NULL, /* gs_body */ DE_NULL, /* tc_body */ DE_NULL, /* te_body */ - PipelineStatisticsQueryUtilities::dummy_vs_code); + PipelineStatisticsQueryUtilities::minimal_vs_code); gl.useProgram(m_po_id); GLU_EXPECT_NO_ERROR(gl.getError(), "glUseProgram() call failed."); @@ -3685,7 +3686,7 @@ void PipelineStatisticsQueryTestFunctional4::initObjects() DE_NULL, /* gs_body */ DE_NULL, /* tc_body */ DE_NULL, /* te_body */ - PipelineStatisticsQueryUtilities::dummy_vs_code); + PipelineStatisticsQueryUtilities::minimal_vs_code); gl.useProgram(m_po_id); GLU_EXPECT_NO_ERROR(gl.getError(), "glUseProgram() call failed."); @@ -3823,9 +3824,9 @@ void PipelineStatisticsQueryTestFunctional5::initObjects() } buildProgram(DE_NULL, /* cs_body */ - PipelineStatisticsQueryUtilities::dummy_fs_code, DE_NULL, /* gs_body */ - PipelineStatisticsQueryUtilities::dummy_tc_code, PipelineStatisticsQueryUtilities::dummy_te_code, - PipelineStatisticsQueryUtilities::dummy_vs_code); + PipelineStatisticsQueryUtilities::minimal_fs_code, DE_NULL, /* gs_body */ + PipelineStatisticsQueryUtilities::minimal_tc_code, PipelineStatisticsQueryUtilities::minimal_te_code, + PipelineStatisticsQueryUtilities::minimal_vs_code); gl.useProgram(m_po_id); GLU_EXPECT_NO_ERROR(gl.getError(), "glUseProgram() call failed."); @@ -3974,9 +3975,9 @@ bool PipelineStatisticsQueryTestFunctional6::executeTest(glw::GLenum current_que } buildProgram(DE_NULL, /* cs_body */ - PipelineStatisticsQueryUtilities::dummy_fs_code, gs_body.c_str(), DE_NULL, /* tc_body */ + PipelineStatisticsQueryUtilities::minimal_fs_code, gs_body.c_str(), DE_NULL, /* tc_body */ DE_NULL, /* te_body */ - PipelineStatisticsQueryUtilities::dummy_vs_code); + PipelineStatisticsQueryUtilities::minimal_vs_code); gl.useProgram(m_po_id); GLU_EXPECT_NO_ERROR(gl.getError(), "glUseProgram() call failed."); @@ -4230,10 +4231,10 @@ void PipelineStatisticsQueryTestFunctional7::initObjects() const glw::Functions& gl = m_context.getRenderContext().getFunctions(); buildProgram(DE_NULL, /* cs_body */ - PipelineStatisticsQueryUtilities::dummy_fs_code, DE_NULL, /* gs_body */ + PipelineStatisticsQueryUtilities::minimal_fs_code, DE_NULL, /* gs_body */ DE_NULL, /* tc_body */ DE_NULL, /* te_body */ - PipelineStatisticsQueryUtilities::dummy_vs_code); + PipelineStatisticsQueryUtilities::minimal_vs_code); gl.useProgram(m_po_id); GLU_EXPECT_NO_ERROR(gl.getError(), "glUseProgram() call failed."); @@ -4340,12 +4341,12 @@ void PipelineStatisticsQueryTestFunctional8::initObjects() /* This test should not execute if we don't have compute shaders */ if (glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::core(4, 3))) { - cs_code = PipelineStatisticsQueryUtilities::dummy_cs_code; + cs_code = PipelineStatisticsQueryUtilities::minimal_cs_code; } else if (m_context.getContextInfo().isExtensionSupported("GL_ARB_compute_shader") && m_context.getContextInfo().isExtensionSupported("GL_ARB_shader_atomic_counters")) { - cs_code = PipelineStatisticsQueryUtilities::dummy_cs_code_arb; + cs_code = PipelineStatisticsQueryUtilities::minimal_cs_code_arb; } else { diff --git a/external/openglcts/modules/gl/gl4cPipelineStatisticsQueryTests.hpp b/external/openglcts/modules/gl/gl4cPipelineStatisticsQueryTests.hpp index af7594058..1d23d125e 100644 --- a/external/openglcts/modules/gl/gl4cPipelineStatisticsQueryTests.hpp +++ b/external/openglcts/modules/gl/gl4cPipelineStatisticsQueryTests.hpp @@ -220,22 +220,22 @@ public: /* Code of a compute shader used by a functional test that verifies * GL_COMPUTE_SHADER_INVOCATIONS_ARB query works correctly. */ - static const char* dummy_cs_code; - static const char* dummy_cs_code_arb; + static const char* minimal_cs_code; + static const char* minimal_cs_code_arb; /* Code of a fragment shader used by a number of functional tests */ - static const char* dummy_fs_code; + static const char* minimal_fs_code; /* Code of a tessellation control shader used by a functional test that verifies * GL_TESS_CONTROL_SHADER_PATCHES_ARB and GL_TESS_EVALUATION_SHADER_INVOCATIONS_ARB * queries work correctly. */ - static const char* dummy_tc_code; + static const char* minimal_tc_code; /* Code of a tessellation evaluation shader used by a functional test that verifies * GL_TESS_CONTROL_SHADER_PATCHES_ARB and GL_TESS_EVALUATION_SHADER_INVOCATIONS_ARB * queries work correctly. */ - static const char* dummy_te_code; + static const char* minimal_te_code; /* Code of a vertex shader used by a number of functional tests */ - static const char* dummy_vs_code; + static const char* minimal_vs_code; /* Tells how many query targets are stored in query_targets */ static const unsigned int n_query_targets; diff --git a/external/openglcts/modules/gl/gl4cSparseBufferTests.cpp b/external/openglcts/modules/gl/gl4cSparseBufferTests.cpp index 8859d75c4..e405d2c85 100644 --- a/external/openglcts/modules/gl/gl4cSparseBufferTests.cpp +++ b/external/openglcts/modules/gl/gl4cSparseBufferTests.cpp @@ -3207,7 +3207,7 @@ bool PixelPackBufferStorageTestCase::execute(glw::GLuint sparse_bo_storage_flags */ bool PixelPackBufferStorageTestCase::initTestCaseGlobal() { - /* Determine dummy vertex shader and fragment shader that will generate black-to-white gradient. */ + /* Determine vertex shader and fragment shader that will generate black-to-white gradient. */ const char* gradient_fs_code = "#version 330 core\n" "\n" "out vec4 result;\n" @@ -5700,7 +5700,7 @@ bool TransformFeedbackBufferStorageTestCase::execute(glw::GLuint sparse_bo_stora /* Only perform the check if the offsets refer to pages with physical backing. * - * Note that, on platforms, whose page size % 4 != 0, the values can land partially in the no-man's land, + * Note that, on platforms, whose page size % 4 != 0, the values can land partially out of bounds, * and partially in the safe zone. In such cases, skip the verification. */ const bool result_instance_id_page_has_physical_backing = (((((char*)result_instance_id_traveller_ptr - (char*)result_ptr) / m_page_size) % 2) == diff --git a/external/openglcts/modules/gles31/es31cArrayOfArraysTests.cpp b/external/openglcts/modules/gles31/es31cArrayOfArraysTests.cpp index 5aab1506a..05e483324 100644 --- a/external/openglcts/modules/gles31/es31cArrayOfArraysTests.cpp +++ b/external/openglcts/modules/gles31/es31cArrayOfArraysTests.cpp @@ -68,7 +68,7 @@ const char* GL::shader_version_gpu5 = "#version 430 core\n\n"; const char* GL::shader_version = "#version 430 core\n\n"; } /* namespace Interface */ -/* Dummy fragment shader source code. +/* Minimal fragment shader source code. * Used when testing the vertex shader. */ const std::string default_fragment_shader_source = "//default fragment shader\n" "out vec4 color;\n" @@ -77,7 +77,7 @@ const std::string default_fragment_shader_source = "//default fragment shader\n" " color = vec4(1.0);\n" "}\n"; -/* Dummy vertex shader source code. +/* Minimal vertex shader source code. * Used when testing the fragment shader. */ const std::string default_vertex_shader_source = "//default vertex shader\n" "\n" @@ -86,7 +86,7 @@ const std::string default_vertex_shader_source = "//default vertex shader\n" " gl_Position = vec4(0.0,0.0,0.0,1.0);\n" "}\n"; -/* Dummy geometry shader source code. +/* Simple geometry shader source code. * Used when testing the other shaders. */ const std::string default_geometry_shader_source = "//default geometry\n" "\n" @@ -102,7 +102,7 @@ const std::string default_geometry_shader_source = "//default geometry\n" " EmitVertex();\n" "}\n"; -/* Dummy tesselation control shader source code. +/* Simple tesselation control shader source code. * Used when testing the other shaders. */ const std::string default_tc_shader_source = "//default tcs\n" "\n" @@ -116,7 +116,7 @@ const std::string default_tc_shader_source = "//default tcs\n" " gl_TessLevelInner[1] = 1.0;\n" "}\n"; -/* Dummy tesselation evaluation shader source code. +/* Minimal tesselation evaluation shader source code. * Used when testing the other shaders. */ const std::string default_te_shader_source = "//default tes\n" "\n" diff --git a/external/openglcts/modules/glesext/geometry_shader/esextcGeometryShaderAPI.cpp b/external/openglcts/modules/glesext/geometry_shader/esextcGeometryShaderAPI.cpp index c4bc8d86a..aa679ef87 100644 --- a/external/openglcts/modules/glesext/geometry_shader/esextcGeometryShaderAPI.cpp +++ b/external/openglcts/modules/glesext/geometry_shader/esextcGeometryShaderAPI.cpp @@ -31,7 +31,8 @@ namespace glcts { -static const char* dummy_fs_code = "${VERSION}\n" +static const char* minimal_fs_code = + "${VERSION}\n" "\n" "precision highp float;\n" "\n" @@ -42,7 +43,8 @@ static const char* dummy_fs_code = "${VERSION}\n" " result = vec4(1.0);\n" "}\n"; -static const char* dummy_gs_code = "${VERSION}\n" +static const char* minimal_gs_code = + "${VERSION}\n" "${GEOMETRY_SHADER_REQUIRE}\n" "\n" "layout (points) in;\n" @@ -56,7 +58,8 @@ static const char* dummy_gs_code = "${VERSION}\n" " EmitVertex();\n" "}\n"; -static const char* dummy_vs_code = "${VERSION}\n" +static const char* minimal_vs_code = + "${VERSION}\n" "\n" "${OUT_PER_VERTEX_DECL}" "\n" @@ -637,12 +640,12 @@ tcu::TestNode::IterateResult GeometryShaderGetProgramiv2Test::iterate() } /* Initialize the program object */ - std::string specialized_dummy_fs = specializeShader(1, - /* parts */ &dummy_fs_code); - const char* specialized_dummy_fs_raw = specialized_dummy_fs.c_str(); - std::string specialized_dummy_vs = specializeShader(1, - /* parts */ &dummy_vs_code); - const char* specialized_dummy_vs_raw = specialized_dummy_vs.c_str(); + std::string specialized_minimal_fs = specializeShader(1, + /* parts */ &minimal_fs_code); + const char* specialized_minimal_fs_raw = specialized_minimal_fs.c_str(); + std::string specialized_minimal_vs = specializeShader(1, + /* parts */ &minimal_vs_code); + const char* specialized_minimal_vs_raw = specialized_minimal_vs.c_str(); m_fs_id = gl.createShader(GL_FRAGMENT_SHADER); m_vs_id = gl.createShader(GL_VERTEX_SHADER); @@ -653,10 +656,10 @@ tcu::TestNode::IterateResult GeometryShaderGetProgramiv2Test::iterate() GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateProgram() call failed."); - if (!TestCaseBase::buildProgram(m_po_id, m_fs_id, 1, &specialized_dummy_fs_raw, m_vs_id, 1, - &specialized_dummy_vs_raw)) + if (!TestCaseBase::buildProgram(m_po_id, m_fs_id, 1, &specialized_minimal_fs_raw, m_vs_id, 1, + &specialized_minimal_vs_raw)) { - m_testCtx.getLog() << tcu::TestLog::Message << "Failed to build a dummy test program object" + m_testCtx.getLog() << tcu::TestLog::Message << "Failed to build a minimal test program object" << tcu::TestLog::EndMessage; result = false; @@ -974,12 +977,12 @@ tcu::TestNode::IterateResult GeometryShaderGetProgramiv3Test::iterate() throw tcu::NotSupportedError(GEOMETRY_SHADER_EXTENSION_NOT_SUPPORTED, "", __FILE__, __LINE__); } - /* Prepare specialized versions of dummy fragment & vertex shaders */ - std::string dummy_fs_specialized = specializeShader(1, - /* parts */ &dummy_fs_code); - const char* dummy_fs_specialized_raw = dummy_fs_specialized.c_str(); - std::string dummy_vs_specialized = specializeShader(1, &dummy_vs_code); - const char* dummy_vs_specialized_raw = dummy_vs_specialized.c_str(); + /* Prepare specialized versions of minimal fragment & vertex shaders */ + std::string minimal_fs_specialized = specializeShader(1, + /* parts */ &minimal_fs_code); + const char* minimal_fs_specialized_raw = minimal_fs_specialized.c_str(); + std::string minimal_vs_specialized = specializeShader(1, &minimal_vs_code); + const char* minimal_vs_specialized_raw = minimal_vs_specialized.c_str(); /* Set up the fragment & the vertex shaders */ m_fs_id = gl.createShader(GL_FRAGMENT_SHADER); @@ -988,7 +991,7 @@ tcu::TestNode::IterateResult GeometryShaderGetProgramiv3Test::iterate() GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateShader() call(s) failed."); - if (!buildShader(m_fs_id, dummy_fs_specialized_raw) || !buildShader(m_vs_id, dummy_vs_specialized_raw)) + if (!buildShader(m_fs_id, minimal_fs_specialized_raw) || !buildShader(m_vs_id, minimal_vs_specialized_raw)) { m_testCtx.getLog() << tcu::TestLog::Message << "Either FS or VS failed to build." << tcu::TestLog::EndMessage; @@ -1007,8 +1010,8 @@ tcu::TestNode::IterateResult GeometryShaderGetProgramiv3Test::iterate() GLU_EXPECT_NO_ERROR(gl.getError(), "glAttachShader() call(s) failed."); /* Set up the fragment & the vertex shader programs */ - if (!buildShaderProgram(&m_fs_po_id, GL_FRAGMENT_SHADER, dummy_fs_specialized_raw) || - !buildShaderProgram(&m_vs_po_id, GL_VERTEX_SHADER, dummy_vs_specialized_raw)) + if (!buildShaderProgram(&m_fs_po_id, GL_FRAGMENT_SHADER, minimal_fs_specialized_raw) || + !buildShaderProgram(&m_vs_po_id, GL_VERTEX_SHADER, minimal_vs_specialized_raw)) { m_testCtx.getLog() << tcu::TestLog::Message << "Either FS or VS SPOs failed to build." << tcu::TestLog::EndMessage; @@ -1276,11 +1279,11 @@ tcu::TestNode::IterateResult GeometryShaderDrawCallWithFSAndGS::iterate() GLU_EXPECT_NO_ERROR(gl.getError(), "glBindVertexArray() call failed."); /* Create shader program objects */ - std::string code_fs_specialized = specializeShader(1, /* parts */ - &dummy_fs_code); + std::string code_fs_specialized = specializeShader(1, /* parts */ + &minimal_fs_code); const char* code_fs_specialized_raw = code_fs_specialized.c_str(); std::string code_gs_specialized = specializeShader(1, /* parts */ - &dummy_gs_code); + &minimal_gs_code); const char* code_gs_specialized_raw = code_gs_specialized.c_str(); glw::GLint link_status = GL_FALSE; @@ -1295,7 +1298,7 @@ tcu::TestNode::IterateResult GeometryShaderDrawCallWithFSAndGS::iterate() if (link_status != GL_TRUE) { - m_testCtx.getLog() << tcu::TestLog::Message << "Dummy fragment shader program failed to link." + m_testCtx.getLog() << tcu::TestLog::Message << "Minimal fragment shader program failed to link." << tcu::TestLog::EndMessage; result = false; @@ -1306,7 +1309,7 @@ tcu::TestNode::IterateResult GeometryShaderDrawCallWithFSAndGS::iterate() if (link_status != GL_TRUE) { - m_testCtx.getLog() << tcu::TestLog::Message << "Dummy geometry shader program failed to link." + m_testCtx.getLog() << tcu::TestLog::Message << "Minimal geometry shader program failed to link." << tcu::TestLog::EndMessage; result = false; @@ -1611,13 +1614,13 @@ tcu::TestNode::IterateResult GeometryShaderMaxImageUniformsTest::iterate() GLU_EXPECT_NO_ERROR(gl.getError(), "glTransformFeedbackVaryings() call failed."); /* Try to link the test program object */ - fs_code_specialized = specializeShader(1, &dummy_fs_code); + fs_code_specialized = specializeShader(1, &minimal_fs_code); fs_code_specialized_raw = fs_code_specialized.c_str(); gs_code_specialized = getGSCode(); gs_code_specialized_raw = gs_code_specialized.c_str(); - vs_code_specialized = specializeShader(1, &dummy_vs_code); + vs_code_specialized = specializeShader(1, &minimal_vs_code); vs_code_specialized_raw = vs_code_specialized.c_str(); if (!TestCaseBase::buildProgram(m_po_id, m_gs_id, 1, /* n_sh1_body_parts */ @@ -1963,13 +1966,13 @@ tcu::TestNode::IterateResult GeometryShaderMaxShaderStorageBlocksTest::iterate() GLU_EXPECT_NO_ERROR(gl.getError(), "glTransformFeedbackVaryings() call failed."); /* Try to link the test program object */ - fs_code_specialized = specializeShader(1, &dummy_fs_code); + fs_code_specialized = specializeShader(1, &minimal_fs_code); fs_code_specialized_raw = fs_code_specialized.c_str(); gs_code_specialized = getGSCode(); gs_code_specialized_raw = gs_code_specialized.c_str(); - vs_code_specialized = specializeShader(1, &dummy_vs_code); + vs_code_specialized = specializeShader(1, &minimal_vs_code); vs_code_specialized_raw = vs_code_specialized.c_str(); if (!TestCaseBase::buildProgram(m_po_id, m_gs_id, 1, /* n_sh1_body_parts */ @@ -2328,7 +2331,7 @@ tcu::TestNode::IterateResult GeometryShaderMaxAtomicCountersTest::iterate() GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateShader() call(s) failed."); /* Try to link the test program object */ - fs_code_specialized = specializeShader(1, &dummy_fs_code); + fs_code_specialized = specializeShader(1, &minimal_fs_code); fs_code_specialized_raw = fs_code_specialized.c_str(); gs_code_specialized = getGSCode(); @@ -2664,7 +2667,7 @@ tcu::TestNode::IterateResult GeometryShaderMaxAtomicCounterBuffersTest::iterate( GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateShader() call(s) failed."); /* Try to link the test program object */ - fs_code_specialized = specializeShader(1, &dummy_fs_code); + fs_code_specialized = specializeShader(1, &minimal_fs_code); fs_code_specialized_raw = fs_code_specialized.c_str(); gs_code_specialized = getGSCode(); @@ -2873,9 +2876,9 @@ tcu::TestNode::IterateResult GeometryShaderPiplineProgramObjectWithoutActiveVSPr GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateShader() call(s) failed."); /* Try to link the test program object */ - std::string fs_code_specialized = specializeShader(1, &dummy_fs_code); + std::string fs_code_specialized = specializeShader(1, &minimal_fs_code); const char* fs_code_specialized_raw = fs_code_specialized.c_str(); - std::string gs_code_specialized = specializeShader(1, &dummy_gs_code); + std::string gs_code_specialized = specializeShader(1, &minimal_gs_code); const char* gs_code_specialized_raw = gs_code_specialized.c_str(); if (!TestCaseBase::buildProgram(m_fs_po_id, m_fs_id, 1, /* n_sh1_body_parts */ @@ -3130,7 +3133,7 @@ tcu::TestNode::IterateResult GeometryShaderIncompatibleDrawCallModeTest::iterate GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateShader() call(s) failed."); /* Try to link the test program object */ - std::string fs_code_specialized = specializeShader(1, &dummy_fs_code); + std::string fs_code_specialized = specializeShader(1, &minimal_fs_code); const char* fs_code_specialized_raw = fs_code_specialized.c_str(); std::string gs_codes_specialized[] = { specializeShader(1, &gs_code_points), specializeShader(1, &gs_code_lines), @@ -3141,7 +3144,7 @@ tcu::TestNode::IterateResult GeometryShaderIncompatibleDrawCallModeTest::iterate const char* gs_codes_specialized_raw[] = { gs_codes_specialized[0].c_str(), gs_codes_specialized[1].c_str(), gs_codes_specialized[2].c_str(), gs_codes_specialized[3].c_str(), gs_codes_specialized[4].c_str() }; - std::string vs_code_specialized = specializeShader(1, &dummy_vs_code); + std::string vs_code_specialized = specializeShader(1, &minimal_vs_code); const char* vs_code_specialized_raw = vs_code_specialized.c_str(); for (glw::GLuint i = 0; i < m_number_of_gs; ++i) @@ -3537,7 +3540,7 @@ tcu::TestNode::IterateResult GeometryShaderInsufficientEmittedVerticesTest::iter const char* gs_codes_specialized_raw[] = { gs_codes_specialized[0].c_str(), gs_codes_specialized[1].c_str() }; - std::string vs_code_specialized = specializeShader(1, &dummy_vs_code); + std::string vs_code_specialized = specializeShader(1, &minimal_vs_code); const char* vs_code_specialized_raw = vs_code_specialized.c_str(); for (glw::GLuint i = 0; i < m_number_of_gs; ++i) @@ -4074,13 +4077,13 @@ tcu::TestNode::IterateResult GeometryShaderDrawPrimitivesDoNotMatchOutputPrimiti GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateShader() call(s) failed."); /* Try to link the test program object */ - std::string fs_code_specialized = specializeShader(1, &dummy_fs_code); + std::string fs_code_specialized = specializeShader(1, &minimal_fs_code); const char* fs_code_specialized_raw = fs_code_specialized.c_str(); std::string gs_code_specialized = specializeShader(1, &gs_code); const char* gs_code_specialized_raw = gs_code_specialized.c_str(); - std::string vs_code_specialized = specializeShader(1, &dummy_vs_code); + std::string vs_code_specialized = specializeShader(1, &minimal_vs_code); const char* vs_code_specialized_raw = vs_code_specialized.c_str(); if (!TestCaseBase::buildProgram(m_po_id, m_fs_id, 1, /* n_sh1_body_parts */ @@ -4308,10 +4311,10 @@ tcu::TestNode::IterateResult GeometryShaderDrawCallsWhileTFPaused::iterate() GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateShader() call(s) failed."); /* Try to link the test program object */ - std::string fs_code_specialized = specializeShader(1, &dummy_fs_code); + std::string fs_code_specialized = specializeShader(1, &minimal_fs_code); const char* fs_code_specialized_raw = fs_code_specialized.c_str(); - std::string vs_code_specialized = specializeShader(1, &dummy_vs_code); + std::string vs_code_specialized = specializeShader(1, &minimal_vs_code); const char* vs_code_specialized_raw = vs_code_specialized.c_str(); for (int i = 0; i < number_of_combinations; ++i) diff --git a/external/openglcts/modules/glesext/geometry_shader/esextcGeometryShaderLinking.cpp b/external/openglcts/modules/glesext/geometry_shader/esextcGeometryShaderLinking.cpp index dd8e7dd2e..c159778da 100644 --- a/external/openglcts/modules/glesext/geometry_shader/esextcGeometryShaderLinking.cpp +++ b/external/openglcts/modules/glesext/geometry_shader/esextcGeometryShaderLinking.cpp @@ -31,7 +31,7 @@ namespace glcts { -static const char* dummy_fs_code = "${VERSION}\n" +static const char* minimal_fs_code = "${VERSION}\n" "\n" "precision highp float;\n" "\n" @@ -42,7 +42,7 @@ static const char* dummy_fs_code = "${VERSION}\n" " result = vec4(1.0);\n" "}\n"; -static const char* dummy_gs_code = "${VERSION}\n" +static const char* minimal_gs_code = "${VERSION}\n" "${GEOMETRY_SHADER_REQUIRE}\n" "\n" "layout (points) in;\n" @@ -57,7 +57,7 @@ static const char* dummy_gs_code = "${VERSION}\n" " EmitVertex();\n" "}\n"; -static const char* dummy_vs_code = "${VERSION}\n" +static const char* minimal_vs_code = "${VERSION}\n" "\n" "${OUT_PER_VERTEX_DECL}" "\n" @@ -115,9 +115,9 @@ void GeometryShaderIncompleteProgramObjectsTest::deinit() void GeometryShaderIncompleteProgramObjectsTest::initShaderObjects() { const glw::Functions& gl = m_context.getRenderContext().getFunctions(); - std::string specialized_fs_code = specializeShader(1, &dummy_fs_code); + std::string specialized_fs_code = specializeShader(1, &minimal_fs_code); const char* specialized_fs_code_raw = specialized_fs_code.c_str(); - std::string specialized_gs_code = specializeShader(1, &dummy_gs_code); + std::string specialized_gs_code = specializeShader(1, &minimal_gs_code); const char* specialized_gs_code_raw = specialized_gs_code.c_str(); m_fs_id = gl.createShader(GL_FRAGMENT_SHADER); @@ -378,11 +378,11 @@ void GeometryShaderIncompleteGSTest::initShaderObjects(const _run& current_run, { const glw::Functions& gl = m_context.getRenderContext().getFunctions(); - std::string specialized_fs_code = specializeShader(1, &dummy_fs_code); + std::string specialized_fs_code = specializeShader(1, &minimal_fs_code); std::string gs_code = getGeometryShaderCode(current_run); const char* gs_code_raw = gs_code.c_str(); std::string specialized_gs_code = specializeShader(1, &gs_code_raw); - std::string specialized_vs_code = specializeShader(1, &dummy_vs_code); + std::string specialized_vs_code = specializeShader(1, &minimal_vs_code); const char* specialized_fs_code_raw = specialized_fs_code.c_str(); const char* specialized_gs_code_raw = specialized_gs_code.c_str(); @@ -474,7 +474,7 @@ tcu::TestNode::IterateResult GeometryShaderIncompleteGSTest::iterate() if (!has_fs_compiled || !has_vs_compiled) { - m_testCtx.getLog() << tcu::TestLog::Message << "Dummy FS and/or dummy VS failed to compile" + m_testCtx.getLog() << tcu::TestLog::Message << "Minimal FS and/or minimal VS failed to compile" << tcu::TestLog::EndMessage; result = false; @@ -737,7 +737,7 @@ void GeometryShaderInvalidArrayedInputVariablesTest::initShaderObjects(glw::GLen bool* out_has_vs_compiled_successfully) { const glw::Functions& gl = m_context.getRenderContext().getFunctions(); - std::string specialized_fs_code = specializeShader(1, &dummy_fs_code); + std::string specialized_fs_code = specializeShader(1, &minimal_fs_code); const char* specialized_fs_code_raw = specialized_fs_code.c_str(); std::string gs_code = getGSCode(gs_input_primitive_type); const char* gs_code_raw = gs_code.c_str(); @@ -979,7 +979,7 @@ tcu::TestNode::IterateResult GeometryShaderVSGSVariableTypeMismatchTest::iterate " test = vec3(gl_VertexID);\n" "}\n"; - std::string fs_code_specialized = specializeShader(1, &dummy_fs_code); + std::string fs_code_specialized = specializeShader(1, &minimal_fs_code); const char* fs_code_specialized_raw = fs_code_specialized.c_str(); std::string gs_code_specialized = specializeShader(1, &gs_code_raw); const char* gs_code_specialized_raw = gs_code_specialized.c_str(); @@ -1124,7 +1124,7 @@ tcu::TestNode::IterateResult GeometryShaderVSGSVariableQualifierMismatchTest::it " test = vec4(gl_VertexID);\n" "}\n"; - std::string fs_code_specialized = specializeShader(1, &dummy_fs_code); + std::string fs_code_specialized = specializeShader(1, &minimal_fs_code); const char* fs_code_specialized_raw = fs_code_specialized.c_str(); std::string gs_code_specialized = specializeShader(1, &gs_code_raw); const char* gs_code_specialized_raw = gs_code_specialized.c_str(); @@ -1284,7 +1284,7 @@ tcu::TestNode::IterateResult GeometryShaderVSGSArrayedVariableSizeMismatchTest:: " Color3 = vec4(0.0, 0.0, gl_VertexID, 0.0);\n" "}\n"; - std::string fs_code_specialized = specializeShader(1, &dummy_fs_code); + std::string fs_code_specialized = specializeShader(1, &minimal_fs_code); const char* fs_code_specialized_raw = fs_code_specialized.c_str(); std::string gs_code_specialized = specializeShader(1, &gs_code_raw); const char* gs_code_specialized_raw = gs_code_specialized.c_str(); @@ -1413,11 +1413,11 @@ tcu::TestNode::IterateResult GeometryShaderFragCoordRedeclarationTest::iterate() " EmitVertex();\n" "}\n"; - std::string fs_code_specialized = specializeShader(1, &dummy_fs_code); + std::string fs_code_specialized = specializeShader(1, &minimal_fs_code); const char* fs_code_specialized_raw = fs_code_specialized.c_str(); std::string gs_code_specialized = specializeShader(1, &gs_code_raw); const char* gs_code_specialized_raw = gs_code_specialized.c_str(); - std::string vs_code_specialized = specializeShader(1, &dummy_vs_code); + std::string vs_code_specialized = specializeShader(1, &minimal_vs_code); const char* vs_code_specialized_raw = vs_code_specialized.c_str(); if (TestCaseBase::buildProgram(m_po_id, m_gs_id, 1, /* n_sh1_body_parts */ @@ -1543,11 +1543,11 @@ tcu::TestNode::IterateResult GeometryShaderLocationAliasingTest::iterate() " EmitVertex();\n" "}\n"; - std::string fs_code_specialized = specializeShader(1, &dummy_fs_code); + std::string fs_code_specialized = specializeShader(1, &minimal_fs_code); const char* fs_code_specialized_raw = fs_code_specialized.c_str(); std::string gs_code_specialized = specializeShader(1, &gs_code_raw); const char* gs_code_specialized_raw = gs_code_specialized.c_str(); - std::string vs_code_specialized = specializeShader(1, &dummy_vs_code); + std::string vs_code_specialized = specializeShader(1, &minimal_vs_code); const char* vs_code_specialized_raw = vs_code_specialized.c_str(); has_program_link_succeeded = TestCaseBase::buildProgram( @@ -1709,11 +1709,11 @@ tcu::TestNode::IterateResult GeometryShaderMoreACsInGSThanSupportedTest::iterate GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateShader() call(s) failed."); /* Try to link the test program object */ - std::string fs_code_specialized = specializeShader(1, &dummy_fs_code); + std::string fs_code_specialized = specializeShader(1, &minimal_fs_code); const char* fs_code_specialized_raw = fs_code_specialized.c_str(); std::string gs_code_specialized = getGSCode(); const char* gs_code_specialized_raw = gs_code_specialized.c_str(); - std::string vs_code_specialized = specializeShader(1, &dummy_vs_code); + std::string vs_code_specialized = specializeShader(1, &minimal_vs_code); const char* vs_code_specialized_raw = vs_code_specialized.c_str(); if (TestCaseBase::buildProgram(m_po_id, m_gs_id, 1, /* n_sh1_body_parts */ @@ -1875,11 +1875,11 @@ tcu::TestNode::IterateResult GeometryShaderMoreACBsInGSThanSupportedTest::iterat GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateShader() call(s) failed."); /* Try to link the test program object */ - std::string fs_code_specialized = specializeShader(1, &dummy_fs_code); + std::string fs_code_specialized = specializeShader(1, &minimal_fs_code); const char* fs_code_specialized_raw = fs_code_specialized.c_str(); std::string gs_code_specialized = getGSCode(); const char* gs_code_specialized_raw = gs_code_specialized.c_str(); - std::string vs_code_specialized = specializeShader(1, &dummy_vs_code); + std::string vs_code_specialized = specializeShader(1, &minimal_vs_code); const char* vs_code_specialized_raw = vs_code_specialized.c_str(); if (TestCaseBase::buildProgram(m_po_id, m_gs_id, 1, /* n_sh1_body_parts */ @@ -2001,13 +2001,13 @@ tcu::TestNode::IterateResult GeometryShaderCompilationFailTest::iterate() GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateShader() call(s) failed."); /* Try to link the test program object */ - std::string fs_code_specialized = specializeShader(1, &dummy_fs_code); + std::string fs_code_specialized = specializeShader(1, &minimal_fs_code); const char* fs_code_specialized_raw = fs_code_specialized.c_str(); std::string gs_code_specialized = specializeShader(1, &gs_code); const char* gs_code_specialized_raw = gs_code_specialized.c_str(); - std::string vs_code_specialized = specializeShader(1, &dummy_vs_code); + std::string vs_code_specialized = specializeShader(1, &minimal_vs_code); const char* vs_code_specialized_raw = vs_code_specialized.c_str(); if (TestCaseBase::buildProgram(m_po_id, m_gs_id, 1, /* n_sh1_body_parts */ @@ -2211,7 +2211,7 @@ tcu::TestNode::IterateResult GeometryShaderMoreInputVerticesThanAvailableTest::i GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateShader() call(s) failed."); /* Try to link the test program object */ - std::string fs_code_specialized = specializeShader(1, &dummy_fs_code); + std::string fs_code_specialized = specializeShader(1, &minimal_fs_code); const char* fs_code_specialized_raw = fs_code_specialized.c_str(); std::string gs_codes_specialized[] = { specializeShader(1, &gs_code_points), specializeShader(1, &gs_code_lines), @@ -2223,7 +2223,7 @@ tcu::TestNode::IterateResult GeometryShaderMoreInputVerticesThanAvailableTest::i gs_codes_specialized[2].c_str(), gs_codes_specialized[3].c_str(), gs_codes_specialized[4].c_str() }; - std::string vs_code_specialized = specializeShader(1, &dummy_vs_code); + std::string vs_code_specialized = specializeShader(1, &minimal_vs_code); const char* vs_code_specialized_raw = vs_code_specialized.c_str(); for (glw::GLuint i = 0; i < m_number_of_gs; ++i) @@ -2367,7 +2367,7 @@ tcu::TestNode::IterateResult GeometryShaderTransformFeedbackVertexAndGeometrySha GLU_EXPECT_NO_ERROR(gl.getError(), "glCreateShader() call(s) failed."); /* Try to link the test program object */ - std::string fs_code_specialized = specializeShader(1, &dummy_fs_code); + std::string fs_code_specialized = specializeShader(1, &minimal_fs_code); const char* fs_code_specialized_raw = fs_code_specialized.c_str(); std::string gs_code_specialized = specializeShader(1, &gs_code); diff --git a/external/openglcts/modules/glesext/tessellation_shader/esextcTessellationShaderTCTE.cpp b/external/openglcts/modules/glesext/tessellation_shader/esextcTessellationShaderTCTE.cpp index bb6bfb05c..da07e0fd6 100644 --- a/external/openglcts/modules/glesext/tessellation_shader/esextcTessellationShaderTCTE.cpp +++ b/external/openglcts/modules/glesext/tessellation_shader/esextcTessellationShaderTCTE.cpp @@ -355,7 +355,7 @@ void TessellationShaderTCTEDataPassThrough::executeTestRun(_run& run, _tessellat shaderSourceSpecialized(run.vs_id, 1 /* count */, &vs_body); GLU_EXPECT_NO_ERROR(gl.getError(), "glShaderSource() call failed for vertex shader"); - /* Set dummy fragment shader's body */ + /* Set minimal fragment shader's body */ const char* fs_body = "${VERSION}\n" "\n" "void main()\n" @@ -1924,7 +1924,7 @@ void TessellationShaderTCTEgl_MaxPatchVertices_Position_PointSize::deinitTestRun } } -/** Retrieves a dummy fragment shader code to be used for forming program objects +/** Retrieves a minimal fragment shader code to be used for forming program objects * used by the test. * * @return As per description. @@ -2212,7 +2212,7 @@ std::string TessellationShaderTCTEgl_MaxPatchVertices_Position_PointSize::getTes return result; } -/** Retrieves a dummy vertex shader code to be used for forming program objects +/** Retrieves a minimal vertex shader code to be used for forming program objects * used by the test. * * @return As per description. diff --git a/external/openglcts/modules/runner/glcTestRunner.cpp b/external/openglcts/modules/runner/glcTestRunner.cpp index 648b98110..12775f3f9 100644 --- a/external/openglcts/modules/runner/glcTestRunner.cpp +++ b/external/openglcts/modules/runner/glcTestRunner.cpp @@ -807,7 +807,7 @@ void TestRunner::initSession(const TestRunParams& runParams) // Translate to argc, argv vector<const char*> argv; - argv.push_back("cts-runner"); // Dummy binary name + argv.push_back("cts-runner"); // Assumed binary name for (vector<string>::const_iterator i = args.begin(); i != args.end(); i++) argv.push_back(i->c_str()); diff --git a/external/vulkancts/framework/vulkan/vkBasicTypes.inl b/external/vulkancts/framework/vulkan/vkBasicTypes.inl index e10355a1f..d8bfe9758 100644 --- a/external/vulkancts/framework/vulkan/vkBasicTypes.inl +++ b/external/vulkancts/framework/vulkan/vkBasicTypes.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ #define VK_API_VERSION_1_0 (static_cast<deUint32> (VK_MAKE_API_VERSION(0, 1, 0, 0))) #define VK_API_VERSION_1_1 (static_cast<deUint32> (VK_MAKE_API_VERSION(0, 1, 1, 0))) diff --git a/external/vulkancts/framework/vulkan/vkConcreteDeviceInterface.inl b/external/vulkancts/framework/vulkan/vkConcreteDeviceInterface.inl index 787e2e2ea..c6bfae0f0 100644 --- a/external/vulkancts/framework/vulkan/vkConcreteDeviceInterface.inl +++ b/external/vulkancts/framework/vulkan/vkConcreteDeviceInterface.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ virtual PFN_vkVoidFunction getDeviceProcAddr (VkDevice device, const char* pName) const; virtual void destroyDevice (VkDevice device, const VkAllocationCallbacks* pAllocator) const; diff --git a/external/vulkancts/framework/vulkan/vkConcreteInstanceInterface.inl b/external/vulkancts/framework/vulkan/vkConcreteInstanceInterface.inl index 555d83194..b13a499fe 100644 --- a/external/vulkancts/framework/vulkan/vkConcreteInstanceInterface.inl +++ b/external/vulkancts/framework/vulkan/vkConcreteInstanceInterface.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ virtual void destroyInstance (VkInstance instance, const VkAllocationCallbacks* pAllocator) const; virtual VkResult enumeratePhysicalDevices (VkInstance instance, deUint32* pPhysicalDeviceCount, VkPhysicalDevice* pPhysicalDevices) const; diff --git a/external/vulkancts/framework/vulkan/vkConcretePlatformInterface.inl b/external/vulkancts/framework/vulkan/vkConcretePlatformInterface.inl index d68dc2236..634bdb35b 100644 --- a/external/vulkancts/framework/vulkan/vkConcretePlatformInterface.inl +++ b/external/vulkancts/framework/vulkan/vkConcretePlatformInterface.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ virtual VkResult createInstance (const VkInstanceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkInstance* pInstance) const; virtual PFN_vkVoidFunction getInstanceProcAddr (VkInstance instance, const char* pName) const; diff --git a/external/vulkancts/framework/vulkan/vkCoreFunctionalities.inl b/external/vulkancts/framework/vulkan/vkCoreFunctionalities.inl index 3d1947808..789195f6d 100644 --- a/external/vulkancts/framework/vulkan/vkCoreFunctionalities.inl +++ b/external/vulkancts/framework/vulkan/vkCoreFunctionalities.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ enum FunctionOrigin diff --git a/external/vulkancts/framework/vulkan/vkDeviceDriverImpl.inl b/external/vulkancts/framework/vulkan/vkDeviceDriverImpl.inl index 126715339..7c889d27c 100644 --- a/external/vulkancts/framework/vulkan/vkDeviceDriverImpl.inl +++ b/external/vulkancts/framework/vulkan/vkDeviceDriverImpl.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ PFN_vkVoidFunction DeviceDriver::getDeviceProcAddr (VkDevice device, const char* pName) const diff --git a/external/vulkancts/framework/vulkan/vkDeviceExtensions.inl b/external/vulkancts/framework/vulkan/vkDeviceExtensions.inl index e47d237f4..122e92a70 100644 --- a/external/vulkancts/framework/vulkan/vkDeviceExtensions.inl +++ b/external/vulkancts/framework/vulkan/vkDeviceExtensions.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ static const char* s_allowedDeviceKhrExtensions[] = { diff --git a/external/vulkancts/framework/vulkan/vkDeviceFeatureTest.inl b/external/vulkancts/framework/vulkan/vkDeviceFeatureTest.inl new file mode 100644 index 000000000..9f3231f63 --- /dev/null +++ b/external/vulkancts/framework/vulkan/vkDeviceFeatureTest.inl @@ -0,0 +1,1209 @@ +/* WARNING: This is auto-generated file. Do not modify, since changes will + * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py + */ + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDevice16BitStorageFeatures>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDevice16BitStorageFeatures, storageBuffer16BitAccess), + FEATURE_ITEM (VkPhysicalDevice16BitStorageFeatures, uniformAndStorageBuffer16BitAccess), + FEATURE_ITEM (VkPhysicalDevice16BitStorageFeatures, storagePushConstant16), + FEATURE_ITEM (VkPhysicalDevice16BitStorageFeatures, storageInputOutput16), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDevice16BitStorageFeatures*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 4, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceMultiviewFeatures>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceMultiviewFeatures, multiview), + FEATURE_ITEM (VkPhysicalDeviceMultiviewFeatures, multiviewGeometryShader), + FEATURE_ITEM (VkPhysicalDeviceMultiviewFeatures, multiviewTessellationShader), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceMultiviewFeatures*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 3, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceVariablePointersFeatures>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceVariablePointersFeatures, variablePointersStorageBuffer), + FEATURE_ITEM (VkPhysicalDeviceVariablePointersFeatures, variablePointers), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceVariablePointersFeatures*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 2, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceProtectedMemoryFeatures>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceProtectedMemoryFeatures, protectedMemory), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceProtectedMemoryFeatures*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceSamplerYcbcrConversionFeatures>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceSamplerYcbcrConversionFeatures, samplerYcbcrConversion), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceSamplerYcbcrConversionFeatures*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceShaderDrawParametersFeatures>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceShaderDrawParametersFeatures, shaderDrawParameters), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceShaderDrawParametersFeatures*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceVulkan11Features>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceVulkan11Features, storageBuffer16BitAccess), + FEATURE_ITEM (VkPhysicalDeviceVulkan11Features, uniformAndStorageBuffer16BitAccess), + FEATURE_ITEM (VkPhysicalDeviceVulkan11Features, storagePushConstant16), + FEATURE_ITEM (VkPhysicalDeviceVulkan11Features, storageInputOutput16), + FEATURE_ITEM (VkPhysicalDeviceVulkan11Features, multiview), + FEATURE_ITEM (VkPhysicalDeviceVulkan11Features, multiviewGeometryShader), + FEATURE_ITEM (VkPhysicalDeviceVulkan11Features, multiviewTessellationShader), + FEATURE_ITEM (VkPhysicalDeviceVulkan11Features, variablePointersStorageBuffer), + FEATURE_ITEM (VkPhysicalDeviceVulkan11Features, variablePointers), + FEATURE_ITEM (VkPhysicalDeviceVulkan11Features, protectedMemory), + FEATURE_ITEM (VkPhysicalDeviceVulkan11Features, samplerYcbcrConversion), + FEATURE_ITEM (VkPhysicalDeviceVulkan11Features, shaderDrawParameters), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceVulkan11Features*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 12, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, DE_NULL, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceVulkan12Features>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, samplerMirrorClampToEdge), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, drawIndirectCount), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, storageBuffer8BitAccess), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, uniformAndStorageBuffer8BitAccess), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, storagePushConstant8), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, shaderBufferInt64Atomics), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, shaderSharedInt64Atomics), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, shaderFloat16), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, shaderInt8), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, descriptorIndexing), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, shaderInputAttachmentArrayDynamicIndexing), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, shaderUniformTexelBufferArrayDynamicIndexing), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, shaderStorageTexelBufferArrayDynamicIndexing), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, shaderUniformBufferArrayNonUniformIndexing), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, shaderSampledImageArrayNonUniformIndexing), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, shaderStorageBufferArrayNonUniformIndexing), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, shaderStorageImageArrayNonUniformIndexing), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, shaderInputAttachmentArrayNonUniformIndexing), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, shaderUniformTexelBufferArrayNonUniformIndexing), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, shaderStorageTexelBufferArrayNonUniformIndexing), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, descriptorBindingUniformBufferUpdateAfterBind), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, descriptorBindingSampledImageUpdateAfterBind), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, descriptorBindingStorageImageUpdateAfterBind), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, descriptorBindingStorageBufferUpdateAfterBind), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, descriptorBindingUniformTexelBufferUpdateAfterBind), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, descriptorBindingStorageTexelBufferUpdateAfterBind), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, descriptorBindingUpdateUnusedWhilePending), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, descriptorBindingPartiallyBound), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, descriptorBindingVariableDescriptorCount), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, runtimeDescriptorArray), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, samplerFilterMinmax), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, scalarBlockLayout), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, imagelessFramebuffer), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, uniformBufferStandardLayout), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, shaderSubgroupExtendedTypes), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, separateDepthStencilLayouts), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, hostQueryReset), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, timelineSemaphore), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, bufferDeviceAddress), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, bufferDeviceAddressCaptureReplay), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, bufferDeviceAddressMultiDevice), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, vulkanMemoryModel), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, vulkanMemoryModelDeviceScope), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, vulkanMemoryModelAvailabilityVisibilityChains), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, shaderOutputViewportIndex), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, shaderOutputLayer), + FEATURE_ITEM (VkPhysicalDeviceVulkan12Features, subgroupBroadcastDynamicId), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceVulkan12Features*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 47, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, DE_NULL, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDevice8BitStorageFeatures>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDevice8BitStorageFeatures, storageBuffer8BitAccess), + FEATURE_ITEM (VkPhysicalDevice8BitStorageFeatures, uniformAndStorageBuffer8BitAccess), + FEATURE_ITEM (VkPhysicalDevice8BitStorageFeatures, storagePushConstant8), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDevice8BitStorageFeatures*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 3, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceShaderAtomicInt64Features>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicInt64Features, shaderBufferInt64Atomics), + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicInt64Features, shaderSharedInt64Atomics), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceShaderAtomicInt64Features*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 2, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceShaderFloat16Int8Features>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceShaderFloat16Int8Features, shaderFloat16), + FEATURE_ITEM (VkPhysicalDeviceShaderFloat16Int8Features, shaderInt8), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceShaderFloat16Int8Features*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 2, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceDescriptorIndexingFeatures>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceDescriptorIndexingFeatures, shaderInputAttachmentArrayDynamicIndexing), + FEATURE_ITEM (VkPhysicalDeviceDescriptorIndexingFeatures, shaderUniformTexelBufferArrayDynamicIndexing), + FEATURE_ITEM (VkPhysicalDeviceDescriptorIndexingFeatures, shaderStorageTexelBufferArrayDynamicIndexing), + FEATURE_ITEM (VkPhysicalDeviceDescriptorIndexingFeatures, shaderUniformBufferArrayNonUniformIndexing), + FEATURE_ITEM (VkPhysicalDeviceDescriptorIndexingFeatures, shaderSampledImageArrayNonUniformIndexing), + FEATURE_ITEM (VkPhysicalDeviceDescriptorIndexingFeatures, shaderStorageBufferArrayNonUniformIndexing), + FEATURE_ITEM (VkPhysicalDeviceDescriptorIndexingFeatures, shaderStorageImageArrayNonUniformIndexing), + FEATURE_ITEM (VkPhysicalDeviceDescriptorIndexingFeatures, shaderInputAttachmentArrayNonUniformIndexing), + FEATURE_ITEM (VkPhysicalDeviceDescriptorIndexingFeatures, shaderUniformTexelBufferArrayNonUniformIndexing), + FEATURE_ITEM (VkPhysicalDeviceDescriptorIndexingFeatures, shaderStorageTexelBufferArrayNonUniformIndexing), + FEATURE_ITEM (VkPhysicalDeviceDescriptorIndexingFeatures, descriptorBindingUniformBufferUpdateAfterBind), + FEATURE_ITEM (VkPhysicalDeviceDescriptorIndexingFeatures, descriptorBindingSampledImageUpdateAfterBind), + FEATURE_ITEM (VkPhysicalDeviceDescriptorIndexingFeatures, descriptorBindingStorageImageUpdateAfterBind), + FEATURE_ITEM (VkPhysicalDeviceDescriptorIndexingFeatures, descriptorBindingStorageBufferUpdateAfterBind), + FEATURE_ITEM (VkPhysicalDeviceDescriptorIndexingFeatures, descriptorBindingUniformTexelBufferUpdateAfterBind), + FEATURE_ITEM (VkPhysicalDeviceDescriptorIndexingFeatures, descriptorBindingStorageTexelBufferUpdateAfterBind), + FEATURE_ITEM (VkPhysicalDeviceDescriptorIndexingFeatures, descriptorBindingUpdateUnusedWhilePending), + FEATURE_ITEM (VkPhysicalDeviceDescriptorIndexingFeatures, descriptorBindingPartiallyBound), + FEATURE_ITEM (VkPhysicalDeviceDescriptorIndexingFeatures, descriptorBindingVariableDescriptorCount), + FEATURE_ITEM (VkPhysicalDeviceDescriptorIndexingFeatures, runtimeDescriptorArray), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceDescriptorIndexingFeatures*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 20, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceScalarBlockLayoutFeatures>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceScalarBlockLayoutFeatures, scalarBlockLayout), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceScalarBlockLayoutFeatures*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceVulkanMemoryModelFeatures>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceVulkanMemoryModelFeatures, vulkanMemoryModel), + FEATURE_ITEM (VkPhysicalDeviceVulkanMemoryModelFeatures, vulkanMemoryModelDeviceScope), + FEATURE_ITEM (VkPhysicalDeviceVulkanMemoryModelFeatures, vulkanMemoryModelAvailabilityVisibilityChains), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceVulkanMemoryModelFeatures*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 3, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceImagelessFramebufferFeatures>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceImagelessFramebufferFeatures, imagelessFramebuffer), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceImagelessFramebufferFeatures*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceUniformBufferStandardLayoutFeatures>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceUniformBufferStandardLayoutFeatures, uniformBufferStandardLayout), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceUniformBufferStandardLayoutFeatures*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures, shaderSubgroupExtendedTypes), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures, separateDepthStencilLayouts), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceHostQueryResetFeatures>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceHostQueryResetFeatures, hostQueryReset), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceHostQueryResetFeatures*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceTimelineSemaphoreFeatures>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceTimelineSemaphoreFeatures, timelineSemaphore), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceTimelineSemaphoreFeatures*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceBufferDeviceAddressFeatures>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceBufferDeviceAddressFeatures, bufferDeviceAddress), + FEATURE_ITEM (VkPhysicalDeviceBufferDeviceAddressFeatures, bufferDeviceAddressCaptureReplay), + FEATURE_ITEM (VkPhysicalDeviceBufferDeviceAddressFeatures, bufferDeviceAddressMultiDevice), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceBufferDeviceAddressFeatures*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 3, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceDynamicRenderingFeaturesKHR>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceDynamicRenderingFeaturesKHR, dynamicRendering), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceDynamicRenderingFeaturesKHR*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDevicePerformanceQueryFeaturesKHR>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDevicePerformanceQueryFeaturesKHR, performanceCounterQueryPools), + FEATURE_ITEM (VkPhysicalDevicePerformanceQueryFeaturesKHR, performanceCounterMultipleQueryPools), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDevicePerformanceQueryFeaturesKHR*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 2, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceShaderClockFeaturesKHR>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceShaderClockFeaturesKHR, shaderSubgroupClock), + FEATURE_ITEM (VkPhysicalDeviceShaderClockFeaturesKHR, shaderDeviceClock), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceShaderClockFeaturesKHR*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 2, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceShaderTerminateInvocationFeaturesKHR>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceShaderTerminateInvocationFeaturesKHR, shaderTerminateInvocation), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceShaderTerminateInvocationFeaturesKHR*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceFragmentShadingRateFeaturesKHR>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceFragmentShadingRateFeaturesKHR, pipelineFragmentShadingRate), + FEATURE_ITEM (VkPhysicalDeviceFragmentShadingRateFeaturesKHR, primitiveFragmentShadingRate), + FEATURE_ITEM (VkPhysicalDeviceFragmentShadingRateFeaturesKHR, attachmentFragmentShadingRate), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceFragmentShadingRateFeaturesKHR*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 3, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDevicePresentWaitFeaturesKHR>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDevicePresentWaitFeaturesKHR, presentWait), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDevicePresentWaitFeaturesKHR*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR, pipelineExecutableInfo), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceShaderIntegerDotProductFeaturesKHR>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceShaderIntegerDotProductFeaturesKHR, shaderIntegerDotProduct), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceShaderIntegerDotProductFeaturesKHR*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDevicePresentIdFeaturesKHR>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDevicePresentIdFeaturesKHR, presentId), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDevicePresentIdFeaturesKHR*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceSynchronization2FeaturesKHR>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceSynchronization2FeaturesKHR, synchronization2), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceSynchronization2FeaturesKHR*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR, shaderSubgroupUniformControlFlow), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceShaderSubgroupUniformControlFlowFeaturesKHR*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR, shaderZeroInitializeWorkgroupMemory), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR, workgroupMemoryExplicitLayout), + FEATURE_ITEM (VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR, workgroupMemoryExplicitLayoutScalarBlockLayout), + FEATURE_ITEM (VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR, workgroupMemoryExplicitLayout8BitAccess), + FEATURE_ITEM (VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR, workgroupMemoryExplicitLayout16BitAccess), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 4, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceMaintenance4FeaturesKHR>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceMaintenance4FeaturesKHR, maintenance4), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceMaintenance4FeaturesKHR*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceTransformFeedbackFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceTransformFeedbackFeaturesEXT, transformFeedback), + FEATURE_ITEM (VkPhysicalDeviceTransformFeedbackFeaturesEXT, geometryStreams), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceTransformFeedbackFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 2, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceCornerSampledImageFeaturesNV>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceCornerSampledImageFeaturesNV, cornerSampledImage), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceCornerSampledImageFeaturesNV*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceTextureCompressionASTCHDRFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceTextureCompressionASTCHDRFeaturesEXT, textureCompressionASTC_HDR), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceTextureCompressionASTCHDRFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceASTCDecodeFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceASTCDecodeFeaturesEXT, decodeModeSharedExponent), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceASTCDecodeFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceConditionalRenderingFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceConditionalRenderingFeaturesEXT, conditionalRendering), + FEATURE_ITEM (VkPhysicalDeviceConditionalRenderingFeaturesEXT, inheritedConditionalRendering), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceConditionalRenderingFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 2, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceDepthClipEnableFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceDepthClipEnableFeaturesEXT, depthClipEnable), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceDepthClipEnableFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceInlineUniformBlockFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceInlineUniformBlockFeaturesEXT, inlineUniformBlock), + FEATURE_ITEM (VkPhysicalDeviceInlineUniformBlockFeaturesEXT, descriptorBindingInlineUniformBlockUpdateAfterBind), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceInlineUniformBlockFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 2, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT, advancedBlendCoherentOperations), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceShaderSMBuiltinsFeaturesNV>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceShaderSMBuiltinsFeaturesNV, shaderSMBuiltins), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceShaderSMBuiltinsFeaturesNV*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceShadingRateImageFeaturesNV>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceShadingRateImageFeaturesNV, shadingRateImage), + FEATURE_ITEM (VkPhysicalDeviceShadingRateImageFeaturesNV, shadingRateCoarseSampleOrder), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceShadingRateImageFeaturesNV*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 2, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceRepresentativeFragmentTestFeaturesNV>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceRepresentativeFragmentTestFeaturesNV, representativeFragmentTest), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceRepresentativeFragmentTestFeaturesNV*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT, vertexAttributeInstanceRateDivisor), + FEATURE_ITEM (VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT, vertexAttributeInstanceRateZeroDivisor), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 2, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceComputeShaderDerivativesFeaturesNV>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceComputeShaderDerivativesFeaturesNV, computeDerivativeGroupQuads), + FEATURE_ITEM (VkPhysicalDeviceComputeShaderDerivativesFeaturesNV, computeDerivativeGroupLinear), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceComputeShaderDerivativesFeaturesNV*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 2, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceMeshShaderFeaturesNV>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceMeshShaderFeaturesNV, taskShader), + FEATURE_ITEM (VkPhysicalDeviceMeshShaderFeaturesNV, meshShader), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceMeshShaderFeaturesNV*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 2, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceFragmentShaderBarycentricFeaturesNV>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceFragmentShaderBarycentricFeaturesNV, fragmentShaderBarycentric), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceFragmentShaderBarycentricFeaturesNV*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceShaderImageFootprintFeaturesNV>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceShaderImageFootprintFeaturesNV, imageFootprint), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceShaderImageFootprintFeaturesNV*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceExclusiveScissorFeaturesNV>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceExclusiveScissorFeaturesNV, exclusiveScissor), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceExclusiveScissorFeaturesNV*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL, shaderIntegerFunctions2), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceFragmentDensityMapFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceFragmentDensityMapFeaturesEXT, fragmentDensityMap), + FEATURE_ITEM (VkPhysicalDeviceFragmentDensityMapFeaturesEXT, fragmentDensityMapDynamic), + FEATURE_ITEM (VkPhysicalDeviceFragmentDensityMapFeaturesEXT, fragmentDensityMapNonSubsampledImages), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceFragmentDensityMapFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 3, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceSubgroupSizeControlFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceSubgroupSizeControlFeaturesEXT, subgroupSizeControl), + FEATURE_ITEM (VkPhysicalDeviceSubgroupSizeControlFeaturesEXT, computeFullSubgroups), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceSubgroupSizeControlFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 2, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceCoherentMemoryFeaturesAMD>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceCoherentMemoryFeaturesAMD, deviceCoherentMemory), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceCoherentMemoryFeaturesAMD*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT, shaderImageInt64Atomics), + FEATURE_ITEM (VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT, sparseImageInt64Atomics), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 2, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceMemoryPriorityFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceMemoryPriorityFeaturesEXT, memoryPriority), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceMemoryPriorityFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV, dedicatedAllocationImageAliasing), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceBufferDeviceAddressFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceBufferDeviceAddressFeaturesEXT, bufferDeviceAddress), + FEATURE_ITEM (VkPhysicalDeviceBufferDeviceAddressFeaturesEXT, bufferDeviceAddressCaptureReplay), + FEATURE_ITEM (VkPhysicalDeviceBufferDeviceAddressFeaturesEXT, bufferDeviceAddressMultiDevice), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceBufferDeviceAddressFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 3, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceCooperativeMatrixFeaturesNV>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceCooperativeMatrixFeaturesNV, cooperativeMatrix), + FEATURE_ITEM (VkPhysicalDeviceCooperativeMatrixFeaturesNV, cooperativeMatrixRobustBufferAccess), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceCooperativeMatrixFeaturesNV*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 2, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceCoverageReductionModeFeaturesNV>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceCoverageReductionModeFeaturesNV, coverageReductionMode), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceCoverageReductionModeFeaturesNV*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT, fragmentShaderSampleInterlock), + FEATURE_ITEM (VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT, fragmentShaderPixelInterlock), + FEATURE_ITEM (VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT, fragmentShaderShadingRateInterlock), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 3, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceYcbcrImageArraysFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceYcbcrImageArraysFeaturesEXT, ycbcrImageArrays), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceYcbcrImageArraysFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceProvokingVertexFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceProvokingVertexFeaturesEXT, provokingVertexLast), + FEATURE_ITEM (VkPhysicalDeviceProvokingVertexFeaturesEXT, transformFeedbackPreservesProvokingVertex), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceProvokingVertexFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 2, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceLineRasterizationFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceLineRasterizationFeaturesEXT, rectangularLines), + FEATURE_ITEM (VkPhysicalDeviceLineRasterizationFeaturesEXT, bresenhamLines), + FEATURE_ITEM (VkPhysicalDeviceLineRasterizationFeaturesEXT, smoothLines), + FEATURE_ITEM (VkPhysicalDeviceLineRasterizationFeaturesEXT, stippledRectangularLines), + FEATURE_ITEM (VkPhysicalDeviceLineRasterizationFeaturesEXT, stippledBresenhamLines), + FEATURE_ITEM (VkPhysicalDeviceLineRasterizationFeaturesEXT, stippledSmoothLines), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceLineRasterizationFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 6, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceShaderAtomicFloatFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicFloatFeaturesEXT, shaderBufferFloat32Atomics), + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicFloatFeaturesEXT, shaderBufferFloat32AtomicAdd), + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicFloatFeaturesEXT, shaderBufferFloat64Atomics), + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicFloatFeaturesEXT, shaderBufferFloat64AtomicAdd), + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicFloatFeaturesEXT, shaderSharedFloat32Atomics), + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicFloatFeaturesEXT, shaderSharedFloat32AtomicAdd), + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicFloatFeaturesEXT, shaderSharedFloat64Atomics), + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicFloatFeaturesEXT, shaderSharedFloat64AtomicAdd), + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicFloatFeaturesEXT, shaderImageFloat32Atomics), + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicFloatFeaturesEXT, shaderImageFloat32AtomicAdd), + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicFloatFeaturesEXT, sparseImageFloat32Atomics), + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicFloatFeaturesEXT, sparseImageFloat32AtomicAdd), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceShaderAtomicFloatFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 12, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceIndexTypeUint8FeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceIndexTypeUint8FeaturesEXT, indexTypeUint8), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceIndexTypeUint8FeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceExtendedDynamicStateFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceExtendedDynamicStateFeaturesEXT, extendedDynamicState), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceExtendedDynamicStateFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT, shaderBufferFloat16Atomics), + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT, shaderBufferFloat16AtomicAdd), + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT, shaderBufferFloat16AtomicMinMax), + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT, shaderBufferFloat32AtomicMinMax), + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT, shaderBufferFloat64AtomicMinMax), + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT, shaderSharedFloat16Atomics), + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT, shaderSharedFloat16AtomicAdd), + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT, shaderSharedFloat16AtomicMinMax), + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT, shaderSharedFloat32AtomicMinMax), + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT, shaderSharedFloat64AtomicMinMax), + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT, shaderImageFloat32AtomicMinMax), + FEATURE_ITEM (VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT, sparseImageFloat32AtomicMinMax), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceShaderAtomicFloat2FeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 12, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT, shaderDemoteToHelperInvocation), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceDeviceGeneratedCommandsFeaturesNV>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceDeviceGeneratedCommandsFeaturesNV, deviceGeneratedCommands), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceDeviceGeneratedCommandsFeaturesNV*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceInheritedViewportScissorFeaturesNV>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceInheritedViewportScissorFeaturesNV, inheritedViewportScissor2D), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceInheritedViewportScissorFeaturesNV*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT, texelBufferAlignment), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceDeviceMemoryReportFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceDeviceMemoryReportFeaturesEXT, deviceMemoryReport), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceDeviceMemoryReportFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceRGBA10X6FormatsFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceRGBA10X6FormatsFeaturesEXT, formatRgba10x6WithoutYCbCrSampler), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceRGBA10X6FormatsFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceRobustness2FeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceRobustness2FeaturesEXT, robustBufferAccess2), + FEATURE_ITEM (VkPhysicalDeviceRobustness2FeaturesEXT, robustImageAccess2), + FEATURE_ITEM (VkPhysicalDeviceRobustness2FeaturesEXT, nullDescriptor), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceRobustness2FeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 3, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceCustomBorderColorFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceCustomBorderColorFeaturesEXT, customBorderColors), + FEATURE_ITEM (VkPhysicalDeviceCustomBorderColorFeaturesEXT, customBorderColorWithoutFormat), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceCustomBorderColorFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 2, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDevicePrivateDataFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDevicePrivateDataFeaturesEXT, privateData), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDevicePrivateDataFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT, pipelineCreationCacheControl), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceDiagnosticsConfigFeaturesNV>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceDiagnosticsConfigFeaturesNV, diagnosticsConfig), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceDiagnosticsConfigFeaturesNV*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceFragmentShadingRateEnumsFeaturesNV>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceFragmentShadingRateEnumsFeaturesNV, fragmentShadingRateEnums), + FEATURE_ITEM (VkPhysicalDeviceFragmentShadingRateEnumsFeaturesNV, supersampleFragmentShadingRates), + FEATURE_ITEM (VkPhysicalDeviceFragmentShadingRateEnumsFeaturesNV, noInvocationFragmentShadingRates), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceFragmentShadingRateEnumsFeaturesNV*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 3, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceRayTracingMotionBlurFeaturesNV>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceRayTracingMotionBlurFeaturesNV, rayTracingMotionBlur), + FEATURE_ITEM (VkPhysicalDeviceRayTracingMotionBlurFeaturesNV, rayTracingMotionBlurPipelineTraceRaysIndirect), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceRayTracingMotionBlurFeaturesNV*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 2, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT, ycbcr2plane444Formats), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceYcbcr2Plane444FormatsFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceFragmentDensityMap2FeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceFragmentDensityMap2FeaturesEXT, fragmentDensityMapDeferred), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceFragmentDensityMap2FeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceImageRobustnessFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceImageRobustnessFeaturesEXT, robustImageAccess), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceImageRobustnessFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDevice4444FormatsFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDevice4444FormatsFeaturesEXT, formatA4R4G4B4), + FEATURE_ITEM (VkPhysicalDevice4444FormatsFeaturesEXT, formatA4B4G4R4), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDevice4444FormatsFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 2, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE, mutableDescriptorType), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceVertexInputDynamicStateFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceVertexInputDynamicStateFeaturesEXT, vertexInputDynamicState), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceVertexInputDynamicStateFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT, primitiveTopologyListRestart), + FEATURE_ITEM (VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT, primitiveTopologyPatchListRestart), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDevicePrimitiveTopologyListRestartFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 2, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceSubpassShadingFeaturesHUAWEI>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceSubpassShadingFeaturesHUAWEI, subpassShading), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceSubpassShadingFeaturesHUAWEI*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceInvocationMaskFeaturesHUAWEI>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceInvocationMaskFeaturesHUAWEI, invocationMask), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceInvocationMaskFeaturesHUAWEI*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceExternalMemoryRDMAFeaturesNV>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceExternalMemoryRDMAFeaturesNV, externalMemoryRDMA), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceExternalMemoryRDMAFeaturesNV*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceExtendedDynamicState2FeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceExtendedDynamicState2FeaturesEXT, extendedDynamicState2), + FEATURE_ITEM (VkPhysicalDeviceExtendedDynamicState2FeaturesEXT, extendedDynamicState2LogicOp), + FEATURE_ITEM (VkPhysicalDeviceExtendedDynamicState2FeaturesEXT, extendedDynamicState2PatchControlPoints), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceExtendedDynamicState2FeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 3, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceColorWriteEnableFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceColorWriteEnableFeaturesEXT, colorWriteEnable), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceColorWriteEnableFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT, globalPriorityQuery), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceMultiDrawFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceMultiDrawFeaturesEXT, multiDraw), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceMultiDrawFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceBorderColorSwizzleFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceBorderColorSwizzleFeaturesEXT, borderColorSwizzle), + FEATURE_ITEM (VkPhysicalDeviceBorderColorSwizzleFeaturesEXT, borderColorSwizzleFromImage), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceBorderColorSwizzleFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 2, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDevicePageableDeviceLocalMemoryFeaturesEXT>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDevicePageableDeviceLocalMemoryFeaturesEXT, pageableDeviceLocalMemory), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDevicePageableDeviceLocalMemoryFeaturesEXT*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceAccelerationStructureFeaturesKHR>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceAccelerationStructureFeaturesKHR, accelerationStructure), + FEATURE_ITEM (VkPhysicalDeviceAccelerationStructureFeaturesKHR, accelerationStructureCaptureReplay), + FEATURE_ITEM (VkPhysicalDeviceAccelerationStructureFeaturesKHR, accelerationStructureIndirectBuild), + FEATURE_ITEM (VkPhysicalDeviceAccelerationStructureFeaturesKHR, accelerationStructureHostCommands), + FEATURE_ITEM (VkPhysicalDeviceAccelerationStructureFeaturesKHR, descriptorBindingAccelerationStructureUpdateAfterBind), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceAccelerationStructureFeaturesKHR*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 5, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceRayTracingPipelineFeaturesKHR>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceRayTracingPipelineFeaturesKHR, rayTracingPipeline), + FEATURE_ITEM (VkPhysicalDeviceRayTracingPipelineFeaturesKHR, rayTracingPipelineShaderGroupHandleCaptureReplay), + FEATURE_ITEM (VkPhysicalDeviceRayTracingPipelineFeaturesKHR, rayTracingPipelineShaderGroupHandleCaptureReplayMixed), + FEATURE_ITEM (VkPhysicalDeviceRayTracingPipelineFeaturesKHR, rayTracingPipelineTraceRaysIndirect), + FEATURE_ITEM (VkPhysicalDeviceRayTracingPipelineFeaturesKHR, rayTraversalPrimitiveCulling), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceRayTracingPipelineFeaturesKHR*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 5, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDeviceRayQueryFeaturesKHR>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDeviceRayQueryFeaturesKHR, rayQuery), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDeviceRayQueryFeaturesKHR*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 1, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + +if (const void* featuresStruct = findStructureInChain(const_cast<const void*>(deviceFeatures2.pNext), getStructureType<VkPhysicalDevicePortabilitySubsetFeaturesKHR>())) +{ + static const Feature features[] = + { + FEATURE_ITEM (VkPhysicalDevicePortabilitySubsetFeaturesKHR, constantAlphaColorBlendFactors), + FEATURE_ITEM (VkPhysicalDevicePortabilitySubsetFeaturesKHR, events), + FEATURE_ITEM (VkPhysicalDevicePortabilitySubsetFeaturesKHR, imageViewFormatReinterpretation), + FEATURE_ITEM (VkPhysicalDevicePortabilitySubsetFeaturesKHR, imageViewFormatSwizzle), + FEATURE_ITEM (VkPhysicalDevicePortabilitySubsetFeaturesKHR, imageView2DOn3DImage), + FEATURE_ITEM (VkPhysicalDevicePortabilitySubsetFeaturesKHR, multisampleArrayImage), + FEATURE_ITEM (VkPhysicalDevicePortabilitySubsetFeaturesKHR, mutableComparisonSamplers), + FEATURE_ITEM (VkPhysicalDevicePortabilitySubsetFeaturesKHR, pointPolygons), + FEATURE_ITEM (VkPhysicalDevicePortabilitySubsetFeaturesKHR, samplerMipLodBias), + FEATURE_ITEM (VkPhysicalDevicePortabilitySubsetFeaturesKHR, separateStencilMaskRef), + FEATURE_ITEM (VkPhysicalDevicePortabilitySubsetFeaturesKHR, shaderSampleRateInterpolationFunctions), + FEATURE_ITEM (VkPhysicalDevicePortabilitySubsetFeaturesKHR, tessellationIsolines), + FEATURE_ITEM (VkPhysicalDevicePortabilitySubsetFeaturesKHR, tessellationPointMode), + FEATURE_ITEM (VkPhysicalDevicePortabilitySubsetFeaturesKHR, triangleFans), + FEATURE_ITEM (VkPhysicalDevicePortabilitySubsetFeaturesKHR, vertexAttributeAccessBeyondStride), + }; + auto* supportedFeatures = reinterpret_cast<const VkPhysicalDevicePortabilitySubsetFeaturesKHR*>(featuresStruct); + checkFeatures(vkp, instance, instanceDriver, physicalDevice, 15, features, supportedFeatures, queueFamilyIndex, queueCount, queuePriority, numErrors, resultCollector, &extensionNames, emptyDeviceFeatures); +} + diff --git a/external/vulkancts/framework/vulkan/vkDeviceFeatures.inl b/external/vulkancts/framework/vulkan/vkDeviceFeatures.inl index e8d6e65e7..524997011 100644 --- a/external/vulkancts/framework/vulkan/vkDeviceFeatures.inl +++ b/external/vulkancts/framework/vulkan/vkDeviceFeatures.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ #include "vkDeviceFeatures.hpp" diff --git a/external/vulkancts/framework/vulkan/vkDeviceFeatures2.inl b/external/vulkancts/framework/vulkan/vkDeviceFeatures2.inl index 1fdba9d6a..337cee1c7 100644 --- a/external/vulkancts/framework/vulkan/vkDeviceFeatures2.inl +++ b/external/vulkancts/framework/vulkan/vkDeviceFeatures2.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ VkPhysicalDeviceConditionalRenderingFeaturesEXT deviceConditionalRenderingFeaturesEXT[count]; VkPhysicalDeviceScalarBlockLayoutFeatures deviceScalarBlockLayoutFeatures[count]; @@ -60,58 +61,58 @@ for (int ndx = 0; ndx < count; ++ndx) deMemset(&deviceFragmentDensityMap2FeaturesEXT[ndx], 0xFF * ndx, sizeof(VkPhysicalDeviceFragmentDensityMap2FeaturesEXT)); deMemset(&deviceShaderIntegerDotProductFeaturesKHR[ndx],0xFF * ndx, sizeof(VkPhysicalDeviceShaderIntegerDotProductFeaturesKHR)); - deviceConditionalRenderingFeaturesEXT[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT; + deviceConditionalRenderingFeaturesEXT[ndx].sType = isConditionalRenderingFeaturesEXT ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT : VK_STRUCTURE_TYPE_MAX_ENUM; deviceConditionalRenderingFeaturesEXT[ndx].pNext = &deviceScalarBlockLayoutFeatures[ndx]; - deviceScalarBlockLayoutFeatures[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES; + deviceScalarBlockLayoutFeatures[ndx].sType = isScalarBlockLayoutFeatures ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES : VK_STRUCTURE_TYPE_MAX_ENUM; deviceScalarBlockLayoutFeatures[ndx].pNext = &devicePerformanceQueryFeaturesKHR[ndx]; - devicePerformanceQueryFeaturesKHR[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_QUERY_FEATURES_KHR; + devicePerformanceQueryFeaturesKHR[ndx].sType = isPerformanceQueryFeaturesKHR ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_QUERY_FEATURES_KHR : VK_STRUCTURE_TYPE_MAX_ENUM; devicePerformanceQueryFeaturesKHR[ndx].pNext = &device16BitStorageFeatures[ndx]; - device16BitStorageFeatures[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES; + device16BitStorageFeatures[ndx].sType = is16BitStorageFeatures ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES : VK_STRUCTURE_TYPE_MAX_ENUM; device16BitStorageFeatures[ndx].pNext = &deviceMultiviewFeatures[ndx]; - deviceMultiviewFeatures[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES; + deviceMultiviewFeatures[ndx].sType = isMultiviewFeatures ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES : VK_STRUCTURE_TYPE_MAX_ENUM; deviceMultiviewFeatures[ndx].pNext = &deviceProtectedMemoryFeatures[ndx]; - deviceProtectedMemoryFeatures[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES; + deviceProtectedMemoryFeatures[ndx].sType = isProtectedMemoryFeatures ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES : VK_STRUCTURE_TYPE_MAX_ENUM; deviceProtectedMemoryFeatures[ndx].pNext = &deviceSamplerYcbcrConversionFeatures[ndx]; - deviceSamplerYcbcrConversionFeatures[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES; + deviceSamplerYcbcrConversionFeatures[ndx].sType = isSamplerYcbcrConversionFeatures ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES : VK_STRUCTURE_TYPE_MAX_ENUM; deviceSamplerYcbcrConversionFeatures[ndx].pNext = &deviceVariablePointersFeatures[ndx]; - deviceVariablePointersFeatures[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES; + deviceVariablePointersFeatures[ndx].sType = isVariablePointersFeatures ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES : VK_STRUCTURE_TYPE_MAX_ENUM; deviceVariablePointersFeatures[ndx].pNext = &device8BitStorageFeatures[ndx]; - device8BitStorageFeatures[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES; + device8BitStorageFeatures[ndx].sType = is8BitStorageFeatures ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES : VK_STRUCTURE_TYPE_MAX_ENUM; device8BitStorageFeatures[ndx].pNext = &deviceShaderAtomicInt64Features[ndx]; - deviceShaderAtomicInt64Features[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES; + deviceShaderAtomicInt64Features[ndx].sType = isShaderAtomicInt64Features ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES : VK_STRUCTURE_TYPE_MAX_ENUM; deviceShaderAtomicInt64Features[ndx].pNext = &deviceShaderFloat16Int8Features[ndx]; - deviceShaderFloat16Int8Features[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES; + deviceShaderFloat16Int8Features[ndx].sType = isShaderFloat16Int8Features ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES : VK_STRUCTURE_TYPE_MAX_ENUM; deviceShaderFloat16Int8Features[ndx].pNext = &deviceBufferDeviceAddressFeaturesEXT[ndx]; - deviceBufferDeviceAddressFeaturesEXT[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES_EXT; + deviceBufferDeviceAddressFeaturesEXT[ndx].sType = isBufferDeviceAddressFeaturesEXT ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES_EXT : VK_STRUCTURE_TYPE_MAX_ENUM; deviceBufferDeviceAddressFeaturesEXT[ndx].pNext = &deviceBufferDeviceAddressFeatures[ndx]; - deviceBufferDeviceAddressFeatures[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES; + deviceBufferDeviceAddressFeatures[ndx].sType = isBufferDeviceAddressFeatures ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES : VK_STRUCTURE_TYPE_MAX_ENUM; deviceBufferDeviceAddressFeatures[ndx].pNext = &deviceDescriptorIndexingFeatures[ndx]; - deviceDescriptorIndexingFeatures[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES; + deviceDescriptorIndexingFeatures[ndx].sType = isDescriptorIndexingFeatures ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES : VK_STRUCTURE_TYPE_MAX_ENUM; deviceDescriptorIndexingFeatures[ndx].pNext = &deviceTimelineSemaphoreFeatures[ndx]; - deviceTimelineSemaphoreFeatures[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES; + deviceTimelineSemaphoreFeatures[ndx].sType = isTimelineSemaphoreFeatures ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES : VK_STRUCTURE_TYPE_MAX_ENUM; deviceTimelineSemaphoreFeatures[ndx].pNext = &deviceFragmentDensityMapFeaturesEXT[ndx]; - deviceFragmentDensityMapFeaturesEXT[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_EXT; + deviceFragmentDensityMapFeaturesEXT[ndx].sType = isFragmentDensityMapFeaturesEXT ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_EXT : VK_STRUCTURE_TYPE_MAX_ENUM; deviceFragmentDensityMapFeaturesEXT[ndx].pNext = &deviceFragmentDensityMap2FeaturesEXT[ndx]; - deviceFragmentDensityMap2FeaturesEXT[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_FEATURES_EXT; + deviceFragmentDensityMap2FeaturesEXT[ndx].sType = isFragmentDensityMap2FeaturesEXT ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_FEATURES_EXT : VK_STRUCTURE_TYPE_MAX_ENUM; deviceFragmentDensityMap2FeaturesEXT[ndx].pNext = &deviceShaderIntegerDotProductFeaturesKHR[ndx]; - deviceShaderIntegerDotProductFeaturesKHR[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES_KHR; + deviceShaderIntegerDotProductFeaturesKHR[ndx].sType = isShaderIntegerDotProductFeaturesKHR ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES_KHR : VK_STRUCTURE_TYPE_MAX_ENUM; deviceShaderIntegerDotProductFeaturesKHR[ndx].pNext = DE_NULL; deMemset(&extFeatures.features, 0xcd, sizeof(extFeatures.features)); diff --git a/external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDecl.inl b/external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDecl.inl index 0526adbe8..c67a87d14 100644 --- a/external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDecl.inl +++ b/external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDecl.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ const vk::VkPhysicalDevice16BitStorageFeatures& get16BitStorageFeatures (void) const; const vk::VkPhysicalDevice4444FormatsFeaturesEXT& get4444FormatsFeaturesEXT (void) const; diff --git a/external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDefs.inl b/external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDefs.inl index d4725a2ab..d9e201882 100644 --- a/external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDefs.inl +++ b/external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDefs.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ const vk::VkPhysicalDevice16BitStorageFeatures& Context::get16BitStorageFeatures (void) const { return m_device->get16BitStorageFeatures(); } const vk::VkPhysicalDevice4444FormatsFeaturesEXT& Context::get4444FormatsFeaturesEXT (void) const { return m_device->get4444FormatsFeaturesEXT(); } diff --git a/external/vulkancts/framework/vulkan/vkDeviceFeaturesForDefaultDeviceDefs.inl b/external/vulkancts/framework/vulkan/vkDeviceFeaturesForDefaultDeviceDefs.inl index 7a8df78d4..2ad7aae79 100644 --- a/external/vulkancts/framework/vulkan/vkDeviceFeaturesForDefaultDeviceDefs.inl +++ b/external/vulkancts/framework/vulkan/vkDeviceFeaturesForDefaultDeviceDefs.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ const VkPhysicalDevice16BitStorageFeatures& get16BitStorageFeatures (void) const { return m_deviceFeatures.getFeatureType<VkPhysicalDevice16BitStorageFeatures>(); } const VkPhysicalDevice4444FormatsFeaturesEXT& get4444FormatsFeaturesEXT (void) const { return m_deviceFeatures.getFeatureType<VkPhysicalDevice4444FormatsFeaturesEXT>(); } diff --git a/external/vulkancts/framework/vulkan/vkDeviceFunctionPointers.inl b/external/vulkancts/framework/vulkan/vkDeviceFunctionPointers.inl index c48da3e01..ebc3e6d32 100644 --- a/external/vulkancts/framework/vulkan/vkDeviceFunctionPointers.inl +++ b/external/vulkancts/framework/vulkan/vkDeviceFunctionPointers.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ GetDeviceProcAddrFunc getDeviceProcAddr; DestroyDeviceFunc destroyDevice; diff --git a/external/vulkancts/framework/vulkan/vkDeviceProperties.inl b/external/vulkancts/framework/vulkan/vkDeviceProperties.inl index 42d0c81bf..20475ad9f 100644 --- a/external/vulkancts/framework/vulkan/vkDeviceProperties.inl +++ b/external/vulkancts/framework/vulkan/vkDeviceProperties.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ #include "vkDeviceProperties.hpp" diff --git a/external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDecl.inl b/external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDecl.inl index 5e7960aa9..ec8e02f4b 100644 --- a/external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDecl.inl +++ b/external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDecl.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ const vk::VkPhysicalDeviceAccelerationStructurePropertiesKHR& getAccelerationStructureProperties (void) const; const vk::VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT& getBlendOperationAdvancedPropertiesEXT (void) const; diff --git a/external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDefs.inl b/external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDefs.inl index b5ec8b253..b6dc6826a 100644 --- a/external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDefs.inl +++ b/external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDefs.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ const vk::VkPhysicalDeviceAccelerationStructurePropertiesKHR& Context::getAccelerationStructureProperties (void) const { return m_device->getAccelerationStructureProperties(); } const vk::VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT& Context::getBlendOperationAdvancedPropertiesEXT (void) const { return m_device->getBlendOperationAdvancedPropertiesEXT(); } diff --git a/external/vulkancts/framework/vulkan/vkDevicePropertiesForDefaultDeviceDefs.inl b/external/vulkancts/framework/vulkan/vkDevicePropertiesForDefaultDeviceDefs.inl index bbd3cd6a7..63512692d 100644 --- a/external/vulkancts/framework/vulkan/vkDevicePropertiesForDefaultDeviceDefs.inl +++ b/external/vulkancts/framework/vulkan/vkDevicePropertiesForDefaultDeviceDefs.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ const VkPhysicalDeviceAccelerationStructurePropertiesKHR& getAccelerationStructureProperties (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceAccelerationStructurePropertiesKHR>(); } const VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT& getBlendOperationAdvancedPropertiesEXT (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT>(); } diff --git a/external/vulkancts/framework/vulkan/vkExtensionFunctions.inl b/external/vulkancts/framework/vulkan/vkExtensionFunctions.inl index c75bf6f24..d4fc47bfd 100644 --- a/external/vulkancts/framework/vulkan/vkExtensionFunctions.inl +++ b/external/vulkancts/framework/vulkan/vkExtensionFunctions.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ void getInstanceExtensionFunctions (deUint32 apiVersion, ::std::string extName, ::std::vector<const char*>& functions) diff --git a/external/vulkancts/framework/vulkan/vkFunctionPointerTypes.inl b/external/vulkancts/framework/vulkan/vkFunctionPointerTypes.inl index e85e72ded..d0c7c0d8b 100644 --- a/external/vulkancts/framework/vulkan/vkFunctionPointerTypes.inl +++ b/external/vulkancts/framework/vulkan/vkFunctionPointerTypes.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ typedef VKAPI_ATTR VkResult (VKAPI_CALL* CreateInstanceFunc) (const VkInstanceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkInstance* pInstance); typedef VKAPI_ATTR void (VKAPI_CALL* DestroyInstanceFunc) (VkInstance instance, const VkAllocationCallbacks* pAllocator); diff --git a/external/vulkancts/framework/vulkan/vkGetStructureTypeImpl.inl b/external/vulkancts/framework/vulkan/vkGetStructureTypeImpl.inl index 834770992..bf9425d1d 100644 --- a/external/vulkancts/framework/vulkan/vkGetStructureTypeImpl.inl +++ b/external/vulkancts/framework/vulkan/vkGetStructureTypeImpl.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ template<> VkStructureType getStructureType<VkBufferMemoryBarrier> (void) { diff --git a/external/vulkancts/framework/vulkan/vkHandleType.inl b/external/vulkancts/framework/vulkan/vkHandleType.inl index b45d6c624..0f7bb7620 100644 --- a/external/vulkancts/framework/vulkan/vkHandleType.inl +++ b/external/vulkancts/framework/vulkan/vkHandleType.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ enum HandleType { diff --git a/external/vulkancts/framework/vulkan/vkInitDeviceFunctionPointers.inl b/external/vulkancts/framework/vulkan/vkInitDeviceFunctionPointers.inl index c98a0ec30..b453f2fca 100644 --- a/external/vulkancts/framework/vulkan/vkInitDeviceFunctionPointers.inl +++ b/external/vulkancts/framework/vulkan/vkInitDeviceFunctionPointers.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ m_vk.getDeviceProcAddr = (GetDeviceProcAddrFunc) GET_PROC_ADDR("vkGetDeviceProcAddr"); m_vk.destroyDevice = (DestroyDeviceFunc) GET_PROC_ADDR("vkDestroyDevice"); diff --git a/external/vulkancts/framework/vulkan/vkInitInstanceFunctionPointers.inl b/external/vulkancts/framework/vulkan/vkInitInstanceFunctionPointers.inl index 9f93b6d4b..de67b1d44 100644 --- a/external/vulkancts/framework/vulkan/vkInitInstanceFunctionPointers.inl +++ b/external/vulkancts/framework/vulkan/vkInitInstanceFunctionPointers.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ m_vk.destroyInstance = (DestroyInstanceFunc) GET_PROC_ADDR("vkDestroyInstance"); m_vk.enumeratePhysicalDevices = (EnumeratePhysicalDevicesFunc) GET_PROC_ADDR("vkEnumeratePhysicalDevices"); diff --git a/external/vulkancts/framework/vulkan/vkInitPlatformFunctionPointers.inl b/external/vulkancts/framework/vulkan/vkInitPlatformFunctionPointers.inl index ce20970b8..506f047c5 100644 --- a/external/vulkancts/framework/vulkan/vkInitPlatformFunctionPointers.inl +++ b/external/vulkancts/framework/vulkan/vkInitPlatformFunctionPointers.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ m_vk.createInstance = (CreateInstanceFunc) GET_PROC_ADDR("vkCreateInstance"); m_vk.enumerateInstanceExtensionProperties = (EnumerateInstanceExtensionPropertiesFunc) GET_PROC_ADDR("vkEnumerateInstanceExtensionProperties"); diff --git a/external/vulkancts/framework/vulkan/vkInstanceDriverImpl.inl b/external/vulkancts/framework/vulkan/vkInstanceDriverImpl.inl index 3e210584f..a8bb1d75e 100644 --- a/external/vulkancts/framework/vulkan/vkInstanceDriverImpl.inl +++ b/external/vulkancts/framework/vulkan/vkInstanceDriverImpl.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ void InstanceDriver::destroyInstance (VkInstance instance, const VkAllocationCallbacks* pAllocator) const diff --git a/external/vulkancts/framework/vulkan/vkInstanceExtensions.inl b/external/vulkancts/framework/vulkan/vkInstanceExtensions.inl index 0565e6410..da1c154b6 100644 --- a/external/vulkancts/framework/vulkan/vkInstanceExtensions.inl +++ b/external/vulkancts/framework/vulkan/vkInstanceExtensions.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ static const char* s_allowedInstanceKhrExtensions[] = { diff --git a/external/vulkancts/framework/vulkan/vkInstanceFunctionPointers.inl b/external/vulkancts/framework/vulkan/vkInstanceFunctionPointers.inl index 9355e3300..82e7841bd 100644 --- a/external/vulkancts/framework/vulkan/vkInstanceFunctionPointers.inl +++ b/external/vulkancts/framework/vulkan/vkInstanceFunctionPointers.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ DestroyInstanceFunc destroyInstance; EnumeratePhysicalDevicesFunc enumeratePhysicalDevices; diff --git a/external/vulkancts/framework/vulkan/vkKnownDriverIds.inl b/external/vulkancts/framework/vulkan/vkKnownDriverIds.inl index 624d140bd..cde343e87 100644 --- a/external/vulkancts/framework/vulkan/vkKnownDriverIds.inl +++ b/external/vulkancts/framework/vulkan/vkKnownDriverIds.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ static const struct { diff --git a/external/vulkancts/framework/vulkan/vkMandatoryFeatures.inl b/external/vulkancts/framework/vulkan/vkMandatoryFeatures.inl index 10bab721b..7558037ba 100644 --- a/external/vulkancts/framework/vulkan/vkMandatoryFeatures.inl +++ b/external/vulkancts/framework/vulkan/vkMandatoryFeatures.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ bool checkMandatoryFeatures(const vkt::Context& context) { diff --git a/external/vulkancts/framework/vulkan/vkNullDriver.cpp b/external/vulkancts/framework/vulkan/vkNullDriver.cpp index b0dfceabf..c0007044e 100644 --- a/external/vulkancts/framework/vulkan/vkNullDriver.cpp +++ b/external/vulkancts/framework/vulkan/vkNullDriver.cpp @@ -18,7 +18,7 @@ * *//*! * \file - * \brief Null (dummy) Vulkan implementation. + * \brief Null (do-nothing) Vulkan implementation. *//*--------------------------------------------------------------------*/ #include "vkNullDriver.hpp" diff --git a/external/vulkancts/framework/vulkan/vkNullDriver.hpp b/external/vulkancts/framework/vulkan/vkNullDriver.hpp index 16c0be550..193542f50 100644 --- a/external/vulkancts/framework/vulkan/vkNullDriver.hpp +++ b/external/vulkancts/framework/vulkan/vkNullDriver.hpp @@ -20,7 +20,7 @@ * *//*! * \file - * \brief Null (dummy) Vulkan implementation. + * \brief Null (do-nothing) Vulkan implementation. *//*--------------------------------------------------------------------*/ #include "vkDefs.hpp" diff --git a/external/vulkancts/framework/vulkan/vkNullDriverImpl.inl b/external/vulkancts/framework/vulkan/vkNullDriverImpl.inl index 589b38f60..34e267646 100644 --- a/external/vulkancts/framework/vulkan/vkNullDriverImpl.inl +++ b/external/vulkancts/framework/vulkan/vkNullDriverImpl.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ VKAPI_ATTR VkResult VKAPI_CALL createInstance (const VkInstanceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkInstance* pInstance) { diff --git a/external/vulkancts/framework/vulkan/vkObjTypeImpl.inl b/external/vulkancts/framework/vulkan/vkObjTypeImpl.inl index 10bc0ed00..c905228a1 100644 --- a/external/vulkancts/framework/vulkan/vkObjTypeImpl.inl +++ b/external/vulkancts/framework/vulkan/vkObjTypeImpl.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ namespace vk { diff --git a/external/vulkancts/framework/vulkan/vkPlatformDriverImpl.inl b/external/vulkancts/framework/vulkan/vkPlatformDriverImpl.inl index 07880fec9..a0d9bf251 100644 --- a/external/vulkancts/framework/vulkan/vkPlatformDriverImpl.inl +++ b/external/vulkancts/framework/vulkan/vkPlatformDriverImpl.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ VkResult PlatformDriver::createInstance (const VkInstanceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkInstance* pInstance) const diff --git a/external/vulkancts/framework/vulkan/vkPlatformFunctionPointers.inl b/external/vulkancts/framework/vulkan/vkPlatformFunctionPointers.inl index 62c6b14a5..01009288a 100644 --- a/external/vulkancts/framework/vulkan/vkPlatformFunctionPointers.inl +++ b/external/vulkancts/framework/vulkan/vkPlatformFunctionPointers.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ CreateInstanceFunc createInstance; GetInstanceProcAddrFunc getInstanceProcAddr; diff --git a/external/vulkancts/framework/vulkan/vkRefUtil.inl b/external/vulkancts/framework/vulkan/vkRefUtil.inl index 5df489b82..a5778957e 100644 --- a/external/vulkancts/framework/vulkan/vkRefUtil.inl +++ b/external/vulkancts/framework/vulkan/vkRefUtil.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ Move<VkInstance> createInstance (const PlatformInterface& vk, const VkInstanceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator = DE_NULL); Move<VkDevice> createDevice (const PlatformInterface& vkp, VkInstance instance, const InstanceInterface& vk, VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator = DE_NULL); diff --git a/external/vulkancts/framework/vulkan/vkRefUtilImpl.inl b/external/vulkancts/framework/vulkan/vkRefUtilImpl.inl index 74f4ccf9e..db8a0058a 100644 --- a/external/vulkancts/framework/vulkan/vkRefUtilImpl.inl +++ b/external/vulkancts/framework/vulkan/vkRefUtilImpl.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ namespace refdetails { diff --git a/external/vulkancts/framework/vulkan/vkStrUtil.inl b/external/vulkancts/framework/vulkan/vkStrUtil.inl index 44b3adf6e..a22df169d 100644 --- a/external/vulkancts/framework/vulkan/vkStrUtil.inl +++ b/external/vulkancts/framework/vulkan/vkStrUtil.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ const char* getResultName (VkResult value); const char* getStructureTypeName (VkStructureType value); diff --git a/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl b/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl index 81831306f..4cef19ae5 100644 --- a/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl +++ b/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ template<> const char* getTypeName<VkBuffer> (void) { return "VkBuffer"; } template<> const char* getTypeName<VkImage> (void) { return "VkImage"; } diff --git a/external/vulkancts/framework/vulkan/vkStructTypes.inl b/external/vulkancts/framework/vulkan/vkStructTypes.inl index 4f4b0695c..7e5866cca 100644 --- a/external/vulkancts/framework/vulkan/vkStructTypes.inl +++ b/external/vulkancts/framework/vulkan/vkStructTypes.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ struct VkExtent2D { diff --git a/external/vulkancts/framework/vulkan/vkSupportedExtensions.inl b/external/vulkancts/framework/vulkan/vkSupportedExtensions.inl index 0b5096659..c56fdd384 100644 --- a/external/vulkancts/framework/vulkan/vkSupportedExtensions.inl +++ b/external/vulkancts/framework/vulkan/vkSupportedExtensions.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ void getCoreDeviceExtensionsImpl (deUint32 coreVersion, ::std::vector<const char*>& dst) diff --git a/external/vulkancts/framework/vulkan/vkTypeUtil.inl b/external/vulkancts/framework/vulkan/vkTypeUtil.inl index 86807f9cb..9484ce84b 100644 --- a/external/vulkancts/framework/vulkan/vkTypeUtil.inl +++ b/external/vulkancts/framework/vulkan/vkTypeUtil.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ inline VkExtent2D makeExtent2D (deUint32 width, deUint32 height) diff --git a/external/vulkancts/framework/vulkan/vkVirtualDeviceInterface.inl b/external/vulkancts/framework/vulkan/vkVirtualDeviceInterface.inl index 9d5f13415..73fbb51c0 100644 --- a/external/vulkancts/framework/vulkan/vkVirtualDeviceInterface.inl +++ b/external/vulkancts/framework/vulkan/vkVirtualDeviceInterface.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ virtual PFN_vkVoidFunction getDeviceProcAddr (VkDevice device, const char* pName) const = 0; virtual void destroyDevice (VkDevice device, const VkAllocationCallbacks* pAllocator) const = 0; diff --git a/external/vulkancts/framework/vulkan/vkVirtualInstanceInterface.inl b/external/vulkancts/framework/vulkan/vkVirtualInstanceInterface.inl index 6ec77273f..3c4030bf8 100644 --- a/external/vulkancts/framework/vulkan/vkVirtualInstanceInterface.inl +++ b/external/vulkancts/framework/vulkan/vkVirtualInstanceInterface.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ virtual void destroyInstance (VkInstance instance, const VkAllocationCallbacks* pAllocator) const = 0; virtual VkResult enumeratePhysicalDevices (VkInstance instance, deUint32* pPhysicalDeviceCount, VkPhysicalDevice* pPhysicalDevices) const = 0; diff --git a/external/vulkancts/framework/vulkan/vkVirtualPlatformInterface.inl b/external/vulkancts/framework/vulkan/vkVirtualPlatformInterface.inl index 3e71695d6..d60b752b0 100644 --- a/external/vulkancts/framework/vulkan/vkVirtualPlatformInterface.inl +++ b/external/vulkancts/framework/vulkan/vkVirtualPlatformInterface.inl @@ -1,5 +1,6 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */ virtual VkResult createInstance (const VkInstanceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkInstance* pInstance) const = 0; virtual PFN_vkVoidFunction getInstanceProcAddr (VkInstance instance, const char* pName) const = 0; diff --git a/external/vulkancts/modules/vulkan/api/vktApiBufferTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiBufferTests.cpp index 97cf06259..fb314f451 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiBufferTests.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiBufferTests.cpp @@ -691,8 +691,6 @@ tcu::TestStatus testOverlyLargeBuffer(Context& context, deUint64 bufferSize) return tcu::TestStatus::fail("Fail"); } - vk.destroyBuffer(vkDevice, rawBuffer, DE_NULL); - // check if one of the allowed errors was returned if ((result == VK_ERROR_OUT_OF_DEVICE_MEMORY) || (result == VK_ERROR_OUT_OF_HOST_MEMORY)) diff --git a/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp index 9196af561..ec295e417 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp @@ -549,7 +549,7 @@ void checkImageSupport (const vk::InstanceInterface& vki, TCU_THROW(NotSupportedError, "External handle type requires dedicated allocation"); } -void submitDummySignal (const vk::DeviceInterface& vkd, +void submitEmptySignal (const vk::DeviceInterface& vkd, vk::VkQueue queue, vk::VkSemaphore semaphore) { @@ -572,7 +572,7 @@ void submitDummySignal (const vk::DeviceInterface& vkd, VK_CHECK(vkd.queueSubmit(queue, 1, &submit, (vk::VkFence)0u)); } -void submitDummySignalAndGetSemaphoreNative ( const vk::DeviceInterface& vk, +void submitEmptySignalAndGetSemaphoreNative ( const vk::DeviceInterface& vk, vk::VkDevice device, vk::VkQueue queue, deUint32 queueFamilyIndex, @@ -602,7 +602,7 @@ void submitDummySignalAndGetSemaphoreNative ( const vk::DeviceInterface& vk VK_CHECK(vk.beginCommandBuffer(*cmdBuffer, &cmdBufferBeginInfo)); /* - The submitDummySignal function calls vkQueueSubmit with an empty VkSubmitInfo structure and a + The submitEmptySignal function calls vkQueueSubmit with an empty VkSubmitInfo structure and a VkSemaphore to be signalled when the work is finished. Because there is no work in the submission, vkQueueSubmit may signal the semaphore immediately. When a semaphore's file descriptor is obtained using vkGetFenceFdKHR, if the handle type is VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT_KHR, vkGetFenceFdKHR is allowed to return -1 if the fence @@ -637,7 +637,7 @@ void submitDummySignalAndGetSemaphoreNative ( const vk::DeviceInterface& vk VK_CHECK(vk.queueWaitIdle(queue)); } -void submitDummyWait (const vk::DeviceInterface& vkd, +void submitEmptyWait (const vk::DeviceInterface& vkd, vk::VkQueue queue, vk::VkSemaphore semaphore) { @@ -661,7 +661,7 @@ void submitDummyWait (const vk::DeviceInterface& vkd, VK_CHECK(vkd.queueSubmit(queue, 1, &submit, (vk::VkFence)0u)); } -void submitDummySignal (const vk::DeviceInterface& vkd, +void submitEmptySignal (const vk::DeviceInterface& vkd, vk::VkQueue queue, vk::VkFence fence) { @@ -684,7 +684,7 @@ void submitDummySignal (const vk::DeviceInterface& vkd, VK_CHECK(vkd.queueSubmit(queue, 1, &submit, fence)); } -void submitDummySignalAndGetFenceNative ( const vk::DeviceInterface& vk, +void submitEmptySignalAndGetFenceNative ( const vk::DeviceInterface& vk, vk::VkDevice device, vk::VkQueue queue, deUint32 queueFamilyIndex, @@ -715,7 +715,7 @@ void submitDummySignalAndGetFenceNative ( const vk::DeviceInterface& vk, VK_CHECK(vk.beginCommandBuffer(*cmdBuffer, &cmdBufferBeginInfo)); /* - The submitDummySignal function calls vkQueueSubmit with an empty VkSubmitInfo structure and a + The submitEmptySignal function calls vkQueueSubmit with an empty VkSubmitInfo structure and a VkFence to be signalled when the work is finished. Because there is no work in the submission, vkQueueSubmit could signal the fence immediately. When a fence's file descriptor is obtained using vkGetFenceFdKHR, if the handle type is VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT_KHR, vkGetFenceFdKHR is allowed to return -1 instead of a @@ -836,7 +836,7 @@ tcu::TestStatus testSemaphoreWin32Create (Context& context, const vk::Unique<vk::VkSemaphore> semaphore (vk::createSemaphore(vkd, *device, &createInfo)); if (transference == TRANSFERENCE_COPY) - submitDummySignal(vkd, queue, *semaphore); + submitEmptySignal(vkd, queue, *semaphore); NativeHandle handleA; getSemaphoreNative(vkd, *device, *semaphore, config.externalType, handleA); @@ -846,11 +846,11 @@ tcu::TestStatus testSemaphoreWin32Create (Context& context, const vk::Unique<vk::VkSemaphore> semaphoreA (createAndImportSemaphore(vkd, *device, config.externalType, handleA, flags)); if (transference == TRANSFERENCE_COPY) - submitDummyWait(vkd, queue, *semaphoreA); + submitEmptyWait(vkd, queue, *semaphoreA); else if (transference == TRANSFERENCE_REFERENCE) { - submitDummySignal(vkd, queue, *semaphore); - submitDummyWait(vkd, queue, *semaphoreA); + submitEmptySignal(vkd, queue, *semaphore); + submitEmptyWait(vkd, queue, *semaphoreA); } else DE_FATAL("Unknown transference."); @@ -887,7 +887,7 @@ tcu::TestStatus testSemaphoreImportTwice (Context& context, NativeHandle handleA; if (transference == TRANSFERENCE_COPY) - submitDummySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphore, config.externalType, handleA); + submitEmptySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphore, config.externalType, handleA); else getSemaphoreNative(vkd, *device, *semaphore, config.externalType, handleA); @@ -898,11 +898,11 @@ tcu::TestStatus testSemaphoreImportTwice (Context& context, const vk::Unique<vk::VkSemaphore> semaphoreB (createAndImportSemaphore(vkd, *device, config.externalType, handleB, flags)); if (transference == TRANSFERENCE_COPY) - submitDummyWait(vkd, queue, *semaphoreA); + submitEmptyWait(vkd, queue, *semaphoreA); else if (transference == TRANSFERENCE_REFERENCE) { - submitDummySignal(vkd, queue, *semaphoreA); - submitDummyWait(vkd, queue, *semaphoreB); + submitEmptySignal(vkd, queue, *semaphoreA); + submitEmptyWait(vkd, queue, *semaphoreB); } else DE_FATAL("Unknown transference."); @@ -935,7 +935,7 @@ tcu::TestStatus testSemaphoreImportReimport (Context& context, NativeHandle handleA; if (transference == TRANSFERENCE_COPY) - submitDummySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphoreA, config.externalType, handleA); + submitEmptySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphoreA, config.externalType, handleA); else getSemaphoreNative(vkd, *device, *semaphoreA, config.externalType, handleA); @@ -946,11 +946,11 @@ tcu::TestStatus testSemaphoreImportReimport (Context& context, importSemaphore(vkd, *device, *semaphoreB, config.externalType, handleB, flags); if (transference == TRANSFERENCE_COPY) - submitDummyWait(vkd, queue, *semaphoreB); + submitEmptyWait(vkd, queue, *semaphoreB); else if (transference == TRANSFERENCE_REFERENCE) { - submitDummySignal(vkd, queue, *semaphoreA); - submitDummyWait(vkd, queue, *semaphoreB); + submitEmptySignal(vkd, queue, *semaphoreA); + submitEmptyWait(vkd, queue, *semaphoreB); } else DE_FATAL("Unknown transference."); @@ -980,12 +980,12 @@ tcu::TestStatus testSemaphoreSignalExportImportWait (Context& context, { NativeHandle handle; - submitDummySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphoreA, config.externalType, handle); + submitEmptySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphoreA, config.externalType, handle); { const vk::VkSemaphoreImportFlags flags = config.permanence == PERMANENCE_TEMPORARY ? vk::VK_SEMAPHORE_IMPORT_TEMPORARY_BIT : (vk::VkSemaphoreImportFlagBits)0u; const vk::Unique<vk::VkSemaphore> semaphoreB (createAndImportSemaphore(vkd, *device, config.externalType, handle, flags)); - submitDummyWait(vkd, queue, *semaphoreB); + submitEmptyWait(vkd, queue, *semaphoreB); VK_CHECK(vkd.queueWaitIdle(queue)); } @@ -1018,12 +1018,12 @@ tcu::TestStatus testSemaphoreExportSignalImportWait (Context& context, getSemaphoreNative(vkd, *device, *semaphoreA, config.externalType, handle); - submitDummySignal(vkd, queue, *semaphoreA); + submitEmptySignal(vkd, queue, *semaphoreA); { { const vk::Unique<vk::VkSemaphore> semaphoreB (createAndImportSemaphore(vkd, *device, config.externalType, handle, flags)); - submitDummyWait(vkd, queue, *semaphoreB); + submitEmptyWait(vkd, queue, *semaphoreB); VK_CHECK(vkd.queueWaitIdle(queue)); } } @@ -1053,12 +1053,12 @@ tcu::TestStatus testSemaphoreExportImportSignalWait (Context& context, const vk::Unique<vk::VkSemaphore> semaphoreA (createExportableSemaphore(vkd, *device, config.externalType)); NativeHandle handle; - submitDummySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphoreA, config.externalType, handle); + submitEmptySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphoreA, config.externalType, handle); const vk::Unique<vk::VkSemaphore> semaphoreB (createAndImportSemaphore(vkd, *device, config.externalType, handle, flags)); - submitDummySignal(vkd, queue, *semaphoreA); - submitDummyWait(vkd, queue, *semaphoreB); + submitEmptySignal(vkd, queue, *semaphoreA); + submitEmptyWait(vkd, queue, *semaphoreB); VK_CHECK(vkd.queueWaitIdle(queue)); @@ -1088,22 +1088,22 @@ tcu::TestStatus testSemaphoreSignalImport (Context& context, const vk::Unique<vk::VkSemaphore> semaphoreB (createSemaphore(vkd, *device)); NativeHandle handle; - submitDummySignal(vkd, queue, *semaphoreB); + submitEmptySignal(vkd, queue, *semaphoreB); VK_CHECK(vkd.queueWaitIdle(queue)); if (transference == TRANSFERENCE_COPY) - submitDummySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphoreA, config.externalType, handle); + submitEmptySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphoreA, config.externalType, handle); else getSemaphoreNative(vkd, *device, *semaphoreA, config.externalType, handle); importSemaphore(vkd, *device, *semaphoreB, config.externalType, handle, flags); if (transference == TRANSFERENCE_COPY) - submitDummyWait(vkd, queue, *semaphoreB); + submitEmptyWait(vkd, queue, *semaphoreB); else if (transference == TRANSFERENCE_REFERENCE) { - submitDummySignal(vkd, queue, *semaphoreA); - submitDummyWait(vkd, queue, *semaphoreB); + submitEmptySignal(vkd, queue, *semaphoreA); + submitEmptyWait(vkd, queue, *semaphoreB); } else DE_FATAL("Unknown transference."); @@ -1137,23 +1137,23 @@ tcu::TestStatus testSemaphoreSignalWaitImport (Context& context, NativeHandle handle; if (transference == TRANSFERENCE_COPY) - submitDummySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphoreA, config.externalType, handle); + submitEmptySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphoreA, config.externalType, handle); else getSemaphoreNative(vkd, *device, *semaphoreA, config.externalType, handle); - submitDummySignal(vkd, queue, *semaphoreB); - submitDummyWait(vkd, queue, *semaphoreB); + submitEmptySignal(vkd, queue, *semaphoreB); + submitEmptyWait(vkd, queue, *semaphoreB); VK_CHECK(vkd.queueWaitIdle(queue)); importSemaphore(vkd, *device, *semaphoreB, config.externalType, handle, flags); if (transference == TRANSFERENCE_COPY) - submitDummyWait(vkd, queue, *semaphoreB); + submitEmptyWait(vkd, queue, *semaphoreB); else if (transference == TRANSFERENCE_REFERENCE) { - submitDummySignal(vkd, queue, *semaphoreA); - submitDummyWait(vkd, queue, *semaphoreB); + submitEmptySignal(vkd, queue, *semaphoreA); + submitEmptyWait(vkd, queue, *semaphoreB); } else DE_FATAL("Unknown transference."); @@ -1183,7 +1183,7 @@ tcu::TestStatus testSemaphoreImportSyncFdSignaled (Context& context, NativeHandle handle = -1; const vk::Unique<vk::VkSemaphore> semaphore (createAndImportSemaphore(vkd, *device, config.externalType, handle, flags)); - submitDummyWait(vkd, queue, *semaphore); + submitEmptyWait(vkd, queue, *semaphore); return tcu::TestStatus::pass("Pass"); } @@ -1213,13 +1213,13 @@ tcu::TestStatus testSemaphoreMultipleExports (Context& context, NativeHandle handle; if (transference == TRANSFERENCE_COPY) - submitDummySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphore, config.externalType, handle); + submitEmptySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphore, config.externalType, handle); else getSemaphoreNative(vkd, *device, *semaphore, config.externalType, handle); } - submitDummySignal(vkd, queue, *semaphore); - submitDummyWait(vkd, queue, *semaphore); + submitEmptySignal(vkd, queue, *semaphore); + submitEmptyWait(vkd, queue, *semaphore); VK_CHECK(vkd.queueWaitIdle(queue)); } @@ -1249,7 +1249,7 @@ tcu::TestStatus testSemaphoreMultipleImports (Context& context, NativeHandle handleA; if (transference == TRANSFERENCE_COPY) - submitDummySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphoreA, config.externalType, handleA); + submitEmptySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphoreA, config.externalType, handleA); else getSemaphoreNative(vkd, *device, *semaphoreA, config.externalType, handleA); @@ -1262,12 +1262,12 @@ tcu::TestStatus testSemaphoreMultipleImports (Context& context, if (transference == TRANSFERENCE_COPY) { importSemaphore(vkd, *device, *semaphoreA, config.externalType, handleA, flags); - submitDummyWait(vkd, queue, *semaphoreA); + submitEmptyWait(vkd, queue, *semaphoreA); } else if (transference == TRANSFERENCE_REFERENCE) { - submitDummySignal(vkd, queue, *semaphoreA); - submitDummyWait(vkd, queue, *semaphoreA); + submitEmptySignal(vkd, queue, *semaphoreA); + submitEmptyWait(vkd, queue, *semaphoreA); } else DE_FATAL("Unknown transference."); @@ -1299,7 +1299,7 @@ tcu::TestStatus testSemaphoreTransference (Context& context, const vk::Unique<vk::VkSemaphore> semaphoreA (createExportableSemaphore(vkd, *device, config.externalType)); NativeHandle handle; - submitDummySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphoreA, config.externalType, handle); + submitEmptySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphoreA, config.externalType, handle); { const vk::Unique<vk::VkSemaphore> semaphoreB (createAndImportSemaphore(vkd, *device, config.externalType, handle, flags)); @@ -1308,26 +1308,26 @@ tcu::TestStatus testSemaphoreTransference (Context& context, { if (transference == TRANSFERENCE_COPY) { - submitDummySignal(vkd, queue, *semaphoreA); - submitDummyWait(vkd, queue, *semaphoreB); + submitEmptySignal(vkd, queue, *semaphoreA); + submitEmptyWait(vkd, queue, *semaphoreB); VK_CHECK(vkd.queueWaitIdle(queue)); - submitDummySignal(vkd, queue, *semaphoreB); + submitEmptySignal(vkd, queue, *semaphoreB); - submitDummyWait(vkd, queue, *semaphoreA); - submitDummyWait(vkd, queue, *semaphoreB); + submitEmptyWait(vkd, queue, *semaphoreA); + submitEmptyWait(vkd, queue, *semaphoreB); VK_CHECK(vkd.queueWaitIdle(queue)); } else if (transference== TRANSFERENCE_REFERENCE) { - submitDummyWait(vkd, queue, *semaphoreB); + submitEmptyWait(vkd, queue, *semaphoreB); VK_CHECK(vkd.queueWaitIdle(queue)); - submitDummySignal(vkd, queue, *semaphoreA); - submitDummyWait(vkd, queue, *semaphoreB); + submitEmptySignal(vkd, queue, *semaphoreA); + submitEmptyWait(vkd, queue, *semaphoreB); - submitDummySignal(vkd, queue, *semaphoreB); - submitDummyWait(vkd, queue, *semaphoreA); + submitEmptySignal(vkd, queue, *semaphoreB); + submitEmptyWait(vkd, queue, *semaphoreA); VK_CHECK(vkd.queueWaitIdle(queue)); } else @@ -1337,26 +1337,26 @@ tcu::TestStatus testSemaphoreTransference (Context& context, { if (transference == TRANSFERENCE_COPY) { - submitDummySignal(vkd, queue, *semaphoreA); - submitDummyWait(vkd, queue, *semaphoreB); + submitEmptySignal(vkd, queue, *semaphoreA); + submitEmptyWait(vkd, queue, *semaphoreB); VK_CHECK(vkd.queueWaitIdle(queue)); - submitDummySignal(vkd, queue, *semaphoreB); + submitEmptySignal(vkd, queue, *semaphoreB); - submitDummyWait(vkd, queue, *semaphoreA); - submitDummyWait(vkd, queue, *semaphoreB); + submitEmptyWait(vkd, queue, *semaphoreA); + submitEmptyWait(vkd, queue, *semaphoreB); VK_CHECK(vkd.queueWaitIdle(queue)); } else if (transference== TRANSFERENCE_REFERENCE) { - submitDummyWait(vkd, queue, *semaphoreB); + submitEmptyWait(vkd, queue, *semaphoreB); VK_CHECK(vkd.queueWaitIdle(queue)); - submitDummySignal(vkd, queue, *semaphoreA); - submitDummySignal(vkd, queue, *semaphoreB); + submitEmptySignal(vkd, queue, *semaphoreA); + submitEmptySignal(vkd, queue, *semaphoreB); - submitDummyWait(vkd, queue, *semaphoreB); - submitDummyWait(vkd, queue, *semaphoreA); + submitEmptyWait(vkd, queue, *semaphoreB); + submitEmptyWait(vkd, queue, *semaphoreA); VK_CHECK(vkd.queueWaitIdle(queue)); } else @@ -1396,7 +1396,7 @@ tcu::TestStatus testSemaphoreFdDup (Context& context, NativeHandle fd; if (transference == TRANSFERENCE_COPY) - submitDummySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphoreA, config.externalType, fd); + submitEmptySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphoreA, config.externalType, fd); else getSemaphoreNative(vkd, *device, *semaphoreA, config.externalType, fd); @@ -1411,11 +1411,11 @@ tcu::TestStatus testSemaphoreFdDup (Context& context, const vk::Unique<vk::VkSemaphore> semaphoreB (createAndImportSemaphore(vkd, *device, config.externalType, newFd, flags)); if (transference == TRANSFERENCE_COPY) - submitDummyWait(vkd, queue, *semaphoreB); + submitEmptyWait(vkd, queue, *semaphoreB); else if (transference == TRANSFERENCE_REFERENCE) { - submitDummySignal(vkd, queue, *semaphoreA); - submitDummyWait(vkd, queue, *semaphoreB); + submitEmptySignal(vkd, queue, *semaphoreA); + submitEmptyWait(vkd, queue, *semaphoreB); } else DE_FATAL("Unknown permanence."); @@ -1461,8 +1461,8 @@ tcu::TestStatus testSemaphoreFdDup2 (Context& context, if (transference == TRANSFERENCE_COPY) { - submitDummySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphoreA, config.externalType, fd); - submitDummySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphoreB, config.externalType, secondFd); + submitEmptySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphoreA, config.externalType, fd); + submitEmptySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphoreB, config.externalType, secondFd); } else { @@ -1481,11 +1481,11 @@ tcu::TestStatus testSemaphoreFdDup2 (Context& context, const vk::Unique<vk::VkSemaphore> semaphoreC (createAndImportSemaphore(vkd, *device, config.externalType, secondFd, flags)); if (transference == TRANSFERENCE_COPY) - submitDummyWait(vkd, queue, *semaphoreC); + submitEmptyWait(vkd, queue, *semaphoreC); else if (transference == TRANSFERENCE_REFERENCE) { - submitDummySignal(vkd, queue, *semaphoreA); - submitDummyWait(vkd, queue, *semaphoreC); + submitEmptySignal(vkd, queue, *semaphoreA); + submitEmptyWait(vkd, queue, *semaphoreC); } else DE_FATAL("Unknown permanence."); @@ -1530,8 +1530,8 @@ tcu::TestStatus testSemaphoreFdDup3 (Context& context, if (transference == TRANSFERENCE_COPY) { - submitDummySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphoreA, config.externalType, fd); - submitDummySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphoreB, config.externalType, secondFd); + submitEmptySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphoreA, config.externalType, fd); + submitEmptySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphoreB, config.externalType, secondFd); } else { @@ -1551,11 +1551,11 @@ tcu::TestStatus testSemaphoreFdDup3 (Context& context, const vk::Unique<vk::VkSemaphore> semaphoreC (createAndImportSemaphore(vkd, *device, config.externalType, secondFd, flags)); if (transference == TRANSFERENCE_COPY) - submitDummyWait(vkd, queue, *semaphoreC); + submitEmptyWait(vkd, queue, *semaphoreC); else if (transference == TRANSFERENCE_REFERENCE) { - submitDummySignal(vkd, queue, *semaphoreA); - submitDummyWait(vkd, queue, *semaphoreC); + submitEmptySignal(vkd, queue, *semaphoreA); + submitEmptyWait(vkd, queue, *semaphoreC); } else DE_FATAL("Unknown permanence."); @@ -1596,7 +1596,7 @@ tcu::TestStatus testSemaphoreFdSendOverSocket (Context& context, NativeHandle fd; if (transference == TRANSFERENCE_COPY) - submitDummySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphore, config.externalType, fd); + submitEmptySignalAndGetSemaphoreNative(vkd, *device, queue, queueFamilyIndex, *semaphore, config.externalType, fd); else getSemaphoreNative(vkd, *device, *semaphore, config.externalType, fd); @@ -1688,11 +1688,11 @@ tcu::TestStatus testSemaphoreFdSendOverSocket (Context& context, const vk::Unique<vk::VkSemaphore> newSemaphore (createAndImportSemaphore(vkd, *device, config.externalType, newFd, flags)); if (transference == TRANSFERENCE_COPY) - submitDummyWait(vkd, queue, *newSemaphore); + submitEmptyWait(vkd, queue, *newSemaphore); else if (transference == TRANSFERENCE_REFERENCE) { - submitDummySignal(vkd, queue, *newSemaphore); - submitDummyWait(vkd, queue, *newSemaphore); + submitEmptySignal(vkd, queue, *newSemaphore); + submitEmptyWait(vkd, queue, *newSemaphore); } else DE_FATAL("Unknown permanence."); @@ -1800,7 +1800,7 @@ tcu::TestStatus testFenceWin32Create (Context& context, const vk::Unique<vk::VkFence> fence (vk::createFence(vkd, *device, &createInfo)); if (transference == TRANSFERENCE_COPY) - submitDummySignal(vkd, queue, *fence); + submitEmptySignal(vkd, queue, *fence); NativeHandle handleA; getFenceNative(vkd, *device, *fence, config.externalType, handleA); @@ -1813,7 +1813,7 @@ tcu::TestStatus testFenceWin32Create (Context& context, VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceA, VK_TRUE, ~0ull)); else if (transference == TRANSFERENCE_REFERENCE) { - submitDummySignal(vkd, queue, *fence); + submitEmptySignal(vkd, queue, *fence); VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceA, VK_TRUE, ~0ull)); } else @@ -1851,7 +1851,7 @@ tcu::TestStatus testFenceImportTwice (Context& context, NativeHandle handleA; if (transference == TRANSFERENCE_COPY) - submitDummySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fence, config.externalType, handleA); + submitEmptySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fence, config.externalType, handleA); else getFenceNative(vkd, *device, *fence, config.externalType, handleA); @@ -1865,7 +1865,7 @@ tcu::TestStatus testFenceImportTwice (Context& context, VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceA, VK_TRUE, ~0ull)); else if (transference == TRANSFERENCE_REFERENCE) { - submitDummySignal(vkd, queue, *fenceA); + submitEmptySignal(vkd, queue, *fenceA); VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceB, VK_TRUE, ~0ull)); } else @@ -1899,7 +1899,7 @@ tcu::TestStatus testFenceImportReimport (Context& context, NativeHandle handleA; if (transference == TRANSFERENCE_COPY) - submitDummySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fenceA, config.externalType, handleA); + submitEmptySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fenceA, config.externalType, handleA); else getFenceNative(vkd, *device, *fenceA, config.externalType, handleA); @@ -1913,7 +1913,7 @@ tcu::TestStatus testFenceImportReimport (Context& context, VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceB, VK_TRUE, ~0ull)); else if (transference == TRANSFERENCE_REFERENCE) { - submitDummySignal(vkd, queue, *fenceA); + submitEmptySignal(vkd, queue, *fenceA); VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceB, VK_TRUE, ~0ull)); } else @@ -1945,7 +1945,7 @@ tcu::TestStatus testFenceSignalExportImportWait (Context& context, { NativeHandle handle; - submitDummySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fenceA, config.externalType, handle); + submitEmptySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fenceA, config.externalType, handle); { const vk::VkFenceImportFlags flags = config.permanence == PERMANENCE_TEMPORARY ? vk::VK_FENCE_IMPORT_TEMPORARY_BIT : (vk::VkFenceImportFlagBits)0u; @@ -2008,7 +2008,7 @@ tcu::TestStatus testFenceExportSignalImportWait (Context& context, getFenceNative(vkd, *device, *fenceA, config.externalType, handle); - submitDummySignal(vkd, queue, *fenceA); + submitEmptySignal(vkd, queue, *fenceA); { { const vk::Unique<vk::VkFence> fenceB (createAndImportFence(vkd, *device, config.externalType, handle, flags)); @@ -2047,7 +2047,7 @@ tcu::TestStatus testFenceExportImportSignalWait (Context& context, const vk::Unique<vk::VkFence> fenceB (createAndImportFence(vkd, *device, config.externalType, handle, flags)); - submitDummySignal(vkd, queue, *fenceA); + submitEmptySignal(vkd, queue, *fenceA); VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceB, VK_TRUE, ~0ull)); VK_CHECK(vkd.queueWaitIdle(queue)); @@ -2078,11 +2078,11 @@ tcu::TestStatus testFenceSignalImport (Context& context, const vk::Unique<vk::VkFence> fenceB (createFence(vkd, *device)); NativeHandle handle; - submitDummySignal(vkd, queue, *fenceB); + submitEmptySignal(vkd, queue, *fenceB); VK_CHECK(vkd.queueWaitIdle(queue)); if (transference == TRANSFERENCE_COPY) - submitDummySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fenceA, config.externalType, handle); + submitEmptySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fenceA, config.externalType, handle); else getFenceNative(vkd, *device, *fenceA, config.externalType, handle); @@ -2092,7 +2092,7 @@ tcu::TestStatus testFenceSignalImport (Context& context, VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceB, VK_TRUE, ~0ull)); else if (transference == TRANSFERENCE_REFERENCE) { - submitDummySignal(vkd, queue, *fenceA); + submitEmptySignal(vkd, queue, *fenceA); VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceB, VK_TRUE, ~0ull)); } else @@ -2127,10 +2127,10 @@ tcu::TestStatus testFenceReset (Context& context, const vk::Unique<vk::VkFence> fenceC (createFence(vkd, *device)); NativeHandle handle; - submitDummySignal(vkd, queue, *fenceB); + submitEmptySignal(vkd, queue, *fenceB); VK_CHECK(vkd.queueWaitIdle(queue)); - submitDummySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fenceA, config.externalType, handle); + submitEmptySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fenceA, config.externalType, handle); NativeHandle handleB (handle); importFence(vkd, *device, *fenceB, config.externalType, handleB, flags); importFence(vkd, *device, *fenceC, config.externalType, handle, flags); @@ -2146,7 +2146,7 @@ tcu::TestStatus testFenceReset (Context& context, // vkResetFences() should have restored fenceBs prior state and should be now reset // or fenceB should have it's separate payload - submitDummySignal(vkd, queue, *fenceB); + submitEmptySignal(vkd, queue, *fenceB); VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceB, VK_TRUE, ~0ull)); } else if (config.permanence == PERMANENCE_PERMANENT) @@ -2154,7 +2154,7 @@ tcu::TestStatus testFenceReset (Context& context, DE_ASSERT(transference == TRANSFERENCE_REFERENCE); // Reset fences should have reset all of the fences - submitDummySignal(vkd, queue, *fenceC); + submitEmptySignal(vkd, queue, *fenceC); VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceA, VK_TRUE, ~0ull)); VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceB, VK_TRUE, ~0ull)); @@ -2192,11 +2192,11 @@ tcu::TestStatus testFenceSignalWaitImport (Context& context, NativeHandle handle; if (transference == TRANSFERENCE_COPY) - submitDummySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fenceA, config.externalType, handle); + submitEmptySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fenceA, config.externalType, handle); else getFenceNative(vkd, *device, *fenceA, config.externalType, handle); - submitDummySignal(vkd, queue, *fenceB); + submitEmptySignal(vkd, queue, *fenceB); VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceB, VK_TRUE, ~0ull)); VK_CHECK(vkd.queueWaitIdle(queue)); @@ -2207,7 +2207,7 @@ tcu::TestStatus testFenceSignalWaitImport (Context& context, VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceB, VK_TRUE, ~0ull)); else if (transference == TRANSFERENCE_REFERENCE) { - submitDummySignal(vkd, queue, *fenceA); + submitEmptySignal(vkd, queue, *fenceA); VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceB, VK_TRUE, ~0ull)); } else @@ -2243,12 +2243,12 @@ tcu::TestStatus testFenceMultipleExports (Context& context, NativeHandle handle; if (transference == TRANSFERENCE_COPY) - submitDummySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fence, config.externalType, handle, exportNdx == 0 /* expect fence to be signaled after first pass */); + submitEmptySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fence, config.externalType, handle, exportNdx == 0 /* expect fence to be signaled after first pass */); else getFenceNative(vkd, *device, *fence, config.externalType, handle, exportNdx == 0 /* expect fence to be signaled after first pass */); } - submitDummySignal(vkd, queue, *fence); + submitEmptySignal(vkd, queue, *fence); VK_CHECK(vkd.waitForFences(*device, 1u, &*fence, VK_TRUE, ~0ull)); VK_CHECK(vkd.queueWaitIdle(queue)); @@ -2279,7 +2279,7 @@ tcu::TestStatus testFenceMultipleImports (Context& context, NativeHandle handleA; if (transference == TRANSFERENCE_COPY) - submitDummySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fenceA, config.externalType, handleA); + submitEmptySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fenceA, config.externalType, handleA); else getFenceNative(vkd, *device, *fenceA, config.externalType, handleA); @@ -2296,7 +2296,7 @@ tcu::TestStatus testFenceMultipleImports (Context& context, } else if (transference == TRANSFERENCE_REFERENCE) { - submitDummySignal(vkd, queue, *fenceA); + submitEmptySignal(vkd, queue, *fenceA); VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceA, VK_TRUE, ~0ull)); } else @@ -2329,7 +2329,7 @@ tcu::TestStatus testFenceTransference (Context& context, const vk::Unique<vk::VkFence> fenceA (createExportableFence(vkd, *device, config.externalType)); NativeHandle handle; - submitDummySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fenceA, config.externalType, handle); + submitEmptySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fenceA, config.externalType, handle); { const vk::Unique<vk::VkFence> fenceB (createAndImportFence(vkd, *device, config.externalType, handle, flags)); @@ -2338,12 +2338,12 @@ tcu::TestStatus testFenceTransference (Context& context, { if (transference == TRANSFERENCE_COPY) { - submitDummySignal(vkd, queue, *fenceA); + submitEmptySignal(vkd, queue, *fenceA); VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceB, VK_TRUE, ~0ull)); VK_CHECK(vkd.queueWaitIdle(queue)); VK_CHECK(vkd.resetFences(*device, 1u, &*fenceB)); - submitDummySignal(vkd, queue, *fenceB); + submitEmptySignal(vkd, queue, *fenceB); VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceA, VK_TRUE, ~0ull)); VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceB, VK_TRUE, ~0ull)); @@ -2355,11 +2355,11 @@ tcu::TestStatus testFenceTransference (Context& context, VK_CHECK(vkd.queueWaitIdle(queue)); VK_CHECK(vkd.resetFences(*device, 1u, &*fenceB)); - submitDummySignal(vkd, queue, *fenceA); + submitEmptySignal(vkd, queue, *fenceA); VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceB, VK_TRUE, ~0ull)); VK_CHECK(vkd.resetFences(*device, 1u, &*fenceA)); - submitDummySignal(vkd, queue, *fenceB); + submitEmptySignal(vkd, queue, *fenceB); VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceA, VK_TRUE, ~0ull)); VK_CHECK(vkd.queueWaitIdle(queue)); } @@ -2370,12 +2370,12 @@ tcu::TestStatus testFenceTransference (Context& context, { if (transference == TRANSFERENCE_COPY) { - submitDummySignal(vkd, queue, *fenceA); + submitEmptySignal(vkd, queue, *fenceA); VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceB, VK_TRUE, ~0ull)); VK_CHECK(vkd.queueWaitIdle(queue)); VK_CHECK(vkd.resetFences(*device, 1u, &*fenceB)); - submitDummySignal(vkd, queue, *fenceB); + submitEmptySignal(vkd, queue, *fenceB); VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceA, VK_TRUE, ~0ull)); VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceB, VK_TRUE, ~0ull)); @@ -2388,8 +2388,8 @@ tcu::TestStatus testFenceTransference (Context& context, VK_CHECK(vkd.resetFences(*device, 1u, &*fenceA)); VK_CHECK(vkd.resetFences(*device, 1u, &*fenceB)); - submitDummySignal(vkd, queue, *fenceA); - submitDummySignal(vkd, queue, *fenceB); + submitEmptySignal(vkd, queue, *fenceA); + submitEmptySignal(vkd, queue, *fenceB); VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceB, VK_TRUE, ~0ull)); VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceA, VK_TRUE, ~0ull)); @@ -2432,7 +2432,7 @@ tcu::TestStatus testFenceFdDup (Context& context, NativeHandle fd; if (transference == TRANSFERENCE_COPY) - submitDummySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fenceA, config.externalType, fd); + submitEmptySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fenceA, config.externalType, fd); else getFenceNative(vkd, *device, *fenceA, config.externalType, fd); @@ -2450,7 +2450,7 @@ tcu::TestStatus testFenceFdDup (Context& context, VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceB, VK_TRUE, ~0ull)); else if (transference == TRANSFERENCE_REFERENCE) { - submitDummySignal(vkd, queue, *fenceA); + submitEmptySignal(vkd, queue, *fenceA); VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceB, VK_TRUE, ~0ull)); } else @@ -2497,8 +2497,8 @@ tcu::TestStatus testFenceFdDup2 (Context& context, if (transference == TRANSFERENCE_COPY) { - submitDummySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fenceA, config.externalType, fd); - submitDummySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fenceB, config.externalType, secondFd); + submitEmptySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fenceA, config.externalType, fd); + submitEmptySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fenceB, config.externalType, secondFd); } else { @@ -2520,7 +2520,7 @@ tcu::TestStatus testFenceFdDup2 (Context& context, VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceC, VK_TRUE, ~0ull)); else if (transference == TRANSFERENCE_REFERENCE) { - submitDummySignal(vkd, queue, *fenceA); + submitEmptySignal(vkd, queue, *fenceA); VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceC, VK_TRUE, ~0ull)); } else @@ -2566,8 +2566,8 @@ tcu::TestStatus testFenceFdDup3 (Context& context, if (transference == TRANSFERENCE_COPY) { - submitDummySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fenceA, config.externalType, fd); - submitDummySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fenceB, config.externalType, secondFd); + submitEmptySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fenceA, config.externalType, fd); + submitEmptySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fenceB, config.externalType, secondFd); } else { @@ -2590,7 +2590,7 @@ tcu::TestStatus testFenceFdDup3 (Context& context, VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceC, VK_TRUE, ~0ull)); else if (transference == TRANSFERENCE_REFERENCE) { - submitDummySignal(vkd, queue, *fenceA); + submitEmptySignal(vkd, queue, *fenceA); VK_CHECK(vkd.waitForFences(*device, 1u, &*fenceC, VK_TRUE, ~0ull)); } else @@ -2632,7 +2632,7 @@ tcu::TestStatus testFenceFdSendOverSocket (Context& context, NativeHandle fd; if (transference == TRANSFERENCE_COPY) - submitDummySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fence, config.externalType, fd); + submitEmptySignalAndGetFenceNative(vkd, *device, queue, queueFamilyIndex, *fence, config.externalType, fd); else getFenceNative(vkd, *device, *fence, config.externalType, fd); @@ -2727,7 +2727,7 @@ tcu::TestStatus testFenceFdSendOverSocket (Context& context, VK_CHECK(vkd.waitForFences(*device, 1u, &*newFence, VK_TRUE, ~0ull)); else if (transference == TRANSFERENCE_REFERENCE) { - submitDummySignal(vkd, queue, *newFence); + submitEmptySignal(vkd, queue, *newFence); VK_CHECK(vkd.waitForFences(*device, 1u, &*newFence, VK_TRUE, ~0ull)); } else diff --git a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp index bf6a60a64..bc5e0113d 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp @@ -1600,13 +1600,13 @@ tcu::TestStatus featureBitInfluenceOnDeviceCreate (Context& context) VkPhysicalDeviceBufferDeviceAddressFeatures bufferDeviceAddressFeatures = initVulkanStructure(); VkPhysicalDeviceVulkanMemoryModelFeatures vulkanMemoryModelFeatures = initVulkanStructure(); - struct DummyExtensionFeatures + struct UnusedExtensionFeatures { VkStructureType sType; void* pNext; VkBool32 descriptorIndexing; VkBool32 samplerFilterMinmax; - } dummyExtensionFeatures; + } unusedExtensionFeatures; struct FeatureTable { @@ -1641,7 +1641,7 @@ tcu::TestStatus featureBitInfluenceOnDeviceCreate (Context& context) FEATURE_TABLE_ITEM(vulkan12Features, shaderAtomicInt64Features, shaderSharedInt64Atomics, "VK_KHR_shader_atomic_int64"), FEATURE_TABLE_ITEM(vulkan12Features, shaderFloat16Int8Features, shaderFloat16, "VK_KHR_shader_float16_int8"), FEATURE_TABLE_ITEM(vulkan12Features, shaderFloat16Int8Features, shaderInt8, "VK_KHR_shader_float16_int8"), - FEATURE_TABLE_ITEM(vulkan12Features, dummyExtensionFeatures, descriptorIndexing, DE_NULL), + FEATURE_TABLE_ITEM(vulkan12Features, unusedExtensionFeatures, descriptorIndexing, DE_NULL), FEATURE_TABLE_ITEM(vulkan12Features, descriptorIndexingFeatures, shaderInputAttachmentArrayDynamicIndexing, "VK_EXT_descriptor_indexing"), FEATURE_TABLE_ITEM(vulkan12Features, descriptorIndexingFeatures, shaderUniformTexelBufferArrayDynamicIndexing, "VK_EXT_descriptor_indexing"), FEATURE_TABLE_ITEM(vulkan12Features, descriptorIndexingFeatures, shaderStorageTexelBufferArrayDynamicIndexing, "VK_EXT_descriptor_indexing"), @@ -1662,7 +1662,7 @@ tcu::TestStatus featureBitInfluenceOnDeviceCreate (Context& context) FEATURE_TABLE_ITEM(vulkan12Features, descriptorIndexingFeatures, descriptorBindingPartiallyBound, "VK_EXT_descriptor_indexing"), FEATURE_TABLE_ITEM(vulkan12Features, descriptorIndexingFeatures, descriptorBindingVariableDescriptorCount, "VK_EXT_descriptor_indexing"), FEATURE_TABLE_ITEM(vulkan12Features, descriptorIndexingFeatures, runtimeDescriptorArray, "VK_EXT_descriptor_indexing"), - FEATURE_TABLE_ITEM(vulkan12Features, dummyExtensionFeatures, samplerFilterMinmax, "VK_EXT_sampler_filter_minmax"), + FEATURE_TABLE_ITEM(vulkan12Features, unusedExtensionFeatures, samplerFilterMinmax, "VK_EXT_sampler_filter_minmax"), FEATURE_TABLE_ITEM(vulkan12Features, scalarBlockLayoutFeatures, scalarBlockLayout, "VK_EXT_scalar_block_layout"), FEATURE_TABLE_ITEM(vulkan12Features, imagelessFramebufferFeatures, imagelessFramebuffer, "VK_KHR_imageless_framebuffer"), FEATURE_TABLE_ITEM(vulkan12Features, uniformBufferStandardLayoutFeatures, uniformBufferStandardLayout, "VK_KHR_uniform_buffer_standard_layout"), @@ -1712,7 +1712,7 @@ tcu::TestStatus featureBitInfluenceOnDeviceCreate (Context& context) DEPENDENCY_DUAL_ITEM (vulkan12Features, vulkanMemoryModelFeatures, vulkanMemoryModelAvailabilityVisibilityChains, vulkanMemoryModel), }; - deMemset(&dummyExtensionFeatures, 0, sizeof(dummyExtensionFeatures)); + deMemset(&unusedExtensionFeatures, 0, sizeof(unusedExtensionFeatures)); for (size_t featureTableNdx = 0; featureTableNdx < DE_LENGTH_OF_ARRAY(featureTable); ++featureTableNdx) { @@ -1726,7 +1726,7 @@ tcu::TestStatus featureBitInfluenceOnDeviceCreate (Context& context) size_t structSize = testedFeature.coreStructSize; VkBool32* featurePtr = testedFeature.coreFieldPtr; - if (structPtr != &dummyExtensionFeatures) + if (structPtr != &unusedExtensionFeatures) features2.pNext = structPtr; vki.getPhysicalDeviceFeatures2(physicalDevice, &features2); @@ -1759,7 +1759,7 @@ tcu::TestStatus featureBitInfluenceOnDeviceCreate (Context& context) VkBool32* featurePtr = testedFeature.extFieldPtr; const char* extStringPtr = testedFeature.extString; - if (structPtr != &dummyExtensionFeatures) + if (structPtr != &unusedExtensionFeatures) features2.pNext = structPtr; if (extStringPtr == DE_NULL || isExtensionSupported(deviceExtensionProperties, RequiredExtension(extStringPtr))) diff --git a/external/vulkancts/modules/vulkan/api/vktApiSmokeTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiSmokeTests.cpp index 360244842..4a72c7ae5 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiSmokeTests.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiSmokeTests.cpp @@ -590,7 +590,7 @@ struct VoidVulkanStruct const void* pNext; }; -tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) +tcu::TestStatus renderTriangleUnusedExtStructTest (Context& context) { const VkDevice vkDevice = context.getDevice(); const DeviceInterface& vk = context.getDeviceInterface(); @@ -602,7 +602,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const tcu::Vec4 clearColor (0.125f, 0.25f, 0.75f, 1.0f); // This structure will stand in as an unknown extension structure that must be ignored by implementations. - VoidVulkanStruct dummyExtStruct = + VoidVulkanStruct unusedExtStruct = { VK_STRUCTURE_TYPE_MAX_ENUM, // sType DE_NULL // pNext @@ -618,7 +618,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkBufferCreateInfo vertexBufferParams = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO, // sType - &dummyExtStruct, // pNext + &unusedExtStruct, // pNext 0u, // flags (VkDeviceSize)sizeof(vertices), // size VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, // usage @@ -635,7 +635,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkBufferCreateInfo readImageBufferParams = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO, // sType - &dummyExtStruct, // pNext + &unusedExtStruct, // pNext (VkBufferCreateFlags)0u, // flags imageSizeBytes, // size VK_BUFFER_USAGE_TRANSFER_DST_BIT, // usage @@ -651,7 +651,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkImageCreateInfo imageParams = { VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, // sType - &dummyExtStruct, // pNext + &unusedExtStruct, // pNext 0u, // flags VK_IMAGE_TYPE_2D, // imageType VK_FORMAT_R8G8B8A8_UNORM, // format @@ -709,7 +709,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkRenderPassCreateInfo renderPassInfo = { VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO, // VkStructureType sType - &dummyExtStruct, // const void* pNext + &unusedExtStruct, // const void* pNext (VkRenderPassCreateFlags)0, // VkRenderPassCreateFlags flags 1u, // deUint32 attachmentCount &colorAttachmentDescription, // const VkAttachmentDescription* pAttachments @@ -725,7 +725,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkImageViewCreateInfo colorAttViewParams = { VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO, // sType - &dummyExtStruct, // pNext + &unusedExtStruct, // pNext 0u, // flags *image, // image VK_IMAGE_VIEW_TYPE_2D, // viewType @@ -750,7 +750,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkPipelineLayoutCreateInfo pipelineLayoutParams = { VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO, // sType - &dummyExtStruct, // pNext + &unusedExtStruct, // pNext (vk::VkPipelineLayoutCreateFlags)0, 0u, // setLayoutCount DE_NULL, // pSetLayouts @@ -766,7 +766,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const struct VkShaderModuleCreateInfo vertModuleInfo = { VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO, - &dummyExtStruct, + &unusedExtStruct, 0, (deUintptr)vertBin.getSize(), (const deUint32*)vertBin.getBinary(), @@ -775,7 +775,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const struct VkShaderModuleCreateInfo fragModuleInfo = { VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO, - &dummyExtStruct, + &unusedExtStruct, 0, (deUintptr)fragBin.getSize(), (const deUint32*)fragBin.getBinary(), @@ -791,7 +791,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) VkPipelineShaderStageCreateInfo stageCreateInfo = { VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO, // VkStructureType sType - &dummyExtStruct, // const void* pNext + &unusedExtStruct, // const void* pNext 0u, // VkPipelineShaderStageCreateFlags flags VK_SHADER_STAGE_VERTEX_BIT, // VkShaderStageFlagBits stage DE_NULL, // VkShaderModule module @@ -827,7 +827,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkPipelineVertexInputStateCreateInfo vertexInputStateCreateInfo = { VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO, // VkStructureType sType - &dummyExtStruct, // const void* pNext + &unusedExtStruct, // const void* pNext (VkPipelineVertexInputStateCreateFlags)0, // VkPipelineVertexInputStateCreateFlags flags 1u, // deUint32 vertexBindingDescriptionCount &vertexInputBindingDescription, // const VkVertexInputBindingDescription* pVertexBindingDescriptions @@ -838,7 +838,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkPipelineInputAssemblyStateCreateInfo inputAssemblyStateCreateInfo = { VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO, // VkStructureType sType - &dummyExtStruct, // const void* pNext + &unusedExtStruct, // const void* pNext 0u, // VkPipelineInputAssemblyStateCreateFlags flags VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST, // VkPrimitiveTopology topology VK_FALSE // VkBool32 primitiveRestartEnable @@ -847,7 +847,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkPipelineViewportStateCreateInfo viewportStateCreateInfo = { VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO, // VkStructureType sType - &dummyExtStruct, // const void* pNext + &unusedExtStruct, // const void* pNext (VkPipelineViewportStateCreateFlags)0, // VkPipelineViewportStateCreateFlags flags (deUint32)viewports.size(), // deUint32 viewportCount viewports.data(), // const VkViewport* pViewports @@ -858,7 +858,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkPipelineRasterizationStateCreateInfo rasterizationStateCreateInfo = { VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO, // VkStructureType sType - &dummyExtStruct, // const void* pNext + &unusedExtStruct, // const void* pNext 0u, // VkPipelineRasterizationStateCreateFlags flags VK_FALSE, // VkBool32 depthClampEnable VK_FALSE, // VkBool32 rasterizerDiscardEnable @@ -875,7 +875,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkPipelineMultisampleStateCreateInfo multisampleStateCreateInfo = { VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO, // VkStructureType sType - &dummyExtStruct, // const void* pNext + &unusedExtStruct, // const void* pNext 0u, // VkPipelineMultisampleStateCreateFlags flags VK_SAMPLE_COUNT_1_BIT, // VkSampleCountFlagBits rasterizationSamples VK_FALSE, // VkBool32 sampleShadingEnable @@ -899,7 +899,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkPipelineDepthStencilStateCreateInfo depthStencilStateCreateInfo = { VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO, // VkStructureType sType - &dummyExtStruct, // const void* pNext + &unusedExtStruct, // const void* pNext 0u, // VkPipelineDepthStencilStateCreateFlags flags VK_FALSE, // VkBool32 depthTestEnable VK_FALSE, // VkBool32 depthWriteEnable @@ -930,7 +930,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkPipelineColorBlendStateCreateInfo colorBlendStateCreateInfo = { VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO, // VkStructureType sType - &dummyExtStruct, // const void* pNext + &unusedExtStruct, // const void* pNext 0u, // VkPipelineColorBlendStateCreateFlags flags VK_FALSE, // VkBool32 logicOpEnable VK_LOGIC_OP_CLEAR, // VkLogicOp logicOp @@ -942,7 +942,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkGraphicsPipelineCreateInfo pipelineCreateInfo = { VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO, // VkStructureType sType - &dummyExtStruct, // const void* pNext + &unusedExtStruct, // const void* pNext 0u, // VkPipelineCreateFlags flags (deUint32)pipelineShaderStageParams.size(), // deUint32 stageCount &pipelineShaderStageParams[0], // const VkPipelineShaderStageCreateInfo* pStages @@ -968,7 +968,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkFramebufferCreateInfo framebufferParams = { VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO, // sType - &dummyExtStruct, // pNext + &unusedExtStruct, // pNext 0u, // flags *renderPass, // renderPass 1u, // attachmentCount @@ -983,7 +983,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkCommandPoolCreateInfo cmdPoolParams = { VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, // sType - &dummyExtStruct, // pNext + &unusedExtStruct, // pNext VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, // flags queueFamilyIndex, // queueFamilyIndex }; @@ -992,7 +992,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkCommandBufferAllocateInfo cmdBufParams = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // sType - &dummyExtStruct, // pNext + &unusedExtStruct, // pNext *cmdPool, // pool VK_COMMAND_BUFFER_LEVEL_PRIMARY, // level 1u, // bufferCount @@ -1003,7 +1003,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkCommandBufferBeginInfo commandBufBeginParams = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, // VkStructureType sType; - &dummyExtStruct, // const void* pNext; + &unusedExtStruct, // const void* pNext; VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT, // VkCommandBufferUsageFlags flags; (const VkCommandBufferInheritanceInfo*)DE_NULL, }; @@ -1012,7 +1012,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkMemoryBarrier vertFlushBarrier = { VK_STRUCTURE_TYPE_MEMORY_BARRIER, // sType - &dummyExtStruct, // pNext + &unusedExtStruct, // pNext VK_ACCESS_HOST_WRITE_BIT, // srcAccessMask VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT, // dstAccessMask }; @@ -1020,7 +1020,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkImageMemoryBarrier colorAttBarrier = { VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, // sType - &dummyExtStruct, // pNext + &unusedExtStruct, // pNext 0u, // srcAccessMask (VK_ACCESS_COLOR_ATTACHMENT_READ_BIT| VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT), // dstAccessMask @@ -1043,7 +1043,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkRenderPassBeginInfo renderPassBeginInfo = { VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO, // VkStructureType sType; - &dummyExtStruct, // const void* pNext; + &unusedExtStruct, // const void* pNext; *renderPass, // VkRenderPass renderPass; *framebuffer, // VkFramebuffer framebuffer; makeRect2D(0, 0, renderSize.x(), renderSize.y()), // VkRect2D renderArea; @@ -1064,7 +1064,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkImageMemoryBarrier imageBarrier = { VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, // VkStructureType sType; - &dummyExtStruct, // const void* pNext; + &unusedExtStruct, // const void* pNext; VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, // VkAccessFlags srcAccessMask; VK_ACCESS_TRANSFER_READ_BIT, // VkAccessFlags dstAccessMask; VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, // VkImageLayout oldLayout; @@ -1101,7 +1101,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkBufferMemoryBarrier bufferBarrier = { VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, // VkStructureType sType; - &dummyExtStruct, // const void* pNext; + &unusedExtStruct, // const void* pNext; VK_ACCESS_TRANSFER_WRITE_BIT, // VkAccessFlags srcAccessMask; VK_ACCESS_HOST_READ_BIT, // VkAccessFlags dstAccessMask; VK_QUEUE_FAMILY_IGNORED, // deUint32 srcQueueFamilyIndex; @@ -1120,7 +1120,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkMappedMemoryRange flushRange = { VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE, - &dummyExtStruct, + &unusedExtStruct, vertexBufferMemory->getMemory(), vertexBufferMemory->getOffset(), VK_WHOLE_SIZE @@ -1132,7 +1132,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkFenceCreateInfo createInfo = { VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, - &dummyExtStruct, + &unusedExtStruct, 0u }; @@ -1141,7 +1141,7 @@ tcu::TestStatus renderTriangleDummyExtStructTest (Context& context) const VkSubmitInfo submitInfo = { VK_STRUCTURE_TYPE_SUBMIT_INFO, // VkStructureType sType; - &dummyExtStruct, // const void* pNext; + &unusedExtStruct, // const void* pNext; 0u, // deUint32 waitSemaphoreCount; DE_NULL, // const VkSemaphore* pWaitSemaphores; (const VkPipelineStageFlags*)DE_NULL, // const VkPipelineStageFlags* pWaitDstStageMask; @@ -1498,7 +1498,7 @@ tcu::TestCaseGroup* createSmokeTests (tcu::TestContext& testCtx) addFunctionCase (smokeTests.get(), "create_sampler", "", createSamplerTest); addFunctionCaseWithPrograms (smokeTests.get(), "create_shader", "", createShaderProgs, createShaderModuleTest); addFunctionCaseWithPrograms (smokeTests.get(), "triangle", "", createTriangleProgs, renderTriangleTest); - addFunctionCaseWithPrograms (smokeTests.get(), "triangle_ext_structs", "", createTriangleProgs, renderTriangleDummyExtStructTest); + addFunctionCaseWithPrograms (smokeTests.get(), "triangle_ext_structs", "", createTriangleProgs, renderTriangleUnusedExtStructTest); addFunctionCaseWithPrograms (smokeTests.get(), "asm_triangle", "", createTriangleAsmProgs, renderTriangleTest); addFunctionCaseWithPrograms (smokeTests.get(), "asm_triangle_no_opname", "", createProgsNoOpName, renderTriangleTest); addFunctionCaseWithPrograms (smokeTests.get(), "unused_resolve_attachment", "", createTriangleProgs, renderTriangleUnusedResolveAttachmentTest); diff --git a/external/vulkancts/modules/vulkan/api/vktApiVersionCheck.cpp b/external/vulkancts/modules/vulkan/api/vktApiVersionCheck.cpp index 2b3cecef8..0af334104 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiVersionCheck.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiVersionCheck.cpp @@ -183,23 +183,23 @@ public: extFunctions.push_back(FunctionInfo("vkGetImageMemoryRequirements2KHR", FUNCTIONORIGIN_DEVICE)); log << tcu::TestLog::Message << "Disabled extensions check - tries to get functions of disabled extensions from proper vkGet*ProcAddr." << tcu::TestLog::EndMessage; - const char * const result = specialCasesCheck(ctx, log, failsQuantity, extFunctions) ? "Passed" : "Failed"; + const char * const result = specialCasesCheck(ctx, log, failsQuantity, extFunctions) ? "Passed" : "Failed"; log << tcu::TestLog::Message << result << tcu::TestLog::EndMessage; } // Check special cases { - FunctionInfosList dummyFunctions = FunctionInfosList(); + FunctionInfosList nonexistingFunctions = FunctionInfosList(); for (deUint32 i = 0; i <= FUNCTIONORIGIN_DEVICE; ++i) { const FunctionOrigin origin = static_cast<FunctionOrigin>(i); - dummyFunctions.push_back(FunctionInfo("vkSomeName", origin)); - dummyFunctions.push_back(FunctionInfo("vkNonexistingKHR", origin)); - dummyFunctions.push_back(FunctionInfo("", origin)); + nonexistingFunctions.push_back(FunctionInfo("vkSomeName", origin)); + nonexistingFunctions.push_back(FunctionInfo("vkNonexistingKHR", origin)); + nonexistingFunctions.push_back(FunctionInfo("", origin)); } - log << tcu::TestLog::Message << "Special check - tries to get some dummy functions from various vkGet*ProcAddr." << tcu::TestLog::EndMessage; - const char * const result = specialCasesCheck(ctx, log, failsQuantity, dummyFunctions) ? "Passed" : "Failed"; + log << tcu::TestLog::Message << "Special check - tries to get some nonexisting functions from various vkGet*ProcAddr." << tcu::TestLog::EndMessage; + const char * const result = specialCasesCheck(ctx, log, failsQuantity, nonexistingFunctions) ? "Passed" : "Failed"; log << tcu::TestLog::Message << result << tcu::TestLog::EndMessage; } } diff --git a/external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp b/external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp index 8d02b954f..68933341a 100644 --- a/external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp +++ b/external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp @@ -589,15 +589,15 @@ void generateRandomLayout(RandomLayout& randomLayout, const CaseDef &caseDef, de { if (numInlineUniformBlocks < caseDef.maxInlineUniformBlocks) { - arraySizes[b] = randRange(&rnd, 1, (caseDef.maxInlineUniformBlockSize - 16) / 16); // subtract 16 for "ivec4 dummy" + arraySizes[b] = randRange(&rnd, 1, (caseDef.maxInlineUniformBlockSize - 16) / 16); // subtract 16 for "ivec4 unused" arraySizes[b] = de::min(maxArray, arraySizes[b]); - binding.descriptorCount = (arraySizes[b] ? arraySizes[b] : 1) * 16 + 16; // add 16 for "ivec4 dummy" + binding.descriptorCount = (arraySizes[b] ? arraySizes[b] : 1) * 16 + 16; // add 16 for "ivec4 unused" numInlineUniformBlocks++; } } else { - // Plug in a dummy descriptor type, so validation layers that don't + // Plug in an unused descriptor type, so validation layers that don't // support inline_uniform_block don't crash. binding.descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; } @@ -761,7 +761,7 @@ void DescriptorSetRandomTestCase::initPrograms (SourceCollections& programCollec switch (binding.descriptorType) { case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT: - decls << "layout(set = " << s << ", binding = " << b << ") uniform inlineubodef" << s << "_" << b << " { ivec4 dummy; int val" << array.str() << "; } inlineubo" << s << "_" << b << ";\n"; + decls << "layout(set = " << s << ", binding = " << b << ") uniform inlineubodef" << s << "_" << b << " { ivec4 unused; int val" << array.str() << "; } inlineubo" << s << "_" << b << ";\n"; break; case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC: case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: @@ -804,7 +804,7 @@ void DescriptorSetRandomTestCase::initPrograms (SourceCollections& programCollec { if (binding.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) { - // Convert to bytes and add 16 for "ivec4 dummy" in case of inline uniform block + // Convert to bytes and add 16 for "ivec4 unused" in case of inline uniform block const deUint32 uboRange = ai*16 + 16; if (uboRange >= variableDescriptorSizes[s]) continue; @@ -1116,7 +1116,7 @@ void DescriptorSetRandomTestCase::initPrograms (SourceCollections& programCollec "#version 460 core\n" "#extension GL_EXT_nonuniform_qualifier : enable\n" "#extension GL_EXT_ray_tracing : require\n" - "layout(location = 0) rayPayloadInEXT dummyPayload { vec4 dummy; };\n" + "layout(location = 0) rayPayloadInEXT vec3 hitValue;\n" << pushdecl.str() << decls.str() << "void main()\n" @@ -1746,7 +1746,7 @@ tcu::TestStatus DescriptorSetRandomTestInstance::iterate (void) } else if (binding.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) { - // subtract 16 for "ivec4 dummy" + // subtract 16 for "ivec4 unused" DE_ASSERT(binding.descriptorCount >= 16); descriptor += binding.descriptorCount - 16; } @@ -1978,7 +1978,7 @@ tcu::TestStatus DescriptorSetRandomTestInstance::iterate (void) { if (binding.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) { - // Convert to bytes and add 16 for "ivec4 dummy" in case of inline uniform block + // Convert to bytes and add 16 for "ivec4 unused" in case of inline uniform block const deUint32 uboRange = ai*16 + 16; if (uboRange >= variableDescriptorSizes[s]) continue; @@ -2049,7 +2049,7 @@ tcu::TestStatus DescriptorSetRandomTestInstance::iterate (void) }; inlineInfoVec[vecIndex] = iuBlock; - w.dstArrayElement = ai*16 + 16; // add 16 to skip "ivec4 dummy" + w.dstArrayElement = ai*16 + 16; // add 16 to skip "ivec4 unused" w.pNext = &inlineInfoVec[vecIndex]; w.descriptorCount = sizeof(deUint32); } diff --git a/external/vulkancts/modules/vulkan/draw/vktDrawScissorTests.cpp b/external/vulkancts/modules/vulkan/draw/vktDrawScissorTests.cpp index 6318160ff..009c48225 100644 --- a/external/vulkancts/modules/vulkan/draw/vktDrawScissorTests.cpp +++ b/external/vulkancts/modules/vulkan/draw/vktDrawScissorTests.cpp @@ -217,7 +217,7 @@ vector<VkRect2D> DynamicScissorTestCommand::updateScissors (vector<VkRect2D> sci for (size_t scissorIdx = 0; scissorIdx < m_scissors.size(); scissorIdx++) { while (scissors.size() <= m_firstScissor + scissorIdx) - scissors.push_back(makeRect2D(0, 0)); // Add dummy scissor + scissors.push_back(makeRect2D(0, 0)); // Add empty scissor scissors[m_firstScissor + scissorIdx] = m_scissors[scissorIdx]; } diff --git a/external/vulkancts/modules/vulkan/image/vktImageCompressionTranscodingSupport.cpp b/external/vulkancts/modules/vulkan/image/vktImageCompressionTranscodingSupport.cpp index 8f696bbd8..23671379d 100644 --- a/external/vulkancts/modules/vulkan/image/vktImageCompressionTranscodingSupport.cpp +++ b/external/vulkancts/modules/vulkan/image/vktImageCompressionTranscodingSupport.cpp @@ -1678,9 +1678,9 @@ void GraphicsAttachmentsTestInstance::transcodeRead () .build(vk, device, VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT, 1u)); const Move<VkDescriptorSet> descriptorSet (makeDescriptorSet(vk, device, *descriptorPool, *descriptorSetLayout)); - const VkExtent2D renderSizeDummy (makeExtent2D(1u, 1u)); + const VkExtent2D renderSizeUnused (makeExtent2D(1u, 1u)); const Unique<VkPipelineLayout> pipelineLayout (makePipelineLayout(vk, device, *descriptorSetLayout)); - const Unique<VkPipeline> pipeline (makeGraphicsPipeline(vk, device, *pipelineLayout, *renderPass, *vertShaderModule, *fragShaderModule, renderSizeDummy, 1u, true)); + const Unique<VkPipeline> pipeline (makeGraphicsPipeline(vk, device, *pipelineLayout, *renderPass, *vertShaderModule, *fragShaderModule, renderSizeUnused, 1u, true)); const Unique<VkCommandPool> cmdPool (createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Unique<VkCommandBuffer> cmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); @@ -1812,9 +1812,9 @@ void GraphicsAttachmentsTestInstance::transcodeWrite () .build(vk, device, VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT, 1u)); const Move<VkDescriptorSet> descriptorSet (makeDescriptorSet(vk, device, *descriptorPool, *descriptorSetLayout)); - const VkExtent2D renderSizeDummy (makeExtent2D(1u, 1u)); + const VkExtent2D renderSizeUnused (makeExtent2D(1u, 1u)); const Unique<VkPipelineLayout> pipelineLayout (makePipelineLayout(vk, device, *descriptorSetLayout)); - const Unique<VkPipeline> pipeline (makeGraphicsPipeline(vk, device, *pipelineLayout, *renderPass, *vertShaderModule, *fragShaderModule, renderSizeDummy, 1u, true)); + const Unique<VkPipeline> pipeline (makeGraphicsPipeline(vk, device, *pipelineLayout, *renderPass, *vertShaderModule, *fragShaderModule, renderSizeUnused, 1u, true)); const Unique<VkCommandPool> cmdPool (createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Unique<VkCommandBuffer> cmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); @@ -2261,9 +2261,9 @@ void GraphicsTextureTestInstance::transcodeRead () .build(vk, device, VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT, 1u)); const Move<VkDescriptorSet> descriptorSet (makeDescriptorSet(vk, device, *descriptorPool, *descriptorSetLayout)); - const VkExtent2D renderSizeDummy (makeExtent2D(1u, 1u)); + const VkExtent2D renderSizeUnused (makeExtent2D(1u, 1u)); const Unique<VkPipelineLayout> pipelineLayout (makePipelineLayout(vk, device, *descriptorSetLayout)); - const Unique<VkPipeline> pipeline (makeGraphicsPipeline(vk, device, *pipelineLayout, *renderPass, *vertShaderModule, *fragShaderModule, renderSizeDummy, 0u, true)); + const Unique<VkPipeline> pipeline (makeGraphicsPipeline(vk, device, *pipelineLayout, *renderPass, *vertShaderModule, *fragShaderModule, renderSizeUnused, 0u, true)); const Unique<VkCommandPool> cmdPool (createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Unique<VkCommandBuffer> cmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); @@ -2401,9 +2401,9 @@ void GraphicsTextureTestInstance::transcodeWrite () .build(vk, device, VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT, 1u)); const Move<VkDescriptorSet> descriptorSet (makeDescriptorSet(vk, device, *descriptorPool, *descriptorSetLayout)); - const VkExtent2D renderSizeDummy (makeExtent2D(1u, 1u)); + const VkExtent2D renderSizeUnused (makeExtent2D(1u, 1u)); const Unique<VkPipelineLayout> pipelineLayout (makePipelineLayout(vk, device, *descriptorSetLayout)); - const Unique<VkPipeline> pipeline (makeGraphicsPipeline(vk, device, *pipelineLayout, *renderPass, *vertShaderModule, *fragShaderModule, renderSizeDummy, 0u, true)); + const Unique<VkPipeline> pipeline (makeGraphicsPipeline(vk, device, *pipelineLayout, *renderPass, *vertShaderModule, *fragShaderModule, renderSizeUnused, 0u, true)); const Unique<VkCommandPool> cmdPool (createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, queueFamilyIndex)); const Unique<VkCommandBuffer> cmdBuffer (allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY)); diff --git a/external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp b/external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp index d204ad141..09b54e23c 100644 --- a/external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp +++ b/external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp @@ -539,8 +539,9 @@ struct MemoryType struct MemoryObject { - VkDeviceMemory memory; - VkDeviceSize size; + VkDeviceMemory memory; + VkDeviceSize size; + VkMemoryPropertyFlags propertyFlags; }; struct Heap @@ -567,6 +568,7 @@ private: const deUint32 m_totalDeviceMaskCombinations; deUint32 m_memoryObjectCount; + deUint32 m_memoryProtectedObjectCount; deUint32 m_currentDeviceMask; size_t m_opNdx; de::Random m_rng; @@ -583,6 +585,7 @@ RandomAllocFreeTestInstance::RandomAllocFreeTestInstance (Context& context, Test , m_memoryLimits (getMemoryLimits(context.getTestContext().getPlatform().getVulkanPlatform())) , m_totalDeviceMaskCombinations (m_subsetAllocationAllowed ? (1 << m_numPhysDevices) - 1 : 1) , m_memoryObjectCount (0) + , m_memoryProtectedObjectCount (0) , m_currentDeviceMask (m_subsetAllocationAllowed ? 1 : (1 << m_numPhysDevices) - 1) , m_opNdx (0) , m_rng (config.seed) @@ -710,10 +713,20 @@ tcu::TestStatus RandomAllocFreeTestInstance::iterate (void) Heap& heap = m_heaps[heapNdx]; const MemoryType& memoryType = m_rng.choose<MemoryType>(heap.types.begin(), heap.types.end()); const bool isDeviceLocal = (heap.heap.flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) != 0; - const VkDeviceSize maxAllocSize = (isDeviceLocal && !isUMA) + const bool isProtected = memoryType.type.propertyFlags & VK_MEMORY_PROPERTY_PROTECTED_BIT; + VkDeviceSize maxAllocSize = (isDeviceLocal && !isUMA) ? de::min(heap.maxMemoryUsage - heap.memoryUsage, (VkDeviceSize)m_memoryLimits.totalDeviceLocalMemory - m_totalDeviceMem) : de::min(heap.maxMemoryUsage - heap.memoryUsage, (VkDeviceSize)m_memoryLimits.totalSystemMemory - usedSysMem - m_allocSysMemSize); - const VkDeviceSize allocationSize = 1 + (m_rng.getUint64() % maxAllocSize); + const VkDeviceSize maxProtectedAllocSize = 1 * 1024 * 1024; + + // Some implementations might have limitations on protected heap, and these + // limitations don't show up in Vulkan queries. Use a hard coded limit for + // allocations of arbitrarily selected size of 1MB as per Note at "Device + // Memory Allocation" at the spec to use minimum-size allocations. + if(isProtected) + maxAllocSize = (maxAllocSize > maxProtectedAllocSize) ? maxProtectedAllocSize : maxAllocSize; + + const VkDeviceSize allocationSize = 1 + (m_rng.getUint64() % maxAllocSize); if ((allocationSize > (deUint64)(heap.maxMemoryUsage - heap.memoryUsage)) && (allocationSize != 1)) TCU_THROW(InternalError, "Test Error: trying to allocate memory more than the available heap size."); @@ -721,7 +734,8 @@ tcu::TestStatus RandomAllocFreeTestInstance::iterate (void) const MemoryObject object = { (VkDeviceMemory)0, - allocationSize + allocationSize, + memoryType.type.propertyFlags }; heap.objects.push_back(object); @@ -735,13 +749,30 @@ tcu::TestStatus RandomAllocFreeTestInstance::iterate (void) memoryType.index // memoryTypeIndex; }; - VK_CHECK(vkd.allocateMemory(device, &alloc, (const VkAllocationCallbacks*)DE_NULL, &heap.objects.back().memory)); - TCU_CHECK(!!heap.objects.back().memory); - m_memoryObjectCount++; + VkResult res = vkd.allocateMemory(device, &alloc, (const VkAllocationCallbacks*)DE_NULL, &heap.objects.back().memory); + + // Some implementations might have limitations on protected heap, and these + // limitations don't show up in Vulkan queries. Use a hard coded threshold + // after which out of memory is allowed as per Note at "Device Memory Allocation" + // at the spec to support at least 80 allocations concurrently. + if (res == VK_ERROR_OUT_OF_DEVICE_MEMORY && isProtected && m_memoryProtectedObjectCount > 80) + { + heap.objects.pop_back(); + } + else + { + VK_CHECK(res); + + TCU_CHECK(!!heap.objects.back().memory); + m_memoryObjectCount++; + + if (isProtected) + m_memoryProtectedObjectCount++; - heap.memoryUsage += allocationSize; - (isDeviceLocal ? m_totalDeviceMem : m_totalSystemMem) += allocationSize; - m_totalSystemMem += m_allocSysMemSize; + heap.memoryUsage += allocationSize; + (isDeviceLocal ? m_totalDeviceMem : m_totalSystemMem) += allocationSize; + m_totalSystemMem += m_allocSysMemSize; + } } else { @@ -753,9 +784,16 @@ tcu::TestStatus RandomAllocFreeTestInstance::iterate (void) const bool isDeviceLocal = (heap.heap.flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) != 0; vkd.freeMemory(device, memoryObject.memory, (const VkAllocationCallbacks*)DE_NULL); + memoryObject.memory = (VkDeviceMemory)0; m_memoryObjectCount--; + if (memoryObject.propertyFlags & VK_MEMORY_PROPERTY_PROTECTED_BIT) + { + m_memoryProtectedObjectCount--; + memoryObject.propertyFlags = (VkMemoryPropertyFlags)0; + } + heap.memoryUsage -= memoryObject.size; (isDeviceLocal ? m_totalDeviceMem : m_totalSystemMem) -= memoryObject.size; m_totalSystemMem -= m_allocSysMemSize; diff --git a/external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderTests.cpp b/external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderTests.cpp index d3e1cbae6..63cd85f9b 100644 --- a/external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderTests.cpp +++ b/external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderTests.cpp @@ -1417,26 +1417,26 @@ MovePtr<tcu::Texture2DArray> MultiViewRenderTestInstance::imageData (void) if (TEST_TYPE_POINT_SIZE == m_parameters.viewIndex) { const deUint32 vertexPerPrimitive = 1u; - const deUint32 dummyQuarterNdx = 0u; + const deUint32 unusedQuarterNdx = 0u; const int pointSize = static_cast<int>(layerNdx == 0u ? TEST_POINT_SIZE_WIDE : TEST_POINT_SIZE_SMALL); if (subpassCount == 1) for (deUint32 drawNdx = 0u; drawNdx < m_squareCount; ++drawNdx) - setPoint(referenceFrame->getLevel(0), getQuarterRefColor(dummyQuarterNdx, vertexPerPrimitive * drawNdx, layerNdx, false), pointSize, layerNdx, drawNdx); + setPoint(referenceFrame->getLevel(0), getQuarterRefColor(unusedQuarterNdx, vertexPerPrimitive * drawNdx, layerNdx, false), pointSize, layerNdx, drawNdx); else - setPoint(referenceFrame->getLevel(0), getQuarterRefColor(dummyQuarterNdx, vertexPerPrimitive * subpassQuarterNdx, layerNdx, false), pointSize, layerNdx, subpassQuarterNdx); + setPoint(referenceFrame->getLevel(0), getQuarterRefColor(unusedQuarterNdx, vertexPerPrimitive * subpassQuarterNdx, layerNdx, false), pointSize, layerNdx, subpassQuarterNdx); } if (TEST_TYPE_MULTISAMPLE == m_parameters.viewIndex) { const deUint32 vertexPerPrimitive = 3u; - const deUint32 dummyQuarterNdx = 0u; + const deUint32 unusedQuarterNdx = 0u; if (subpassCount == 1) for (deUint32 drawNdx = 0u; drawNdx < m_squareCount; ++drawNdx) - fillTriangle(referenceFrame->getLevel(0), getQuarterRefColor(dummyQuarterNdx, vertexPerPrimitive * drawNdx, layerNdx, false), layerNdx, drawNdx); + fillTriangle(referenceFrame->getLevel(0), getQuarterRefColor(unusedQuarterNdx, vertexPerPrimitive * drawNdx, layerNdx, false), layerNdx, drawNdx); else - fillTriangle(referenceFrame->getLevel(0), getQuarterRefColor(dummyQuarterNdx, vertexPerPrimitive * subpassQuarterNdx, layerNdx, false), layerNdx, subpassQuarterNdx); + fillTriangle(referenceFrame->getLevel(0), getQuarterRefColor(unusedQuarterNdx, vertexPerPrimitive * subpassQuarterNdx, layerNdx, false), layerNdx, subpassQuarterNdx); } } @@ -3726,8 +3726,8 @@ void multiViewRenderCreateTests (tcu::TestCaseGroup* group) // maxMultiviewViewCount case { const VkExtent3D incompleteExtent3D = { 16u, 16u, 0u }; - const vector<deUint32> dummyMasks; - const TestParameters parameters = { incompleteExtent3D, dummyMasks, testType, sampleCountFlags, colorFormat, renderPassType }; + const vector<deUint32> unusedMasks; + const TestParameters parameters = { incompleteExtent3D, unusedMasks, testType, sampleCountFlags, colorFormat, renderPassType }; groupShader->addChild(new MultiViewRenderTestsCase(testCtx, "max_multi_view_view_count", "", parameters)); } diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineCacheTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineCacheTests.cpp index 41d505b28..73d9b383a 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineCacheTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineCacheTests.cpp @@ -682,7 +682,7 @@ void GraphicsCacheTest::initPrograms (SourceCollections& programCollection) cons break; case VK_SHADER_STAGE_GEOMETRY_BIT: - programCollection.glslSources.add("dummy_geo" + missSuffix) << glu::GeometrySource( + programCollection.glslSources.add("unused_geo" + missSuffix) << glu::GeometrySource( "#version 450 \n" "layout(triangles) in;\n" "layout(triangle_strip, max_vertices = 3) out;\n" @@ -957,10 +957,10 @@ GraphicsCacheTestInstance::GraphicsCacheTestInstance (Context& context, } break; case VK_SHADER_STAGE_GEOMETRY_BIT: - m_pipelineBuilder.bindShaderStage(VK_SHADER_STAGE_GEOMETRY_BIT, "dummy_geo", "main"); + m_pipelineBuilder.bindShaderStage(VK_SHADER_STAGE_GEOMETRY_BIT, "unused_geo", "main"); if (m_param->getCompileMissShaders()) { - m_missPipelineBuilder.bindShaderStage(VK_SHADER_STAGE_GEOMETRY_BIT, "dummy_geo_miss", "main"); + m_missPipelineBuilder.bindShaderStage(VK_SHADER_STAGE_GEOMETRY_BIT, "unused_geo_miss", "main"); } break; case VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT: diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineCreationFeedbackTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineCreationFeedbackTests.cpp index e59314b6e..849f80e3f 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineCreationFeedbackTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineCreationFeedbackTests.cpp @@ -644,7 +644,7 @@ void GraphicsCacheTest::initPrograms (SourceCollections& programCollection) cons break; case VK_SHADER_STAGE_GEOMETRY_BIT: - programCollection.glslSources.add("dummy_geo") << glu::GeometrySource( + programCollection.glslSources.add("unused_geo") << glu::GeometrySource( "#version 450 \n" "layout(triangles) in;\n" "layout(triangle_strip, max_vertices = 3) out;\n" @@ -794,7 +794,7 @@ GraphicsCacheTestInstance::GraphicsCacheTestInstance (Context& context, m_pipelineBuilder.bindShaderStage(VK_SHADER_STAGE_FRAGMENT_BIT, "color_frag", "main"); break; case VK_SHADER_STAGE_GEOMETRY_BIT: - m_pipelineBuilder.bindShaderStage(VK_SHADER_STAGE_GEOMETRY_BIT, "dummy_geo", "main"); + m_pipelineBuilder.bindShaderStage(VK_SHADER_STAGE_GEOMETRY_BIT, "unused_geo", "main"); break; case VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT: m_pipelineBuilder.bindShaderStage(VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT, "basic_tcs", "main"); diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineExecutablePropertiesTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineExecutablePropertiesTests.cpp index 3e58d2923..f661c7015 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineExecutablePropertiesTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineExecutablePropertiesTests.cpp @@ -1121,7 +1121,7 @@ void GraphicsExecutablePropertiesTest::initPrograms (SourceCollections& programC break; case VK_SHADER_STAGE_GEOMETRY_BIT: - programCollection.glslSources.add("dummy_geo") << glu::GeometrySource( + programCollection.glslSources.add("unused_geo") << glu::GeometrySource( "#version 450 \n" "layout(triangles) in;\n" "layout(triangle_strip, max_vertices = 3) out;\n" @@ -1256,7 +1256,7 @@ GraphicsExecutablePropertiesTestInstance::GraphicsExecutablePropertiesTestInstan } else { - m_pipelineBuilder.bindShaderStage(VK_SHADER_STAGE_GEOMETRY_BIT, "dummy_geo", "main"); + m_pipelineBuilder.bindShaderStage(VK_SHADER_STAGE_GEOMETRY_BIT, "unused_geo", "main"); } break; case VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT: diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleMixedAttachmentSamplesTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleMixedAttachmentSamplesTests.cpp index 0a3f96ea8..25dea3cc7 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleMixedAttachmentSamplesTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleMixedAttachmentSamplesTests.cpp @@ -105,7 +105,7 @@ struct CompareData } }; -//! Make a dummy sampler. +//! Make a (unused) sampler. Move<VkSampler> makeSampler (const DeviceInterface& vk, const VkDevice device) { const VkSamplerCreateInfo samplerParams = diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleShaderFragmentMaskTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleShaderFragmentMaskTests.cpp index d27aadac8..505575aba 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleShaderFragmentMaskTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleShaderFragmentMaskTests.cpp @@ -92,7 +92,7 @@ struct PositionColor } }; -//! Make a dummy sampler. +//! Make a (unused) sampler. Move<VkSampler> makeSampler (const DeviceInterface& vk, const VkDevice device) { const VkSamplerCreateInfo samplerParams = @@ -443,7 +443,7 @@ struct WorkingData Move<VkBuffer> colorBuffer; //!< Buffer used to copy image data MovePtr<Allocation> colorBufferAlloc; VkDeviceSize colorBufferSize; - Move<VkSampler> defaultSampler; //!< Dummy sampler, we are using texel fetches + Move<VkSampler> defaultSampler; //!< Unused sampler, we are using texel fetches WorkingData (void) : numVertices () diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelinePushConstantTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelinePushConstantTests.cpp index b2dfd2615..10e0987b8 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelinePushConstantTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelinePushConstantTests.cpp @@ -1144,8 +1144,8 @@ void PushConstantGraphicsDisjointTest::initPrograms (SourceCollections& sourceCo << "} matInst;\n"; break; case SIZE_CASE_48: - vertexSrc << "int dummy1;\n" - << "vec4 dummy2;\n" + vertexSrc << "int unused1;\n" + << "vec4 unused2;\n" << "vec4 color;\n" << "} matInst;\n"; break; @@ -1474,8 +1474,8 @@ std::string PushConstantGraphicsOverlapTest::getPushConstantDeclarationStr (VkSh src << " layout(offset = " << m_pushConstantRange[rangeNdx].range.offset << ") vec4 color[2];\n"; break; case SIZE_CASE_36: - src << " layout(offset = " << m_pushConstantRange[rangeNdx].range.offset << ") int dummy1;\n" - << " layout(offset = " << (m_pushConstantRange[rangeNdx].range.offset + 4) << ") vec4 dummy2;\n" + src << " layout(offset = " << m_pushConstantRange[rangeNdx].range.offset << ") int unused1;\n" + << " layout(offset = " << (m_pushConstantRange[rangeNdx].range.offset + 4) << ") vec4 unused2;\n" << " layout(offset = " << (m_pushConstantRange[rangeNdx].range.offset + 20) << ") vec4 color;\n"; break; case SIZE_CASE_128: diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp index 7ff3c876c..a8699ade5 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp @@ -1824,7 +1824,7 @@ void AdvGraphicsTest::initPrograms (SourceCollections& programCollection) const { BasicGraphicsTest::initPrograms(programCollection); - programCollection.glslSources.add("dummy_geo") << glu::GeometrySource( + programCollection.glslSources.add("unused_geo") << glu::GeometrySource( "#version 310 es\n" "#extension GL_EXT_geometry_shader : enable\n" "layout(triangles) in;\n" @@ -1928,7 +1928,7 @@ AdvGraphicsTestInstance::AdvGraphicsTestInstance (Context& context, if(m_features.geometryShader == VK_TRUE) { - m_pipelineBuilder.bindShaderStage(VK_SHADER_STAGE_GEOMETRY_BIT, "dummy_geo"); + m_pipelineBuilder.bindShaderStage(VK_SHADER_STAGE_GEOMETRY_BIT, "unused_geo"); } if(m_features.tessellationShader == VK_TRUE) diff --git a/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemBufferValidator.cpp b/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemBufferValidator.cpp index 38585b1f4..5c33d2c31 100644 --- a/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemBufferValidator.cpp +++ b/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemBufferValidator.cpp @@ -86,7 +86,7 @@ void initBufferValidatorPrograms (vk::SourceCollections& programCollection, Test "layout(set=0, binding=1) buffer ProtectedHelper\n" "{\n" " highp uint zero; // set to 0\n" - " highp uint dummyOut;\n" + " highp uint unusedOut;\n" "} helper;\n" "\n" "layout(set=0, binding=2) uniform Data\n" @@ -98,7 +98,7 @@ void initBufferValidatorPrograms (vk::SourceCollections& programCollection, Test "void error ()\n" "{\n" " for (uint x = 0; x < 10; x += helper.zero)\n" - " atomicAdd(helper.dummyOut, 1u);\n" + " atomicAdd(helper.unusedOut, 1u);\n" "}\n" "\n" "bool compare (${VAR_TYPE} a, ${VAR_TYPE} b, float threshold)\n" @@ -128,7 +128,7 @@ void initBufferValidatorPrograms (vk::SourceCollections& programCollection, Test "layout(set=0, binding=1) buffer ProtectedHelper\n" "{\n" " highp uint zero; // set to 0\n" - " highp uint dummyOut;\n" + " highp uint unusedOut;\n" "} helper;\n" "\n" "layout(set=0, binding=2) uniform Data\n" @@ -139,7 +139,7 @@ void initBufferValidatorPrograms (vk::SourceCollections& programCollection, Test "void error ()\n" "{\n" " for (uint x = 0; x < 10; x += helper.zero)\n" - " atomicAdd(helper.dummyOut, 1u);\n" + " atomicAdd(helper.unusedOut, 1u);\n" "}\n" "\n" "bool compare (${VAR_TYPE} a, ${VAR_TYPE} b, float threshold)\n" @@ -167,7 +167,7 @@ void initBufferValidatorPrograms (vk::SourceCollections& programCollection, Test "layout(set=0, binding=1) buffer ProtectedHelper\n" "{\n" " highp uint zero; // set to 0\n" - " highp uint dummyOut;\n" + " highp uint unusedOut;\n" "} helper;\n" "\n" "void main (void)\n" diff --git a/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemImageValidator.cpp b/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemImageValidator.cpp index 20107fd62..d4fc44680 100644 --- a/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemImageValidator.cpp +++ b/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemImageValidator.cpp @@ -58,7 +58,7 @@ void ImageValidator::initPrograms (vk::SourceCollections& programCollection) con "layout(set=0, binding=1) buffer ProtectedHelper\n" "{\n" " highp uint zero; // set to 0\n" - " highp uint dummyOut;\n" + " highp uint unusedOut;\n" "} helper;\n" "\n" "layout(set=0, binding=2) uniform Data\n" @@ -70,7 +70,7 @@ void ImageValidator::initPrograms (vk::SourceCollections& programCollection) con "void error ()\n" "{\n" " for (uint x = 0; x < 10; x += helper.zero)\n" - " atomicAdd(helper.dummyOut, 1u);\n" + " atomicAdd(helper.unusedOut, 1u);\n" "}\n" "\n" "bool compare (vec4 a, vec4 b, float threshold)\n" @@ -94,7 +94,7 @@ void ImageValidator::initPrograms (vk::SourceCollections& programCollection) con "layout(set=0, binding=1) buffer ProtectedHelper\n" "{\n" " highp uint zero; // set to 0\n" - " highp uint dummyOut;\n" + " highp uint unusedOut;\n" "} helper;\n" "\n" "void main (void)\n" diff --git a/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemYCbCrConversionTests.cpp b/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemYCbCrConversionTests.cpp index 80259503a..505a18414 100644 --- a/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemYCbCrConversionTests.cpp +++ b/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemYCbCrConversionTests.cpp @@ -646,13 +646,13 @@ void testShaders (vk::SourceCollections& dst, const TestConfig config) "layout(std140, set = 0, binding = 2) buffer ProtectedHelper\n" "{\n" " highp uint zero;\n" - " highp uint dummyOut;\n" + " highp uint unusedOut;\n" "} helper;\n" "\n" "void error()\n" "{\n" " for (uint x = 0u; x < 10u; x += helper.zero)\n" - " atomicAdd(helper.dummyOut, 1u);\n" + " atomicAdd(helper.unusedOut, 1u);\n" "}\n" "\n" "${COMPARE_FUNCTION}" @@ -674,13 +674,13 @@ void testShaders (vk::SourceCollections& dst, const TestConfig config) "layout(std140, set=0, binding=2) buffer ProtectedHelper\n" "{\n" " highp uint zero; // set to 0\n" - " highp uint dummyOut;\n" + " highp uint unusedOut;\n" "} helper;\n" "\n" "void main (void)\n" "{\n" " helper.zero = 0;\n" - " helper.dummyOut = 0;\n" + " helper.unusedOut = 0;\n" "}\n"; dst.glslSources.add("ResetSSBO") << glu::ComputeSource(resetSSBOShader); diff --git a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassFragmentDensityMapTests.cpp b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassFragmentDensityMapTests.cpp index 7ab111d42..a9fd7bc6c 100644 --- a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassFragmentDensityMapTests.cpp +++ b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassFragmentDensityMapTests.cpp @@ -70,7 +70,7 @@ // Code of FragmentDensityMapTestInstance is also used to test subsampledLoads, subsampledCoarseReconstructionEarlyAccess, // maxDescriptorSetSubsampledSamplers properties. -// set value of DRY_RUN_WITHOUT_FDM_EXTENSION to 1 for dummy run hat checks the correctness of the code without using VK_EXT_fragment_density_map extension +// set value of DRY_RUN_WITHOUT_FDM_EXTENSION to 1 for empty run that checks the correctness of the code without using VK_EXT_fragment_density_map extension #define DRY_RUN_WITHOUT_FDM_EXTENSION 0 namespace vkt diff --git a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultipleSubpassesMultipleCommandBuffersTests.cpp b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultipleSubpassesMultipleCommandBuffersTests.cpp index 69d58b4d1..87dfbfb91 100644 --- a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultipleSubpassesMultipleCommandBuffersTests.cpp +++ b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultipleSubpassesMultipleCommandBuffersTests.cpp @@ -747,7 +747,7 @@ void MultipleSubpassesMultipleCommandBuffersTestInstance::createCommandBuffer (c VkDeviceSize vertexBufferOffset = 0u; - // Command Buffer A will set his own event but wait for the B's event before continuing to the next subpass. + // Command Buffer A will set its own event but wait for the B's event before continuing to the next subpass. beginCommandBuffer(vk, *m_cmdBufferA, 0u); beginCommandBuffer(vk, *m_cmdBufferB, 0u); vk.cmdBeginRenderPass(*m_cmdBufferA, &renderPassBeginInfoA, VK_SUBPASS_CONTENTS_INLINE); diff --git a/external/vulkancts/modules/vulkan/robustness/vktRobustBufferAccessWithVariablePointersTests.cpp b/external/vulkancts/modules/vulkan/robustness/vktRobustBufferAccessWithVariablePointersTests.cpp index eba4a9f06..6ef55cf2e 100644 --- a/external/vulkancts/modules/vulkan/robustness/vktRobustBufferAccessWithVariablePointersTests.cpp +++ b/external/vulkancts/modules/vulkan/robustness/vktRobustBufferAccessWithVariablePointersTests.cpp @@ -136,9 +136,9 @@ void populateBufferWithValues (void* buffer, // An adapter function matching FillBufferProcPtr interface. Fills a buffer with 0xBABABABABABA... pattern. Used to fill up output buffers. // Since this pattern cannot show up in generated test data it should not show up in the valid output. -void populateBufferWithDummy (void* buffer, - VkDeviceSize size, - const void* const blob) +void populateBufferWithFiller (void* buffer, + VkDeviceSize size, + const void* const blob) { DE_UNREF(blob); deMemset(buffer, 0xBA, static_cast<size_t>(size)); @@ -267,7 +267,7 @@ private: const bool m_accessOutOfBackingMemory; }; -// In case I detect that some prerequisites are not fullfilled I am creating this lightweight dummy test instance instead of AccessInstance. Should be bit faster that way. +// In case I detect that some prerequisites are not fullfilled I am creating this lightweight empty test instance instead of AccessInstance. Should be bit faster that way. class NotSupportedInstance : public vkt::TestInstance { public: @@ -818,7 +818,7 @@ public: }; // A routing generating SPIRV code for all test cases in this group -std::string MakeShader(VkShaderStageFlags shaderStage, ShaderType shaderType, VkFormat bufferFormat, bool reads, bool dummy) +std::string MakeShader(VkShaderStageFlags shaderStage, ShaderType shaderType, VkFormat bufferFormat, bool reads, bool unused) { const bool isR64 = (bufferFormat == VK_FORMAT_R64_UINT || bufferFormat == VK_FORMAT_R64_SINT); // faster to write @@ -874,9 +874,9 @@ std::string MakeShader(VkShaderStageFlags shaderStage, ShaderType shaderType, Vk } // If we are testing vertex shader or fragment shader we need to provide the other one for the pipeline too. - // So the not tested one is 'dummy'. It is then a minimal/simplest possible pass-through shader. - // If we are testing compute shader we dont need dummy shader at all. - if (dummy) + // So the not tested one is 'unused'. It is then a minimal/simplest possible pass-through shader. + // If we are testing compute shader we dont need unused shader at all. + if (unused) { if (shaderStage == VK_SHADER_STAGE_FRAGMENT_BIT) { @@ -1244,7 +1244,7 @@ std::string MakeShader(VkShaderStageFlags shaderStage, ShaderType shaderType, Vk } } - // This is common for test shaders and dummy ones + // This is common for test shaders and unused ones // We need to fill stage ouput from shader properly // output vertices positions in vertex shader if (shaderStage == VK_SHADER_STAGE_VERTEX_BIT) @@ -1385,7 +1385,7 @@ AccessInstance::AccessInstance (Context& context, } createTestBuffer(vk, *m_device, inBufferAccessRange, VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, memAlloc, m_inBuffer, m_inBufferAlloc, m_inBufferAccess, &populateBufferWithValues, &m_bufferFormat); - createTestBuffer(vk, *m_device, outBufferAccessRange, VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, memAlloc, m_outBuffer, m_outBufferAlloc, m_outBufferAccess, &populateBufferWithDummy, DE_NULL); + createTestBuffer(vk, *m_device, outBufferAccessRange, VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, memAlloc, m_outBuffer, m_outBufferAlloc, m_outBufferAccess, &populateBufferWithFiller, DE_NULL); deInt32 indices[] = { (m_accessOutOfBackingMemory && (m_bufferAccessType == BUFFER_ACCESS_TYPE_READ_FROM_STORAGE)) ? static_cast<deInt32>(RobustAccessWithPointersTest::s_testArraySize) - 1 : 0, diff --git a/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderBuiltinPrecisionTests.cpp b/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderBuiltinPrecisionTests.cpp index 0cdf90ff1..27e9d6391 100644 --- a/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderBuiltinPrecisionTests.cpp +++ b/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderBuiltinPrecisionTests.cpp @@ -179,7 +179,7 @@ const T& instance (void) } /*--------------------------------------------------------------------*//*! - * \brief Dummy placeholder type for unused template parameters. + * \brief Empty placeholder type for unused template parameters. * * In the precision tests we are dealing with functions of different arities. * To minimize code duplication, we only define templates with the maximum @@ -1423,7 +1423,7 @@ public: template <typename T> class ExprP : public ExprPBase<T> {}; -// We treat Voids as containers since the dummy parameters in generalized +// We treat Voids as containers since the unused parameters in generalized // vector functions are represented as Voids. template <> class ExprP<Void> : public ContainerExprPBase<Void> {}; @@ -6235,7 +6235,7 @@ tcu::TestStatus BuiltinPrecisionCaseTestInstance<In, Out>::iterate (void) m_executor->execute(int(numValues), inputArr, outputArr); - // Initialize environment with dummy values so we don't need to bind in inner loop. + // Initialize environment with unused values so we don't need to bind in inner loop. { const typename Traits<In0>::IVal in0; const typename Traits<In1>::IVal in1; diff --git a/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp b/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp index 1ef5eec47..6bcb47c76 100644 --- a/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp +++ b/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp @@ -854,9 +854,9 @@ static Move<VkDescriptorSetLayout> createEmptyDescriptorSetLayout (const DeviceI return createDescriptorSetLayout(vkd, device, &createInfo); } -static Move<VkDescriptorPool> createDummyDescriptorPool (const DeviceInterface& vkd, VkDevice device) +static Move<VkDescriptorPool> createEmptyDescriptorPool (const DeviceInterface& vkd, VkDevice device) { - const VkDescriptorPoolSize dummySize = + const VkDescriptorPoolSize emptySize = { VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1u, @@ -868,7 +868,7 @@ static Move<VkDescriptorPool> createDummyDescriptorPool (const DeviceInterface& (VkDescriptorPoolCreateFlags)VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT, 1u, 1u, - &dummySize + &emptySize }; return createDescriptorPool(vkd, device, &createInfo); } @@ -925,8 +925,8 @@ void FragmentOutExecutor::execute (int numValues, const void* const* inputs, voi Move<VkCommandBuffer> cmdBuffer; Unique<VkDescriptorSetLayout> emptyDescriptorSetLayout (createEmptyDescriptorSetLayout(vk, vkDevice)); - Unique<VkDescriptorPool> dummyDescriptorPool (createDummyDescriptorPool(vk, vkDevice)); - Unique<VkDescriptorSet> emptyDescriptorSet (allocateSingleDescriptorSet(vk, vkDevice, *dummyDescriptorPool, *emptyDescriptorSetLayout)); + Unique<VkDescriptorPool> emptyDescriptorPool (createEmptyDescriptorPool(vk, vkDevice)); + Unique<VkDescriptorSet> emptyDescriptorSet (allocateSingleDescriptorSet(vk, vkDevice, *emptyDescriptorPool, *emptyDescriptorSetLayout)); clearRenderData(); diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderBuiltinVarTests.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderBuiltinVarTests.cpp index 5574e8d28..3de7c50e9 100644 --- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderBuiltinVarTests.cpp +++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderBuiltinVarTests.cpp @@ -636,10 +636,6 @@ TestStatus BuiltinFragDepthCaseInstance::iterate (void) // Initialize Marker Buffer { - VkImageAspectFlags depthImageAspectFlags = VK_IMAGE_ASPECT_DEPTH_BIT; - if (hasStencilComponent(mapVkFormat(m_format).order)) - depthImageAspectFlags |= VK_IMAGE_ASPECT_STENCIL_BIT; - const VkImageMemoryBarrier imageBarrier[] = { { diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesQueueBindSparseTests.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesQueueBindSparseTests.cpp index 9021ac5b7..a0e2ee034 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesQueueBindSparseTests.cpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesQueueBindSparseTests.cpp @@ -230,7 +230,7 @@ public: } else { - // a dummy submission, won't be used in a call to vkQueueBindSparse + // an unused submission, won't be used in a call to vkQueueBindSparse queueSubmissions.push_back(makeSubmissionSparse(sparseQueue, 0u, DE_NULL, 0u, DE_NULL)); } diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm16bitStorageTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm16bitStorageTests.cpp index 61b0d9008..bfac1f610 100644 --- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm16bitStorageTests.cpp +++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm16bitStorageTests.cpp @@ -2236,7 +2236,7 @@ void addCompute16bitStorageUniform16To16Group (tcu::TestCaseGroup* group) de::Random rnd (deStringHash(group->getName())); const int numElements = 128; const vector<deFloat16> float16Data = getFloat16s(rnd, numElements); - const vector<deFloat16> float16DummyData (numElements, 0); + const vector<deFloat16> float16UnusedData (numElements, 0); ComputeShaderSpec spec; std::ostringstream shaderTemplate; @@ -2305,7 +2305,7 @@ void addCompute16bitStorageUniform16To16Group (tcu::TestCaseGroup* group) spec.verifyIO = computeCheckBuffersFloats; spec.coherentMemory = true; spec.inputs.push_back(Resource(BufferSp(new Float16Buffer(float16Data)))); - spec.outputs.push_back(Resource(BufferSp(new Float16Buffer(float16DummyData)))); + spec.outputs.push_back(Resource(BufferSp(new Float16Buffer(float16UnusedData)))); spec.extensions.push_back("VK_KHR_16bit_storage"); spec.requestedVulkanFeatures = get16BitStorageFeatures("uniform_buffer_block"); @@ -2438,7 +2438,7 @@ void addCompute16bitStorageUniform32To16Group (tcu::TestCaseGroup* group) } }; - vector<deFloat16> float16DummyData (numElements, 0); + vector<deFloat16> float16UnusedData (numElements, 0); for (deUint32 capIdx = 0; capIdx < DE_LENGTH_OF_ARRAY(CAPABILITIES); ++capIdx) for (deUint32 tyIdx = 0; tyIdx < DE_LENGTH_OF_ARRAY(cTypes[capIdx]); ++tyIdx) @@ -2491,8 +2491,8 @@ void addCompute16bitStorageUniform32To16Group (tcu::TestCaseGroup* group) spec.inputs.push_back(Resource(BufferSp(new Float32Buffer(float32Data)), CAPABILITIES[capIdx].dtype)); // We provided a custom verifyIO in the above in which inputs will be used for checking. - // So put dummy data in the expected values. - spec.outputs.push_back(Resource(BufferSp(new Float16Buffer(float16DummyData)))); + // So put unused data in the expected values. + spec.outputs.push_back(Resource(BufferSp(new Float16Buffer(float16UnusedData)))); spec.extensions.push_back("VK_KHR_16bit_storage"); spec.requestedVulkanFeatures = get16BitStorageFeatures(CAPABILITIES[capIdx].name); @@ -3249,7 +3249,7 @@ void addGraphics16BitStorageUniformFloat32To16Group (tcu::TestCaseGroup* testGro RGBA defaultColors[4]; const vector<float> float32Data = getFloat32s(rnd, numDataPoints); vector<float> float32DataPadded; - vector<deFloat16> float16DummyData (numDataPoints, 0); + vector<deFloat16> float16UnusedData (numDataPoints, 0); const StringTemplate capabilities ("OpCapability ${cap}\n"); for (size_t dataIdx = 0; dataIdx < float32Data.size(); ++dataIdx) @@ -3354,7 +3354,7 @@ void addGraphics16BitStorageUniformFloat32To16Group (tcu::TestCaseGroup* testGro resources.inputs.push_back(Resource(BufferSp(new Float32Buffer(arrayStrides[capIdx] == 4 ? float32Data : float32DataPadded)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); // We use a custom verifyIO to check the result via computing directly from inputs; the contents in outputs do not matter. - resources.outputs.push_back(Resource(BufferSp(new Float16Buffer(float16DummyData)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); + resources.outputs.push_back(Resource(BufferSp(new Float16Buffer(float16UnusedData)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); specs["cap"] = CAPABILITIES[capIdx].cap; specs["indecor"] = CAPABILITIES[capIdx].decor; @@ -3379,7 +3379,7 @@ void addGraphics16BitStorageUniformFloat32To16Group (tcu::TestCaseGroup* testGro GraphicsResources resources; resources.inputs.push_back(Resource(BufferSp(new Float32Buffer(float32Data)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); // We use a custom verifyIO to check the result via computing directly from inputs; the contents in outputs do not matter. - resources.outputs.push_back(Resource(BufferSp(new Float16Buffer(float16DummyData)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); + resources.outputs.push_back(Resource(BufferSp(new Float16Buffer(float16UnusedData)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); { // vector cases fragments["pre_main"] = @@ -7525,7 +7525,7 @@ void addCompute16bitStorageUniform64To16Group (tcu::TestCaseGroup* group) }; vector<double> float64Data = getFloat64s(rnd, numElements); - vector<deFloat16> float16DummyData (numElements, 0); + vector<deFloat16> float16UnusedData (numElements, 0); for (deUint32 capIdx = 0; capIdx < DE_LENGTH_OF_ARRAY(CAPABILITIES); ++capIdx) for (deUint32 tyIdx = 0; tyIdx < DE_LENGTH_OF_ARRAY(cTypes); ++tyIdx) @@ -7585,8 +7585,8 @@ void addCompute16bitStorageUniform64To16Group (tcu::TestCaseGroup* group) spec.inputs.push_back(Resource(BufferSp(new Float64Buffer(float64Data, padding)), CAPABILITIES[capIdx].dtype)); // We provided a custom verifyIO in the above in which inputs will be used for checking. - // So put dummy data in the expected values. - spec.outputs.push_back(BufferSp(new Float16Buffer(float16DummyData))); + // So put unused data in the expected values. + spec.outputs.push_back(BufferSp(new Float16Buffer(float16UnusedData))); spec.extensions.push_back("VK_KHR_16bit_storage"); @@ -7607,11 +7607,11 @@ void addGraphics16BitStorageUniformFloat64To16Group (tcu::TestCaseGroup* testGro const deUint32 numDataPoints = 256; RGBA defaultColors[4]; vector<double> float64Data = getFloat64s(rnd, numDataPoints); - vector<deFloat16> float16DummyData (numDataPoints, 0); + vector<deFloat16> float16UnusedData (numDataPoints, 0); const StringTemplate capabilities ("OpCapability Float64\n" "OpCapability ${cap}\n"); // We use a custom verifyIO to check the result via computing directly from inputs; the contents in outputs do not matter. - resources.outputs.push_back(Resource(BufferSp(new Float16Buffer(float16DummyData)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); + resources.outputs.push_back(Resource(BufferSp(new Float16Buffer(float16UnusedData)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); extensions.push_back("VK_KHR_16bit_storage"); diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm8bitStorageTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm8bitStorageTests.cpp index 9b6aafb70..275e2380d 100644 --- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm8bitStorageTests.cpp +++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm8bitStorageTests.cpp @@ -1910,7 +1910,7 @@ void addCompute8bitStorageBuffer8To8Group (tcu::TestCaseGroup* group) de::Random rnd (deStringHash(group->getName())); const int numElements = 128; const vector<deInt8> int8Data = getInt8s(rnd, numElements); - const vector<deInt8> int8DummyData (numElements, 0); + const vector<deInt8> int8UnusedData (numElements, 0); ComputeShaderSpec spec; std::ostringstream shaderTemplate; shaderTemplate<<"OpCapability Shader\n" @@ -1979,7 +1979,7 @@ void addCompute8bitStorageBuffer8To8Group (tcu::TestCaseGroup* group) spec.verifyIO = computeCheckBuffers; spec.coherentMemory = true; spec.inputs.push_back(BufferSp(new Int8Buffer(int8Data))); - spec.outputs.push_back(BufferSp(new Int8Buffer(int8DummyData))); + spec.outputs.push_back(BufferSp(new Int8Buffer(int8UnusedData))); spec.extensions.push_back("VK_KHR_storage_buffer_storage_class"); spec.extensions.push_back("VK_KHR_8bit_storage"); spec.requestedVulkanFeatures.ext8BitStorage = EXT8BITSTORAGEFEATURES_STORAGE_BUFFER; diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmConditionalBranchTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmConditionalBranchTests.cpp index 8b4ac874e..a5a47292d 100644 --- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmConditionalBranchTests.cpp +++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmConditionalBranchTests.cpp @@ -93,7 +93,7 @@ void addComputeSameLabelsTest (tcu::TestCaseGroup* group) " %_ptr_Uniform_Output = OpTypePointer Uniform %Output\n" " %dataOutput = OpVariable %_ptr_Uniform_Output Uniform\n" " %_ptr_Uniform_uint = OpTypePointer Uniform %uint\n" - " %uint_dummy = OpConstant %uint 2863311530\n" + " %uint_unused = OpConstant %uint 2863311530\n" " %main = OpFunction %void None %3\n" " %5 = OpLabel\n" " %i = OpVariable %_ptr_Function_uint Function\n" @@ -109,7 +109,7 @@ void addComputeSameLabelsTest (tcu::TestCaseGroup* group) " OpBranch %merge\n" " %dead = OpLabel\n" " %35 = OpAccessChain %_ptr_Uniform_uint %dataOutput %uint_0 %uint_i\n" - " OpStore %35 %uint_dummy\n" + " OpStore %35 %uint_unused\n" " OpBranch %merge\n" " %merge = OpLabel\n" " OpReturn\n" @@ -160,7 +160,7 @@ void addGraphicsSameLabelsTest (tcu::TestCaseGroup* group) " %dataOutput = OpVariable %_ptr_Uniform_Output Uniform\n" " %_ptr_Uniform_uint = OpTypePointer Uniform %u32\n" " %fp_u32 = OpTypePointer Function %u32\n" - " %uint_dummy = OpConstant %u32 2863311530\n"; + " %uint_unused = OpConstant %u32 2863311530\n"; fragments["decoration"] = " OpDecorate %_arr_uint_uint_128 ArrayStride 4\n" @@ -194,7 +194,7 @@ void addGraphicsSameLabelsTest (tcu::TestCaseGroup* group) " OpBranch %condmerge\n" " %dead = OpLabel\n" " %35 = OpAccessChain %_ptr_Uniform_uint %dataOutput %c_u32_0 %uint_i\n" - " OpStore %35 %uint_dummy\n" + " OpStore %35 %uint_unused\n" " OpBranch %condmerge\n" " %condmerge = OpLabel\n" " OpBranch %inc\n" diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp index 22e6c75fa..fbbe1a4e2 100644 --- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp +++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp @@ -4383,8 +4383,8 @@ InstanceContext GraphicsTestGroupBuilder::createInstanceContext(const OperationT } // varying is not used but it needs to be specified so lets use type_i32 for it - string dummyVertVarying = "%BP_vertex_result = OpVariable %type_i32_optr Output\n"; - string dummyFragVarying = "%BP_vertex_result = OpVariable %type_i32_iptr Input\n"; + string unusedVertVarying = "%BP_vertex_result = OpVariable %type_i32_optr Output\n"; + string unusedFragVarying = "%BP_vertex_result = OpVariable %type_i32_iptr Input\n"; vertCapabilities = ""; vertExtensions = ""; @@ -4401,8 +4401,8 @@ InstanceContext GraphicsTestGroupBuilder::createInstanceContext(const OperationT vertExecutionMode = ""; fragExecutionMode = behaviorExecutionMode; - vertIODefinitions = dummyVertVarying; - fragIODefinitions = dummyFragVarying; + vertIODefinitions = unusedVertVarying; + fragIODefinitions = unusedFragVarying; vertArguments = ""; fragArguments = specOpData.arguments; diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmImageSamplerTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmImageSamplerTests.cpp index af3abb8c7..833d954b7 100644 --- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmImageSamplerTests.cpp +++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmImageSamplerTests.cpp @@ -803,8 +803,8 @@ void addComputeImageSamplerTest (tcu::TestCaseGroup* group) // Separate sampler for sampled images if ((DescriptorType)descNdx == DESCRIPTOR_TYPE_SAMPLED_IMAGE) { - vector<tcu::Vec4> dummyData; - spec.inputs.push_back(Resource(BufferSp(new Vec4Buffer(dummyData)))); + vector<tcu::Vec4> unusedData; + spec.inputs.push_back(Resource(BufferSp(new Vec4Buffer(unusedData)))); spec.inputs[1].setDescriptorType(VK_DESCRIPTOR_TYPE_SAMPLER); } @@ -1086,8 +1086,8 @@ void addGraphicsImageSamplerTest (tcu::TestCaseGroup* group) // Separate sampler for sampled images if ((DescriptorType)descNdx == DESCRIPTOR_TYPE_SAMPLED_IMAGE) { - vector<tcu::Vec4> dummyData; - resources.inputs.push_back(Resource(BufferSp(new Vec4Buffer(dummyData)), VK_DESCRIPTOR_TYPE_SAMPLER)); + vector<tcu::Vec4> unusedData; + resources.inputs.push_back(Resource(BufferSp(new Vec4Buffer(unusedData)), VK_DESCRIPTOR_TYPE_SAMPLER)); } // Second combined image sampler with different image data @@ -1233,8 +1233,8 @@ void addGraphicsDepthPropertyTest (tcu::TestCaseGroup* group) // Separate sampler for sampled images if ((DescriptorType)descNdx == DESCRIPTOR_TYPE_SAMPLED_IMAGE) { - vector<Vec4> dummyData; - resources.inputs.push_back(Resource(BufferSp(new Vec4Buffer(dummyData)), VK_DESCRIPTOR_TYPE_SAMPLER)); + vector<Vec4> unusedData; + resources.inputs.push_back(Resource(BufferSp(new Vec4Buffer(unusedData)), VK_DESCRIPTOR_TYPE_SAMPLER)); } // Second combined image sampler with different image data diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp index e57b34b86..989ec0b7f 100644 --- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp +++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp @@ -11353,8 +11353,8 @@ tcu::TestCaseGroup* createFloat16LogicalSet (tcu::TestContext& testCtx, const bo const vector<deFloat16> float16Data2 = squarize(float16DataScalar, 1); const vector<deFloat16> float16DataVec1 = squarizeVector(float16DataVector, 0); // Total Size: 2 * (square(square(sizeof(float16DataVector)))) const vector<deFloat16> float16DataVec2 = squarizeVector(float16DataVector, 1); - const vector<deFloat16> float16OutDummy (float16Data1.size(), 0); - const vector<deFloat16> float16OutVecDummy (float16DataVec1.size(), 0); + const vector<deFloat16> float16OutUnused (float16Data1.size(), 0); + const vector<deFloat16> float16OutVecUnused (float16DataVec1.size(), 0); struct TestOp { @@ -11493,7 +11493,7 @@ tcu::TestCaseGroup* createFloat16LogicalSet (tcu::TestContext& testCtx, const bo specResource.inputs.push_back(Resource(BufferSp(new Float16Buffer(float16Data1)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); specResource.inputs.push_back(Resource(BufferSp(new Float16Buffer(float16Data2)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); - specResource.outputs.push_back(Resource(BufferSp(new Float16Buffer(float16OutDummy)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); + specResource.outputs.push_back(Resource(BufferSp(new Float16Buffer(float16OutUnused)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); specResource.verifyIO = nanSupported ? testOp.verifyFuncNan : testOp.verifyFuncNonNan; extensions.push_back("VK_KHR_shader_float16_int8"); @@ -11622,7 +11622,7 @@ tcu::TestCaseGroup* createFloat16LogicalSet (tcu::TestContext& testCtx, const bo specResource.inputs.push_back(Resource(BufferSp(new Float16Buffer(float16DataVec1)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); specResource.inputs.push_back(Resource(BufferSp(new Float16Buffer(float16DataVec2)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); - specResource.outputs.push_back(Resource(BufferSp(new Float16Buffer(float16OutVecDummy)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); + specResource.outputs.push_back(Resource(BufferSp(new Float16Buffer(float16OutVecUnused)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); specResource.verifyIO = nanSupported ? testOp.verifyFuncNan : testOp.verifyFuncNonNan; extensions.push_back("VK_KHR_shader_float16_int8"); @@ -11678,7 +11678,7 @@ tcu::TestCaseGroup* createFloat16FuncSet (tcu::TestContext& testCtx) const StringTemplate capabilities ("OpCapability Float16\n"); const deUint32 numDataPoints = 256; const vector<deFloat16> float16InputData = getFloat16s(rnd, numDataPoints); - const vector<deFloat16> float16OutputDummy (float16InputData.size(), 0); + const vector<deFloat16> float16OutputUnused (float16InputData.size(), 0); map<string, string> fragments; struct TestType @@ -11835,7 +11835,7 @@ tcu::TestCaseGroup* createFloat16FuncSet (tcu::TestContext& testCtx) fragments["testfun"] += StringTemplate(testType.storeFunc).specialize({{"var", "ssbo_dst"}}); specResource.inputs.push_back(Resource(BufferSp(new Float16Buffer(float16InputData)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); - specResource.outputs.push_back(Resource(BufferSp(new Float16Buffer(float16OutputDummy)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); + specResource.outputs.push_back(Resource(BufferSp(new Float16Buffer(float16OutputUnused)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); specResource.verifyIO = compareFP16FunctionSetFunc; extensions.push_back("VK_KHR_shader_float16_int8"); @@ -11900,7 +11900,7 @@ tcu::TestCaseGroup* createFloat16VectorExtractSet (tcu::TestContext& testCtx) de::Random rnd (deStringHash(testGroup->getName())); const deUint32 numDataPoints = 256; const vector<deFloat16> float16InputData = getFloat16s(rnd, numDataPoints); - const vector<deFloat16> float16OutputDummy (float16InputData.size(), 0); + const vector<deFloat16> float16OutputUnused (float16InputData.size(), 0); struct TestType { @@ -12088,7 +12088,7 @@ tcu::TestCaseGroup* createFloat16VectorExtractSet (tcu::TestContext& testCtx) specResource.inputs.push_back(Resource(BufferSp(new Float16Buffer(float16InputData)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); specResource.inputs.push_back(Resource(BufferSp(new Uint32Buffer(inputDataNdx)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); - specResource.outputs.push_back(Resource(BufferSp(new Float16Buffer(float16OutputDummy)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); + specResource.outputs.push_back(Resource(BufferSp(new Float16Buffer(float16OutputUnused)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); specResource.verifyIO = compareFP16VectorExtractFunc; extensions.push_back("VK_KHR_shader_float16_int8"); @@ -12161,7 +12161,7 @@ tcu::TestCaseGroup* createFloat16VectorInsertSet (tcu::TestContext& testCtx) const deUint32 replacement = 42; const deUint32 numDataPoints = 256; const vector<deFloat16> float16InputData = getFloat16s(rnd, numDataPoints); - const vector<deFloat16> float16OutputDummy (float16InputData.size(), 0); + const vector<deFloat16> float16OutputUnused (float16InputData.size(), 0); struct TestType { @@ -12345,7 +12345,7 @@ tcu::TestCaseGroup* createFloat16VectorInsertSet (tcu::TestContext& testCtx) specResource.inputs.push_back(Resource(BufferSp(new Float16Buffer(float16InputData)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); specResource.inputs.push_back(Resource(BufferSp(new Uint32Buffer(inputDataNdx)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); - specResource.outputs.push_back(Resource(BufferSp(new Float16Buffer(float16OutputDummy)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); + specResource.outputs.push_back(Resource(BufferSp(new Float16Buffer(float16OutputUnused)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); specResource.verifyIO = testType.verifyIOFunc; extensions.push_back("VK_KHR_shader_float16_int8"); @@ -12660,7 +12660,7 @@ tcu::TestCaseGroup* createFloat16VectorShuffleSet (tcu::TestContext& testCtx) const deUint32 outputStride = (dstType.typeComponents == 3) ? 4 : dstType.typeComponents; const vector<deFloat16> float16Input0Data = getFloat16s(rnd, input0Stride * numDataPoints); const vector<deFloat16> float16Input1Data = getFloat16s(rnd, input1Stride * numDataPoints); - const vector<deFloat16> float16OutputDummy (outputStride * numDataPoints, 0); + const vector<deFloat16> float16OutputUnused (outputStride * numDataPoints, 0); const string testName = de::toString(dstType.typeComponents) + de::toString(src0Type.typeComponents) + de::toString(src1Type.typeComponents); deUint32 caseCount = 0; SpecResource specResource; @@ -12725,7 +12725,7 @@ tcu::TestCaseGroup* createFloat16VectorShuffleSet (tcu::TestContext& testCtx) specResource.inputs.push_back(Resource(BufferSp(new Float16Buffer(float16Input0Data)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); specResource.inputs.push_back(Resource(BufferSp(new Float16Buffer(float16Input1Data)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); - specResource.outputs.push_back(Resource(BufferSp(new Float16Buffer(float16OutputDummy)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); + specResource.outputs.push_back(Resource(BufferSp(new Float16Buffer(float16OutputUnused)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); specResource.verifyIO = getFloat16VectorShuffleVerifyIOFunc(dstType.typeComponents, src0Type.typeComponents, src1Type.typeComponents); extensions.push_back("VK_KHR_shader_float16_int8"); @@ -14099,14 +14099,14 @@ tcu::TestCaseGroup* createFloat16CompositeInsertExtractSet (tcu::TestContext& te map<string, string> fragments; vector<string> extensions; vector<deFloat16> inputFP16; - vector<deFloat16> dummyFP16Output; + vector<deFloat16> unusedFP16Output; // Generate values for input inputFP16.reserve(structItemsCount); for (deUint32 structItemNdx = 0; structItemNdx < structItemsCount; ++structItemNdx) inputFP16.push_back((accessPath[structItemNdx] == DE_NULL) ? exceptionValue : tcu::Float16(float(structItemNdx)).bits()); - dummyFP16Output.resize(structItemsCount); + unusedFP16Output.resize(structItemsCount); // Generate cases for OpSwitch { @@ -14161,7 +14161,7 @@ tcu::TestCaseGroup* createFloat16CompositeInsertExtractSet (tcu::TestContext& te } specResource.inputs.push_back(Resource(BufferSp(new Float16Buffer(inputFP16)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); - specResource.outputs.push_back(Resource(BufferSp(new Float16Buffer(dummyFP16Output)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); + specResource.outputs.push_back(Resource(BufferSp(new Float16Buffer(unusedFP16Output)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); specResource.verifyIO = compareFP16CompositeFunc; extensions.push_back("VK_KHR_shader_float16_int8"); @@ -15091,10 +15091,10 @@ struct fp16ModfInt : public fp16PerComponent const fp16type x (*in[0]); const double d (x.asDouble()); double i (0.0); - const double dummy (deModf(d, &i)); + const double unused (deModf(d, &i)); const double result (i); - DE_UNREF(dummy); + DE_UNREF(unused); if (x.isInf() || x.isNaN()) return false; @@ -15136,10 +15136,10 @@ struct fp16FrexpE : public fp16PerComponent const fp16type x (*in[0]); const double d (x.asDouble()); int e (0); - const double dummy (deFrExp(d, &e)); + const double unused (deFrExp(d, &e)); const double result (static_cast<double>(e)); - DE_UNREF(dummy); + DE_UNREF(unused); if (x.isNaN() || x.isInf()) return false; @@ -18295,17 +18295,17 @@ void createFloat16ArithmeticFuncTest (tcu::TestContext& testCtx, tcu::TestCaseGr const Math16ArgFragments argFragmentModfInt = { - " %val_src0 = OpFunctionCall %${t0} %ld_arg_ssbo_src0 %ndx\n" - "%val_dummy = ${op} %${tr} ${ext_inst} %val_src0 %tmp\n" - " %tmp0 = OpAccessChain %fp_tmp %tmp\n" - " %val_dst = OpLoad %${tr} %tmp0\n" - " %dst = OpFunctionCall %void %st_fn_ssbo_dst %val_dst %ndx\n", + " %val_src0 = OpFunctionCall %${t0} %ld_arg_ssbo_src0 %ndx\n" + "%val_unused = ${op} %${tr} ${ext_inst} %val_src0 %tmp\n" + " %tmp0 = OpAccessChain %fp_tmp %tmp\n" + " %val_dst = OpLoad %${tr} %tmp0\n" + " %dst = OpFunctionCall %void %st_fn_ssbo_dst %val_dst %ndx\n", - " %fp_tmp = OpTypePointer Function %${tr}\n", + " %fp_tmp = OpTypePointer Function %${tr}\n", "", - " %tmp = OpVariable %fp_tmp Function\n", + " %tmp = OpVariable %fp_tmp Function\n", }; const Math16ArgFragments argFragmentModfStruct = @@ -18386,18 +18386,18 @@ void createFloat16ArithmeticFuncTest (tcu::TestContext& testCtx, tcu::TestCaseGr const Math16ArgFragments argFragmentFrexpE = { - " %val_src0 = OpFunctionCall %${t0} %ld_arg_ssbo_src0 %ndx\n" - " %out_exp = OpAccessChain %fp_${dr}i32 %tmp\n" - "%val_dummy = ${op} %${tr} ${ext_inst} %val_src0 %out_exp\n" - "%val_dst_i = OpLoad %${dr}i32 %out_exp\n" - " %val_dst = OpConvertSToF %${tr} %val_dst_i\n" - " %dst = OpFunctionCall %void %st_fn_ssbo_dst %val_dst %ndx\n", + " %val_src0 = OpFunctionCall %${t0} %ld_arg_ssbo_src0 %ndx\n" + " %out_exp = OpAccessChain %fp_${dr}i32 %tmp\n" + "%val_unused = ${op} %${tr} ${ext_inst} %val_src0 %out_exp\n" + "%val_dst_i = OpLoad %${dr}i32 %out_exp\n" + " %val_dst = OpConvertSToF %${tr} %val_dst_i\n" + " %dst = OpFunctionCall %void %st_fn_ssbo_dst %val_dst %ndx\n", "", "", - " %tmp = OpVariable %fp_${dr}i32 Function\n", + " %tmp = OpVariable %fp_${dr}i32 Function\n", }; string load_funcs[MATH16_TYPE_LAST]; @@ -18439,7 +18439,7 @@ void createFloat16ArithmeticFuncTest (tcu::TestContext& testCtx, tcu::TestCaseGr const size_t numFloatsPerArg0Type = testTypes[testFunc.typeArg0].typeArrayStride / sizeof(deFloat16); const size_t iterations = numDataPoints / numFloatsPerArg0Type; const size_t numFloatsPerResultType = testTypes[testFunc.typeResult].typeArrayStride / sizeof(deFloat16); - const vector<deFloat16> float16DummyOutput (iterations * numFloatsPerResultType, 0); + const vector<deFloat16> float16UnusedOutput (iterations * numFloatsPerResultType, 0); VulkanFeatures features; SpecResource specResource; map<string, string> specs; @@ -18594,7 +18594,7 @@ void createFloat16ArithmeticFuncTest (tcu::TestContext& testCtx, tcu::TestCaseGr specResource.inputs.push_back(Resource(BufferSp(new Float16Buffer(inputData)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); } - specResource.outputs.push_back(Resource(BufferSp(new Float16Buffer(float16DummyOutput)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); + specResource.outputs.push_back(Resource(BufferSp(new Float16Buffer(float16UnusedOutput)), VK_DESCRIPTOR_TYPE_STORAGE_BUFFER)); specResource.verifyIO = testFunc.verifyFunc; extensions.push_back("VK_KHR_shader_float16_int8"); diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmNonSemanticInfoTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmNonSemanticInfoTests.cpp index 0b59f4c7f..545eef700 100644 --- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmNonSemanticInfoTests.cpp +++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmNonSemanticInfoTests.cpp @@ -40,7 +40,7 @@ using namespace vk; enum TestType { TT_BASIC = 0, - TT_DUMMY_INSTRUCTION_SET, + TT_NONEXISTING_INSTRUCTION_SET, TT_LARGE_INSTRUCTION_NUMBER, TT_MANY_PARAMETERS, TT_ANY_CONSTANT_TYPE, @@ -137,11 +137,11 @@ void SpvAsmSpirvNonSemanticInfoBasicCase::initPrograms (SourceCollections& progr "%tmp = OpExtInst %void %extInstSet 1 %main %fileStr\n"; break; - case TT_DUMMY_INSTRUCTION_SET: + case TT_NONEXISTING_INSTRUCTION_SET: // Testing non existing instruction set extendedInstructions = - "%extInstSet = OpExtInstImport \"NonSemantic.P.B.DummySet\"\n"; + "%extInstSet = OpExtInstImport \"NonSemantic.P.B.NonexistingSet\"\n"; additionalPreamble += "%testStrA = OpString \"this.is.test\"\n" "%testStrB = OpString \"yet another test\"\n"; @@ -345,7 +345,7 @@ tcu::TestCaseGroup* createNonSemanticInfoGroup(tcu::TestContext& testCtx) std::vector<TestData> testList = { { "basic", TT_BASIC }, - { "dummy_instruction_set", TT_DUMMY_INSTRUCTION_SET }, + { "dummy_instruction_set", TT_NONEXISTING_INSTRUCTION_SET }, { "large_instruction_number", TT_LARGE_INSTRUCTION_NUMBER }, { "many_parameters", TT_MANY_PARAMETERS }, { "any_constant_type", TT_ANY_CONSTANT_TYPE }, diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSignalOrderTests.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSignalOrderTests.cpp index 6e8b64011..87c2de185 100644 --- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSignalOrderTests.cpp +++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSignalOrderTests.cpp @@ -59,7 +59,6 @@ namespace using namespace vk; using namespace vkt::ExternalMemoryUtil; -using tcu::TestLog; using de::MovePtr; using de::SharedPtr; using de::UniquePtr; @@ -1445,14 +1444,12 @@ public: DE_ASSERT(semaphoreHandlesA.size() == iterations.size()); // Record all read operations into a single command buffer and track the union of their execution stages. - VkPipelineStageFlags2KHR readStages = 0; ptrCmdBufferB = makeVkSharedPtr(makeCommandBuffer(vk, device, *cmdPoolB)); cmdBufferB = **(ptrCmdBufferB); beginCommandBuffer(vk, cmdBufferB); for (deUint32 iterIdx = 0; iterIdx < iterations.size(); iterIdx++) { QueueSubmitOrderIteration& iter = iterations[iterIdx]; - readStages |= iter.readOp->getInSyncInfo().stageMask; iter.readOp->recordCommands(cmdBufferB); } endCommandBuffer(vk, cmdBufferB); diff --git a/external/vulkancts/modules/vulkan/ubo/vktRandomUniformBlockCase.cpp b/external/vulkancts/modules/vulkan/ubo/vktRandomUniformBlockCase.cpp index d4b080b2e..f93ba6c99 100644 --- a/external/vulkancts/modules/vulkan/ubo/vktRandomUniformBlockCase.cpp +++ b/external/vulkancts/modules/vulkan/ubo/vktRandomUniformBlockCase.cpp @@ -158,19 +158,19 @@ void RandomUniformBlockCase::generateBlock (de::Random& rnd, deUint32 layoutFlag block.setFlags(layoutFlags); for (int ndx = 0; ndx < numUniforms; ndx++) - generateUniform(rnd, block); + generateUniform(rnd, block, numInstances ? numInstances : 1); m_blockNdx += 1; } -void RandomUniformBlockCase::generateUniform (de::Random& rnd, UniformBlock& block) +void RandomUniformBlockCase::generateUniform (de::Random& rnd, UniformBlock& block, deUint32 complexity) { const float unusedVtxWeight = 0.15f; const float unusedFragWeight = 0.15f; bool unusedOk = (m_features & FEATURE_UNUSED_UNIFORMS) != 0; deUint32 flags = 0; std::string name = genName('a', 'z', m_uniformNdx); - VarType type = generateType(rnd, 0, true); + VarType type = generateType(rnd, 0, true, complexity); flags |= (unusedOk && rnd.getFloat() < unusedVtxWeight) ? UNUSED_VERTEX : 0; flags |= (unusedOk && rnd.getFloat() < unusedFragWeight) ? UNUSED_FRAGMENT : 0; @@ -180,7 +180,7 @@ void RandomUniformBlockCase::generateUniform (de::Random& rnd, UniformBlock& blo m_uniformNdx += 1; } -VarType RandomUniformBlockCase::generateType (de::Random& rnd, int typeDepth, bool arrayOk) +VarType RandomUniformBlockCase::generateType (de::Random& rnd, int typeDepth, bool arrayOk, deUint32 complexity) { const float structWeight = 0.1f; const float arrayWeight = 0.1f; @@ -195,7 +195,7 @@ VarType RandomUniformBlockCase::generateType (de::Random& rnd, int typeDepth, bo // Generate members first so nested struct declarations are in correct order. for (int ndx = 0; ndx < numMembers; ndx++) - memberTypes.push_back(generateType(rnd, typeDepth+1, true)); + memberTypes.push_back(generateType(rnd, typeDepth+1, true, complexity)); StructType& structType = m_interface.allocStruct(std::string("s") + genName('A', 'Z', m_structNdx)); m_structNdx += 1; @@ -216,8 +216,15 @@ VarType RandomUniformBlockCase::generateType (de::Random& rnd, int typeDepth, bo else if (m_maxArrayLength > 0 && arrayOk && rnd.getFloat() < arrayWeight) { const bool arraysOfArraysOk = (m_features & FEATURE_ARRAYS_OF_ARRAYS) != 0; - const int arrayLength = rnd.getInt(1, m_maxArrayLength); - VarType elementType = generateType(rnd, typeDepth, arraysOfArraysOk); + int arrayLength = rnd.getInt(1, m_maxArrayLength); + + if (complexity * arrayLength >= 70) + { + // Trim overly complicated cases (affects 18 cases out of 1576) + arrayLength = 1; + } + + VarType elementType = generateType(rnd, typeDepth, arraysOfArraysOk, complexity * arrayLength); return VarType(elementType, arrayLength); } else diff --git a/external/vulkancts/modules/vulkan/ubo/vktRandomUniformBlockCase.hpp b/external/vulkancts/modules/vulkan/ubo/vktRandomUniformBlockCase.hpp index 6ecc7308d..c4a27055d 100644 --- a/external/vulkancts/modules/vulkan/ubo/vktRandomUniformBlockCase.hpp +++ b/external/vulkancts/modules/vulkan/ubo/vktRandomUniformBlockCase.hpp @@ -74,8 +74,8 @@ public: private: void generateBlock (de::Random& rnd, deUint32 layoutFlags); - void generateUniform (de::Random& rnd, UniformBlock& block); - VarType generateType (de::Random& rnd, int typeDepth, bool arrayOk); + void generateUniform (de::Random& rnd, UniformBlock& block, deUint32 complexity); + VarType generateType (de::Random& rnd, int typeDepth, bool arrayOk, deUint32 complexity); const deUint32 m_features; const int m_maxVertexBlocks; diff --git a/external/vulkancts/modules/vulkan/util/vktDrawUtil.cpp b/external/vulkancts/modules/vulkan/util/vktDrawUtil.cpp index 55b5d77e1..79fc840eb 100644 --- a/external/vulkancts/modules/vulkan/util/vktDrawUtil.cpp +++ b/external/vulkancts/modules/vulkan/util/vktDrawUtil.cpp @@ -542,6 +542,8 @@ void VulkanDrawContext::registerDrawObject(const PipelineState& pipelineState, c } } + DE_UNREF(stageFlags); // For release builds. + DE_ASSERT( (drawCallData.topology != VK_PRIMITIVE_TOPOLOGY_PATCH_LIST) || (stageFlags & (VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT | VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT))); diff --git a/external/vulkancts/modules/vulkan/wsi/vktWsiFullScreenExclusiveTests.cpp b/external/vulkancts/modules/vulkan/wsi/vktWsiFullScreenExclusiveTests.cpp index 0f5f4c138..e97ea7ae5 100644 --- a/external/vulkancts/modules/vulkan/wsi/vktWsiFullScreenExclusiveTests.cpp +++ b/external/vulkancts/modules/vulkan/wsi/vktWsiFullScreenExclusiveTests.cpp @@ -39,6 +39,8 @@ #include "tcuPlatform.hpp" #include "tcuCommandLine.hpp" +#include <limits> + #if ( DE_OS == DE_OS_WIN32 ) #define NOMINMAX #define WIN32_LEAN_AND_MEAN diff --git a/external/vulkancts/modules/vulkan/wsi/vktWsiIncrementalPresentTests.cpp b/external/vulkancts/modules/vulkan/wsi/vktWsiIncrementalPresentTests.cpp index 75a885e4a..8e5895547 100644 --- a/external/vulkancts/modules/vulkan/wsi/vktWsiIncrementalPresentTests.cpp +++ b/external/vulkancts/modules/vulkan/wsi/vktWsiIncrementalPresentTests.cpp @@ -712,7 +712,7 @@ std::vector<vk::VkSwapchainCreateInfoKHR> generateSwapchainConfigs (vk::VkSurfac ? de::max(31u, properties.minImageExtent.height) : de::min(deSmallestGreaterOrEquallPowerOfTwoU32(currentHeight+1), properties.maxImageExtent.height)); const vk::VkExtent2D imageSize = { imageWidth, imageHeight }; - const vk::VkExtent2D dummySize = { de::max(31u, properties.minImageExtent.width), de::max(31u, properties.minImageExtent.height) }; + const vk::VkExtent2D unusedSize = { de::max(31u, properties.minImageExtent.width), de::max(31u, properties.minImageExtent.height) }; { size_t presentModeNdx; @@ -764,8 +764,8 @@ std::vector<vk::VkSwapchainCreateInfoKHR> generateSwapchainConfigs (vk::VkSurfac createInfos.push_back(createInfo); - // add an extra dummy swapchain - const vk::VkSwapchainCreateInfoKHR dummyInfo = + // add an extra unused swapchain + const vk::VkSwapchainCreateInfoKHR unusedInfo = { vk::VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR, DE_NULL, @@ -774,7 +774,7 @@ std::vector<vk::VkSwapchainCreateInfoKHR> generateSwapchainConfigs (vk::VkSurfac properties.minImageCount, imageFormat, imageColorSpace, - dummySize, + unusedSize, imageLayers, imageUsage, vk::VK_SHARING_MODE_EXCLUSIVE, @@ -787,7 +787,7 @@ std::vector<vk::VkSwapchainCreateInfoKHR> generateSwapchainConfigs (vk::VkSurfac (vk::VkSwapchainKHR)0 }; - createInfos.push_back(dummyInfo); + createInfos.push_back(unusedInfo); } return createInfos; diff --git a/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp b/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp index bd19e5580..bbe49c9a6 100644 --- a/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp +++ b/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp @@ -2561,12 +2561,13 @@ tcu::TestStatus acquireTooManyTest (Context& context, Type wsiType) const deUint32 numAcquirableImages = numImages - minImageCount + 1; const auto fences = createFences(devHelper.vkd, *devHelper.device, numAcquirableImages + 1, false); - deUint32 dummy; + deUint32 unused; + for (deUint32 i = 0; i < numAcquirableImages; ++i) { - VK_CHECK_WSI(devHelper.vkd.acquireNextImageKHR(*devHelper.device, *swapchain, std::numeric_limits<deUint64>::max(), (VkSemaphore)0, **fences[i], &dummy)); + VK_CHECK_WSI(devHelper.vkd.acquireNextImageKHR(*devHelper.device, *swapchain, std::numeric_limits<deUint64>::max(), (VkSemaphore)0, **fences[i], &unused)); } - const auto result = devHelper.vkd.acquireNextImageKHR(*devHelper.device, *swapchain, 0, (VkSemaphore)0, **fences[numAcquirableImages], &dummy); + const auto result = devHelper.vkd.acquireNextImageKHR(*devHelper.device, *swapchain, 0, (VkSemaphore)0, **fences[numAcquirableImages], &unused); if (result != VK_SUCCESS && result != VK_SUBOPTIMAL_KHR && result != VK_NOT_READY ){ return tcu::TestStatus::fail("Implementation failed to respond well acquiring too many images with 0 timeout"); @@ -2598,14 +2599,15 @@ tcu::TestStatus acquireTooManyTimeoutTest (Context& context, Type wsiType) const deUint32 numAcquirableImages = numImages - minImageCount + 1; const auto fences = createFences(devHelper.vkd, *devHelper.device, numAcquirableImages + 1, false); - deUint32 dummy; + deUint32 unused; + for (deUint32 i = 0; i < numAcquirableImages; ++i) { - VK_CHECK_WSI(devHelper.vkd.acquireNextImageKHR(*devHelper.device, *swapchain, std::numeric_limits<deUint64>::max(), (VkSemaphore)0, **fences[i], &dummy)); + VK_CHECK_WSI(devHelper.vkd.acquireNextImageKHR(*devHelper.device, *swapchain, std::numeric_limits<deUint64>::max(), (VkSemaphore)0, **fences[i], &unused)); } const deUint64 millisecond = 1000000; const deUint64 timeout = 50 * millisecond; // arbitrary realistic non-0 non-infinite timeout - const auto result = devHelper.vkd.acquireNextImageKHR(*devHelper.device, *swapchain, timeout, (VkSemaphore)0, **fences[numAcquirableImages], &dummy); + const auto result = devHelper.vkd.acquireNextImageKHR(*devHelper.device, *swapchain, timeout, (VkSemaphore)0, **fences[numAcquirableImages], &unused); if (result != VK_SUCCESS && result != VK_SUBOPTIMAL_KHR && result != VK_TIMEOUT ){ return tcu::TestStatus::fail("Implementation failed to respond well acquiring too many images with timeout"); diff --git a/external/vulkancts/scripts/gen_framework.py b/external/vulkancts/scripts/gen_framework.py index 3ebcf9ac6..2748f091b 100755 --- a/external/vulkancts/scripts/gen_framework.py +++ b/external/vulkancts/scripts/gen_framework.py @@ -38,6 +38,7 @@ VULKAN_DIR = os.path.join(os.path.dirname(__file__), "..", "framework", "vulkan INL_HEADER = """\ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. + * This file was generated by /scripts/gen_framework.py */\ """ @@ -1841,7 +1842,7 @@ def writeDeviceFeatures2(api, filename): nextInstanceName = 'DE_NULL'; if index < len(testedStructureDetail)-1: nextInstanceName = '&' + testedStructureDetail[index+1].instanceName + '[ndx]' - structureChain.append('\t' + structureDetail.instanceName + '[ndx].sType = ' + structureDetail.sType + ';') + structureChain.append('\t' + structureDetail.instanceName + '[ndx].sType = ' + structureDetail.flagName + ' ? ' + structureDetail.sType + ' : VK_STRUCTURE_TYPE_MAX_ENUM;') structureChain.append('\t' + structureDetail.instanceName + '[ndx].pNext = ' + nextInstanceName + ';\n') # construct log section logStructures.append('if (' + structureDetail.flagName + ')') diff --git a/framework/common/tcuAstcUtil.cpp b/framework/common/tcuAstcUtil.cpp index 096b8b968..8bb38c8c6 100644 --- a/framework/common/tcuAstcUtil.cpp +++ b/framework/common/tcuAstcUtil.cpp @@ -1973,9 +1973,9 @@ static void writeBlockMode (AssignBlock128& dst, const NormalBlockParams& blockP if (de::inRange(blockParams.weightGridWidth, widthMin, widthMax) && de::inRange(blockParams.weightGridHeight, heightMin, heightMax)) { - deUint32 dummy = 0; - deUint32& widthVariable = layout.gridWidthVariableTerm == A ? a : layout.gridWidthVariableTerm == B ? b : dummy; - deUint32& heightVariable = layout.gridHeightVariableTerm == A ? a : layout.gridHeightVariableTerm == B ? b : dummy; + deUint32 defaultvalue = 0; + deUint32& widthVariable = layout.gridWidthVariableTerm == A ? a : layout.gridWidthVariableTerm == B ? b : defaultvalue; + deUint32& heightVariable = layout.gridHeightVariableTerm == A ? a : layout.gridHeightVariableTerm == B ? b : defaultvalue; widthVariable = blockParams.weightGridWidth - layout.gridWidthConstantTerm; heightVariable = blockParams.weightGridHeight - layout.gridHeightConstantTerm; @@ -2896,15 +2896,15 @@ void generateRandomValidBlocks (deUint8* dst, size_t numBlocks, CompressedTexFor } } -// Generate a number of trivial dummy blocks to fill unneeded space in a texture. -void generateDummyVoidExtentBlocks (deUint8* dst, size_t numBlocks) +// Generate a number of trivial blocks to fill unneeded space in a texture. +void generateDefaultVoidExtentBlocks (deUint8* dst, size_t numBlocks) { AssignBlock128 block = generateVoidExtentBlock(VoidExtentParams(false, 0, 0, 0, 0)); for (size_t ndx = 0; ndx < numBlocks; ndx++) block.assignToMemory(&dst[ndx * BLOCK_SIZE_BYTES]); } -void generateDummyNormalBlocks (deUint8* dst, size_t numBlocks, int blockWidth, int blockHeight) +void generateDefaultNormalBlocks (deUint8* dst, size_t numBlocks, int blockWidth, int blockHeight) { NormalBlockParams blockParams; diff --git a/framework/common/tcuAstcUtil.hpp b/framework/common/tcuAstcUtil.hpp index 620e49285..2bb114a7c 100644 --- a/framework/common/tcuAstcUtil.hpp +++ b/framework/common/tcuAstcUtil.hpp @@ -67,8 +67,8 @@ void generateBlockCaseTestData (std::vector<deUint8>& dst, CompressedTexForma void generateRandomBlocks (deUint8* dst, size_t numBlocks, CompressedTexFormat format, deUint32 seed); void generateRandomValidBlocks (deUint8* dst, size_t numBlocks, CompressedTexFormat format, TexDecompressionParams::AstcMode mode, deUint32 seed); -void generateDummyVoidExtentBlocks (deUint8* dst, size_t numBlocks); -void generateDummyNormalBlocks (deUint8* dst, size_t numBlocks, int blockWidth, int blockHeight); +void generateDefaultVoidExtentBlocks (deUint8* dst, size_t numBlocks); +void generateDefaultNormalBlocks (deUint8* dst, size_t numBlocks, int blockWidth, int blockHeight); bool isValidBlock (const deUint8* data, CompressedTexFormat format, TexDecompressionParams::AstcMode mode); diff --git a/framework/common/tcuCPUWarmup.cpp b/framework/common/tcuCPUWarmup.cpp index 13b6e0f3e..b20075c9b 100644 --- a/framework/common/tcuCPUWarmup.cpp +++ b/framework/common/tcuCPUWarmup.cpp @@ -34,7 +34,7 @@ namespace tcu namespace warmupCPUInternal { -volatile Dummy g_dummy; +volatile Unused g_unused; }; @@ -64,7 +64,7 @@ static inline float floatRelativeMedianAbsoluteDeviation (const T (&v)[Size]) return floatMedian(absoluteDeviations) / median; } -static inline float dummyComputation (float initial, int numIterations) +static inline float unusedComputation (float initial, int numIterations) { float a = initial; int b = 123; @@ -84,10 +84,10 @@ static inline float dummyComputation (float initial, int numIterations) void warmupCPU (void) { - float dummy = *warmupCPUInternal::g_dummy.m_v; + float unused = *warmupCPUInternal::g_unused.m_v; int computationSize = 1; - // Do a rough calibration for computationSize to get dummyComputation's running time above a certain threshold. + // Do a rough calibration for computationSize to get unusedComputation's running time above a certain threshold. while (computationSize < 1<<30) // \note This condition is unlikely to be met. The "real" loop exit is the break below. { const float singleMeasurementThreshold = 10000.0f; @@ -97,7 +97,7 @@ void warmupCPU (void) for (int i = 0; i < numMeasurements; i++) { const deUint64 startTime = deGetMicroseconds(); - dummy = dummyComputation(dummy, computationSize); + unused = unusedComputation(unused, computationSize); times[i] = (deInt64)(deGetMicroseconds() - startTime); } @@ -107,7 +107,7 @@ void warmupCPU (void) computationSize *= 2; } - // Do dummyComputations until running time seems stable enough. + // Do unusedComputations until running time seems stable enough. { const int maxNumMeasurements = 50; const int numConsecutiveMeasurementsRequired = 5; @@ -123,12 +123,12 @@ void warmupCPU (void) measurementNdx++) { const deUint64 startTime = deGetMicroseconds(); - dummy = dummyComputation(dummy, computationSize); + unused = unusedComputation(unused, computationSize); latestTimes[measurementNdx % numConsecutiveMeasurementsRequired] = (deInt64)(deGetMicroseconds() - startTime); } } - *warmupCPUInternal::g_dummy.m_v = dummy; + *warmupCPUInternal::g_unused.m_v = unused; } } // tcu diff --git a/framework/common/tcuCPUWarmup.hpp b/framework/common/tcuCPUWarmup.hpp index 879487d8d..95c6a3f54 100644 --- a/framework/common/tcuCPUWarmup.hpp +++ b/framework/common/tcuCPUWarmup.hpp @@ -26,7 +26,7 @@ namespace tcu { -//! Does some dummy calculations to try and get the CPU working at full speed. +//! Does some unused calculations to try and get the CPU working at full speed. void warmupCPU (void); namespace warmupCPUInternal @@ -34,16 +34,16 @@ namespace warmupCPUInternal // \note Used in an attempt to prevent compiler from doing optimizations. Not supposed to be touched elsewhere. -class Dummy +class Unused { public: - Dummy (void) : m_v(new float) {} - ~Dummy (void) { delete m_v; } + Unused (void) : m_v(new float) {} + ~Unused (void) { delete m_v; } volatile float* volatile m_v; }; -extern volatile Dummy g_dummy; +extern volatile Unused g_unused; }; diff --git a/framework/common/tcuThreadUtil.cpp b/framework/common/tcuThreadUtil.cpp index 4ee3b338a..964c2132f 100644 --- a/framework/common/tcuThreadUtil.cpp +++ b/framework/common/tcuThreadUtil.cpp @@ -177,14 +177,14 @@ Thread::~Thread (void) m_operations.clear(); } -deUint8* Thread::getDummyData (size_t size) +deUint8* Thread::getUnusedData (size_t size) { - if (m_dummyData.size() < size) + if (m_unusedData.size() < size) { - m_dummyData.resize(size); + m_unusedData.resize(size); } - return &(m_dummyData[0]); + return &(m_unusedData[0]); } void Thread::addOperation (Operation* operation) diff --git a/framework/common/tcuThreadUtil.hpp b/framework/common/tcuThreadUtil.hpp index d6c412473..e7b04cd21 100644 --- a/framework/common/tcuThreadUtil.hpp +++ b/framework/common/tcuThreadUtil.hpp @@ -174,7 +174,7 @@ public: void exec (void); - deUint8* getDummyData (size_t size); //!< Return data pointer that contains at least size bytes. Valid until next call + deUint8* getUnusedData (size_t size); //!< Return data pointer that contains at least size bytes. Valid until next call ThreadStatus getStatus (void) const { de::ScopedLock lock(m_statusLock); return m_status; } void setStatus (ThreadStatus status) { de::ScopedLock lock(m_statusLock); m_status = status; } @@ -199,7 +199,7 @@ private: std::vector<Message> m_messages; mutable de::Mutex m_statusLock; ThreadStatus m_status; - std::vector<deUint8> m_dummyData; + std::vector<deUint8> m_unusedData; // Disabled Thread (const Thread&); diff --git a/framework/delibs/decpp/deBlockBuffer.cpp b/framework/delibs/decpp/deBlockBuffer.cpp index 7e00594e4..e2f532208 100644 --- a/framework/delibs/decpp/deBlockBuffer.cpp +++ b/framework/delibs/decpp/deBlockBuffer.cpp @@ -25,6 +25,7 @@ #include "deRandom.hpp" #include "deThread.hpp" #include "deInt32.h" +#include "deMemory.h" #include <vector> @@ -239,6 +240,8 @@ public: deUint8 tmp[1024]; Random rnd(m_seed); + deMemset(tmp, 0, DE_LENGTH_OF_ARRAY(tmp)); + for (;;) { int blockSize = rnd.getInt(1, DE_LENGTH_OF_ARRAY(tmp)); diff --git a/framework/delibs/decpp/dePoolArray.cpp b/framework/delibs/decpp/dePoolArray.cpp index 3169e2001..c9867e760 100644 --- a/framework/delibs/decpp/dePoolArray.cpp +++ b/framework/delibs/decpp/dePoolArray.cpp @@ -39,7 +39,7 @@ static void intArrayTest (void) /* Test pushBack(). */ for (i = 0; i < 5000; i++) { - /* Dummy alloc to try to break alignments. */ + /* Unused alloc to try to break alignments. */ pool.alloc(1); arr.pushBack(i); @@ -113,7 +113,7 @@ static void alignedIntArrayTest (void) /* Test pushBack(). */ for (i = 0; i < 5000; i++) { - /* Dummy alloc to try to break alignments. */ + /* Unused alloc to try to break alignments. */ pool.alloc(1); arr.pushBack(i); diff --git a/framework/delibs/depool/dePoolArray.c b/framework/delibs/depool/dePoolArray.c index aff04de3c..ddbf7539c 100644 --- a/framework/delibs/depool/dePoolArray.c +++ b/framework/delibs/depool/dePoolArray.c @@ -164,7 +164,7 @@ void dePoolArray_selfTest (void) /* Test pushBack(). */ for (i = 0; i < 5000; i++) { - /* Dummy alloc to try to break alignments. */ + /* Unused alloc to try to break alignments. */ deMemPool_alloc(pool, 1); dePoolIntArray_pushBack(arr, i); diff --git a/framework/delibs/depool/dePoolArray.h b/framework/delibs/depool/dePoolArray.h index 8365e7f06..8278f115b 100644 --- a/framework/delibs/depool/dePoolArray.h +++ b/framework/delibs/depool/dePoolArray.h @@ -207,7 +207,7 @@ DE_INLINE void TYPENAME##_swap (DE_PTR_TYPE(TYPENAME) arr, int aNdx, int bNdx) \ TYPENAME##_set(arr, bNdx, tmp); \ } \ \ -struct TYPENAME##Dummy_s { int dummy; } +struct TYPENAME##Unused_s { int unused; } /*--------------------------------------------------------------------*//*! * \brief Declare a sort function for an array. @@ -284,7 +284,7 @@ DE_INLINE void TYPENAME##_##SORTNAME (DE_PTR_TYPE(TYPENAME) arr) \ } \ } \ \ -struct TYPENAME##SORTNAME##Dummy_s { int dummy; } +struct TYPENAME##SORTNAME##unused_s { int unused; } /* Basic array types. */ diff --git a/framework/delibs/depool/dePoolHash.h b/framework/delibs/depool/dePoolHash.h index 5316f322d..6d8992782 100644 --- a/framework/delibs/depool/dePoolHash.h +++ b/framework/delibs/depool/dePoolHash.h @@ -182,7 +182,7 @@ DE_INLINE VALUETYPE TYPENAME##Iter_getValue (const TYPENAME##Iter* iter) \ return iter->curSlot->values[iter->curElemIndex]; \ } \ \ -struct TYPENAME##Dummy_s { int dummy; } +struct TYPENAME##Unused_s { int unused; } /*--------------------------------------------------------------------*//*! * \brief Implement a template pool hash class. @@ -416,13 +416,13 @@ void TYPENAME##_delete (DE_PTR_TYPE(TYPENAME) hash, KEYTYPE key) \ DE_ASSERT(slot); \ } \ } \ -struct TYPENAME##Dummy2_s { int dummy; } +struct TYPENAME##Unused2_s { int unused; } /* Copy-to-array templates. */ #define DE_DECLARE_POOL_HASH_TO_ARRAY(HASHTYPENAME, KEYARRAYTYPENAME, VALUEARRAYTYPENAME) \ deBool HASHTYPENAME##_copyToArray(const HASHTYPENAME* set, DE_PTR_TYPE(KEYARRAYTYPENAME) keyArray, DE_PTR_TYPE(VALUEARRAYTYPENAME) valueArray); \ - struct HASHTYPENAME##_##KEYARRAYTYPENAME##_##VALUEARRAYTYPENAME##_declare_dummy { int dummy; } + struct HASHTYPENAME##_##KEYARRAYTYPENAME##_##VALUEARRAYTYPENAME##_declare_unused { int unused; } #define DE_IMPLEMENT_POOL_HASH_TO_ARRAY(HASHTYPENAME, KEYARRAYTYPENAME, VALUEARRAYTYPENAME) \ deBool HASHTYPENAME##_copyToArray(const HASHTYPENAME* hash, DE_PTR_TYPE(KEYARRAYTYPENAME) keyArray, DE_PTR_TYPE(VALUEARRAYTYPENAME) valueArray) \ @@ -455,6 +455,6 @@ deBool HASHTYPENAME##_copyToArray(const HASHTYPENAME* hash, DE_PTR_TYPE(KEYARRAY DE_ASSERT(arrayNdx == numElements); \ return DE_TRUE; \ } \ -struct HASHTYPENAME##_##KEYARRAYTYPENAME##_##VALUEARRAYTYPENAME##_implement_dummy { int dummy; } +struct HASHTYPENAME##_##KEYARRAYTYPENAME##_##VALUEARRAYTYPENAME##_implement_unused { int unused; } #endif /* _DEPOOLHASH_H */ diff --git a/framework/delibs/depool/dePoolHashArray.h b/framework/delibs/depool/dePoolHashArray.h index cf9cfbe5b..7b2da1a07 100644 --- a/framework/delibs/depool/dePoolHashArray.h +++ b/framework/delibs/depool/dePoolHashArray.h @@ -103,7 +103,7 @@ DE_INLINE void TYPENAME##_reset (DE_PTR_TYPE(TYPENAME) hashArray) \ TYPENAME##Array_reset(hashArray->array); \ } \ \ -struct TYPENAME##Dummy_s { int dummy; } +struct TYPENAME##Unused_s { int unused; } /*--------------------------------------------------------------------*//*! * \brief Implement a template pool hash-array class. @@ -166,6 +166,6 @@ deBool TYPENAME##_copyToArray (const TYPENAME* hashArray, DE_PTR_TYPE(KEYARRAYTY return DE_TRUE; \ } \ \ -struct TYPENAME##Dummy2_s { int dummy; } +struct TYPENAME##Unused2_s { int unused; } #endif /* _DEPOOLHASHARRAY_H */ diff --git a/framework/delibs/depool/dePoolHashSet.h b/framework/delibs/depool/dePoolHashSet.h index 3d823b291..a9f1491a6 100644 --- a/framework/delibs/depool/dePoolHashSet.h +++ b/framework/delibs/depool/dePoolHashSet.h @@ -146,7 +146,7 @@ DE_INLINE deBool TYPENAME##_exists (const TYPENAME* hashSet, KEYTYPE key, VALUET return DE_FALSE; \ } \ \ -struct TYPENAME##Dummy_s { int dummy; } +struct TYPENAME##Unused_s { int unused; } /*--------------------------------------------------------------------*//*! * \brief Implement a template pool hash-set class. @@ -164,7 +164,7 @@ struct TYPENAME##Dummy_s { int dummy; } #define DE_IMPLEMENT_POOL_HASH_SET(TYPENAME, KEYTYPE, VALUETYPE, KEYHASHFUNC, KEYCMPFUNC, VALUEHASHFUNC, VALUECMPFUNC) \ DE_IMPLEMENT_POOL_SET(TYPENAME##Set, VALUETYPE, VALUEHASHFUNC, VALUECMPFUNC); \ DE_IMPLEMENT_POOL_HASH(TYPENAME##Hash, KEYTYPE, TYPENAME##Set*, KEYHASHFUNC, KEYCMPFUNC); \ -struct TYPENAME##Dummy2_s { int dummy; } +struct TYPENAME##Unused2_s { int unused; } /* Copy-to-array templates. */ @@ -172,7 +172,7 @@ struct TYPENAME##Dummy2_s { int dummy; } #define DE_DECLARE_POOL_HASH_TO_ARRAY(HASHTYPENAME, KEYARRAYTYPENAME, VALUEARRAYTYPENAME) \ deBool HASHTYPENAME##_copyToArray(const HASHTYPENAME* set, KEYARRAYTYPENAME* keyArray, VALUEARRAYTYPENAME* valueArray); \ - struct HASHTYPENAME##_##KEYARRAYTYPENAME##_##VALUEARRAYTYPENAME##_declare_dummy { int dummy; } + struct HASHTYPENAME##_##KEYARRAYTYPENAME##_##VALUEARRAYTYPENAME##_declare_unused { int unused; } #define DE_IMPLEMENT_POOL_HASH_TO_ARRAY(HASHTYPENAME, KEYARRAYTYPENAME, VALUEARRAYTYPENAME) \ deBool HASHTYPENAME##_copyToArray(const HASHTYPENAME* hash, KEYARRAYTYPENAME* keyArray, VALUEARRAYTYPENAME* valueArray) \ @@ -205,7 +205,7 @@ deBool HASHTYPENAME##_copyToArray(const HASHTYPENAME* hash, KEYARRAYTYPENAME* ke DE_ASSERT(arrayNdx == numElements); \ return DE_TRUE; \ } \ -struct HASHTYPENAME##_##KEYARRAYTYPENAME##_##VALUEARRAYTYPENAME##_implement_dummy { int dummy; } +struct HASHTYPENAME##_##KEYARRAYTYPENAME##_##VALUEARRAYTYPENAME##_implement_unused { int unused; } #endif diff --git a/framework/delibs/depool/dePoolHeap.c b/framework/delibs/depool/dePoolHeap.c index 4e5e4b692..213a6bbb7 100644 --- a/framework/delibs/depool/dePoolHeap.c +++ b/framework/delibs/depool/dePoolHeap.c @@ -75,7 +75,7 @@ void dePoolHeap_selfTest (void) /* Push items -1000..1000 into heap. */ for (i = -1000; i < 1000; i++) { - /* Dummy alloc to try to break alignments. */ + /* Unused alloc to try to break alignments. */ deMemPool_alloc(pool, 1); TestHeap_push(heap, HeapItem_create(i, -i)); } diff --git a/framework/delibs/depool/dePoolHeap.h b/framework/delibs/depool/dePoolHeap.h index 9df1b89f5..61ff8e1b2 100644 --- a/framework/delibs/depool/dePoolHeap.h +++ b/framework/delibs/depool/dePoolHeap.h @@ -163,6 +163,6 @@ DE_INLINE VALUETYPE TYPENAME##_popMin (DE_PTR_TYPE(TYPENAME) heap) \ return tmp; \ } \ \ -struct TYPENAME##Dummy_s { int dummy; } +struct TYPENAME##Unused_s { int unused; } #endif /* _DEPOOLHEAP_H */ diff --git a/framework/delibs/depool/dePoolMultiSet.h b/framework/delibs/depool/dePoolMultiSet.h index c5dce8541..8079c3950 100644 --- a/framework/delibs/depool/dePoolMultiSet.h +++ b/framework/delibs/depool/dePoolMultiSet.h @@ -104,7 +104,7 @@ DE_INLINE void TYPENAME##_delete (DE_PTR_TYPE(TYPENAME) set, KEYTYPE key) \ TYPENAME##_setKeyCount(set, key, oldCount - 1); \ } \ \ -struct TYPENAME##DeclareDummy_s { int dummy; } +struct TYPENAME##DeclareUnused_s { int unused; } /*--------------------------------------------------------------------*//*! * \brief Implement a template pool multiset class. @@ -162,7 +162,7 @@ deBool TYPENAME##_setKeyCount (DE_PTR_TYPE(TYPENAME) set, KEYTYPE key, int newCo return DE_TRUE; \ } \ \ -struct TYPENAME##ImplementDummy_s { int dummy; } +struct TYPENAME##ImplementUnused_s { int unused; } /*--------------------------------------------------------------------*//*! * \brief Declare set-wise operations for a multiset template. @@ -197,7 +197,7 @@ struct TYPENAME##ImplementDummy_s { int dummy; } deBool TYPENAME##_sumInplace (DE_PTR_TYPE(TYPENAME) a, const TYPENAME* b); \ deBool TYPENAME##_difference (DE_PTR_TYPE(TYPENAME) to, const TYPENAME* a, const TYPENAME* b); \ void TYPENAME##_differenceInplace (DE_PTR_TYPE(TYPENAME) a, const TYPENAME* b); \ - struct TYPENAME##SetwiseDeclareDummy_s { int dummy; } + struct TYPENAME##SetwiseDeclareUnused_s { int unused; } #define DE_IMPLEMENT_POOL_MULTISET_SETWISE_OPERATIONS(TYPENAME, KEYTYPE) \ deBool TYPENAME##_union (DE_PTR_TYPE(TYPENAME) to, const TYPENAME* a, const TYPENAME* b) \ @@ -291,6 +291,6 @@ void TYPENAME##_differenceInplace (DE_PTR_TYPE(TYPENAME) a, const TYPENAME* b) \ DE_FATAL("Not implemented."); \ } \ \ -struct TYPENAME##SetwiseImplementDummy_s { int dummy; } +struct TYPENAME##SetwiseImplementUnused_s { int unused; } #endif /* _DEPOOLMULTISET_H */ diff --git a/framework/delibs/depool/dePoolSet.h b/framework/delibs/depool/dePoolSet.h index 214bc1758..240904563 100644 --- a/framework/delibs/depool/dePoolSet.h +++ b/framework/delibs/depool/dePoolSet.h @@ -190,7 +190,7 @@ DE_INLINE void TYPENAME##_safeDelete (DE_PTR_TYPE(TYPENAME) set, KEYTYPE key) \ TYPENAME##_delete(set, key); \ } \ \ -struct TYPENAME##Dummy_s { int dummy; } +struct TYPENAME##Unused_s { int unused; } /*--------------------------------------------------------------------*//*! * \brief Implement a template pool set class. @@ -424,13 +424,13 @@ void TYPENAME##_delete (DE_PTR_TYPE(TYPENAME) set, KEYTYPE key) \ } \ } \ \ -struct TYPENAME##Dummy2_s { int dummy; } +struct TYPENAME##Unused2_s { int unused; } /* Copy-to-array templates. */ #define DE_DECLARE_POOL_SET_TO_ARRAY(SETTYPENAME, ARRAYTYPENAME) \ deBool SETTYPENAME##_copyToArray(const SETTYPENAME* set, DE_PTR_TYPE(ARRAYTYPENAME) array); \ - struct SETTYPENAME##_##ARRAYTYPENAME##_declare_dummy { int dummy; } + struct SETTYPENAME##_##ARRAYTYPENAME##_declare_unused { int unused; } #define DE_IMPLEMENT_POOL_SET_TO_ARRAY(SETTYPENAME, ARRAYTYPENAME) \ deBool SETTYPENAME##_copyToArray(const SETTYPENAME* set, DE_PTR_TYPE(ARRAYTYPENAME) array) \ @@ -456,7 +456,7 @@ struct TYPENAME##Dummy2_s { int dummy; } DE_ASSERT(arrayNdx == numElements); \ return DE_TRUE; \ } \ - struct SETTYPENAME##_##ARRAYTYPENAME##_implement_dummy { int dummy; } + struct SETTYPENAME##_##ARRAYTYPENAME##_implement_unused { int unused; } /*--------------------------------------------------------------------*//*! * \brief Declare set-wise operations for a set template. @@ -487,7 +487,7 @@ struct TYPENAME##Dummy2_s { int dummy; } void TYPENAME##_intersectInplace (DE_PTR_TYPE(TYPENAME) a, const TYPENAME* b); \ deBool TYPENAME##_difference (DE_PTR_TYPE(TYPENAME) to, const TYPENAME* a, const TYPENAME* b); \ void TYPENAME##_differenceInplace (DE_PTR_TYPE(TYPENAME) a, const TYPENAME* b); \ - struct TYPENAME##SetwiseDeclareDummy_s { int dummy; } + struct TYPENAME##SetwiseDeclareUnused_s { int unused; } #define DE_IMPLEMENT_POOL_SET_SETWISE_OPERATIONS(TYPENAME, KEYTYPE) \ deBool TYPENAME##_union (DE_PTR_TYPE(TYPENAME) to, const TYPENAME* a, const TYPENAME* b) \ @@ -572,6 +572,6 @@ void TYPENAME##_differenceInplace (DE_PTR_TYPE(TYPENAME) a, const TYPENAME* b) \ } \ } \ \ -struct TYPENAME##UnionIntersectImplementDummy_s { int dummy; } +struct TYPENAME##UnionIntersectImplementUnused_s { int unused; } #endif /* _DEPOOLSET_H */ diff --git a/framework/delibs/destream/deRingbuffer.c b/framework/delibs/destream/deRingbuffer.c index 7468484c4..cb26a2da0 100644 --- a/framework/delibs/destream/deRingbuffer.c +++ b/framework/delibs/destream/deRingbuffer.c @@ -270,7 +270,7 @@ static deStreamResult consumerStream_deinit (deStreamData* stream) } /* There are no sensible errors so status is always good */ -deStreamStatus dummy_getStatus (deStreamData* stream) +deStreamStatus empty_getStatus (deStreamData* stream) { DE_UNREF(stream); @@ -278,7 +278,7 @@ deStreamStatus dummy_getStatus (deStreamData* stream) } /* There are no sensible errors in ringbuffer */ -static const char* dummy_getError (deStreamData* stream) +static const char* empty_getError (deStreamData* stream) { DE_ASSERT(stream); DE_UNREF(stream); @@ -288,19 +288,19 @@ static const char* dummy_getError (deStreamData* stream) static const deIOStreamVFTable producerStreamVFTable = { DE_NULL, producerStream_write, - dummy_getError, + empty_getError, producerStream_flush, producerStream_deinit, - dummy_getStatus + empty_getStatus }; static const deIOStreamVFTable consumerStreamVFTable = { consumerStream_read, DE_NULL, - dummy_getError, + empty_getError, DE_NULL, consumerStream_deinit, - dummy_getStatus + empty_getStatus }; void deProducerStream_init (deOutStream* stream, deRingbuffer* buffer) diff --git a/framework/egl/egluNativeWindow.hpp b/framework/egl/egluNativeWindow.hpp index 5d417c028..e5c99fbc2 100644 --- a/framework/egl/egluNativeWindow.hpp +++ b/framework/egl/egluNativeWindow.hpp @@ -96,7 +96,7 @@ public: //! Return native pointer that can be used with eglCreatePlatformWindowSurface(). Default implementation throws tcu::NotSupportedError(). virtual void* getPlatformNative (void); - // Process window events. Defaults to dummy implementation, that does nothing. + // Process window events. Defaults to empty implementation, that does nothing. virtual void processEvents (void) {} // Get current size of window's logical surface. Default implementation throws tcu::NotSupportedError() diff --git a/framework/opengl/gluDummyRenderContext.hpp b/framework/opengl/gluDummyRenderContext.hpp index a76aa2c55..41812d9f2 100644 --- a/framework/opengl/gluDummyRenderContext.hpp +++ b/framework/opengl/gluDummyRenderContext.hpp @@ -41,13 +41,13 @@ namespace glu * currently depend on having access to the glw::Functions already in test * case constructor; in such situations there may not be a proper render * context available (like in test case list dumping mode). This is a - * simple workaround for that: a dummy render context with a glw::Functions + * simple workaround for that: a empty render context with a glw::Functions * containing just null pointers. *//*--------------------------------------------------------------------*/ -class DummyRenderContext : public RenderContext +class EmptyRenderContext : public RenderContext { public: - explicit DummyRenderContext (ContextType ctxType = ContextType()) : m_ctxType(ctxType) {} + explicit EmptyRenderContext (ContextType ctxType = ContextType()) : m_ctxType(ctxType) {} virtual ContextType getType (void) const { return m_ctxType; } virtual const glw::Functions& getFunctions (void) const { return m_functions; } diff --git a/framework/opengl/gluShaderLibrary.cpp b/framework/opengl/gluShaderLibrary.cpp index 8343cba76..293c91980 100644 --- a/framework/opengl/gluShaderLibrary.cpp +++ b/framework/opengl/gluShaderLibrary.cpp @@ -1287,9 +1287,9 @@ void ShaderParser::parsePipelineProgram (ProgramSpecification& program) } else if (m_curToken == TOKEN_REQUIRE) { - vector<RequiredCapability> dummyCaps; + vector<RequiredCapability> unusedCaps; size_t size = program.requiredExtensions.size(); - parseRequirement(dummyCaps, program.requiredExtensions); + parseRequirement(unusedCaps, program.requiredExtensions); if (size == program.requiredExtensions.size()) parseError("only extension requirements are allowed inside pipeline program"); diff --git a/framework/opengl/simplereference/sglrReferenceContext.cpp b/framework/opengl/simplereference/sglrReferenceContext.cpp index bd38151a2..6ac67951f 100644 --- a/framework/opengl/simplereference/sglrReferenceContext.cpp +++ b/framework/opengl/simplereference/sglrReferenceContext.cpp @@ -37,6 +37,8 @@ #include "rrFragmentOperations.hpp" #include "rrRenderer.hpp" +#include <cstdint> + namespace sglr { @@ -4081,7 +4083,7 @@ void ReferenceContext::drawElementsInstancedBaseVertex (deUint32 mode, int count // All is ok { const rr::PrimitiveType primitiveType = sglr::rr_util::mapGLPrimitiveType(mode); - const void* indicesPtr = (vao.m_elementArrayBufferBinding) ? (vao.m_elementArrayBufferBinding->getData() + ((const deUint8*)indices - (const deUint8*)DE_NULL)) : (indices); + const void* indicesPtr = (vao.m_elementArrayBufferBinding) ? (vao.m_elementArrayBufferBinding->getData() + reinterpret_cast<uintptr_t>(indices)) : (indices); drawWithReference(rr::PrimitiveList(primitiveType, count, rr::DrawIndices(indicesPtr, sglr::rr_util::mapGLIndexType(type), baseVertex)), instanceCount); } @@ -4124,12 +4126,12 @@ void ReferenceContext::drawArraysIndirect (deUint32 mode, const void *indirect) RC_IF_ERROR(!deIsAlignedPtr(indirect, 4), GL_INVALID_OPERATION, RC_RET_VOID); // \note watch for overflows, indirect might be close to 0xFFFFFFFF and indirect+something might overflow - RC_IF_ERROR((size_t)((const char*)indirect - (const char*)DE_NULL) > (size_t)m_drawIndirectBufferBinding->getSize(), GL_INVALID_OPERATION, RC_RET_VOID); - RC_IF_ERROR((size_t)((const char*)indirect - (const char*)DE_NULL) + sizeof(DrawArraysIndirectCommand) > (size_t)m_drawIndirectBufferBinding->getSize(), GL_INVALID_OPERATION, RC_RET_VOID); + RC_IF_ERROR((size_t)reinterpret_cast<uintptr_t>(indirect) > (size_t)m_drawIndirectBufferBinding->getSize(), GL_INVALID_OPERATION, RC_RET_VOID); + RC_IF_ERROR((size_t)reinterpret_cast<uintptr_t>(indirect) + sizeof(DrawArraysIndirectCommand) > (size_t)m_drawIndirectBufferBinding->getSize(), GL_INVALID_OPERATION, RC_RET_VOID); // Check values - command = (const DrawArraysIndirectCommand*)(m_drawIndirectBufferBinding->getData() + ((const char*)indirect - (const char*)DE_NULL)); + command = (const DrawArraysIndirectCommand*)(m_drawIndirectBufferBinding->getData() + reinterpret_cast<uintptr_t>(indirect)); RC_IF_ERROR(command->reservedMustBeZero != 0, GL_INVALID_OPERATION, RC_RET_VOID); // draw @@ -4166,12 +4168,12 @@ void ReferenceContext::drawElementsIndirect (deUint32 mode, deUint32 type, const RC_IF_ERROR(!deIsAlignedPtr(indirect, 4), GL_INVALID_OPERATION, RC_RET_VOID); // \note watch for overflows, indirect might be close to 0xFFFFFFFF and indirect+something might overflow - RC_IF_ERROR((size_t)((const char*)indirect - (const char*)DE_NULL) > (size_t)m_drawIndirectBufferBinding->getSize(), GL_INVALID_OPERATION, RC_RET_VOID); - RC_IF_ERROR((size_t)((const char*)indirect - (const char*)DE_NULL) + sizeof(DrawElementsIndirectCommand) > (size_t)m_drawIndirectBufferBinding->getSize(), GL_INVALID_OPERATION, RC_RET_VOID); + RC_IF_ERROR((size_t)reinterpret_cast<uintptr_t>(indirect) > (size_t)m_drawIndirectBufferBinding->getSize(), GL_INVALID_OPERATION, RC_RET_VOID); + RC_IF_ERROR((size_t)reinterpret_cast<uintptr_t>(indirect) + sizeof(DrawElementsIndirectCommand) > (size_t)m_drawIndirectBufferBinding->getSize(), GL_INVALID_OPERATION, RC_RET_VOID); // Check values - command = (const DrawElementsIndirectCommand*)(m_drawIndirectBufferBinding->getData() + ((const char*)indirect - (const char*)DE_NULL)); + command = (const DrawElementsIndirectCommand*)(m_drawIndirectBufferBinding->getData() + reinterpret_cast<uintptr_t>(indirect)); RC_IF_ERROR(command->reservedMustBeZero != 0, GL_INVALID_OPERATION, RC_RET_VOID); // Check command error conditions @@ -4434,7 +4436,7 @@ void ReferenceContext::drawWithReference (const rr::PrimitiveList& primitives, i vertexAttribs[ndx].size = sglr::rr_util::mapGLSize(vao.m_arrays[ndx].size); vertexAttribs[ndx].stride = vao.m_arrays[ndx].stride; vertexAttribs[ndx].instanceDivisor = vao.m_arrays[ndx].divisor; - vertexAttribs[ndx].pointer = (vao.m_arrays[ndx].bufferBinding) ? (vao.m_arrays[ndx].bufferBinding->getData() + ((const deUint8*)vao.m_arrays[ndx].pointer - (const deUint8*)DE_NULL)) : (vao.m_arrays[ndx].pointer); + vertexAttribs[ndx].pointer = (vao.m_arrays[ndx].bufferBinding) ? (vao.m_arrays[ndx].bufferBinding->getData() + reinterpret_cast<uintptr_t>(vao.m_arrays[ndx].pointer)) : (vao.m_arrays[ndx].pointer); } } } diff --git a/framework/randomshaders/rsgShaderGenerator.cpp b/framework/randomshaders/rsgShaderGenerator.cpp index 7af96232a..388279bab 100644 --- a/framework/randomshaders/rsgShaderGenerator.cpp +++ b/framework/randomshaders/rsgShaderGenerator.cpp @@ -333,7 +333,7 @@ void ShaderGenerator::generate (const ShaderParameters& shaderParams, Shader& sh m_varManager.popVariableScope(); m_varManager.popValueScope(); - // Fill undefined (unused) components in inputs with dummy values + // Fill undefined (unused) components in inputs with unused values fillUndefinedShaderInputs(shader.getInputs()); fillUndefinedShaderInputs(shader.getUniforms()); diff --git a/modules/egl/teglGLES2SharingThreadedTests.cpp b/modules/egl/teglGLES2SharingThreadedTests.cpp index da3c859b3..0a3638c19 100644 --- a/modules/egl/teglGLES2SharingThreadedTests.cpp +++ b/modules/egl/teglGLES2SharingThreadedTests.cpp @@ -978,14 +978,14 @@ TexImage2D::TexImage2D (SharedPtr<Texture> texture, GLint level, GLint internalF void TexImage2D::exec (tcu::ThreadUtil::Thread& t) { EGLThread& thread = dynamic_cast<EGLThread&>(t); - void* dummyData = thread.getDummyData(m_width*m_height*4); + void* unusedData = thread.getUnusedData(m_width*m_height*4); thread.newMessage() << "Begin -- glBindTexture(GL_TEXTURE_2D, " << m_texture->texture << ")" << tcu::ThreadUtil::Message::End; GLU_CHECK_GLW_CALL(thread.gl, bindTexture(GL_TEXTURE_2D, m_texture->texture)); thread.newMessage() << "End -- glBindTexture()" << tcu::ThreadUtil::Message::End; thread.newMessage() << "Begin -- glTexImage2D(GL_TEXTURE_2D, " << m_level << ", " << m_internalFormat << ", " << m_width << ", " << m_height << ", 0, " << m_format << ", " << m_type << ", data)" << tcu::ThreadUtil::Message::End; - GLU_CHECK_GLW_CALL(thread.gl, texImage2D(GL_TEXTURE_2D, m_level, m_internalFormat, m_width, m_height, 0, m_format, m_type, dummyData)); + GLU_CHECK_GLW_CALL(thread.gl, texImage2D(GL_TEXTURE_2D, m_level, m_internalFormat, m_width, m_height, 0, m_format, m_type, unusedData)); thread.newMessage() << "End -- glTexImage2D()" << tcu::ThreadUtil::Message::End; thread.newMessage() << "Begin -- glBindTexture(GL_TEXTURE_2D, 0)" << tcu::ThreadUtil::Message::End; @@ -1030,14 +1030,14 @@ TexSubImage2D::TexSubImage2D (SharedPtr<Texture> texture, GLint level, GLint xof void TexSubImage2D::exec (tcu::ThreadUtil::Thread& t) { EGLThread& thread = dynamic_cast<EGLThread&>(t); - void* dummyData = thread.getDummyData(m_width*m_height*4); + void* unusedData = thread.getUnusedData(m_width*m_height*4); thread.newMessage() << "Begin -- glBindTexture(GL_TEXTURE_2D, " << m_texture->texture << ")" << tcu::ThreadUtil::Message::End; GLU_CHECK_GLW_CALL(thread.gl, bindTexture(GL_TEXTURE_2D, m_texture->texture)); thread.newMessage() << "End -- glBindTexture()" << tcu::ThreadUtil::Message::End; thread.newMessage() << "Begin -- glTexSubImage2D(GL_TEXTURE_2D, " << m_level << ", " << m_xoffset << ", " << m_yoffset << ", " << m_width << ", " << m_height << ", 0, " << m_format << ", " << m_type << ", <data>)" << tcu::ThreadUtil::Message::End; - GLU_CHECK_GLW_CALL(thread.gl, texSubImage2D(GL_TEXTURE_2D, m_level, m_xoffset, m_yoffset, m_width, m_height, m_format, m_type, dummyData)); + GLU_CHECK_GLW_CALL(thread.gl, texSubImage2D(GL_TEXTURE_2D, m_level, m_xoffset, m_yoffset, m_width, m_height, m_format, m_type, unusedData)); thread.newMessage() << "End -- glSubTexImage2D()" << tcu::ThreadUtil::Message::End; thread.newMessage() << "Begin -- glBindTexture(GL_TEXTURE_2D, 0)" << tcu::ThreadUtil::Message::End; @@ -1255,14 +1255,14 @@ BufferData::BufferData (SharedPtr<Buffer> buffer, GLenum target, GLsizeiptr size void BufferData::exec (tcu::ThreadUtil::Thread& t) { EGLThread& thread = dynamic_cast<EGLThread&>(t); - void* dummyData = thread.getDummyData(m_size); + void* unusedData = thread.getUnusedData(m_size); thread.newMessage() << "Begin -- glBindBuffer(" << m_target << ", " << m_buffer->buffer << ")" << tcu::ThreadUtil::Message::End; GLU_CHECK_GLW_CALL(thread.gl, bindBuffer(m_target, m_buffer->buffer)); thread.newMessage() << "End -- glBindBuffer()" << tcu::ThreadUtil::Message::End; thread.newMessage() << "Begin -- glBufferData(" << m_target << ", " << m_size << ", <DATA>, " << m_usage << ")" << tcu::ThreadUtil::Message::End; - GLU_CHECK_GLW_CALL(thread.gl, bufferData(m_target, m_size, dummyData, m_usage)); + GLU_CHECK_GLW_CALL(thread.gl, bufferData(m_target, m_size, unusedData, m_usage)); thread.newMessage() << "End -- glBufferData()" << tcu::ThreadUtil::Message::End; thread.newMessage() << "Begin -- glBindBuffer(" << m_target << ", 0)" << tcu::ThreadUtil::Message::End; @@ -1296,14 +1296,14 @@ BufferSubData::BufferSubData (SharedPtr<Buffer> buffer, GLenum target, GLintptr void BufferSubData::exec (tcu::ThreadUtil::Thread& t) { EGLThread& thread = dynamic_cast<EGLThread&>(t); - void* dummyData = thread.getDummyData(m_size); + void* unusedData = thread.getUnusedData(m_size); thread.newMessage() << "Begin -- glBindBuffer(" << m_target << ", " << m_buffer->buffer << ")" << tcu::ThreadUtil::Message::End; GLU_CHECK_GLW_CALL(thread.gl, bindBuffer(m_target, m_buffer->buffer)); thread.newMessage() << "End -- glBindBuffer()" << tcu::ThreadUtil::Message::End; thread.newMessage() << "Begin -- glBufferSubData(" << m_target << ", " << m_offset << ", " << m_size << ", <DATA>)" << tcu::ThreadUtil::Message::End; - GLU_CHECK_GLW_CALL(thread.gl, bufferSubData(m_target, m_offset, m_size, dummyData)); + GLU_CHECK_GLW_CALL(thread.gl, bufferSubData(m_target, m_offset, m_size, unusedData)); thread.newMessage() << "End -- glBufferSubData()" << tcu::ThreadUtil::Message::End; thread.newMessage() << "Begin -- glBindBuffer(" << m_target << ", 0)" << tcu::ThreadUtil::Message::End; diff --git a/modules/egl/teglNegativePartialUpdateTests.cpp b/modules/egl/teglNegativePartialUpdateTests.cpp index 553a56ead..d445b4b72 100644 --- a/modules/egl/teglNegativePartialUpdateTests.cpp +++ b/modules/egl/teglNegativePartialUpdateTests.cpp @@ -279,7 +279,7 @@ TestCase::IterateResult NotCurrentSurfaceTest::iterate (void) EGL_HEIGHT, 64, EGL_NONE }; - const eglu::UniqueSurface dummyPbuffer (egl, m_eglDisplay, egl.createPbufferSurface(m_eglDisplay, m_eglConfig, attribList)); + const eglu::UniqueSurface unusedPbuffer (egl, m_eglDisplay, egl.createPbufferSurface(m_eglDisplay, m_eglConfig, attribList)); TestLog& log = m_testCtx.getLog(); CallLogWrapper wrapper (egl, log); EGLint damageRegion[] = { 10, 10, 10, 10 }; @@ -287,7 +287,7 @@ TestCase::IterateResult NotCurrentSurfaceTest::iterate (void) wrapper.enableLogging(true); m_testCtx.setTestResult(QP_TEST_RESULT_PASS, "Pass"); - EGLU_CHECK_CALL(egl, makeCurrent(m_eglDisplay, *dummyPbuffer, *dummyPbuffer, m_eglContext)); + EGLU_CHECK_CALL(egl, makeCurrent(m_eglDisplay, *unusedPbuffer, *unusedPbuffer, m_eglContext)); { tcu::ScopedLogSection(log, "Test2.1", "If query buffer age on a surface that is not the current draw surface --> EGL_BAD_SURFACE"); EGLU_CHECK_CALL(egl, surfaceAttrib(m_eglDisplay, m_eglSurface, EGL_SWAP_BEHAVIOR, EGL_BUFFER_DESTROYED)); @@ -502,7 +502,7 @@ TestCase::IterateResult NotCurrentSurfaceTest2::iterate (void) EGL_HEIGHT, 64, EGL_NONE }; - const eglu::UniqueSurface dummyPbuffer (egl, m_eglDisplay, egl.createPbufferSurface(m_eglDisplay, m_eglConfig, attribList)); + const eglu::UniqueSurface unusedPbuffer (egl, m_eglDisplay, egl.createPbufferSurface(m_eglDisplay, m_eglConfig, attribList)); TestLog& log = m_testCtx.getLog(); CallLogWrapper wrapper (egl, log); EGLint damageRegion[] = { 10, 10, 10, 10 }; @@ -516,7 +516,7 @@ TestCase::IterateResult NotCurrentSurfaceTest2::iterate (void) { tcu::ScopedLogSection(log, "Test7", "If call setDamageRegion() on a surface that is not the current draw surface --> EGL_BAD_MATCH"); - EGLU_CHECK_CALL(egl, makeCurrent(m_eglDisplay, *dummyPbuffer, *dummyPbuffer, m_eglContext)); + EGLU_CHECK_CALL(egl, makeCurrent(m_eglDisplay, *unusedPbuffer, *unusedPbuffer, m_eglContext)); expectFalse(wrapper.eglSetDamageRegionKHR(m_eglDisplay, m_eglSurface, damageRegion, 1)); expectError(EGL_BAD_MATCH); } diff --git a/modules/egl/teglRobustnessTests.cpp b/modules/egl/teglRobustnessTests.cpp index aa90f7f34..1a7246413 100644 --- a/modules/egl/teglRobustnessTests.cpp +++ b/modules/egl/teglRobustnessTests.cpp @@ -1050,7 +1050,7 @@ void ShadersOOB::setup (void) GLU_CHECK_GLW_CALL(m_gl, vertexAttribPointer(m_coordLocation, 2, GL_FLOAT, GL_FALSE, 0, DE_NULL)); } - // Create dummy data for filling buffer objects + // Create unused data for filling buffer objects const std::vector<tcu::Vec4> refValues(s_numBindings, tcu::Vec4(0.0f, 1.0f, 1.0f, 1.0f)); if (m_isLocalArray && m_shaderType == SHADERTYPE_COMPUTE) diff --git a/modules/gles2/functional/es2fDrawTests.cpp b/modules/gles2/functional/es2fDrawTests.cpp index 762b27355..642c66b5c 100644 --- a/modules/gles2/functional/es2fDrawTests.cpp +++ b/modules/gles2/functional/es2fDrawTests.cpp @@ -579,7 +579,7 @@ void RandomGroup::init (void) }; const UniformWeightArray<DE_LENGTH_OF_ARRAY(usages)> usageWeights; - static const deUint32 blacklistedCases[]= + static const deUint32 disallowedCases[]= { 3153, //!< extremely narrow triangle, results depend on sample positions }; @@ -672,7 +672,7 @@ void RandomGroup::init (void) hash = (hash << 2) ^ (deUint32)spec.attribs[attrNdx].hash(); if (insertedHashes.find(hash) == insertedHashes.end() && - !de::contains(DE_ARRAY_BEGIN(blacklistedCases), DE_ARRAY_END(blacklistedCases), hash)) + !de::contains(DE_ARRAY_BEGIN(disallowedCases), DE_ARRAY_END(disallowedCases), hash)) { // Only aligned cases if (spec.isCompatibilityTest() != gls::DrawTestSpec::COMPATIBILITY_UNALIGNED_OFFSET && diff --git a/modules/gles2/functional/es2fShaderStructTests.cpp b/modules/gles2/functional/es2fShaderStructTests.cpp index b7354d8c5..966322e34 100644 --- a/modules/gles2/functional/es2fShaderStructTests.cpp +++ b/modules/gles2/functional/es2fShaderStructTests.cpp @@ -1292,7 +1292,7 @@ void setUniform (const glw::Functions& gl, deUint32 programID, const char* name, SETUNIFORM(loc, 1, vec.getPtr()); \ CHECK_SET_UNIFORM(name); \ } \ -struct SetUniform##VECTYPE##Dummy_s { int unused; } +struct SetUniform##VECTYPE##Unused_s { int unused; } #define MAKE_SET_VEC_UNIFORM_PTR(VECTYPE, SETUNIFORM) \ void setUniform (const glw::Functions& gl, deUint32 programID, const char* name, const tcu::VECTYPE* vec, int arraySize) \ @@ -1301,7 +1301,7 @@ void setUniform (const glw::Functions& gl, deUint32 programID, const char* name, SETUNIFORM(loc, arraySize, vec->getPtr()); \ CHECK_SET_UNIFORM(name); \ } \ -struct SetUniformPtr##VECTYPE##Dummy_s { int unused; } +struct SetUniformPtr##VECTYPE##Unused_s { int unused; } MAKE_SET_VEC_UNIFORM (Vec2, gl.uniform2fv); MAKE_SET_VEC_UNIFORM (Vec3, gl.uniform3fv); diff --git a/modules/gles2/performance/es2pShaderCompilationCases.cpp b/modules/gles2/performance/es2pShaderCompilationCases.cpp index 7a921ba83..7215efe23 100644 --- a/modules/gles2/performance/es2pShaderCompilationCases.cpp +++ b/modules/gles2/performance/es2pShaderCompilationCases.cpp @@ -1851,7 +1851,7 @@ bool ShaderCompilerCase::goodEnoughMeasurements (const vector<Measurement>& meas ShaderCompilerCase::IterateResult ShaderCompilerCase::iterate (void) { - // Before actual measurements, compile and draw with a dummy shader to avoid possible initial slowdowns in the actual test. + // Before actual measurements, compile and draw with a minimal shader to avoid possible initial slowdowns in the actual test. { deUint32 specID = getSpecializationID(0); ProgramContext progCtx; @@ -2459,7 +2459,7 @@ InvalidShaderCompilerCase::IterateResult InvalidShaderCompilerCase::iterate (voi DE_ASSERT(shaderValidity != SHADER_VALIDITY_LAST); - // Before actual measurements, compile a dummy shader to avoid possible initial slowdowns in the actual test. + // Before actual measurements, compile a minimal shader to avoid possible initial slowdowns in the actual test. { deUint32 specID = getSpecializationID(0); ProgramContext progCtx; diff --git a/modules/gles2/stress/es2sDrawTests.cpp b/modules/gles2/stress/es2sDrawTests.cpp index 8d027d5f1..cb751673e 100644 --- a/modules/gles2/stress/es2sDrawTests.cpp +++ b/modules/gles2/stress/es2sDrawTests.cpp @@ -293,7 +293,7 @@ void RandomGroup::init (void) }; const UniformWeightArray<DE_LENGTH_OF_ARRAY(usages)> usageWeights; - const deUint32 blacklistedCases[]= + const deUint32 disallowedCases[]= { 3153, //!< extremely narrow triangle, results depend on sample positions }; @@ -386,7 +386,7 @@ void RandomGroup::init (void) hash = (hash << 2) ^ (deUint32)spec.attribs[attrNdx].hash(); if (insertedHashes.find(hash) == insertedHashes.end() && - std::find(DE_ARRAY_BEGIN(blacklistedCases), DE_ARRAY_END(blacklistedCases), hash) == DE_ARRAY_END(blacklistedCases)) + std::find(DE_ARRAY_BEGIN(disallowedCases), DE_ARRAY_END(disallowedCases), hash) == DE_ARRAY_END(disallowedCases)) { // Only unaligned cases if (spec.isCompatibilityTest() == gls::DrawTestSpec::COMPATIBILITY_UNALIGNED_OFFSET || diff --git a/modules/gles3/functional/es3fASTCDecompressionCases.cpp b/modules/gles3/functional/es3fASTCDecompressionCases.cpp index af32ff2f6..fe029a22c 100644 --- a/modules/gles3/functional/es3fASTCDecompressionCases.cpp +++ b/modules/gles3/functional/es3fASTCDecompressionCases.cpp @@ -137,7 +137,7 @@ static bool compareBlockImages (const Surface& reference, const Surface& result, const tcu::RGBA& thresholdRGBA, const IVec2& blockSize, - int numNonDummyBlocks, + int numUsedBlocks, IVec2& firstFailedBlockCoordDst, Surface& errorMaskDst, IVec4& maxDiffDst) @@ -161,7 +161,7 @@ static bool compareBlockImages (const Surface& reference, { const IVec2 blockCoord = IVec2(x, y) / blockSize; - if (blockCoord.y()*numXBlocks + blockCoord.x() < numNonDummyBlocks) + if (blockCoord.y()*numXBlocks + blockCoord.x() < numUsedBlocks) { const IVec4 refPix = reference.getPixel(x, y).toIVec(); @@ -423,8 +423,8 @@ ASTCBlockCase2D::IterateResult ASTCBlockCase2D::iterate (void) const int imageWidth = numXBlocksPerImage * blockSize.x(); const int imageHeight = numYBlocksPerImage * blockSize.y(); const int numBlocksRemaining = totalNumBlocks - m_numBlocksTested; - const int curNumNonDummyBlocks = de::min(numBlocksPerImage, numBlocksRemaining); - const int curNumDummyBlocks = numBlocksPerImage - curNumNonDummyBlocks; + const int curNumUsedBlocks = de::min(numBlocksPerImage, numBlocksRemaining); + const int curNumUnusedBlocks = numBlocksPerImage - curNumUsedBlocks; const glu::RenderContext& renderCtx = m_context.getRenderContext(); const tcu::RGBA threshold = renderCtx.getRenderTarget().getPixelFormat().getColorThreshold() + (tcu::isAstcSRGBFormat(m_format) ? tcu::RGBA(2,2,2,2) : tcu::RGBA(1,1,1,1)); tcu::CompressedTexture compressed (m_format, imageWidth, imageHeight); @@ -439,9 +439,9 @@ ASTCBlockCase2D::IterateResult ASTCBlockCase2D::iterate (void) } DE_ASSERT(compressed.getDataSize() == numBlocksPerImage*tcu::astc::BLOCK_SIZE_BYTES); - deMemcpy(compressed.getData(), &m_blockData[m_numBlocksTested*tcu::astc::BLOCK_SIZE_BYTES], curNumNonDummyBlocks*tcu::astc::BLOCK_SIZE_BYTES); - if (curNumDummyBlocks > 1) - tcu::astc::generateDummyVoidExtentBlocks((deUint8*)compressed.getData() + curNumNonDummyBlocks*tcu::astc::BLOCK_SIZE_BYTES, curNumDummyBlocks); + deMemcpy(compressed.getData(), &m_blockData[m_numBlocksTested*tcu::astc::BLOCK_SIZE_BYTES], curNumUsedBlocks*tcu::astc::BLOCK_SIZE_BYTES); + if (curNumUsedBlocks > 1) + tcu::astc::generateDefaultVoidExtentBlocks((deUint8*)compressed.getData() + curNumUsedBlocks*tcu::astc::BLOCK_SIZE_BYTES, curNumUnusedBlocks); // Create texture and render. @@ -461,7 +461,7 @@ ASTCBlockCase2D::IterateResult ASTCBlockCase2D::iterate (void) Surface errorMask; IVec2 firstFailedBlockCoord; IVec4 maxDiff; - const bool compareOk = compareBlockImages(referenceFrame, renderedFrame, threshold, blockSize, curNumNonDummyBlocks, firstFailedBlockCoord, errorMask, maxDiff); + const bool compareOk = compareBlockImages(referenceFrame, renderedFrame, threshold, blockSize, curNumUsedBlocks, firstFailedBlockCoord, errorMask, maxDiff); if (m_currentIteration == 0 || !compareOk) { @@ -470,10 +470,10 @@ ASTCBlockCase2D::IterateResult ASTCBlockCase2D::iterate (void) { tcu::ScopedLogSection section(log, "Iteration " + de::toString(m_currentIteration), - "Blocks " + de::toString(m_numBlocksTested) + " to " + de::toString(m_numBlocksTested + curNumNonDummyBlocks - 1)); + "Blocks " + de::toString(m_numBlocksTested) + " to " + de::toString(m_numBlocksTested + curNumUsedBlocks - 1)); - if (curNumDummyBlocks > 0) - log << TestLog::Message << "Note: Only the first " << curNumNonDummyBlocks << " blocks in the image are relevant; rest " << curNumDummyBlocks << " are dummies and not checked" << TestLog::EndMessage; + if (curNumUsedBlocks > 0) + log << TestLog::Message << "Note: Only the first " << curNumUsedBlocks << " blocks in the image are relevant; rest " << curNumUnusedBlocks << " are dummies and not checked" << TestLog::EndMessage; if (!compareOk) { @@ -501,13 +501,13 @@ ASTCBlockCase2D::IterateResult ASTCBlockCase2D::iterate (void) } } - if (m_numBlocksTested + curNumNonDummyBlocks < totalNumBlocks) + if (m_numBlocksTested + curNumUsedBlocks < totalNumBlocks) log << TestLog::Message << "Note: not logging further images unless reference comparison fails" << TestLog::EndMessage; } } m_currentIteration++; - m_numBlocksTested += curNumNonDummyBlocks; + m_numBlocksTested += curNumUsedBlocks; if (m_numBlocksTested >= totalNumBlocks) { @@ -564,7 +564,7 @@ ASTCBlockSizeRemainderCase2D::IterateResult ASTCBlockSizeRemainderCase2D::iterat tcu::CompressedTexture compressed (m_format, imageWidth, imageHeight); DE_ASSERT(compressed.getDataSize() == totalNumBlocks*tcu::astc::BLOCK_SIZE_BYTES); - tcu::astc::generateDummyNormalBlocks((deUint8*)compressed.getData(), totalNumBlocks, blockSize.x(), blockSize.y()); + tcu::astc::generateDefaultNormalBlocks((deUint8*)compressed.getData(), totalNumBlocks, blockSize.x(), blockSize.y()); // Create texture and render. diff --git a/modules/gles3/functional/es3fDrawTests.cpp b/modules/gles3/functional/es3fDrawTests.cpp index f3a1e3701..f37b88a60 100644 --- a/modules/gles3/functional/es3fDrawTests.cpp +++ b/modules/gles3/functional/es3fDrawTests.cpp @@ -1014,7 +1014,7 @@ void RandomGroup::init (void) }; const UniformWeightArray<DE_LENGTH_OF_ARRAY(usages)> usageWeights; - static const deUint32 blacklistedCases[]= + static const deUint32 disallowedCases[]= { 544, //!< extremely narrow triangle }; @@ -1108,10 +1108,10 @@ void RandomGroup::init (void) if (insertedHashes.find(hash) == insertedHashes.end()) { - // Only properly aligned and not blacklisted cases + // Only properly aligned and not disallowed cases if (spec.isCompatibilityTest() != gls::DrawTestSpec::COMPATIBILITY_UNALIGNED_OFFSET && spec.isCompatibilityTest() != gls::DrawTestSpec::COMPATIBILITY_UNALIGNED_STRIDE && - !de::contains(DE_ARRAY_BEGIN(blacklistedCases), DE_ARRAY_END(blacklistedCases), hash)) + !de::contains(DE_ARRAY_BEGIN(disallowedCases), DE_ARRAY_END(disallowedCases), hash)) { this->addChild(new gls::DrawTest(m_testCtx, m_context.getRenderContext(), spec, de::toString(insertedCount).c_str(), spec.getDesc().c_str())); } diff --git a/modules/gles3/functional/es3fFboInvalidateTests.cpp b/modules/gles3/functional/es3fFboInvalidateTests.cpp index 5bfd62afa..e8944b102 100644 --- a/modules/gles3/functional/es3fFboInvalidateTests.cpp +++ b/modules/gles3/functional/es3fFboInvalidateTests.cpp @@ -1255,18 +1255,18 @@ protected: // Bound FBO to test target and default to other if (m_boundTarget != GL_FRAMEBUFFER) { - // Dummy fbo is used as complemeting target (read when discarding draw for example). + // Unused fbo is used as complemeting target (read when discarding draw for example). // \note Framework takes care of deleting objects at the end of test case. - const deUint32 dummyTarget = m_boundTarget == GL_DRAW_FRAMEBUFFER ? GL_READ_FRAMEBUFFER : GL_DRAW_FRAMEBUFFER; - deUint32 dummyFbo = 0; - deUint32 dummyColorRbo = 0; + const deUint32 unusedTarget = m_boundTarget == GL_DRAW_FRAMEBUFFER ? GL_READ_FRAMEBUFFER : GL_DRAW_FRAMEBUFFER; + deUint32 unusedFbo = 0; + deUint32 unusedColorRbo = 0; - glGenRenderbuffers (1, &dummyColorRbo); - glBindRenderbuffer (GL_RENDERBUFFER, dummyColorRbo); + glGenRenderbuffers (1, &unusedColorRbo); + glBindRenderbuffer (GL_RENDERBUFFER, unusedColorRbo); glRenderbufferStorage (GL_RENDERBUFFER, GL_RGBA8, 64, 64); - glGenFramebuffers (1, &dummyFbo); - glBindFramebuffer (dummyTarget, dummyFbo); - glFramebufferRenderbuffer (dummyTarget, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, dummyColorRbo); + glGenFramebuffers (1, &unusedFbo); + glBindFramebuffer (unusedTarget, unusedFbo); + glFramebufferRenderbuffer (unusedTarget, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, unusedColorRbo); glBindFramebuffer (m_boundTarget, fbo); } diff --git a/modules/gles3/functional/es3fNegativeShaderApiTests.cpp b/modules/gles3/functional/es3fNegativeShaderApiTests.cpp index 8aefd03f3..0ac515aa9 100644 --- a/modules/gles3/functional/es3fNegativeShaderApiTests.cpp +++ b/modules/gles3/functional/es3fNegativeShaderApiTests.cpp @@ -421,7 +421,7 @@ void NegativeShaderApiTests::init (void) { glu::ShaderProgram srcProgram (m_context.getRenderContext(), glu::makeVtxFragSources(vertexShaderSource, fragmentShaderSource)); GLuint dstProgram = glCreateProgram(); - GLuint dummyShader = glCreateShader(GL_VERTEX_SHADER); + GLuint unusedShader = glCreateShader(GL_VERTEX_SHADER); GLenum binaryFormat = -1; GLsizei binaryLength = -1; std::vector<deUint8> binaryBuf; @@ -442,7 +442,7 @@ void NegativeShaderApiTests::init (void) expectError (GL_NO_ERROR); m_log << TestLog::Section("", "GL_INVALID_OPERATION is generated if program is not the name of an existing program object."); - glProgramBinary (dummyShader, binaryFormat, &binaryBuf[0], binaryLength); + glProgramBinary (unusedShader, binaryFormat, &binaryBuf[0], binaryLength); expectError (GL_INVALID_OPERATION); m_log << TestLog::EndSection; @@ -452,7 +452,7 @@ void NegativeShaderApiTests::init (void) m_log << TestLog::EndSection; } - glDeleteShader(dummyShader); + glDeleteShader(unusedShader); glDeleteProgram(dstProgram); }); ES3F_ADD_API_CASE(program_parameteri, "Invalid glProgramParameteri() usage", diff --git a/modules/gles3/functional/es3fNegativeStateApiTests.cpp b/modules/gles3/functional/es3fNegativeStateApiTests.cpp index 78556e633..1a82b9dbd 100644 --- a/modules/gles3/functional/es3fNegativeStateApiTests.cpp +++ b/modules/gles3/functional/es3fNegativeStateApiTests.cpp @@ -529,8 +529,8 @@ void NegativeStateApiTests::init (void) { GLuint shader = glCreateShader(GL_VERTEX_SHADER); glu::ShaderProgram program (m_context.getRenderContext(), glu::makeVtxFragSources(uniformTestVertSource, uniformTestFragSource)); - GLuint dummyUniformIndex = 1; - GLint dummyParamDst = -1; + GLuint unusedUniformIndex = 1; + GLint unusedParamDst = -1; GLint numActiveUniforms = -1; glUseProgram(program.getProgram()); @@ -539,12 +539,12 @@ void NegativeStateApiTests::init (void) m_log << TestLog::Message << "// GL_ACTIVE_UNIFORMS = " << numActiveUniforms << " (expected 4)." << TestLog::EndMessage; m_log << TestLog::Section("", "GL_INVALID_VALUE is generated if program is not a value generated by OpenGL."); - glGetActiveUniformsiv(-1, 1, &dummyUniformIndex, GL_UNIFORM_TYPE, &dummyParamDst); + glGetActiveUniformsiv(-1, 1, &unusedUniformIndex, GL_UNIFORM_TYPE, &unusedParamDst); expectError(GL_INVALID_VALUE); m_log << TestLog::EndSection; m_log << TestLog::Section("", "GL_INVALID_OPERATION is generated if program is not a program object."); - glGetActiveUniformsiv(shader, 1, &dummyUniformIndex, GL_UNIFORM_TYPE, &dummyParamDst); + glGetActiveUniformsiv(shader, 1, &unusedUniformIndex, GL_UNIFORM_TYPE, &unusedParamDst); expectError(GL_INVALID_OPERATION); m_log << TestLog::EndSection; @@ -556,14 +556,14 @@ void NegativeStateApiTests::init (void) invalidUniformIndices.push_back(numActiveUniforms-1+excess); invalidUniformIndices.push_back(1); - std::vector<GLint> dummyParamsDst(invalidUniformIndices.size()); - glGetActiveUniformsiv(program.getProgram(), (GLsizei)invalidUniformIndices.size(), &invalidUniformIndices[0], GL_UNIFORM_TYPE, &dummyParamsDst[0]); + std::vector<GLint> unusedParamsDst(invalidUniformIndices.size()); + glGetActiveUniformsiv(program.getProgram(), (GLsizei)invalidUniformIndices.size(), &invalidUniformIndices[0], GL_UNIFORM_TYPE, &unusedParamsDst[0]); expectError(excess == 0 ? GL_NO_ERROR : GL_INVALID_VALUE); } m_log << TestLog::EndSection; m_log << TestLog::Section("", "GL_INVALID_ENUM is generated if pname is not an accepted token."); - glGetActiveUniformsiv(program.getProgram(), 1, &dummyUniformIndex, -1, &dummyParamDst); + glGetActiveUniformsiv(program.getProgram(), 1, &unusedUniformIndex, -1, &unusedParamDst); expectError(GL_INVALID_ENUM); m_log << TestLog::EndSection; diff --git a/modules/gles3/functional/es3fNegativeTextureApiTests.cpp b/modules/gles3/functional/es3fNegativeTextureApiTests.cpp index 2c73be890..e096baff1 100644 --- a/modules/gles3/functional/es3fNegativeTextureApiTests.cpp +++ b/modules/gles3/functional/es3fNegativeTextureApiTests.cpp @@ -510,18 +510,18 @@ void NegativeTextureApiTests::init (void) const IVec3 blockPixels = getBlockPixelSize(tcuFormat); { const size_t blockBytes = getBlockSize(tcuFormat); - const vector<deUint8> dummyData (blockBytes); + const vector<deUint8> unusedData (blockBytes); - glCompressedTexImage2D(GL_TEXTURE_2D, 0, format, blockPixels.x(), blockPixels.y(), 0, (int)blockBytes, &dummyData[0]); + glCompressedTexImage2D(GL_TEXTURE_2D, 0, format, blockPixels.x(), blockPixels.y(), 0, (int)blockBytes, &unusedData[0]); expectError(GL_INVALID_ENUM); } FOR_CUBE_FACES(faceGL, { const deInt32 cubeSize = blockPixels.x() * blockPixels.y(); // Divisible by the block size and square const size_t blockBytes = getBlockSize(tcuFormat) * cubeSize; // We have a x * y grid of blocks - const vector<deUint8> dummyData (blockBytes); + const vector<deUint8> unusedData (blockBytes); - glCompressedTexImage2D(faceGL, 0, format, cubeSize, cubeSize, 0, (int)blockBytes, &dummyData[0]); + glCompressedTexImage2D(faceGL, 0, format, cubeSize, cubeSize, 0, (int)blockBytes, &unusedData[0]); expectError(GL_INVALID_ENUM); }); } @@ -2693,9 +2693,9 @@ void NegativeTextureApiTests::init (void) const CompressedTexFormat tcuFormat = mapGLCompressedTexFormat(format); const IVec3 blockPixels = getBlockPixelSize(tcuFormat); const size_t blockBytes = getBlockSize(tcuFormat); - const vector<deUint8> dummyData (blockBytes); + const vector<deUint8> unusedData (blockBytes); - glCompressedTexImage3D(GL_TEXTURE_3D, 0, format, blockPixels.x(), blockPixels.y(), blockPixels.z(), 0, (int)blockBytes, &dummyData[0]); + glCompressedTexImage3D(GL_TEXTURE_3D, 0, format, blockPixels.x(), blockPixels.y(), blockPixels.z(), 0, (int)blockBytes, &unusedData[0]); expectError(requiredError); } } diff --git a/modules/gles3/functional/es3fShaderStructTests.cpp b/modules/gles3/functional/es3fShaderStructTests.cpp index 526db73ac..0e3dae584 100644 --- a/modules/gles3/functional/es3fShaderStructTests.cpp +++ b/modules/gles3/functional/es3fShaderStructTests.cpp @@ -1296,7 +1296,7 @@ void setUniform (const glw::Functions& gl, deUint32 programID, const char* name, SETUNIFORM(loc, 1, vec.getPtr()); \ CHECK_SET_UNIFORM(name); \ } \ -struct SetUniform##VECTYPE##Dummy_s { int unused; } +struct SetUniform##VECTYPE##Unused_s { int unused; } #define MAKE_SET_VEC_UNIFORM_PTR(VECTYPE, SETUNIFORM) \ void setUniform (const glw::Functions& gl, deUint32 programID, const char* name, const tcu::VECTYPE* vec, int arraySize) \ @@ -1305,7 +1305,7 @@ void setUniform (const glw::Functions& gl, deUint32 programID, const char* name, SETUNIFORM(loc, arraySize, vec->getPtr()); \ CHECK_SET_UNIFORM(name); \ } \ -struct SetUniformPtr##VECTYPE##Dummy_s { int unused; } +struct SetUniformPtr##VECTYPE##Unused_s { int unused; } MAKE_SET_VEC_UNIFORM (Vec2, gl.uniform2fv); MAKE_SET_VEC_UNIFORM (Vec3, gl.uniform3fv); diff --git a/modules/gles3/performance/es3pBufferDataUploadTests.cpp b/modules/gles3/performance/es3pBufferDataUploadTests.cpp index 793e30db1..aca3575e5 100644 --- a/modules/gles3/performance/es3pBufferDataUploadTests.cpp +++ b/modules/gles3/performance/es3pBufferDataUploadTests.cpp @@ -61,14 +61,14 @@ using gls::LineParametersWithConfidence; using de::meta::EnableIf; using de::meta::Not; -static const char* const s_dummyVertexShader = "#version 300 es\n" +static const char* const s_minimalVertexShader = "#version 300 es\n" "in highp vec4 a_position;\n" "void main (void)\n" "{\n" " gl_Position = a_position;\n" "}\n"; -static const char* const s_dummyFragnentShader = "#version 300 es\n" +static const char* const s_minimalFragnentShader = "#version 300 es\n" "layout(location = 0) out mediump vec4 dEQP_FragColor;\n" "void main (void)\n" "{\n" @@ -601,7 +601,7 @@ static deUint64 medianTimeMemcpy (void* dst, const void* src, int numBytes) } } -static float dummyCalculation (float initial, int workSize) +static float busyworkCalculation (float initial, int workSize) { float a = initial; int b = 123; @@ -619,7 +619,7 @@ static void busyWait (int microseconds) { const deUint64 maxSingleWaitTime = 1000; // 1ms const deUint64 endTime = deGetMicroseconds() + microseconds; - float dummy = *tcu::warmupCPUInternal::g_dummy.m_v; + float unused = *tcu::warmupCPUInternal::g_unused.m_v; int workSize = 500; // exponentially increase work, cap to 1ms @@ -628,7 +628,7 @@ static void busyWait (int microseconds) const deUint64 startTime = deGetMicroseconds(); deUint64 totalTime; - dummy = dummyCalculation(dummy, workSize); + unused = busyworkCalculation(unused, workSize); totalTime = deGetMicroseconds() - startTime; @@ -640,9 +640,9 @@ static void busyWait (int microseconds) // "wait" while (deGetMicroseconds() < endTime) - dummy = dummyCalculation(dummy, workSize); + unused = busyworkCalculation(unused, workSize); - *tcu::warmupCPUInternal::g_dummy.m_v = dummy; + *tcu::warmupCPUInternal::g_unused.m_v = unused; } // Sample from given values using linear interpolation at a given position as if values were laid to range [0, 1] @@ -1902,11 +1902,11 @@ protected: enum { - DUMMY_RENDER_AREA_SIZE = 32 + UNUSED_RENDER_AREA_SIZE = 32 }; - glu::ShaderProgram* m_dummyProgram; - deInt32 m_dummyProgramPosLoc; + glu::ShaderProgram* m_minimalProgram; + deInt32 m_minimalProgramPosLoc; deUint32 m_bufferID; const int m_numSamples; @@ -1926,8 +1926,8 @@ private: template <typename SampleType> BasicBufferCase<SampleType>::BasicBufferCase (Context& context, const char* name, const char* desc, int bufferSizeMin, int bufferSizeMax, int numSamples, int flags) : TestCase (context, tcu::NODETYPE_PERFORMANCE, name, desc) - , m_dummyProgram (DE_NULL) - , m_dummyProgramPosLoc (-1) + , m_minimalProgram (DE_NULL) + , m_minimalProgramPosLoc (-1) , m_bufferID (0) , m_numSamples (numSamples) , m_bufferSizeMin (bufferSizeMin) @@ -1969,19 +1969,19 @@ void BasicBufferCase<SampleType>::init (void) if (!m_useGL) return; - // \note Viewport size is not checked, it won't matter if the render target actually is smaller hhan DUMMY_RENDER_AREA_SIZE + // \note Viewport size is not checked, it won't matter if the render target actually is smaller than UNUSED_RENDER_AREA_SIZE - // dummy shader + // minimal shader - m_dummyProgram = new glu::ShaderProgram(m_context.getRenderContext(), glu::ProgramSources() << glu::VertexSource(s_dummyVertexShader) << glu::FragmentSource(s_dummyFragnentShader)); - if (!m_dummyProgram->isOk()) + m_minimalProgram = new glu::ShaderProgram(m_context.getRenderContext(), glu::ProgramSources() << glu::VertexSource(s_minimalVertexShader) << glu::FragmentSource(s_minimalFragnentShader)); + if (!m_minimalProgram->isOk()) { - m_testCtx.getLog() << *m_dummyProgram; + m_testCtx.getLog() << *m_minimalProgram; throw tcu::TestError("failed to build shader program"); } - m_dummyProgramPosLoc = gl.getAttribLocation(m_dummyProgram->getProgram(), "a_position"); - if (m_dummyProgramPosLoc == -1) + m_minimalProgramPosLoc = gl.getAttribLocation(m_minimalProgram->getProgram(), "a_position"); + if (m_minimalProgramPosLoc == -1) throw tcu::TestError("a_position location was -1"); } @@ -1994,8 +1994,8 @@ void BasicBufferCase<SampleType>::deinit (void) m_bufferID = 0; } - delete m_dummyProgram; - m_dummyProgram = DE_NULL; + delete m_minimalProgram; + m_minimalProgram = DE_NULL; } template <typename SampleType> @@ -2025,9 +2025,9 @@ TestCase::IterateResult BasicBufferCase<SampleType>::iterate (void) de::Random rnd (0x1234); deUint32 bufferIDs[numRandomBuffers] = {0}; - gl.useProgram(m_dummyProgram->getProgram()); - gl.viewport(0, 0, DUMMY_RENDER_AREA_SIZE, DUMMY_RENDER_AREA_SIZE); - gl.enableVertexAttribArray(m_dummyProgramPosLoc); + gl.useProgram(m_minimalProgram->getProgram()); + gl.viewport(0, 0, UNUSED_RENDER_AREA_SIZE, UNUSED_RENDER_AREA_SIZE); + gl.enableVertexAttribArray(m_minimalProgramPosLoc); for (int ndx = 0; ndx < numRepeats; ++ndx) { @@ -2043,7 +2043,7 @@ TestCase::IterateResult BasicBufferCase<SampleType>::iterate (void) if (rnd.getBool()) { - gl.vertexAttribPointer(m_dummyProgramPosLoc, 4, GL_FLOAT, GL_FALSE, 0, DE_NULL); + gl.vertexAttribPointer(m_minimalProgramPosLoc, 4, GL_FLOAT, GL_FALSE, 0, DE_NULL); gl.drawArrays(GL_POINTS, 0, 1); gl.drawArrays(GL_POINTS, randomSize / (int)sizeof(float[4]) - 1, 1); } @@ -2106,7 +2106,7 @@ TestCase::IterateResult BasicBufferCase<SampleType>::iterate (void) gl.bindBuffer(GL_ARRAY_BUFFER, bufferIDs[randomBufferNdx]); gl.bufferData(GL_ARRAY_BUFFER, randomSize, &zeroData[0], usage); - gl.vertexAttribPointer(m_dummyProgramPosLoc, 4, GL_FLOAT, GL_FALSE, 0, DE_NULL); + gl.vertexAttribPointer(m_minimalProgramPosLoc, 4, GL_FLOAT, GL_FALSE, 0, DE_NULL); gl.drawArrays(GL_POINTS, 0, 1); gl.drawArrays(GL_POINTS, randomSize / (int)sizeof(float[4]) - 1, 1); @@ -2161,8 +2161,8 @@ void BasicBufferCase<SampleType>::disableGLWarmup (void) template <typename SampleType> void BasicBufferCase<SampleType>::waitGLResults (void) { - tcu::Surface dummySurface(DUMMY_RENDER_AREA_SIZE, DUMMY_RENDER_AREA_SIZE); - glu::readPixels(m_context.getRenderContext(), 0, 0, dummySurface.getAccess()); + tcu::Surface unusedSurface(UNUSED_RENDER_AREA_SIZE, UNUSED_RENDER_AREA_SIZE); + glu::readPixels(m_context.getRenderContext(), 0, 0, unusedSurface.getAccess()); } template <typename SampleType> @@ -2218,7 +2218,7 @@ private: virtual void testBufferUpload (UploadSampleResult<SampleType>& result, int writeSize) = 0; void logAndSetTestResult (const std::vector<UploadSampleResult<SampleType> >& results); - deUint32 m_dummyBufferID; + deUint32 m_unusedBufferID; protected: const CaseType m_caseType; @@ -2231,9 +2231,9 @@ protected: using BasicBufferCase<SampleType>::m_testCtx; using BasicBufferCase<SampleType>::m_context; - using BasicBufferCase<SampleType>::DUMMY_RENDER_AREA_SIZE; - using BasicBufferCase<SampleType>::m_dummyProgram; - using BasicBufferCase<SampleType>::m_dummyProgramPosLoc; + using BasicBufferCase<SampleType>::UNUSED_RENDER_AREA_SIZE; + using BasicBufferCase<SampleType>::m_minimalProgram; + using BasicBufferCase<SampleType>::m_minimalProgramPosLoc; using BasicBufferCase<SampleType>::m_bufferID; using BasicBufferCase<SampleType>::m_numSamples; using BasicBufferCase<SampleType>::m_bufferSizeMin; @@ -2244,7 +2244,7 @@ protected: template <typename SampleType> BasicUploadCase<SampleType>::BasicUploadCase (Context& context, const char* name, const char* desc, int bufferSizeMin, int bufferSizeMax, int numSamples, deUint32 bufferUsage, CaseType caseType, ResultType resultType, int flags) : BasicBufferCase<SampleType> (context, name, desc, bufferSizeMin, bufferSizeMax, numSamples, (caseType == CASE_USED_LARGER_BUFFER) ? (BasicBufferCase<SampleType>::FLAG_ALLOCATE_LARGER_BUFFER) : (0)) - , m_dummyBufferID (0) + , m_unusedBufferID (0) , m_caseType (caseType) , m_resultType (resultType) , m_bufferUsage (bufferUsage) @@ -2271,9 +2271,9 @@ void BasicUploadCase<SampleType>::init (void) // zero buffer as upload source m_zeroData.resize(m_bufferSizeMax, 0x00); - // dummy buffer + // unused buffer - gl.genBuffers(1, &m_dummyBufferID); + gl.genBuffers(1, &m_unusedBufferID); GLU_EXPECT_NO_ERROR(gl.getError(), "Gen buf"); // log basic info @@ -2328,10 +2328,10 @@ void BasicUploadCase<SampleType>::init (void) template <typename SampleType> void BasicUploadCase<SampleType>::deinit (void) { - if (m_dummyBufferID) + if (m_unusedBufferID) { - m_context.getRenderContext().getFunctions().deleteBuffers(1, &m_dummyBufferID); - m_dummyBufferID = 0; + m_context.getRenderContext().getFunctions().deleteBuffers(1, &m_unusedBufferID); + m_unusedBufferID = 0; } m_zeroData = std::vector<deUint8>(); @@ -2391,14 +2391,14 @@ void BasicUploadCase<SampleType>::createBuffer (int iteration, int bufferSize) de::Random rng (0xbadc * iteration); const int sizeDelta = rng.getInt(0, 2097140); - const int dummyUploadSize = deAlign32(1048576 + sizeDelta, 4*4); // Vary buffer size to make sure it is always reallocated - const std::vector<deUint8> dummyData (dummyUploadSize, 0x20); + const int unusedUploadSize = deAlign32(1048576 + sizeDelta, 4*4); // Vary buffer size to make sure it is always reallocated + const std::vector<deUint8> unusedData (unusedUploadSize, 0x20); - gl.bindBuffer(GL_ARRAY_BUFFER, m_dummyBufferID); - gl.bufferData(GL_ARRAY_BUFFER, dummyUploadSize, &dummyData[0], m_bufferUsage); + gl.bindBuffer(GL_ARRAY_BUFFER, m_unusedBufferID); + gl.bufferData(GL_ARRAY_BUFFER, unusedUploadSize, &unusedData[0], m_bufferUsage); // make sure upload won't interfere with the test - useBuffer(dummyUploadSize); + useBuffer(unusedUploadSize); // don't kill the buffer so that the following upload cannot potentially reuse the buffer @@ -2411,8 +2411,8 @@ void BasicUploadCase<SampleType>::createBuffer (int iteration, int bufferSize) gl.bufferData(GL_ARRAY_BUFFER, bufferSize, DE_NULL, m_bufferUsage); else { - const std::vector<deUint8> dummyData(bufferSize, 0x20); - gl.bufferData(GL_ARRAY_BUFFER, bufferSize, &dummyData[0], m_bufferUsage); + const std::vector<deUint8> unusedData(bufferSize, 0x20); + gl.bufferData(GL_ARRAY_BUFFER, bufferSize, &unusedData[0], m_bufferUsage); } if (m_caseType == CASE_UNSPECIFIED_BUFFER || m_caseType == CASE_SPECIFIED_BUFFER) @@ -2444,8 +2444,8 @@ void BasicUploadCase<SampleType>::deleteBuffer (int bufferSize) if (m_bufferUnspecifiedContent) { - const std::vector<deUint8> dummyData(bufferSize, 0x20); - gl.bufferData(GL_ARRAY_BUFFER, bufferSize, &dummyData[0], m_bufferUsage); + const std::vector<deUint8> unusedData(bufferSize, 0x20); + gl.bufferData(GL_ARRAY_BUFFER, bufferSize, &unusedData[0], m_bufferUsage); GLU_EXPECT_NO_ERROR(gl.getError(), "re-specify buffer"); } @@ -2461,11 +2461,11 @@ void BasicUploadCase<SampleType>::useBuffer (int bufferSize) { const glw::Functions& gl = m_context.getRenderContext().getFunctions(); - gl.useProgram(m_dummyProgram->getProgram()); + gl.useProgram(m_minimalProgram->getProgram()); - gl.viewport(0, 0, DUMMY_RENDER_AREA_SIZE, DUMMY_RENDER_AREA_SIZE); - gl.vertexAttribPointer(m_dummyProgramPosLoc, 4, GL_FLOAT, GL_FALSE, 0, DE_NULL); - gl.enableVertexAttribArray(m_dummyProgramPosLoc); + gl.viewport(0, 0, UNUSED_RENDER_AREA_SIZE, UNUSED_RENDER_AREA_SIZE); + gl.vertexAttribPointer(m_minimalProgramPosLoc, 4, GL_FLOAT, GL_FALSE, 0, DE_NULL); + gl.enableVertexAttribArray(m_minimalProgramPosLoc); // use whole buffer to make sure buffer is uploaded by drawing first and last DE_ASSERT(bufferSize % (int)sizeof(float[4]) == 0); @@ -3181,9 +3181,9 @@ protected: using BasicBufferCase<SampleType>::m_testCtx; using BasicBufferCase<SampleType>::m_context; - using BasicBufferCase<SampleType>::DUMMY_RENDER_AREA_SIZE; - using BasicBufferCase<SampleType>::m_dummyProgram; - using BasicBufferCase<SampleType>::m_dummyProgramPosLoc; + using BasicBufferCase<SampleType>::UNUSED_RENDER_AREA_SIZE; + using BasicBufferCase<SampleType>::m_minimalProgram; + using BasicBufferCase<SampleType>::m_minimalProgramPosLoc; using BasicBufferCase<SampleType>::m_bufferID; using BasicBufferCase<SampleType>::m_numSamples; using BasicBufferCase<SampleType>::m_bufferSizeMin; @@ -3237,9 +3237,9 @@ void ModifyAfterBasicCase<SampleType>::init (void) // Set state for drawing so that we don't have to change these during the iteration { - gl.useProgram(m_dummyProgram->getProgram()); - gl.viewport(0, 0, DUMMY_RENDER_AREA_SIZE, DUMMY_RENDER_AREA_SIZE); - gl.enableVertexAttribArray(m_dummyProgramPosLoc); + gl.useProgram(m_minimalProgram->getProgram()); + gl.viewport(0, 0, UNUSED_RENDER_AREA_SIZE, UNUSED_RENDER_AREA_SIZE); + gl.enableVertexAttribArray(m_minimalProgramPosLoc); } } @@ -3307,7 +3307,7 @@ bool ModifyAfterBasicCase<SampleType>::prepareAndRunTest (int iteration, UploadS gl.bufferData(GL_ARRAY_BUFFER, bufferSize, &m_zeroData[0], m_bufferUsage); // ...use it... - gl.vertexAttribPointer(m_dummyProgramPosLoc, 4, GL_FLOAT, GL_FALSE, 0, DE_NULL); + gl.vertexAttribPointer(m_minimalProgramPosLoc, 4, GL_FLOAT, GL_FALSE, 0, DE_NULL); drawBufferRange(0, bufferSize); // ..and make sure it is uploaded @@ -4007,8 +4007,8 @@ void RenderPerformanceTestBase::setupVertexAttribs (void) const void RenderPerformanceTestBase::waitGLResults (void) const { - tcu::Surface dummySurface(RENDER_AREA_SIZE, RENDER_AREA_SIZE); - glu::readPixels(m_context.getRenderContext(), 0, 0, dummySurface.getAccess()); + tcu::Surface unusedSurface(RENDER_AREA_SIZE, RENDER_AREA_SIZE); + glu::readPixels(m_context.getRenderContext(), 0, 0, unusedSurface.getAccess()); } template <typename SampleType> @@ -4111,7 +4111,7 @@ void RenderCase<SampleType>::init (void) m_results.back().result.numVertices = getLayeredGridNumVertices(m_results.back().scene); - // test cases set these, initialize to dummy values + // test cases set these, initialize to unused values m_results.back().result.renderDataSize = -1; m_results.back().result.uploadedDataSize = -1; m_results.back().result.unrelatedDataSize = -1; @@ -5642,14 +5642,14 @@ void UploadWaitDrawCase::deinit (void) UploadWaitDrawCase::IterateResult UploadWaitDrawCase::iterate (void) { const glw::Functions& gl = m_context.getRenderContext().getFunctions(); - const int betweenIterationDummyFrameCount = 5; // draw misc between test samples + const int betweenIterationFrameCount = 5; // draw misc between test samples const int frameNdx = m_frameNdx++; const int currentSampleNdx = m_iterationOrder[m_sampleNdx]; // Simulate work for about 8ms busyWait(8000); - // Dummy rendering during dummy frames + // Busywork rendering during unused frames if (frameNdx != m_samples[currentSampleNdx].numFrames) { // draw similar from another buffer @@ -5671,7 +5671,7 @@ UploadWaitDrawCase::IterateResult UploadWaitDrawCase::iterate (void) if (m_bufferState == BUFFERSTATE_NEW) reuseAndDeleteBuffer(); } - else if (frameNdx == m_samples[currentSampleNdx].numFrames + betweenIterationDummyFrameCount) + else if (frameNdx == m_samples[currentSampleNdx].numFrames + betweenIterationFrameCount) { // next sample ++m_sampleNdx; diff --git a/modules/gles3/performance/es3pDepthTests.cpp b/modules/gles3/performance/es3pDepthTests.cpp index 63aef9887..7b01706ba 100644 --- a/modules/gles3/performance/es3pDepthTests.cpp +++ b/modules/gles3/performance/es3pDepthTests.cpp @@ -1380,7 +1380,7 @@ void FragmentWorkloadCullCase::logDescription (void) log << TestLog::Message << "Testing effects of culled fragment workload on render time" << TestLog::EndMessage; log << TestLog::Message << "Geometry consists of two fullsceen quads. The first (occluding) quad uses a trivial shader," "the second (occluded) contains significant fragment shader work" << TestLog::EndMessage; - log << TestLog::Message << "Workload indicates the number of iterations of dummy work done in the occluded quad's fragment shader" << TestLog::EndMessage; + log << TestLog::Message << "Workload indicates the number of iterations of unused work done in the occluded quad's fragment shader" << TestLog::EndMessage; log << TestLog::Message << "The ratio of rendering times of this scene with/without depth testing are compared" << TestLog::EndMessage; log << TestLog::Message << "Successfull early Z-testing should result in no correlation between workload and render time" << TestLog::EndMessage; log << TestLog::EndSection; @@ -1473,7 +1473,7 @@ private: log << TestLog::Message << "Testing effects of culled fragment workload on render time" << TestLog::EndMessage; log << TestLog::Message << "Geometry consists of two fullsceen quads. The first (occluding) quad uses a trivial shader," "the second (occluded) contains significant fragment shader work and a discard that is never triggers but has a dynamic condition" << TestLog::EndMessage; - log << TestLog::Message << "Workload indicates the number of iterations of dummy work done in the occluded quad's fragment shader" << TestLog::EndMessage; + log << TestLog::Message << "Workload indicates the number of iterations of unused work done in the occluded quad's fragment shader" << TestLog::EndMessage; log << TestLog::Message << "The ratio of rendering times of this scene with/without depth testing are compared" << TestLog::EndMessage; log << TestLog::Message << "Successfull early Z-testing should result in no correlation between workload and render time" << TestLog::EndMessage; log << TestLog::EndSection; @@ -1503,7 +1503,7 @@ private: log << TestLog::Message << "Testing effects of partially discarded occluder on rendering time" << TestLog::EndMessage; log << TestLog::Message << "Geometry consists of two fullsceen quads. The first (occluding) quad discards half the " "fragments in a grid pattern, the second (partially occluded) contains significant fragment shader work" << TestLog::EndMessage; - log << TestLog::Message << "Workload indicates the number of iterations of dummy work done in the occluded quad's fragment shader" << TestLog::EndMessage; + log << TestLog::Message << "Workload indicates the number of iterations of unused work done in the occluded quad's fragment shader" << TestLog::EndMessage; log << TestLog::Message << "The ratio of rendering times of this scene with/without depth testing are compared" << TestLog::EndMessage; log << TestLog::Message << "Successfull early Z-testing should result in depth testing halving the render time" << TestLog::EndMessage; log << TestLog::EndSection; @@ -1535,7 +1535,7 @@ private: log << TestLog::Message << "Testing effects of partial occluder on rendering time" << TestLog::EndMessage; log << TestLog::Message << "Geometry consists of two quads. The first (occluding) quad covers " << m_coverage*100.0f << "% of the screen, while the second (partially occluded, fullscreen) contains significant fragment shader work" << TestLog::EndMessage; - log << TestLog::Message << "Workload indicates the number of iterations of dummy work done in the occluded quad's fragment shader" << TestLog::EndMessage; + log << TestLog::Message << "Workload indicates the number of iterations of unused work done in the occluded quad's fragment shader" << TestLog::EndMessage; log << TestLog::Message << "The ratio of rendering times of this scene with/without depth testing are compared" << TestLog::EndMessage; log << TestLog::Message << "Successfull early Z-testing should result in render time increasing proportionally with unoccluded area" << TestLog::EndMessage; log << TestLog::EndSection; @@ -1566,7 +1566,7 @@ private: log << TestLog::Section("Description", "Test description"); log << TestLog::Message << "Testing effects of non-default frag depth on culling efficiency" << TestLog::EndMessage; log << TestLog::Message << "Geometry consists of two fullscreen quads. The first (occluding) quad is trivial, while the second (occluded) contains significant fragment shader work" << TestLog::EndMessage; - log << TestLog::Message << "Workload indicates the number of iterations of dummy work done in the occluded quad's fragment shader" << TestLog::EndMessage; + log << TestLog::Message << "Workload indicates the number of iterations of unused work done in the occluded quad's fragment shader" << TestLog::EndMessage; log << TestLog::Message << "The occluder quad has a static offset applied to gl_FragDepth" << TestLog::EndMessage; log << TestLog::Message << "The ratio of rendering times of this scene with/without depth testing are compared" << TestLog::EndMessage; log << TestLog::Message << "Successfull early Z-testing should result in no correlation between workload and render time" << TestLog::EndMessage; @@ -1596,7 +1596,7 @@ private: log << TestLog::Section("Description", "Test description"); log << TestLog::Message << "Testing effects of non-default frag depth on culling efficiency" << TestLog::EndMessage; log << TestLog::Message << "Geometry consists of two fullscreen quads. The first (occluding) quad is trivial, while the second (occluded) contains significant fragment shader work" << TestLog::EndMessage; - log << TestLog::Message << "Workload indicates the number of iterations of dummy work done in the occluded quad's fragment shader" << TestLog::EndMessage; + log << TestLog::Message << "Workload indicates the number of iterations of unused work done in the occluded quad's fragment shader" << TestLog::EndMessage; log << TestLog::Message << "The occluder quad has a dynamic offset applied to gl_FragDepth" << TestLog::EndMessage; log << TestLog::Message << "The ratio of rendering times of this scene with/without depth testing are compared" << TestLog::EndMessage; log << TestLog::Message << "Successfull early Z-testing should result in no correlation between workload and render time" << TestLog::EndMessage; @@ -1626,7 +1626,7 @@ private: log << TestLog::Section("Description", "Test description"); log << TestLog::Message << "Testing effects of non-default frag depth on rendering time" << TestLog::EndMessage; log << TestLog::Message << "Geometry consists of two fullscreen quads. The first (occluding) quad is trivial, while the second (occluded) contains significant fragment shader work" << TestLog::EndMessage; - log << TestLog::Message << "Workload indicates the number of iterations of dummy work done in the occluded quad's fragment shader" << TestLog::EndMessage; + log << TestLog::Message << "Workload indicates the number of iterations of unused work done in the occluded quad's fragment shader" << TestLog::EndMessage; log << TestLog::Message << "The occluded quad has a static offset applied to gl_FragDepth" << TestLog::EndMessage; log << TestLog::Message << "The ratio of rendering times of this scene with/without depth testing are compared" << TestLog::EndMessage; log << TestLog::Message << "Successfull early Z-testing should result in no correlation between workload and render time" << TestLog::EndMessage; @@ -1656,7 +1656,7 @@ private: log << TestLog::Section("Description", "Test description"); log << TestLog::Message << "Testing effects of non-default frag depth on rendering time" << TestLog::EndMessage; log << TestLog::Message << "Geometry consists of two fullscreen quads. The first (occluding) quad is trivial, while the second (occluded) contains significant fragment shader work" << TestLog::EndMessage; - log << TestLog::Message << "Workload indicates the number of iterations of dummy work done in the occluded quad's fragment shader" << TestLog::EndMessage; + log << TestLog::Message << "Workload indicates the number of iterations of unused work done in the occluded quad's fragment shader" << TestLog::EndMessage; log << TestLog::Message << "The occluded quad has a dynamic offset applied to gl_FragDepth" << TestLog::EndMessage; log << TestLog::Message << "The ratio of rendering times of this scene with/without depth testing are compared" << TestLog::EndMessage; log << TestLog::Message << "Successfull early Z-testing should result in no correlation between workload and render time" << TestLog::EndMessage; @@ -1686,7 +1686,7 @@ private: log << TestLog::Section("Description", "Test description"); log << TestLog::Message << "Testing effects of of back first rendering order on culling efficiency" << TestLog::EndMessage; log << TestLog::Message << "Geometry consists of two fullscreen quads. The second (occluding) quad is trivial, while the first (occluded) contains significant fragment shader work" << TestLog::EndMessage; - log << TestLog::Message << "Workload indicates the number of iterations of dummy work done in the occluded quad's fragment shader" << TestLog::EndMessage; + log << TestLog::Message << "Workload indicates the number of iterations of unused work done in the occluded quad's fragment shader" << TestLog::EndMessage; log << TestLog::Message << "The ratio of rendering times of this scene with/without depth testing are compared" << TestLog::EndMessage; log << TestLog::Message << "Successfull early Z-testing should result in no correlation between workload and render time" << TestLog::EndMessage; log << TestLog::EndSection; diff --git a/modules/gles3/performance/es3pShaderCompilationCases.cpp b/modules/gles3/performance/es3pShaderCompilationCases.cpp index 8c80cd7f9..65d951c2a 100644 --- a/modules/gles3/performance/es3pShaderCompilationCases.cpp +++ b/modules/gles3/performance/es3pShaderCompilationCases.cpp @@ -1871,7 +1871,7 @@ bool ShaderCompilerCase::goodEnoughMeasurements (const vector<Measurement>& meas ShaderCompilerCase::IterateResult ShaderCompilerCase::iterate (void) { - // Before actual measurements, compile and draw with a dummy shader to avoid possible initial slowdowns in the actual test. + // Before actual measurements, compile and draw with a minimal shader to avoid possible initial slowdowns in the actual test. { deUint32 specID = getSpecializationID(0); ProgramContext progCtx; @@ -2479,7 +2479,7 @@ InvalidShaderCompilerCase::IterateResult InvalidShaderCompilerCase::iterate (voi DE_ASSERT(shaderValidity != SHADER_VALIDITY_LAST); - // Before actual measurements, compile a dummy shader to avoid possible initial slowdowns in the actual test. + // Before actual measurements, compile a minimal shader to avoid possible initial slowdowns in the actual test. { deUint32 specID = getSpecializationID(0); ProgramContext progCtx; diff --git a/modules/gles31/functional/es31fDebugTests.cpp b/modules/gles31/functional/es31fDebugTests.cpp index 4a507cca4..f0995b530 100644 --- a/modules/gles31/functional/es31fDebugTests.cpp +++ b/modules/gles31/functional/es31fDebugTests.cpp @@ -2803,9 +2803,9 @@ GroupStackDepthQueryCase::IterateResult GroupStackDepthQueryCase::iterate (void) return STOP; } -extern "C" void GLW_APIENTRY dummyCallback(GLenum, GLenum, GLuint, GLenum, GLsizei, const char*, const void*) +extern "C" void GLW_APIENTRY emptyCallback(GLenum, GLenum, GLuint, GLenum, GLsizei, const char*, const void*) { - // dummy + // empty } class DebugCallbackFunctionCase : public TestCase @@ -2839,8 +2839,8 @@ DebugCallbackFunctionCase::IterateResult DebugCallbackFunctionCase::iterate (voi { const tcu::ScopedLogSection section(m_testCtx.getLog(), "Set", "Set"); - gl.glDebugMessageCallback(dummyCallback, DE_NULL); - verifyStatePointer(result, gl, GL_DEBUG_CALLBACK_FUNCTION, (const void*)dummyCallback, QUERY_POINTER); + gl.glDebugMessageCallback(emptyCallback, DE_NULL); + verifyStatePointer(result, gl, GL_DEBUG_CALLBACK_FUNCTION, (const void*)emptyCallback, QUERY_POINTER); } result.setTestContextResult(m_testCtx); @@ -2880,7 +2880,7 @@ DebugCallbackUserParamCase::IterateResult DebugCallbackUserParamCase::iterate (v const tcu::ScopedLogSection section (m_testCtx.getLog(), "Set", "Set"); const void* param = (void*)(int*)0x123; - gl.glDebugMessageCallback(dummyCallback, param); + gl.glDebugMessageCallback(emptyCallback, param); verifyStatePointer(result, gl, GL_DEBUG_CALLBACK_USER_PARAM, param, QUERY_POINTER); } diff --git a/modules/gles31/functional/es31fGeometryShaderTests.cpp b/modules/gles31/functional/es31fGeometryShaderTests.cpp index a90b51e0f..7fa9c6a45 100644 --- a/modules/gles31/functional/es31fGeometryShaderTests.cpp +++ b/modules/gles31/functional/es31fGeometryShaderTests.cpp @@ -4068,11 +4068,11 @@ void GeometryProgramQueryCase::expectProgramValue (deUint32 program, int value) void GeometryProgramQueryCase::expectQueryError (deUint32 program) { const glw::Functions& gl = m_context.getRenderContext().getFunctions(); - glw::GLint dummy; + glw::GLint unused; glw::GLenum errorCode; m_testCtx.getLog() << tcu::TestLog::Message << "Querying " << glu::getProgramParamStr(m_target) << ", expecting INVALID_OPERATION" << tcu::TestLog::EndMessage; - gl.getProgramiv(program, m_target, &dummy); + gl.getProgramiv(program, m_target, &unused); errorCode = gl.getError(); @@ -5858,7 +5858,7 @@ void VertexFeedbackOverflowCase::init (void) const int feedbackCount = 5 * 4; // 5x vec4 const std::vector<float> initialBufferContents (feedbackCount, -1.0f); - m_testCtx.getLog() << tcu::TestLog::Message << "Filling feeback buffer with dummy value (-1.0)." << tcu::TestLog::EndMessage; + m_testCtx.getLog() << tcu::TestLog::Message << "Filling feeback buffer with unused value (-1.0)." << tcu::TestLog::EndMessage; gl.genBuffers(1, &m_feedbackBuf); gl.bindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, m_feedbackBuf); diff --git a/modules/gles31/functional/es31fNegativeShaderApiTests.cpp b/modules/gles31/functional/es31fNegativeShaderApiTests.cpp index 88ee474fb..7df42361e 100644 --- a/modules/gles31/functional/es31fNegativeShaderApiTests.cpp +++ b/modules/gles31/functional/es31fNegativeShaderApiTests.cpp @@ -522,7 +522,7 @@ void program_binary (NegativeTestContext& ctx) { glu::ShaderProgram srcProgram (ctx.getRenderContext(), glu::makeVtxFragSources(vertexShaderSource, fragmentShaderSource)); GLuint dstProgram = ctx.glCreateProgram(); - GLuint dummyShader = ctx.glCreateShader(GL_VERTEX_SHADER); + GLuint unusedShader = ctx.glCreateShader(GL_VERTEX_SHADER); GLenum binaryFormat = -1; GLsizei binaryLength = -1; std::vector<deUint8> binaryBuf; @@ -542,7 +542,7 @@ void program_binary (NegativeTestContext& ctx) ctx.expectError (GL_NO_ERROR); ctx.beginSection("GL_INVALID_OPERATION is generated if program is not the name of an existing program object."); - ctx.glProgramBinary (dummyShader, binaryFormat, &binaryBuf[0], binaryLength); + ctx.glProgramBinary (unusedShader, binaryFormat, &binaryBuf[0], binaryLength); ctx.expectError (GL_INVALID_OPERATION); ctx.endSection(); @@ -552,7 +552,7 @@ void program_binary (NegativeTestContext& ctx) ctx.endSection(); } - ctx.glDeleteShader(dummyShader); + ctx.glDeleteShader(unusedShader); ctx.glDeleteProgram(dstProgram); } diff --git a/modules/gles31/functional/es31fNegativeStateApiTests.cpp b/modules/gles31/functional/es31fNegativeStateApiTests.cpp index 284bf4561..2ca77fd18 100644 --- a/modules/gles31/functional/es31fNegativeStateApiTests.cpp +++ b/modules/gles31/functional/es31fNegativeStateApiTests.cpp @@ -850,8 +850,8 @@ void get_active_uniformsiv (NegativeTestContext& ctx) { GLuint shader = ctx.glCreateShader(GL_VERTEX_SHADER); glu::ShaderProgram program (ctx.getRenderContext(), glu::makeVtxFragSources(getVtxFragVersionSources(uniformTestVertSource, ctx), getVtxFragVersionSources(uniformTestFragSource, ctx))); - GLuint dummyUniformIndex = 1; - GLint dummyParamDst = -1; + GLuint unusedUniformIndex = 1; + GLint unusedParamDst = -1; GLint numActiveUniforms = -1; ctx.glUseProgram(program.getProgram()); @@ -860,12 +860,12 @@ void get_active_uniformsiv (NegativeTestContext& ctx) ctx.getLog() << TestLog::Message << "// GL_ACTIVE_UNIFORMS = " << numActiveUniforms << " (expected 4)." << TestLog::EndMessage; ctx.beginSection("GL_INVALID_VALUE is generated if program is not a value generated by OpenGL."); - ctx.glGetActiveUniformsiv(-1, 1, &dummyUniformIndex, GL_UNIFORM_TYPE, &dummyParamDst); + ctx.glGetActiveUniformsiv(-1, 1, &unusedUniformIndex, GL_UNIFORM_TYPE, &unusedParamDst); ctx.expectError(GL_INVALID_VALUE); ctx.endSection(); ctx.beginSection("GL_INVALID_OPERATION is generated if program is not a program object."); - ctx.glGetActiveUniformsiv(shader, 1, &dummyUniformIndex, GL_UNIFORM_TYPE, &dummyParamDst); + ctx.glGetActiveUniformsiv(shader, 1, &unusedUniformIndex, GL_UNIFORM_TYPE, &unusedParamDst); ctx.expectError(GL_INVALID_OPERATION); ctx.endSection(); @@ -877,14 +877,14 @@ void get_active_uniformsiv (NegativeTestContext& ctx) invalidUniformIndices.push_back(numActiveUniforms-1+excess); invalidUniformIndices.push_back(1); - std::vector<GLint> dummyParamsDst(invalidUniformIndices.size()); - ctx.glGetActiveUniformsiv(program.getProgram(), (GLsizei)invalidUniformIndices.size(), &invalidUniformIndices[0], GL_UNIFORM_TYPE, &dummyParamsDst[0]); + std::vector<GLint> unusedParamsDst(invalidUniformIndices.size()); + ctx.glGetActiveUniformsiv(program.getProgram(), (GLsizei)invalidUniformIndices.size(), &invalidUniformIndices[0], GL_UNIFORM_TYPE, &unusedParamsDst[0]); ctx.expectError(excess == 0 ? GL_NO_ERROR : GL_INVALID_VALUE); } ctx.endSection(); ctx.beginSection("GL_INVALID_ENUM is generated if pname is not an accepted token."); - ctx.glGetActiveUniformsiv(program.getProgram(), 1, &dummyUniformIndex, -1, &dummyParamDst); + ctx.glGetActiveUniformsiv(program.getProgram(), 1, &unusedUniformIndex, -1, &unusedParamDst); ctx.expectError(GL_INVALID_ENUM); ctx.endSection(); diff --git a/modules/gles31/functional/es31fPrimitiveBoundingBoxTests.cpp b/modules/gles31/functional/es31fPrimitiveBoundingBoxTests.cpp index c389aec5f..3938129e8 100644 --- a/modules/gles31/functional/es31fPrimitiveBoundingBoxTests.cpp +++ b/modules/gles31/functional/es31fPrimitiveBoundingBoxTests.cpp @@ -3924,9 +3924,9 @@ std::string DepthDrawCase::genVertexSource (void) const if (hasTessellation) buf << " gl_Position = a_position;\n"; else if (m_depthType == DEPTH_USER_DEFINED) - buf << " highp float dummyZ = a_position.z;\n" + buf << " highp float unusedZ = a_position.z;\n" " highp float writtenZ = a_position.w;\n" - " gl_Position = vec4(a_position.xy, dummyZ, 1.0);\n" + " gl_Position = vec4(a_position.xy, unusedZ, 1.0);\n" " v_fragDepth = writtenZ * u_depthScale + u_depthBias;\n"; else buf << " highp float writtenZ = a_position.w;\n" @@ -4038,9 +4038,9 @@ std::string DepthDrawCase::genTessellationEvaluationSource (void) const " highp vec4 tessellatedPos = gl_TessCoord.x * gl_in[0].gl_Position + gl_TessCoord.y * gl_in[1].gl_Position + gl_TessCoord.z * gl_in[2].gl_Position;\n"; if (m_depthType == DEPTH_USER_DEFINED) - buf << " highp float dummyZ = tessellatedPos.z;\n" + buf << " highp float unusedZ = tessellatedPos.z;\n" " highp float writtenZ = tessellatedPos.w;\n" - " gl_Position = vec4(tessellatedPos.xy, dummyZ, 1.0);\n" + " gl_Position = vec4(tessellatedPos.xy, unusedZ, 1.0);\n" " v_fragDepth = writtenZ * u_depthScale + u_depthBias;\n"; else buf << " highp float writtenZ = tessellatedPos.w;\n" diff --git a/modules/gles31/functional/es31fProgramInterfaceDefinitionUtil.cpp b/modules/gles31/functional/es31fProgramInterfaceDefinitionUtil.cpp index c18029ea3..ec1bc46d8 100644 --- a/modules/gles31/functional/es31fProgramInterfaceDefinitionUtil.cpp +++ b/modules/gles31/functional/es31fProgramInterfaceDefinitionUtil.cpp @@ -955,7 +955,7 @@ static int accumulateShader (const ProgramInterfaceDefinition::Shader* shader, return retVal; } -static bool dummyTrueConstantTypeFilter (glu::DataType d) +static bool unusedTrueConstantTypeFilter (glu::DataType d) { DE_UNREF(d); return true; @@ -1024,7 +1024,7 @@ static int getNumTypeInstances (const ProgramInterfaceDefinition::Shader* shader static int getNumTypeInstances (const ProgramInterfaceDefinition::Shader* shader, glu::Storage storage) { - return getNumTypeInstances(shader, storage, dummyTrueConstantTypeFilter); + return getNumTypeInstances(shader, storage, unusedTrueConstantTypeFilter); } static int accumulateShaderStorage (const ProgramInterfaceDefinition::Shader* shader, glu::Storage storage, int (*typeMap)(glu::DataType)) @@ -1503,18 +1503,18 @@ std::vector<std::string> getProgramInterfaceResourceList (const ProgramInterface } /** - * Name of the dummy uniform added by generateProgramInterfaceProgramSources + * Name of the unused uniform added by generateProgramInterfaceProgramSources * - * A uniform named "dummyZero" is added by + * A uniform named "unusedZero" is added by * generateProgramInterfaceProgramSources. It is used in expressions to * prevent various program resources from being eliminated by the GLSL * compiler's optimizer. * * \sa deqp::gles31::Functional::ProgramInterfaceDefinition::generateProgramInterfaceProgramSources */ -const char* getDummyZeroUniformName() +const char* getUnusedZeroUniformName() { - return "dummyZero"; + return "unusedZero"; } glu::ProgramSources generateProgramInterfaceProgramSources (const ProgramInterfaceDefinition::Program* program) @@ -1555,10 +1555,10 @@ glu::ProgramSources generateProgramInterfaceProgramSources (const ProgramInterfa // Use inputs and outputs so that they won't be removed by the optimizer - usageBuf << "highp uniform vec4 " << getDummyZeroUniformName() << "; // Default value is vec4(0.0).\n" + usageBuf << "highp uniform vec4 " << getUnusedZeroUniformName() << "; // Default value is vec4(0.0).\n" "highp vec4 readInputs()\n" "{\n" - " highp vec4 retValue = " << getDummyZeroUniformName() << ";\n"; + " highp vec4 retValue = " << getUnusedZeroUniformName() << ";\n"; // User-defined inputs @@ -1633,7 +1633,7 @@ glu::ProgramSources generateProgramInterfaceProgramSources (const ProgramInterfa usageBuf << " return retValue;\n" "}\n\n"; - usageBuf << "void writeOutputs(in highp vec4 dummyValue)\n" + usageBuf << "void writeOutputs(in highp vec4 unusedValue)\n" "{\n"; // User-defined outputs @@ -1644,7 +1644,7 @@ glu::ProgramSources generateProgramInterfaceProgramSources (const ProgramInterfa shader->getDefaultBlock().variables[ndx].storage == glu::STORAGE_PATCH_OUT) { writeVariableWriteExpression(usageBuf, - "dummyValue", + "unusedValue", shader->getDefaultBlock().variables[ndx].name, shader->getType(), shader->getDefaultBlock().variables[ndx].storage, @@ -1659,7 +1659,7 @@ glu::ProgramSources generateProgramInterfaceProgramSources (const ProgramInterfa const glu::InterfaceBlock& interface = shader->getDefaultBlock().interfaceBlocks[interfaceNdx]; if (isWritableInterface(interface)) { - writeInterfaceWriteExpression(usageBuf, "dummyValue", interface, shader->getType(), program); + writeInterfaceWriteExpression(usageBuf, "unusedValue", interface, shader->getType(), program); containsUserDefinedOutputs = true; } } @@ -1667,12 +1667,12 @@ glu::ProgramSources generateProgramInterfaceProgramSources (const ProgramInterfa // Builtin-outputs that must be written to if (shader->getType() == glu::SHADERTYPE_VERTEX) - usageBuf << " gl_Position = dummyValue;\n"; + usageBuf << " gl_Position = unusedValue;\n"; else if (shader->getType() == glu::SHADERTYPE_GEOMETRY) - usageBuf << " gl_Position = dummyValue;\n" + usageBuf << " gl_Position = unusedValue;\n" " EmitVertex();\n"; else if (shader->getType() == glu::SHADERTYPE_TESSELLATION_CONTROL) - usageBuf << " gl_out[gl_InvocationID].gl_Position = dummyValue;\n" + usageBuf << " gl_out[gl_InvocationID].gl_Position = unusedValue;\n" " gl_TessLevelOuter[0] = 2.8;\n" " gl_TessLevelOuter[1] = 2.8;\n" " gl_TessLevelOuter[2] = 2.8;\n" @@ -1680,16 +1680,16 @@ glu::ProgramSources generateProgramInterfaceProgramSources (const ProgramInterfa " gl_TessLevelInner[0] = 2.8;\n" " gl_TessLevelInner[1] = 2.8;\n"; else if (shader->getType() == glu::SHADERTYPE_TESSELLATION_EVALUATION) - usageBuf << " gl_Position = dummyValue;\n"; + usageBuf << " gl_Position = unusedValue;\n"; // Output to sink input data to if (!containsUserDefinedOutputs) { if (shader->getType() == glu::SHADERTYPE_FRAGMENT) - usageBuf << " gl_FragDepth = dot(dummyValue.xy, dummyValue.xw);\n"; + usageBuf << " gl_FragDepth = dot(unusedValue.xy, unusedValue.xw);\n"; else if (shader->getType() == glu::SHADERTYPE_COMPUTE) - usageBuf << " dummyOutputBlock.dummyValue = dummyValue;\n"; + usageBuf << " unusedOutputBlock.unusedValue = unusedValue;\n"; } usageBuf << "}\n\n" @@ -1698,14 +1698,14 @@ glu::ProgramSources generateProgramInterfaceProgramSources (const ProgramInterfa " writeOutputs(readInputs());\n" "}\n"; - // Interface for dummy output + // Interface for unused output if (shader->getType() == glu::SHADERTYPE_COMPUTE && !containsUserDefinedOutputs) { - sourceBuf << "writeonly buffer DummyOutputInterface\n" + sourceBuf << "writeonly buffer UnusedOutputInterface\n" << "{\n" - << " highp vec4 dummyValue;\n" - << "} dummyOutputBlock;\n\n"; + << " highp vec4 unusedValue;\n" + << "} unusedOutputBlock;\n\n"; } sources << glu::ShaderSource(shader->getType(), sourceBuf.str() + usageBuf.str()); diff --git a/modules/gles31/functional/es31fProgramInterfaceDefinitionUtil.hpp b/modules/gles31/functional/es31fProgramInterfaceDefinitionUtil.hpp index eb56fa00f..19dcd663e 100644 --- a/modules/gles31/functional/es31fProgramInterfaceDefinitionUtil.hpp +++ b/modules/gles31/functional/es31fProgramInterfaceDefinitionUtil.hpp @@ -174,7 +174,7 @@ bool shaderContainsIOBlocks (const ProgramInterfaceDefinition::S glu::ShaderType getProgramTransformFeedbackStage (const ProgramInterfaceDefinition::Program* program); std::vector<std::string> getProgramInterfaceResourceList (const ProgramInterfaceDefinition::Program* program, ProgramInterface interface); std::vector<std::string> getProgramInterfaceBlockMemberResourceList (const glu::InterfaceBlock& interfaceBlock); -const char* getDummyZeroUniformName (); +const char* getUnusedZeroUniformName (); glu::ProgramSources generateProgramInterfaceProgramSources (const ProgramInterfaceDefinition::Program* program); bool findProgramVariablePathByPathName (std::vector<ProgramInterfaceDefinition::VariablePathComponent>& typePath, const ProgramInterfaceDefinition::Program* program, const std::string& pathName, const ProgramInterfaceDefinition::VariableSearchFilter& filter); void generateVariableTypeResourceNames (std::vector<std::string>& resources, const std::string& name, const glu::VarType& type, deUint32 resourceNameGenerationFlags); diff --git a/modules/gles31/functional/es31fProgramInterfaceQueryTestCase.cpp b/modules/gles31/functional/es31fProgramInterfaceQueryTestCase.cpp index 236242066..62332695a 100644 --- a/modules/gles31/functional/es31fProgramInterfaceQueryTestCase.cpp +++ b/modules/gles31/functional/es31fProgramInterfaceQueryTestCase.cpp @@ -1160,8 +1160,8 @@ void VariableReferencedByShaderValidator::validate (const ProgramInterfaceDefini { DE_UNREF(implementationName); - std::vector<VariablePathComponent> dummyPath; - const bool referencedByShader = findProgramVariablePathByPathName(dummyPath, program, resource, m_filter); + std::vector<VariablePathComponent> unusedPath; + const bool referencedByShader = findProgramVariablePathByPathName(unusedPath, program, resource, m_filter); m_testCtx.getLog() << tcu::TestLog::Message diff --git a/modules/gles31/functional/es31fProgramInterfaceQueryTests.cpp b/modules/gles31/functional/es31fProgramInterfaceQueryTests.cpp index d2bb74969..e2449769c 100644 --- a/modules/gles31/functional/es31fProgramInterfaceQueryTests.cpp +++ b/modules/gles31/functional/es31fProgramInterfaceQueryTests.cpp @@ -1034,10 +1034,10 @@ bool ResourceListTestCase::verifyResourceList (const std::vector<std::string>& r for (int ndx = 0; ndx < (int)resourceList.size(); ++ndx) { - // dummyZero is a uniform that may be added by + // unusedZero is a uniform that may be added by // generateProgramInterfaceProgramSources. Omit it here to avoid // confusion about the output. - if (resourceList[ndx] != getDummyZeroUniformName()) + if (resourceList[ndx] != getUnusedZeroUniformName()) m_testCtx.getLog() << tcu::TestLog::Message << "\t" << ndx << ": " << resourceList[ndx] << tcu::TestLog::EndMessage; } @@ -1061,11 +1061,11 @@ bool ResourceListTestCase::verifyResourceList (const std::vector<std::string>& r { if (!de::contains(expectedResources.begin(), expectedResources.end(), resourceList[ndx])) { - // Ignore all builtin variables or the variable dummyZero, - // mismatch causes errors otherwise. dummyZero is a uniform that + // Ignore all builtin variables or the variable unusedZero, + // mismatch causes errors otherwise. unusedZero is a uniform that // may be added by generateProgramInterfaceProgramSources. if (deStringBeginsWith(resourceList[ndx].c_str(), "gl_") == DE_FALSE && - resourceList[ndx] != getDummyZeroUniformName()) + resourceList[ndx] != getUnusedZeroUniformName()) { m_testCtx.getLog() << tcu::TestLog::Message << "Error, resource list contains unexpected resource name " << resourceList[ndx] << tcu::TestLog::EndMessage; error = true; @@ -4738,35 +4738,35 @@ static void generateBufferBackedInterfaceResourceBasicBlockTypes (Context& conte // .named_block { const ResourceDefinition::Node::SharedPtr block (new ResourceDefinition::InterfaceBlock(binding, true)); - const ResourceDefinition::Node::SharedPtr dummyVariable (new ResourceDefinition::Variable(block, glu::TYPE_BOOL_VEC3)); + const ResourceDefinition::Node::SharedPtr unusedVariable(new ResourceDefinition::Variable(block, glu::TYPE_BOOL_VEC3)); - blockContentGenerator(context, dummyVariable, targetGroup, programInterface, "named_block"); + blockContentGenerator(context, unusedVariable, targetGroup, programInterface, "named_block"); } // .unnamed_block { const ResourceDefinition::Node::SharedPtr block (new ResourceDefinition::InterfaceBlock(binding, false)); - const ResourceDefinition::Node::SharedPtr dummyVariable (new ResourceDefinition::Variable(block, glu::TYPE_BOOL_VEC3)); + const ResourceDefinition::Node::SharedPtr unusedVariable(new ResourceDefinition::Variable(block, glu::TYPE_BOOL_VEC3)); - blockContentGenerator(context, dummyVariable, targetGroup, programInterface, "unnamed_block"); + blockContentGenerator(context, unusedVariable, targetGroup, programInterface, "unnamed_block"); } // .block_array { const ResourceDefinition::Node::SharedPtr arrayElement (new ResourceDefinition::ArrayElement(binding, 3)); const ResourceDefinition::Node::SharedPtr block (new ResourceDefinition::InterfaceBlock(arrayElement, true)); - const ResourceDefinition::Node::SharedPtr dummyVariable (new ResourceDefinition::Variable(block, glu::TYPE_BOOL_VEC3)); + const ResourceDefinition::Node::SharedPtr unusedVariable(new ResourceDefinition::Variable(block, glu::TYPE_BOOL_VEC3)); - blockContentGenerator(context, dummyVariable, targetGroup, programInterface, "block_array"); + blockContentGenerator(context, unusedVariable, targetGroup, programInterface, "block_array"); } // .block_array_single_element { const ResourceDefinition::Node::SharedPtr arrayElement (new ResourceDefinition::ArrayElement(binding, 1)); const ResourceDefinition::Node::SharedPtr block (new ResourceDefinition::InterfaceBlock(arrayElement, true)); - const ResourceDefinition::Node::SharedPtr dummyVariable (new ResourceDefinition::Variable(block, glu::TYPE_BOOL_VEC3)); + const ResourceDefinition::Node::SharedPtr unusedVariable(new ResourceDefinition::Variable(block, glu::TYPE_BOOL_VEC3)); - blockContentGenerator(context, dummyVariable, targetGroup, programInterface, "block_array_single_element"); + blockContentGenerator(context, unusedVariable, targetGroup, programInterface, "block_array_single_element"); } } @@ -4788,26 +4788,26 @@ static void generateBufferBackedInterfaceResourceBufferBindingCases (Context& co // .named_block* { const ResourceDefinition::Node::SharedPtr block (new ResourceDefinition::InterfaceBlock(binding, true)); - const ResourceDefinition::Node::SharedPtr dummyVariable (new ResourceDefinition::Variable(block, glu::TYPE_BOOL_VEC3)); + const ResourceDefinition::Node::SharedPtr unusedVariable(new ResourceDefinition::Variable(block, glu::TYPE_BOOL_VEC3)); - targetGroup->addChild(new ResourceTestCase(context, dummyVariable, ProgramResourceQueryTestTarget(programInterface, PROGRAMRESOURCEPROP_BUFFER_BINDING), ("named_block" + nameSuffix).c_str())); + targetGroup->addChild(new ResourceTestCase(context, unusedVariable, ProgramResourceQueryTestTarget(programInterface, PROGRAMRESOURCEPROP_BUFFER_BINDING), ("named_block" + nameSuffix).c_str())); } // .unnamed_block* { const ResourceDefinition::Node::SharedPtr block (new ResourceDefinition::InterfaceBlock(binding, false)); - const ResourceDefinition::Node::SharedPtr dummyVariable (new ResourceDefinition::Variable(block, glu::TYPE_BOOL_VEC3)); + const ResourceDefinition::Node::SharedPtr unusedVariable(new ResourceDefinition::Variable(block, glu::TYPE_BOOL_VEC3)); - targetGroup->addChild(new ResourceTestCase(context, dummyVariable, ProgramResourceQueryTestTarget(programInterface, PROGRAMRESOURCEPROP_BUFFER_BINDING), ("unnamed_block" + nameSuffix).c_str())); + targetGroup->addChild(new ResourceTestCase(context, unusedVariable, ProgramResourceQueryTestTarget(programInterface, PROGRAMRESOURCEPROP_BUFFER_BINDING), ("unnamed_block" + nameSuffix).c_str())); } // .block_array* { const ResourceDefinition::Node::SharedPtr arrayElement (new ResourceDefinition::ArrayElement(binding, 3)); const ResourceDefinition::Node::SharedPtr block (new ResourceDefinition::InterfaceBlock(arrayElement, true)); - const ResourceDefinition::Node::SharedPtr dummyVariable (new ResourceDefinition::Variable(block, glu::TYPE_BOOL_VEC3)); + const ResourceDefinition::Node::SharedPtr unusedVariable(new ResourceDefinition::Variable(block, glu::TYPE_BOOL_VEC3)); - targetGroup->addChild(new ResourceTestCase(context, dummyVariable, ProgramResourceQueryTestTarget(programInterface, PROGRAMRESOURCEPROP_BUFFER_BINDING), ("block_array" + nameSuffix).c_str())); + targetGroup->addChild(new ResourceTestCase(context, unusedVariable, ProgramResourceQueryTestTarget(programInterface, PROGRAMRESOURCEPROP_BUFFER_BINDING), ("block_array" + nameSuffix).c_str())); } } } @@ -4828,26 +4828,26 @@ static void generateBufferBlockReferencedByShaderSingleBlockContentCases (Contex // .named_block { const ResourceDefinition::Node::SharedPtr block (new ResourceDefinition::InterfaceBlock(storage, true)); - const ResourceDefinition::Node::SharedPtr dummyVariable (new ResourceDefinition::Variable(block, glu::TYPE_BOOL_VEC3)); + const ResourceDefinition::Node::SharedPtr unusedVariable(new ResourceDefinition::Variable(block, glu::TYPE_BOOL_VEC3)); - targetGroup->addChild(new ResourceTestCase(context, dummyVariable, ProgramResourceQueryTestTarget(programInterface, PROGRAMRESOURCEPROP_REFERENCED_BY_SHADER), "named_block")); + targetGroup->addChild(new ResourceTestCase(context, unusedVariable, ProgramResourceQueryTestTarget(programInterface, PROGRAMRESOURCEPROP_REFERENCED_BY_SHADER), "named_block")); } // .unnamed_block { const ResourceDefinition::Node::SharedPtr block (new ResourceDefinition::InterfaceBlock(storage, false)); - const ResourceDefinition::Node::SharedPtr dummyVariable (new ResourceDefinition::Variable(block, glu::TYPE_BOOL_VEC3)); + const ResourceDefinition::Node::SharedPtr unusedVariable(new ResourceDefinition::Variable(block, glu::TYPE_BOOL_VEC3)); - targetGroup->addChild(new ResourceTestCase(context, dummyVariable, ProgramResourceQueryTestTarget(programInterface, PROGRAMRESOURCEPROP_REFERENCED_BY_SHADER), "unnamed_block")); + targetGroup->addChild(new ResourceTestCase(context, unusedVariable, ProgramResourceQueryTestTarget(programInterface, PROGRAMRESOURCEPROP_REFERENCED_BY_SHADER), "unnamed_block")); } // .block_array { const ResourceDefinition::Node::SharedPtr arrayElement (new ResourceDefinition::ArrayElement(storage, 3)); const ResourceDefinition::Node::SharedPtr block (new ResourceDefinition::InterfaceBlock(arrayElement, true)); - const ResourceDefinition::Node::SharedPtr dummyVariable (new ResourceDefinition::Variable(block, glu::TYPE_BOOL_VEC3)); + const ResourceDefinition::Node::SharedPtr unusedVariable(new ResourceDefinition::Variable(block, glu::TYPE_BOOL_VEC3)); - targetGroup->addChild(new ResourceTestCase(context, dummyVariable, ProgramResourceQueryTestTarget(programInterface, PROGRAMRESOURCEPROP_REFERENCED_BY_SHADER), "block_array")); + targetGroup->addChild(new ResourceTestCase(context, unusedVariable, ProgramResourceQueryTestTarget(programInterface, PROGRAMRESOURCEPROP_REFERENCED_BY_SHADER), "block_array")); } } diff --git a/modules/gles31/functional/es31fProgramUniformTests.cpp b/modules/gles31/functional/es31fProgramUniformTests.cpp index 19fd1c029..21c9e4aa8 100644 --- a/modules/gles31/functional/es31fProgramUniformTests.cpp +++ b/modules/gles31/functional/es31fProgramUniformTests.cpp @@ -1657,11 +1657,11 @@ UniformCase::IterateResult UniformCase::iterate (void) const string fragmentSource = generateFragmentSource(basicUniforms); const ShaderProgram program (m_context.getRenderContext(), glu::makeVtxFragSources(vertexSource, fragmentSource)); - // A dummy program that we'll give to glUseProgram before we actually need + // An unused program that we'll give to glUseProgram before we actually need // the real program above, to see if an implementation tries to use the // currently active program for something inappropriate (instead of the // program given as argument to, say, glProgramUniform*). - const ShaderProgram dummyProgram (m_context.getRenderContext(), glu::makeVtxFragSources("#version 310 es\n" + const ShaderProgram unusedProgram (m_context.getRenderContext(), glu::makeVtxFragSources("#version 310 es\n" "void main (void) { gl_Position = vec4(1.0); }\n", "#version 310 es\n" @@ -1676,15 +1676,15 @@ UniformCase::IterateResult UniformCase::iterate (void) return STOP; } - if (!dummyProgram.isOk()) + if (!unusedProgram.isOk()) { - log << dummyProgram; - m_testCtx.setTestResult(QP_TEST_RESULT_FAIL, "Compilation of dummy program failed"); + log << unusedProgram; + m_testCtx.setTestResult(QP_TEST_RESULT_FAIL, "Compilation of unused program failed"); return STOP; } - log << TestLog::Message << "// Note: calling glUseProgram with a dummy program (will only use the real program once it's needed for rendering)" << TestLog::EndMessage; - glUseProgram(dummyProgram.getProgram()); + log << TestLog::Message << "// Note: calling glUseProgram with a unused program (will only use the real program once it's needed for rendering)" << TestLog::EndMessage; + glUseProgram(unusedProgram.getProgram()); const bool success = test(basicUniforms, basicUniformReportsRef, program, rnd); m_testCtx.setTestResult(success ? QP_TEST_RESULT_PASS : QP_TEST_RESULT_FAIL, diff --git a/modules/gles31/functional/es31fSynchronizationTests.cpp b/modules/gles31/functional/es31fSynchronizationTests.cpp index 38f731e9c..bf5d6d4e6 100644 --- a/modules/gles31/functional/es31fSynchronizationTests.cpp +++ b/modules/gles31/functional/es31fSynchronizationTests.cpp @@ -3118,14 +3118,14 @@ std::string ConcurrentSSBOAtomicCounterMixedCase::genSSBOComputeSource (void) co << "layout (binding = 1, std430) volatile buffer WorkBuffer\n" << "{\n" << " highp uint targetValue;\n" - << " highp uint dummy;\n" + << " highp uint unused;\n" << "} sb_work;\n" << "\n" << "void main ()\n" << "{\n" << " // flip high bits\n" << " highp uint mask = uint(1) << (24u + (gl_GlobalInvocationID.x % 8u));\n" - << " sb_work.dummy = atomicXor(sb_work.targetValue, mask);\n" + << " sb_work.unused = atomicXor(sb_work.targetValue, mask);\n" << "}"; return specializeShader(m_context, buf.str().c_str()); diff --git a/modules/gles31/functional/es31fTextureBorderClampTests.cpp b/modules/gles31/functional/es31fTextureBorderClampTests.cpp index 0587f5ad4..1b2afbdb0 100644 --- a/modules/gles31/functional/es31fTextureBorderClampTests.cpp +++ b/modules/gles31/functional/es31fTextureBorderClampTests.cpp @@ -174,7 +174,7 @@ int getDimensionNumBlocks (int dimensionSize, int blockSize) return (dimensionSize + blockSize - 1) / blockSize; } -void generateDummyCompressedData (tcu::CompressedTexture& dst, const tcu::CompressedTexFormat& format) +void generateDefaultCompressedData (tcu::CompressedTexture& dst, const tcu::CompressedTexFormat& format) { const int blockByteSize = tcu::getBlockSize(format); const tcu::IVec3 blockPixelSize = tcu::getBlockPixelSize(format); @@ -281,7 +281,7 @@ struct TextureTraits<glu::Texture3D> }; template <typename T> -de::MovePtr<T> genDummyTexture (glu::RenderContext& renderCtx, const glu::ContextInfo& ctxInfo, deUint32 texFormat, const typename TextureTraits<T>::SizeType& size) +de::MovePtr<T> genDefaultTexture (glu::RenderContext& renderCtx, const glu::ContextInfo& ctxInfo, deUint32 texFormat, const typename TextureTraits<T>::SizeType& size) { de::MovePtr<T> texture; @@ -338,7 +338,7 @@ de::MovePtr<T> genDummyTexture (glu::RenderContext& renderCtx, const glu::Contex const bool isAstcFormat = tcu::isAstcFormat(compressedFormat); tcu::TexDecompressionParams decompressionParams ((isAstcFormat) ? (tcu::TexDecompressionParams::ASTCMODE_LDR) : (tcu::TexDecompressionParams::ASTCMODE_LAST)); - generateDummyCompressedData(compressedLevel, compressedFormat); + generateDefaultCompressedData(compressedLevel, compressedFormat); texture = TextureTraits<T>::createTextureFromCompressedData(renderCtx, ctxInfo, @@ -673,7 +673,7 @@ void TextureBorderClampTest::init (void) // resources - m_texture = genDummyTexture<glu::Texture2D>(m_context.getRenderContext(), m_context.getContextInfo(), m_texFormat, tcu::IVec2(m_texWidth, m_texHeight)); + m_texture = genDefaultTexture<glu::Texture2D>(m_context.getRenderContext(), m_context.getContextInfo(), m_texFormat, tcu::IVec2(m_texWidth, m_texHeight)); m_testCtx.getLog() << tcu::TestLog::Message << "Created texture with format " << glu::getTextureFormatName(m_texFormat) @@ -2089,7 +2089,7 @@ void TextureBorderClampPerAxisCase3D::init (void) } // resources - m_texture = genDummyTexture<glu::Texture3D>(m_context.getRenderContext(), m_context.getContextInfo(), m_texFormat, m_size); + m_texture = genDefaultTexture<glu::Texture3D>(m_context.getRenderContext(), m_context.getContextInfo(), m_texFormat, m_size); m_renderer = de::MovePtr<gls::TextureTestUtil::TextureRenderer>(new gls::TextureTestUtil::TextureRenderer(m_context.getRenderContext(), m_testCtx.getLog(), glslVersion, glu::PRECISION_HIGHP)); // texture info diff --git a/modules/gles31/functional/es31fVertexAttributeBindingTests.cpp b/modules/gles31/functional/es31fVertexAttributeBindingTests.cpp index 7f6e61457..97a042359 100644 --- a/modules/gles31/functional/es31fVertexAttributeBindingTests.cpp +++ b/modules/gles31/functional/es31fVertexAttributeBindingTests.cpp @@ -1126,7 +1126,7 @@ void MixedApiCase::renderTo (tcu::Surface& dst) glu::CallLogWrapper gl (m_context.getRenderContext().getFunctions(), m_testCtx.getLog()); const int positionLoc = gl.glGetAttribLocation(m_program->getProgram(), "a_position"); const int colorLoc = gl.glGetAttribLocation(m_program->getProgram(), "a_color"); - glu::Buffer dummyBuffer (m_context.getRenderContext()); + glu::Buffer unusedBuffer (m_context.getRenderContext()); gl.enableLogging(true); @@ -1145,7 +1145,7 @@ void MixedApiCase::renderTo (tcu::Surface& dst) { // bind data using old api - gl.glBindBuffer(GL_ARRAY_BUFFER, *dummyBuffer); + gl.glBindBuffer(GL_ARRAY_BUFFER, *unusedBuffer); gl.glVertexAttribPointer(positionLoc, 4, GL_FLOAT, GL_FALSE, (glw::GLsizei)(2 * sizeof(tcu::Vec4)), (const deUint8*)DE_NULL); gl.glVertexAttribPointer(colorLoc, 4, GL_FLOAT, GL_FALSE, (glw::GLsizei)(2 * sizeof(tcu::Vec4)), glu::BufferOffsetAsPointer(sizeof(tcu::Vec4))); diff --git a/modules/gles31/tes31Context.cpp b/modules/gles31/tes31Context.cpp index af4a6a88b..4c2b203a1 100644 --- a/modules/gles31/tes31Context.cpp +++ b/modules/gles31/tes31Context.cpp @@ -45,8 +45,8 @@ Context::Context (tcu::TestContext& testCtx, glu::ApiType apiType) { // \todo [2016-11-15 pyry] Many tests (erroneously) inspect context type // during test hierarchy construction. We should fix that - // and revert dummy context to advertise unknown context type. - m_renderCtx = new glu::DummyRenderContext(glu::ContextType(glu::ApiType::es(3,1))); + // and revert empty context to advertise unknown context type. + m_renderCtx = new glu::EmptyRenderContext(glu::ContextType(glu::ApiType::es(3,1))); } } diff --git a/modules/glshared/glsBuiltinPrecisionTests.cpp b/modules/glshared/glsBuiltinPrecisionTests.cpp index 1668899c3..80c55203d 100644 --- a/modules/glshared/glsBuiltinPrecisionTests.cpp +++ b/modules/glshared/glsBuiltinPrecisionTests.cpp @@ -132,7 +132,7 @@ const T& instance (void) } /*--------------------------------------------------------------------*//*! - * \brief Dummy placeholder type for unused template parameters. + * \brief A placeholder type for unused template parameters. * * In the precision tests we are dealing with functions of different arities. * To minimize code duplication, we only define templates with the maximum @@ -923,7 +923,7 @@ public: template <typename T> class ExprP : public ExprPBase<T> {}; -// We treat Voids as containers since the dummy parameters in generalized +// We treat Voids as containers since the unused parameters in generalized // vector functions are represented as Voids. template <> class ExprP<Void> : public ContainerExprPBase<Void> {}; @@ -4736,7 +4736,7 @@ void PrecisionCase::testStatement (const Variables<In, Out>& variables, executor->execute(int(numValues), inputArr, outputArr); } - // Initialize environment with dummy values so we don't need to bind in inner loop. + // Initialize environment with unused values so we don't need to bind in inner loop. { const typename Traits<In0>::IVal in0; const typename Traits<In1>::IVal in1; diff --git a/modules/glshared/glsDrawTest.cpp b/modules/glshared/glsDrawTest.cpp index a026d496c..c78e1e393 100644 --- a/modules/glshared/glsDrawTest.cpp +++ b/modules/glshared/glsDrawTest.cpp @@ -58,6 +58,7 @@ #include <vector> #include <sstream> #include <limits> +#include <cstdint> #include "glwDefs.hpp" #include "glwEnums.hpp" @@ -1962,11 +1963,12 @@ void AttributePack::render (DrawTestSpec::Primitive primitive, DrawTestSpec::Dra DrawCommand command; // index offset must be converted to firstIndex by dividing with the index element size - DE_ASSERT(((const deUint8*)indexOffset - (const deUint8*)DE_NULL) % gls::DrawTestSpec::indexTypeSize(indexType) == 0); // \note This is checked in spec validation + const auto offsetAsInteger = reinterpret_cast<uintptr_t>(indexOffset); + DE_ASSERT(offsetAsInteger % gls::DrawTestSpec::indexTypeSize(indexType) == 0); // \note This is checked in spec validation command.count = vertexCount; command.primCount = instanceCount; - command.firstIndex = (glw::GLuint)(((const deUint8*)indexOffset - (const deUint8*)DE_NULL) / gls::DrawTestSpec::indexTypeSize(indexType)); + command.firstIndex = (glw::GLuint)(offsetAsInteger / gls::DrawTestSpec::indexTypeSize(indexType)); command.baseVertex = baseVertex; command.reservedMustBeZero = 0; diff --git a/modules/glshared/glsLongStressCase.cpp b/modules/glshared/glsLongStressCase.cpp index d84fd8d22..098b6c804 100644 --- a/modules/glshared/glsLongStressCase.cpp +++ b/modules/glshared/glsLongStressCase.cpp @@ -1126,7 +1126,7 @@ LongStressCase::~LongStressCase (void) void LongStressCase::init (void) { - // Generate dummy texture data for each texture spec in m_programContexts. + // Generate unused texture data for each texture spec in m_programContexts. DE_ASSERT(!m_programContexts.empty()); DE_ASSERT(m_programResources.empty()); @@ -1144,32 +1144,32 @@ void LongStressCase::init (void) // If texture data with the same format has already been generated, re-use that (don't care much about contents). - SharedPtr<TextureLevel> dummyTex; + SharedPtr<TextureLevel> unusedTex; for (int prevProgCtxNdx = 0; prevProgCtxNdx < (int)m_programResources.size(); prevProgCtxNdx++) { - const vector<SharedPtr<TextureLevel> >& prevProgCtxTextures = m_programResources[prevProgCtxNdx].dummyTextures; + const vector<SharedPtr<TextureLevel> >& prevProgCtxTextures = m_programResources[prevProgCtxNdx].unusedTextures; for (int texNdx = 0; texNdx < (int)prevProgCtxTextures.size(); texNdx++) { if (prevProgCtxTextures[texNdx]->getFormat() == format) { - dummyTex = prevProgCtxTextures[texNdx]; + unusedTex = prevProgCtxTextures[texNdx]; break; } } } - if (!dummyTex) - dummyTex = SharedPtr<TextureLevel>(new TextureLevel(format)); + if (!unusedTex) + unusedTex = SharedPtr<TextureLevel>(new TextureLevel(format)); - if (dummyTex->getWidth() < spec.width || dummyTex->getHeight() < spec.height) + if (unusedTex->getWidth() < spec.width || unusedTex->getHeight() < spec.height) { - dummyTex->setSize(spec.width, spec.height); - tcu::fillWithComponentGradients(dummyTex->getAccess(), spec.minValue, spec.maxValue); + unusedTex->setSize(spec.width, spec.height); + tcu::fillWithComponentGradients(unusedTex->getAccess(), spec.minValue, spec.maxValue); } - progRes.dummyTextures.push_back(dummyTex); + progRes.unusedTextures.push_back(unusedTex); } } @@ -1314,9 +1314,9 @@ LongStressCase::IterateResult LongStressCase::iterate (void) m_textures->removeGarbageUntilUnder(m_maxTexMemoryUsageBytes - texture.getApproxMemUsageDiff(spec.width, spec.height, spec.internalFormat, spec.useMipmap), m_rnd); if (!hadTexture || m_rnd.getFloat() < m_probabilities.reuploadWithTexImage) - texture.setData(programResources.dummyTextures[texNdx]->getAccess(), spec.width, spec.height, spec.internalFormat, spec.useMipmap); + texture.setData(programResources.unusedTextures[texNdx]->getAccess(), spec.width, spec.height, spec.internalFormat, spec.useMipmap); else - texture.setSubData(programResources.dummyTextures[texNdx]->getAccess(), 0, 0, spec.width, spec.height); + texture.setSubData(programResources.unusedTextures[texNdx]->getAccess(), 0, 0, spec.width, spec.height); texture.toUnit(0); texture.setWrap(spec.sWrap, spec.tWrap); diff --git a/modules/glshared/glsLongStressCase.hpp b/modules/glshared/glsLongStressCase.hpp index 0291dcaba..b49d80a81 100644 --- a/modules/glshared/glsLongStressCase.hpp +++ b/modules/glshared/glsLongStressCase.hpp @@ -331,7 +331,7 @@ private: std::vector<deUint8> attrDataBuf; std::vector<int> attrDataOffsets; std::vector<int> attrDataSizes; - std::vector<de::SharedPtr<tcu::TextureLevel> > dummyTextures; + std::vector<de::SharedPtr<tcu::TextureLevel> > unusedTextures; std::string shaderNameManglingSuffix; }; diff --git a/modules/glshared/glsLongStressTestUtil.cpp b/modules/glshared/glsLongStressTestUtil.cpp index 8ef682127..6ef57776d 100644 --- a/modules/glshared/glsLongStressTestUtil.cpp +++ b/modules/glshared/glsLongStressTestUtil.cpp @@ -85,12 +85,12 @@ ProgramLibrary::ProgramLibrary (const glu::GLSLVersion glslVersion) DE_ASSERT(glslVersion == glu::GLSL_VERSION_100_ES || glslVersion == glu::GLSL_VERSION_300_ES); } -gls::ProgramContext ProgramLibrary::generateBufferContext (const int numDummyAttributes) const +gls::ProgramContext ProgramLibrary::generateBufferContext (const int numUnusedAttributes) const { static const char* const vertexTemplate = "${VTX_HEADER}" "${VTX_IN} highp vec3 a_position;\n" - "${VTX_DUMMY_INPUTS}" + "${VTX_UNUSED_INPUTS}" "${VTX_OUT} mediump vec4 v_color;\n" "\n" "void main (void)\n" @@ -111,15 +111,15 @@ gls::ProgramContext ProgramLibrary::generateBufferContext (const int numDummyAtt map<string, string> firstLevelParams; { - string vtxDummyInputs; + string vtxUnusedInputs; string vtxColorExpr; - for (int i = 0; i < numDummyAttributes; i++) + for (int i = 0; i < numUnusedAttributes; i++) { - vtxDummyInputs += "${VTX_IN} mediump vec4 a_in" + toString(i) + ";\n"; + vtxUnusedInputs += "${VTX_IN} mediump vec4 a_in" + toString(i) + ";\n"; vtxColorExpr += string() + (i > 0 ? " + " : "") + "a_in" + toString(i); } - firstLevelParams["VTX_DUMMY_INPUTS"] = substitute(vtxDummyInputs); + firstLevelParams["VTX_UNUSED_INPUTS"] = substitute(vtxUnusedInputs); firstLevelParams["VTX_COLOR_EXPRESSION"] = vtxColorExpr; } @@ -127,8 +127,8 @@ gls::ProgramContext ProgramLibrary::generateBufferContext (const int numDummyAtt context.attributes.push_back(gls::VarSpec("a_position", Vec3(-0.1f), Vec3(0.1f))); - for (int i = 0; i < numDummyAttributes; i++) - context.attributes.push_back(gls::VarSpec("a_in" + de::toString(i), Vec4(0.0f), Vec4(1.0f / (float)numDummyAttributes))); + for (int i = 0; i < numUnusedAttributes; i++) + context.attributes.push_back(gls::VarSpec("a_in" + de::toString(i), Vec4(0.0f), Vec4(1.0f / (float)numUnusedAttributes))); return context; } diff --git a/modules/glshared/glsLongStressTestUtil.hpp b/modules/glshared/glsLongStressTestUtil.hpp index baa12f599..62f0e9417 100644 --- a/modules/glshared/glsLongStressTestUtil.hpp +++ b/modules/glshared/glsLongStressTestUtil.hpp @@ -41,7 +41,7 @@ class ProgramLibrary public: ProgramLibrary (glu::GLSLVersion glslVersion); - gls::ProgramContext generateBufferContext (int numDummyAttributes) const; + gls::ProgramContext generateBufferContext (int numUnusedAttributes) const; gls::ProgramContext generateTextureContext (int numTextureObjects, int texWid, int texHei, float positionFactor) const; gls::ProgramContext generateBufferAndTextureContext (int numTextures, int texWid, int texHei) const; gls::ProgramContext generateFragmentPointLightContext (int texWid, int texHei) const; diff --git a/modules/glshared/glsMemoryStressCase.cpp b/modules/glshared/glsMemoryStressCase.cpp index 3195d28f2..0400ff3ed 100644 --- a/modules/glshared/glsMemoryStressCase.cpp +++ b/modules/glshared/glsMemoryStressCase.cpp @@ -460,7 +460,7 @@ private: Result m_result; MemObjectConfig m_config; deUint32 m_glError; - vector<deUint8> m_dummyData; + vector<deUint8> m_unusedData; BufferRenderer m_bufferRenderer; TextureRenderer m_textureRenderer; }; @@ -478,13 +478,13 @@ MemObjectAllocator::MemObjectAllocator (tcu::TestLog& log, glu::RenderContext& r { DE_UNREF(renderContext); - if (m_config.useDummyData) + if (m_config.useUnusedData) { - int dummySize = deMax32(m_config.maxBufferSize, m_config.maxTextureSize*m_config.maxTextureSize*4); - m_dummyData = vector<deUint8>(dummySize); + int unusedSize = deMax32(m_config.maxBufferSize, m_config.maxTextureSize*m_config.maxTextureSize*4); + m_unusedData = vector<deUint8>(unusedSize); } else if (m_config.write) - m_dummyData = vector<deUint8>(128); + m_unusedData = vector<deUint8>(128); } MemObjectAllocator::~MemObjectAllocator (void) @@ -608,10 +608,10 @@ void MemObjectAllocator::allocateTexture (de::Random& rnd) return; } - if (m_config.useDummyData) + if (m_config.useUnusedData) { - DE_ASSERT((int)m_dummyData.size() >= width*height*4); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, &(m_dummyData[0])); + DE_ASSERT((int)m_unusedData.size() >= width*height*4); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, &(m_unusedData[0])); } else glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); @@ -625,7 +625,7 @@ void MemObjectAllocator::allocateTexture (de::Random& rnd) } if (m_config.write) - glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, &(m_dummyData[0])); + glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, &(m_unusedData[0])); error = glGetError(); if (error != 0) @@ -698,10 +698,10 @@ void MemObjectAllocator::allocateBuffer (de::Random& rnd) m_buffers.push_back(buffer); - if (m_config.useDummyData) + if (m_config.useUnusedData) { - DE_ASSERT((int)m_dummyData.size() >= size); - glBufferData(GL_ARRAY_BUFFER, size, &(m_dummyData[0]), GL_DYNAMIC_DRAW); + DE_ASSERT((int)m_unusedData.size() >= size); + glBufferData(GL_ARRAY_BUFFER, size, &(m_unusedData[0]), GL_DYNAMIC_DRAW); } else glBufferData(GL_ARRAY_BUFFER, size, NULL, GL_DYNAMIC_DRAW); @@ -715,7 +715,7 @@ void MemObjectAllocator::allocateBuffer (de::Random& rnd) } if (m_config.write) - glBufferSubData(GL_ARRAY_BUFFER, 0, 1, &(m_dummyData[0])); + glBufferSubData(GL_ARRAY_BUFFER, 0, 1, &(m_unusedData[0])); error = glGetError(); if (error != 0) @@ -816,7 +816,7 @@ const char* MemObjectAllocator::resultToString (Result result) } } -MemoryStressCase::MemoryStressCase (tcu::TestContext& ctx, glu::RenderContext& renderContext, deUint32 objectTypes, int minTextureSize, int maxTextureSize, int minBufferSize, int maxBufferSize, bool write, bool use, bool useDummyData, bool clearAfterOOM, const char* name, const char* desc) +MemoryStressCase::MemoryStressCase (tcu::TestContext& ctx, glu::RenderContext& renderContext, deUint32 objectTypes, int minTextureSize, int maxTextureSize, int minBufferSize, int maxBufferSize, bool write, bool use, bool useUnusedData, bool clearAfterOOM, const char* name, const char* desc) : tcu::TestCase (ctx, name, desc) , m_iteration (0) , m_iterationCount (5) @@ -830,7 +830,7 @@ MemoryStressCase::MemoryStressCase (tcu::TestContext& ctx, glu::RenderContext& r m_config.minTextureSize = minTextureSize; m_config.maxBufferSize = maxBufferSize; m_config.minBufferSize = minBufferSize; - m_config.useDummyData = useDummyData; + m_config.useUnusedData = useUnusedData; m_config.write = write; m_config.use = use; } diff --git a/modules/glshared/glsMemoryStressCase.hpp b/modules/glshared/glsMemoryStressCase.hpp index 2aacec922..bef419634 100644 --- a/modules/glshared/glsMemoryStressCase.hpp +++ b/modules/glshared/glsMemoryStressCase.hpp @@ -50,7 +50,7 @@ struct MemObjectConfig int minTextureSize; int maxTextureSize; - bool useDummyData; + bool useUnusedData; bool write; bool use; }; @@ -58,7 +58,7 @@ struct MemObjectConfig class MemoryStressCase : public tcu::TestCase { public: - MemoryStressCase (tcu::TestContext& testCtx, glu::RenderContext& renderContext, deUint32 objectTypes, int minTextureSize, int maxTextureSize, int minBufferSize, int maxBufferSize, bool write, bool use, bool useDummyData, bool clearAfterOOM, const char* name, const char* desc); + MemoryStressCase (tcu::TestContext& testCtx, glu::RenderContext& renderContext, deUint32 objectTypes, int minTextureSize, int maxTextureSize, int minBufferSize, int maxBufferSize, bool write, bool use, bool useUnusedData, bool clearAfterOOM, const char* name, const char* desc); ~MemoryStressCase (void); void init (void); diff --git a/modules/glshared/glsShaderExecUtil.cpp b/modules/glshared/glsShaderExecUtil.cpp index ff6dccb4c..5c8401ff4 100644 --- a/modules/glshared/glsShaderExecUtil.cpp +++ b/modules/glshared/glsShaderExecUtil.cpp @@ -257,7 +257,7 @@ static std::string generateEmptyFragmentSource (glu::GLSLVersion version) src << glu::getGLSLVersionDeclaration(version) << "\n"; - // \todo [2013-08-05 pyry] Do we need one dummy output? + // \todo [2013-08-05 pyry] Do we need one unused output? src << "void main (void)\n{\n"; if (!customOut) diff --git a/modules/internal/ditAstcTests.cpp b/modules/internal/ditAstcTests.cpp index c7e648a49..95c8b4b92 100644 --- a/modules/internal/ditAstcTests.cpp +++ b/modules/internal/ditAstcTests.cpp @@ -133,7 +133,7 @@ AstcCase::IterateResult AstcCase::iterate (void) const size_t numBlocks = 1024; generatedData.resize(numBlocks*astc::BLOCK_SIZE_BYTES); - astc::generateDummyVoidExtentBlocks(&generatedData[0], numBlocks); + astc::generateDefaultVoidExtentBlocks(&generatedData[0], numBlocks); testDecompress(m_format, numBlocks, &generatedData[0]); @@ -143,13 +143,13 @@ AstcCase::IterateResult AstcCase::iterate (void) verifyBlocksValid(m_format, TexDecompressionParams::ASTCMODE_HDR, numBlocks, &generatedData[0]); } - // Verify generating dummy normal blocks + // Verify generating unused normal blocks { const size_t numBlocks = 1024; const IVec3 blockPixelSize = getBlockPixelSize(m_format); generatedData.resize(numBlocks*astc::BLOCK_SIZE_BYTES); - astc::generateDummyNormalBlocks(&generatedData[0], numBlocks, blockPixelSize.x(), blockPixelSize.y()); + astc::generateDefaultNormalBlocks(&generatedData[0], numBlocks, blockPixelSize.x(), blockPixelSize.y()); testDecompress(m_format, numBlocks, &generatedData[0]); |