Remove unreachable breaks
authorMika Väinölä <mika.vainola@siru.fi>
Tue, 24 Aug 2021 10:51:42 +0000 (13:51 +0300)
committerPeter Kohaut <peter.kohaut@arm.com>
Fri, 3 Sep 2021 12:04:48 +0000 (12:04 +0000)
Fix warnings for Clang builds with -Wunreachable-code-break.

Components: Framework, OpenGL, OpenGL ES, Vulkan

VK-GL-CTS issue: 3074

Change-Id: Ib658e631bad3d06d787c6151f744e8db3e850fb4

54 files changed:
execserver/tools/xsClient.cpp
external/openglcts/modules/common/glcGLSLVectorConstructorTests.cpp
external/openglcts/modules/common/glcPixelStorageModesTests.cpp
external/openglcts/modules/common/glcRobustBufferAccessBehaviorTests.cpp
external/openglcts/modules/common/glcTextureFilterAnisotropicTests.cpp
external/openglcts/modules/common/subgroups/glcSubgroupsTestsUtils.cpp
external/openglcts/modules/gl/gl3cCommonBugsTests.cpp
external/openglcts/modules/gl/gl3cGPUShader5Tests.cpp
external/openglcts/modules/gl/gl3cTextureSwizzleTests.cpp
external/openglcts/modules/gl/gl4cBufferStorageTests.cpp
external/openglcts/modules/gl/gl4cCopyImageTests.cpp
external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.cpp
external/openglcts/modules/gl/gl4cGPUShaderFP64Tests.cpp
external/openglcts/modules/gl/gl4cMultiBindTests.cpp
external/openglcts/modules/gl/gl4cShaderImageLoadStoreTests.cpp
external/openglcts/modules/gl/gl4cShaderSubroutineTests.cpp
external/openglcts/modules/gl/gl4cShadingLanguage420PackTests.cpp
external/openglcts/modules/gl/gl4cSparseTextureTests.cpp
external/openglcts/modules/gl/gl4cStencilTexturingTests.cpp
external/openglcts/modules/gles3/es3cNumberParsingTests.cpp
external/openglcts/modules/gles31/es31cDrawIndirectTests.cpp
external/openglcts/modules/gles31/es31cExplicitUniformLocationTest.cpp
external/openglcts/modules/glesext/draw_elements_base_vertex/esextcDrawElementsBaseVertexTests.cpp
external/openglcts/modules/glesext/geometry_shader/esextcGeometryShaderRendering.cpp
external/openglcts/modules/glesext/texture_cube_map_array/esextcTextureCubeMapArraySampling.cpp
external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorUpdateASTests.cpp
external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp
external/vulkancts/modules/vulkan/binding_model/vktBindingValveMutableTests.cpp
external/vulkancts/modules/vulkan/clipping/vktClippingTests.cpp
external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.cpp
external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp
external/vulkancts/modules/vulkan/rasterization/vktRasterizationTests.cpp
external/vulkancts/modules/vulkan/ray_query/vktRayQueryBuiltinTests.cpp
external/vulkancts/modules/vulkan/ray_query/vktRayQueryWatertightnessTests.cpp
external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingCaptureReplayTests.cpp
external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp
external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderMatrixTests.cpp
external/vulkancts/modules/vulkan/subgroups/vktSubgroupsTestsUtils.cpp
external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTests.cpp
framework/delibs/destream/deFileStream.c
framework/platform/lnx/X11/tcuLnxX11GlxPlatform.cpp
framework/platform/lnx/tcuLnxVulkanPlatform.cpp
modules/egl/teglGetProcAddressTests.cpp
modules/egl/teglImageFormatTests.cpp
modules/gles3/functional/es3fFragmentOutputTests.cpp
modules/gles3/functional/es3fShaderTextureFunctionTests.cpp
modules/gles31/functional/es31fFboSRGBWriteControlTests.cpp
modules/gles31/functional/es31fTextureGatherTests.cpp
modules/glshared/glsDrawTest.cpp
modules/glshared/glsFragOpInteractionCase.cpp
modules/glshared/glsMemoryStressCase.cpp
modules/glshared/glsRandomShaderCase.cpp
modules/glshared/glsSamplerObjectTest.cpp
modules/glshared/glsVertexArrayTests.cpp

index 49987b7..e08c5ae 100644 (file)
@@ -241,7 +241,6 @@ void Client::run (void)
 
                        default:
                                XS_FAIL("Unknown message");
-                               break;
                }
        }
 
index 3a43c41..a1423f1 100644 (file)
@@ -474,7 +474,6 @@ GLSLVectorConstructorTestCase::IterateResult GLSLVectorConstructorTestCase::iter
                        return STOP;
                default:
                        TCU_FAIL("Shader compilation failed:\nVertex shader:\n" + m_vertexShader + "\nFragment shader:\n" + m_fragmentShader);
-                       break;
                }
        }
 
index 1a92494..07d8aa8 100644 (file)
@@ -132,7 +132,6 @@ double getEps(deUint32 internalFormat)
                break;
        default:
                TCU_FAIL("Invalid internal format");
-               break;
        }
 
        return std::max(0.01, eps);
@@ -289,7 +288,6 @@ void TexImageUtils::writeChannel(glw::GLubyte *p, int channel, glw::GLdouble col
                break;
        default:
                TCU_FAIL("Invalid type");
-               break;
        }
 }
 
@@ -471,7 +469,6 @@ void TexImageUtils::write11F_11F_10F_Channel(glw::GLubyte *p, int channel, glw::
        break;
        default:
                TCU_FAIL("Invalid channel");
-               break;
        }
 }
 
@@ -518,7 +515,6 @@ void TexImageUtils::setRefcolour (glu::CallLogWrapper gl, glw::GLdouble col)
                        break;
                default:
                        TCU_FAIL("Invalid type");
-                       break;
                }
        }
 }
@@ -1382,7 +1378,6 @@ CompressedTexImage2DCase::IterateResult CompressedTexImage2DCase::iterate (void)
                break;
        default:
                TCU_FAIL("Invalid internal format");
-               break;
        }
 
        createTexture();
@@ -1731,7 +1726,6 @@ CompressedTexImage3DCase::IterateResult CompressedTexImage3DCase::iterate (void)
                break;
        default:
                TCU_FAIL("Invalid internal format");
-               break;
        }
 
        createTexture();
index 7890ea8..a98068c 100644 (file)
@@ -678,7 +678,6 @@ void Texture::CompressedImage(const glw::Functions& gl, glw::GLenum target, glw:
                break;
        default:
                TCU_FAIL("Invliad enum");
-               break;
        }
 }
 
@@ -811,7 +810,6 @@ void Texture::Image(const glw::Functions& gl, glw::GLenum target, glw::GLint lev
                break;
        default:
                TCU_FAIL("Invliad enum");
-               break;
        }
 }
 
@@ -852,7 +850,6 @@ void Texture::Storage(const glw::Functions& gl, glw::GLenum target, glw::GLsizei
                break;
        default:
                TCU_FAIL("Invliad enum");
-               break;
        }
 }
 
@@ -903,7 +900,6 @@ void Texture::SubImage(const glw::Functions& gl, glw::GLenum target, glw::GLint
                break;
        default:
                TCU_FAIL("Invliad enum");
-               break;
        }
 }
 
@@ -1669,7 +1665,6 @@ const glw::GLchar* TexelFetchTest::getTestCaseName() const
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        return name;
index 8580bdd..4d98d55 100644 (file)
@@ -122,7 +122,6 @@ void texImage(const Functions& gl, GLenum target, GLint level, GLenum internal_f
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 }
 
@@ -156,7 +155,6 @@ void subImage(const Functions& gl, GLenum target, GLint level, GLint x, GLint y,
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 }
 
index 01f29b9..6820e5a 100755 (executable)
@@ -1056,16 +1056,12 @@ deUint32 getResultBinding (const glc::subgroups::ShaderStageFlags shaderStage)
        {
                case SHADER_STAGE_VERTEX_BIT:
                        return 0u;
-                       break;
                case SHADER_STAGE_TESS_CONTROL_BIT:
                        return 1u;
-                       break;
                case SHADER_STAGE_TESS_EVALUATION_BIT:
                        return 2u;
-                       break;
                case SHADER_STAGE_GEOMETRY_BIT:
                        return 3u;
-                       break;
                default:
                        DE_ASSERT(0);
                        return -1;
index 927a7d1..2be0e7b 100644 (file)
@@ -2691,7 +2691,6 @@ bool PerVertexValidationTest::runPipelineObjectValidationTestMode(_test_iteratio
                        break;
                default:
                        TCU_FAIL("Invalid enum");
-                       break;
                }
 
                if (validate_status != validate_expected_status)
index 524e6fb..9211142 100644 (file)
@@ -296,7 +296,6 @@ void Utils::programInfo::setUniform(Utils::_variable_type type, const glw::GLcha
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        GLU_EXPECT_NO_ERROR(gl.getError(), "Uniform");
index a7f842c..422dab4 100644 (file)
@@ -1724,7 +1724,6 @@ void calculate_expected_value(size_t source_format_idx, size_t output_format_idx
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        /* Signed formats use one bit less */
@@ -1795,7 +1794,6 @@ void calculate_expected_value(size_t source_format_idx, size_t output_format_idx
                        break;
                default:
                        TCU_FAIL("Invalid enum");
-                       break;
                }
                out_expected_data_size = texel_size;
        }
@@ -1890,7 +1888,6 @@ size_t get_swizzled_channel_idx(const size_t channel_idx, const glw::GLint swizz
                break;
        default:
                TCU_FAIL("Invalid value");
-               break;
        }
 
        return channel;
@@ -1929,7 +1926,6 @@ const _out_ch_desc& get_descriptor_for_channel(const _texture_format& format, co
                break;
        default:
                TCU_FAIL("Invalid value");
-               break;
        }
 
        switch (desc->m_internal_format)
@@ -2738,7 +2734,6 @@ bool SmokeTest::fillSourceTexture(size_t format_idx, size_t target_idx)
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        /* Attach texture */
@@ -2751,7 +2746,6 @@ bool SmokeTest::fillSourceTexture(size_t format_idx, size_t target_idx)
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        /* Unbind */
@@ -3227,7 +3221,6 @@ std::string SmokeTest::prepareCoordinates(const testCase& test_case)
                        break;
                default:
                        TCU_FAIL("Invalid value");
-                       break;
                }
        }
        else
@@ -3248,7 +3241,6 @@ std::string SmokeTest::prepareCoordinates(const testCase& test_case)
                        break;
                default:
                        TCU_FAIL("Invalid value");
-                       break;
                }
        }
 
@@ -3318,7 +3310,6 @@ std::string SmokeTest::prepareDerivatives(const testCase& test_case, size_t inde
                break;
        default:
                TCU_FAIL("Invalid value");
-               break;
        }
 
        size_t position = 0;
@@ -3376,7 +3367,6 @@ std::string SmokeTest::prepareOffsets(const testCase& test_case)
                break;
        default:
                TCU_FAIL("Invalid value");
-               break;
        }
 
        size_t position = 0;
@@ -3538,7 +3528,6 @@ void SmokeTest::prepareSourceTexture(size_t format_idx, size_t target_idx, glw::
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        /* Log error */
@@ -3702,7 +3691,6 @@ void SmokeTest::verifyOutputImage(const testCase& test_case, size_t /* output_fo
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 }
 
@@ -3972,7 +3960,6 @@ bool FunctionalTest::fillMSTexture(size_t format_idx, size_t target_idx)
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        /* Verify status */
@@ -4085,7 +4072,6 @@ bool FunctionalTest::fillSourceTexture(size_t format_idx, size_t target_idx)
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        /* Unbind */
@@ -4228,7 +4214,6 @@ void FunctionalTest::verifyOutputImage(const testCase& test_case, size_t output_
                        break;
                default:
                        TCU_FAIL("Invalid enum");
-                       break;
                }
 
                if (false == res)
index 12b6d06..b5101f4 100644 (file)
@@ -628,7 +628,6 @@ void Buffer::LoadExtDirectStateAccess(deqp::Context& context)
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 }
 
@@ -1306,7 +1305,6 @@ void Texture::LoadExtDirectStateAccess(deqp::Context& context)
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 }
 
@@ -1372,7 +1370,6 @@ void Texture::CompressedImage(const glw::Functions& gl, glw::GLenum target, glw:
                break;
        default:
                TCU_FAIL("Invliad enum");
-               break;
        }
 }
 
@@ -1477,7 +1474,6 @@ void Texture::Image(const glw::Functions& gl, glw::GLenum target, glw::GLint lev
                break;
        default:
                TCU_FAIL("Invliad enum");
-               break;
        }
 }
 
@@ -1514,7 +1510,6 @@ void Texture::Storage(const glw::Functions& gl, glw::GLenum target, glw::GLsizei
                break;
        default:
                TCU_FAIL("Invliad enum");
-               break;
        }
 }
 
@@ -1565,7 +1560,6 @@ void Texture::SubImage(const glw::Functions& gl, glw::GLenum target, glw::GLint
                break;
        default:
                TCU_FAIL("Invliad enum");
-               break;
        }
 }
 
index ee8a51a..2ecee08 100644 (file)
@@ -596,7 +596,6 @@ GLdouble Utils::getEpsilon(GLenum internal_format)
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        return epsilon;
@@ -705,7 +704,6 @@ GLenum Utils::getFormat(GLenum internal_format)
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        return format;
@@ -798,7 +796,6 @@ GLuint Utils::getNumberOfChannels(GLenum internal_format)
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        return result;
@@ -924,7 +921,6 @@ GLenum Utils::getType(GLenum internal_format)
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        return type;
@@ -1078,7 +1074,6 @@ GLuint Utils::getPixelSizeForFormat(GLenum internal_format)
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        return size;
@@ -1310,7 +1305,6 @@ GLuint Utils::prepareMultisampleTex(deqp::Context& context, GLenum target, GLsiz
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        /* Clean binding point */
@@ -1542,7 +1536,6 @@ void Utils::prepareTexture(deqp::Context& context, GLuint name, GLenum target, G
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        if (GL_NO_ERROR != error)
@@ -1889,7 +1882,6 @@ void read11F_11F_10F_Channel(GLuint channel, const GLubyte* pixel, GLdouble& out
        break;
        default:
                TCU_FAIL("Invalid channel");
-               break;
        }
 }
 
@@ -2133,7 +2125,6 @@ void write11F_11F_10F_Channel(GLuint channel, GLdouble value, GLubyte* pixel)
        break;
        default:
                TCU_FAIL("Invalid channel");
-               break;
        }
 }
 
@@ -2204,7 +2195,6 @@ void Utils::readChannel(GLenum type, GLuint channel, const GLubyte* pixel, GLdou
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 }
 
@@ -2276,7 +2266,6 @@ void Utils::writeChannel(GLenum type, GLuint channel, GLdouble value, GLubyte* p
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 }
 
@@ -2376,7 +2365,6 @@ void Utils::packPixel(GLenum internal_format, GLenum type, GLdouble red, GLdoubl
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 }
 
@@ -2436,7 +2424,6 @@ void Utils::unpackPixel(GLenum format, GLenum type, const GLubyte* pixel, GLdoub
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 }
 
index f3ffbca..efd6311 100644 (file)
@@ -3458,7 +3458,6 @@ void Texture::Storage(const Functions& gl, TYPES tex_type, GLuint width, GLuint
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 }
 
@@ -3525,7 +3524,6 @@ void Texture::Update(const Functions& gl, TYPES tex_type, GLuint width, GLuint h
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 }
 
@@ -4072,7 +4070,6 @@ std::string Variable::Descriptor::GetDefinition(FLAVOUR flavour, STORAGE storage
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        if (BUILTIN != m_type)
@@ -4124,7 +4121,6 @@ std::string Variable::Descriptor::GetDefinition(FLAVOUR flavour, STORAGE storage
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        replaceToken("STORAGE", position, storage_str, definition);
@@ -4690,7 +4686,6 @@ void ProgramInterface::cloneVariableForStage(const Variable& variable, Shader::S
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 }
 
@@ -4775,7 +4770,6 @@ Variable* ProgramInterface::cloneVariableForStage(const Variable& variable, Shad
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        return result;
@@ -5170,7 +5164,6 @@ GLint TestBase::getLastInputLocation(Utils::Shader::STAGES stage, const Utils::T
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        /* Zero means no array, but 1 slot is required */
@@ -5245,7 +5238,6 @@ GLint TestBase::getLastOutputLocation(Utils::Shader::STAGES stage, const Utils::
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        /* Zero means no array, but 1 slot is required */
@@ -21454,7 +21446,6 @@ std::string XFBTooSmallStrideTest::getShaderSource(GLuint test_case_index, Utils
                        break;
                default:
                        TCU_FAIL("Invalid enum");
-                       break;
                }
        }
 
@@ -21796,7 +21787,6 @@ std::string XFBVariableStrideTest::getShaderSource(GLuint test_case_index, Utils
                        break;
                default:
                        TCU_FAIL("Invalid enum");
-                       break;
                }
        }
 
@@ -22150,7 +22140,6 @@ std::string XFBBlockStrideTest::getShaderSource(GLuint test_case_index, Utils::S
                        break;
                default:
                        TCU_FAIL("Invalid enum");
-                       break;
                }
        }
 
@@ -22626,7 +22615,6 @@ std::string XFBDuplicatedStrideTest::getShaderSource(GLuint test_case_index, Uti
                        break;
                default:
                        TCU_FAIL("Invalid enum");
-                       break;
                }
        }
 
@@ -24040,7 +24028,6 @@ std::string XFBExceedBufferLimitTest::getShaderSource(GLuint test_case_index, Ut
                        break;
                default:
                        TCU_FAIL("Invalid enum");
-                       break;
                }
        }
 
@@ -24381,7 +24368,6 @@ std::string XFBExceedOffsetLimitTest::getShaderSource(GLuint test_case_index, Ut
                        break;
                default:
                        TCU_FAIL("Invalid enum");
-                       break;
                }
        }
 
@@ -24772,7 +24758,6 @@ std::string XFBGlobalBufferTest::getShaderSource(GLuint test_case_index, Utils::
                        break;
                default:
                        TCU_FAIL("Invalid enum");
-                       break;
                }
        }
 
@@ -25121,7 +25106,6 @@ std::string XFBStrideTest::getShaderSource(GLuint test_case_index, Utils::Shader
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        /* */
@@ -25392,7 +25376,6 @@ std::string XFBBlockMemberBufferTest::getShaderSource(GLuint test_case_index, Ut
                        break;
                default:
                        TCU_FAIL("Invalid enum");
-                       break;
                }
        }
 
@@ -25675,7 +25658,6 @@ std::string XFBOutputOverlappingTest::getShaderSource(GLuint test_case_index, Ut
                        break;
                default:
                        TCU_FAIL("Invalid enum");
-                       break;
                }
        }
 
@@ -25974,7 +25956,6 @@ std::string XFBInvalidOffsetAlignmentTest::getShaderSource(GLuint test_case_inde
                        break;
                default:
                        TCU_FAIL("Invalid enum");
-                       break;
                }
        }
 
@@ -26303,7 +26284,6 @@ std::string XFBCaptureInactiveOutputVariableTest::getShaderSource(GLuint test_ca
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        /* */
@@ -26737,7 +26717,6 @@ std::string XFBCaptureInactiveOutputComponentTest::getShaderSource(GLuint test_c
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        /* */
@@ -27115,7 +27094,6 @@ std::string XFBCaptureInactiveOutputBlockMemberTest::getShaderSource(GLuint
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        /* */
@@ -27465,7 +27443,6 @@ std::string XFBCaptureStructTest::getShaderSource(GLuint test_case_index, Utils:
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        /* */
@@ -27642,7 +27619,6 @@ std::string XFBCaptureUnsizedArrayTest::getShaderSource(GLuint test_case_index,
                        break;
                default:
                        TCU_FAIL("Invalid enum");
-                       break;
                }
        }
 
@@ -28010,7 +27986,6 @@ std::string XFBExplicitLocationTest::getShaderSource(GLuint test_case_index, Uti
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        /* */
@@ -28462,7 +28437,6 @@ std::string XFBExplicitLocationStructTest::getShaderSource(GLuint test_case_inde
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        /* */
index 8ce76ce..1b49064 100644 (file)
@@ -3395,11 +3395,9 @@ glw::GLenum GPUShaderFP64Test2::getCapturedPrimitiveType(shaderStage shader_stag
        case TESS_EVAL_SHADER:
        case VERTEX_SHADER:
                return GL_POINTS;
-               break;
 
        default:
                return GL_NONE;
-               break;
        }
 }
 
@@ -3415,21 +3413,17 @@ glw::GLenum GPUShaderFP64Test2::getDrawPrimitiveType(shaderStage shader_stage) c
        {
        case FRAGMENT_SHADER:
                return GL_TRIANGLE_FAN;
-               break;
 
        case GEOMETRY_SHADER:
        case VERTEX_SHADER:
                return GL_POINTS;
-               break;
 
        case TESS_CTRL_SHADER:
        case TESS_EVAL_SHADER:
                return GL_PATCHES;
-               break;
 
        default:
                return GL_NONE;
-               break;
        }
 }
 
@@ -3558,22 +3552,16 @@ const glw::GLchar* GPUShaderFP64Test2::getShaderStageName(shaderStage shader_sta
        {
        case COMPUTE_SHADER:
                return "compute shader";
-               break;
        case FRAGMENT_SHADER:
                return "fragment shader";
-               break;
        case GEOMETRY_SHADER:
                return "geometry shader";
-               break;
        case TESS_CTRL_SHADER:
                return "tesselation control shader";
-               break;
        case TESS_EVAL_SHADER:
                return "tesselation evaluation shader";
-               break;
        case VERTEX_SHADER:
                return "vertex shader";
-               break;
        }
 
        return 0;
@@ -13256,13 +13244,10 @@ public:
                {
                case 0:
                        return m_arg_1_type;
-                       break;
                case 1:
                        return m_arg_2_type;
-                       break;
                default:
                        return Utils::VARIABLE_TYPE_UNKNOWN;
-                       break;
                }
        }
 
@@ -13379,16 +13364,12 @@ public:
                {
                case 0:
                        return m_arg_1_type;
-                       break;
                case 1:
                        return m_arg_2_type;
-                       break;
                case 2:
                        return m_arg_3_type;
-                       break;
                default:
                        return Utils::VARIABLE_TYPE_UNKNOWN;
-                       break;
                }
        }
 
@@ -13886,8 +13867,6 @@ bool BuiltinFunctionTest::compare(Utils::_variable_type type, const glw::GLvoid*
        default:
 
                TCU_FAIL("Not implemented");
-
-               break;
        }
 
        return result;
@@ -13927,36 +13906,28 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                return new FunctionObject::unaryByComponent<glw::GLdouble /* ResT */>(
                        function, "abs", de::abs, variable_type /* res_type */, variable_type /* arg_type */);
 
-               break;
-
        case FUNCTION_CEIL:
 
                return new FunctionObject::unaryByComponent<glw::GLdouble /* ResT */>(
                        function, "ceil", ceil, variable_type /* res_type */, variable_type /* arg_type */);
 
-               break;
-
        case FUNCTION_CLAMP:
 
                return new FunctionObject::tenaryByComponent(function, "clamp", Math::clamp, variable_type /* res_type  */,
                                                                                                         variable_type /* arg1_type */, variable_type /* arg2_type */,
                                                                                                         variable_type /* arg3_type */);
-               break;
 
        case FUNCTION_CLAMP_AGAINST_SCALAR:
 
                return new FunctionObject::tenaryByComponent(function, "clamp", Math::clamp, variable_type /* res_type  */,
                                                                                                         variable_type /* arg1_type */, scalar_type /* arg2_type */,
                                                                                                         scalar_type /* arg3_type */);
-               break;
 
        case FUNCTION_CROSS:
 
                return new FunctionObject::binary<tcu::DVec3 /* ResT */, tcu::DVec3 /* Arg1T */, tcu::DVec3 /* Arg2T */>(
                        function, "cross", tcu::cross);
 
-               break;
-
        case FUNCTION_DETERMINANT:
 
                switch (variable_type)
@@ -13972,11 +13943,8 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                                                                                                                                                                                 Math::determinant);
                default:
                        TCU_FAIL("Not implemented");
-                       break;
                }
 
-               break;
-
        case FUNCTION_DISTANCE:
 
                switch (variable_type)
@@ -13984,15 +13952,12 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                case Utils::VARIABLE_TYPE_DVEC2:
                        return new FunctionObject::binary<glw::GLdouble /* ResT */, tcu::DVec2 /* Arg1T */, tcu::DVec2 /* Arg2T */>(
                                function, "distance", tcu::distance);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC3:
                        return new FunctionObject::binary<glw::GLdouble /* ResT */, tcu::DVec3 /* Arg1T */, tcu::DVec3 /* Arg2T */>(
                                function, "distance", tcu::distance);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC4:
                        return new FunctionObject::binary<glw::GLdouble /* ResT */, tcu::DVec4 /* Arg1T */, tcu::DVec4 /* Arg2T */>(
                                function, "distance", tcu::distance);
-                       break;
                default:
                        break;
                }
@@ -14006,15 +13971,12 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                case Utils::VARIABLE_TYPE_DVEC2:
                        return new FunctionObject::binary<glw::GLdouble /* ResT */, tcu::DVec2 /* Arg1T */, tcu::DVec2 /* Arg2T */>(
                                function, "dot", tcu::dot);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC3:
                        return new FunctionObject::binary<glw::GLdouble /* ResT */, tcu::DVec3 /* Arg1T */, tcu::DVec3 /* Arg2T */>(
                                function, "dot", tcu::dot);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC4:
                        return new FunctionObject::binary<glw::GLdouble /* ResT */, tcu::DVec4 /* Arg1T */, tcu::DVec4 /* Arg2T */>(
                                function, "dot", tcu::dot);
-                       break;
                default:
                        break;
                }
@@ -14028,15 +13990,12 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                case Utils::VARIABLE_TYPE_DVEC2:
                        return new FunctionObject::binary<tcu::UVec2 /* ResT */, tcu::DVec2 /* Arg1T */, tcu::DVec2 /* Arg2T */>(
                                function, "equal", Math::equal);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC3:
                        return new FunctionObject::binary<tcu::UVec3 /* ResT */, tcu::DVec3 /* Arg1T */, tcu::DVec3 /* Arg2T */>(
                                function, "equal", Math::equal);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC4:
                        return new FunctionObject::binary<tcu::UVec4 /* ResT */, tcu::DVec4 /* Arg1T */, tcu::DVec4 /* Arg2T */>(
                                function, "equal", Math::equal);
-                       break;
                default:
                        break;
                }
@@ -14051,17 +14010,14 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                        return new FunctionObject::tenary<tcu::DVec2 /* ResT */, const tcu::DVec2& /* Arg1T */,
                                                                                          const tcu::DVec2& /* Arg2T */, const tcu::DVec2& /* Arg3T */>(
                                function, "faceforward", tcu::faceForward);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC3:
                        return new FunctionObject::tenary<tcu::DVec3 /* ResT */, const tcu::DVec3& /* Arg1T */,
                                                                                          const tcu::DVec3& /* Arg2T */, const tcu::DVec3& /* Arg3T */>(
                                function, "faceforward", tcu::faceForward);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC4:
                        return new FunctionObject::tenary<tcu::DVec4 /* ResT */, const tcu::DVec4& /* Arg1T */,
                                                                                          const tcu::DVec4& /* Arg2T */, const tcu::DVec4& /* Arg3T */>(
                                function, "faceforward", tcu::faceForward);
-                       break;
                default:
                        break;
                }
@@ -14073,23 +14029,17 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                return new FunctionObject::unaryByComponent<glw::GLdouble /* ResT */>(
                        function, "floor", floor, variable_type /* res_type */, variable_type /* arg_type */);
 
-               break;
-
        case FUNCTION_FMA:
 
                return new FunctionObject::tenaryByComponent(function, "fma", Math::fma, variable_type /* res_type  */,
                                                                                                         variable_type /* arg1_type */, variable_type /* arg2_type */,
                                                                                                         variable_type /* arg3_type */);
 
-               break;
-
        case FUNCTION_FRACT:
 
                return new FunctionObject::unaryByComponent<glw::GLdouble /* ResT */>(
                        function, "fract", Math::fract, variable_type /* res_type */, variable_type /* arg_type */);
 
-               break;
-
        case FUNCTION_FREXP:
 
                return new FunctionObject::unaryWithOutputByComponent<glw::GLdouble /* ResT */, glw::GLdouble /* ArgT */,
@@ -14097,8 +14047,6 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                        function, "frexp", Math::frexp, variable_type /* res_type */, variable_type /* arg_type */,
                        int_type /* out_type */);
 
-               break;
-
        case FUNCTION_GREATERTHAN:
 
                switch (variable_type)
@@ -14106,15 +14054,12 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                case Utils::VARIABLE_TYPE_DVEC2:
                        return new FunctionObject::binary<tcu::UVec2 /* ResT */, tcu::DVec2 /* Arg1T */, tcu::DVec2 /* Arg2T */>(
                                function, "greaterThan", Math::greaterThan);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC3:
                        return new FunctionObject::binary<tcu::UVec3 /* ResT */, tcu::DVec3 /* Arg1T */, tcu::DVec3 /* Arg2T */>(
                                function, "greaterThan", Math::greaterThan);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC4:
                        return new FunctionObject::binary<tcu::UVec4 /* ResT */, tcu::DVec4 /* Arg1T */, tcu::DVec4 /* Arg2T */>(
                                function, "greaterThan", Math::greaterThan);
-                       break;
                default:
                        break;
                }
@@ -14128,15 +14073,12 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                case Utils::VARIABLE_TYPE_DVEC2:
                        return new FunctionObject::binary<tcu::UVec2 /* ResT */, tcu::DVec2 /* Arg1T */, tcu::DVec2 /* Arg2T */>(
                                function, "greaterThanEqual", Math::greaterThanEqual);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC3:
                        return new FunctionObject::binary<tcu::UVec3 /* ResT */, tcu::DVec3 /* Arg1T */, tcu::DVec3 /* Arg2T */>(
                                function, "greaterThanEqual", Math::greaterThanEqual);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC4:
                        return new FunctionObject::binary<tcu::UVec4 /* ResT */, tcu::DVec4 /* Arg1T */, tcu::DVec4 /* Arg2T */>(
                                function, "greaterThanEqual", Math::greaterThanEqual);
-                       break;
                default:
                        break;
                }
@@ -14149,13 +14091,10 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                {
                case Utils::VARIABLE_TYPE_DMAT2:
                        return new FunctionObject::unary<DMat2 /* ResT */, DMat2 /* ArgT */>(function, "inverse", Math::inverse);
-                       break;
                case Utils::VARIABLE_TYPE_DMAT3:
                        return new FunctionObject::unary<DMat3 /* ResT */, DMat3 /* ArgT */>(function, "inverse", Math::inverse);
-                       break;
                case Utils::VARIABLE_TYPE_DMAT4:
                        return new FunctionObject::unary<DMat4 /* ResT */, DMat4 /* ArgT */>(function, "inverse", Math::inverse);
-                       break;
                default:
                        break;
                }
@@ -14167,8 +14106,6 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                return new FunctionObject::unaryByComponent<glw::GLdouble /* ResT */>(
                        function, "inversesqrt", Math::inverseSqrt, variable_type /* res_type */, variable_type /* arg_type */);
 
-               break;
-
        case FUNCTION_LDEXP:
 
                return new FunctionObject::binaryByComponent<glw::GLdouble /* ResT */, glw::GLdouble /* Arg1T */,
@@ -14176,8 +14113,6 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                        function, "ldexp", ::ldexp, variable_type /* res_type  */, variable_type /* arg1_type */,
                        int_type /* arg2_type */);
 
-               break;
-
        case FUNCTION_LESSTHAN:
 
                switch (variable_type)
@@ -14185,15 +14120,12 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                case Utils::VARIABLE_TYPE_DVEC2:
                        return new FunctionObject::binary<tcu::UVec2 /* ResT */, tcu::DVec2 /* Arg1T */, tcu::DVec2 /* Arg2T */>(
                                function, "lessThan", Math::lessThan);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC3:
                        return new FunctionObject::binary<tcu::UVec3 /* ResT */, tcu::DVec3 /* Arg1T */, tcu::DVec3 /* Arg2T */>(
                                function, "lessThan", Math::lessThan);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC4:
                        return new FunctionObject::binary<tcu::UVec4 /* ResT */, tcu::DVec4 /* Arg1T */, tcu::DVec4 /* Arg2T */>(
                                function, "lessThan", Math::lessThan);
-                       break;
                default:
                        break;
                }
@@ -14207,15 +14139,12 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                case Utils::VARIABLE_TYPE_DVEC2:
                        return new FunctionObject::binary<tcu::UVec2 /* ResT */, tcu::DVec2 /* Arg1T */, tcu::DVec2 /* Arg2T */>(
                                function, "lessThanEqual", Math::lessThanEqual);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC3:
                        return new FunctionObject::binary<tcu::UVec3 /* ResT */, tcu::DVec3 /* Arg1T */, tcu::DVec3 /* Arg2T */>(
                                function, "lessThanEqual", Math::lessThanEqual);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC4:
                        return new FunctionObject::binary<tcu::UVec4 /* ResT */, tcu::DVec4 /* Arg1T */, tcu::DVec4 /* Arg2T */>(
                                function, "lessThanEqual", Math::lessThanEqual);
-                       break;
                default:
                        break;
                }
@@ -14229,15 +14158,12 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                case Utils::VARIABLE_TYPE_DVEC2:
                        return new FunctionObject::unary<glw::GLdouble /* ResT */, tcu::DVec2 /* ArgT */>(function, "length",
                                                                                                                                                                                          tcu::length);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC3:
                        return new FunctionObject::unary<glw::GLdouble /* ResT */, tcu::DVec3 /* ArgT */>(function, "length",
                                                                                                                                                                                          tcu::length);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC4:
                        return new FunctionObject::unary<glw::GLdouble /* ResT */, tcu::DVec4 /* ArgT */>(function, "length",
                                                                                                                                                                                          tcu::length);
-                       break;
                default:
                        break;
                }
@@ -14251,8 +14177,6 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                        function, "matrixCompMult", Math::multiply, variable_type /* res_type  */, variable_type /* arg1_type */,
                        variable_type /* arg2_type */);
 
-               break;
-
        case FUNCTION_MAX:
 
                return new FunctionObject::binaryByComponent<glw::GLdouble /* ResT */, glw::GLdouble /* Arg1T */,
@@ -14260,8 +14184,6 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                        function, "max", Math::max, variable_type /* res_type  */, variable_type /* arg1_type */,
                        variable_type /* arg2_type */);
 
-               break;
-
        case FUNCTION_MAX_AGAINST_SCALAR:
 
                return new FunctionObject::binaryByComponent<glw::GLdouble /* ResT */, glw::GLdouble /* Arg1T */,
@@ -14269,8 +14191,6 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                        function, "max", Math::max, variable_type /* res_type  */, variable_type /* arg1_type */,
                        scalar_type /* arg2_type */);
 
-               break;
-
        case FUNCTION_MIN:
 
                return new FunctionObject::binaryByComponent<glw::GLdouble /* ResT */, glw::GLdouble /* Arg1T */,
@@ -14278,8 +14198,6 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                        function, "min", Math::min, variable_type /* res_type  */, variable_type /* arg1_type */,
                        variable_type /* arg2_type */);
 
-               break;
-
        case FUNCTION_MIN_AGAINST_SCALAR:
 
                return new FunctionObject::binaryByComponent<glw::GLdouble /* ResT */, glw::GLdouble /* Arg1T */,
@@ -14287,16 +14205,12 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                        function, "min", Math::min, variable_type /* res_type  */, variable_type /* arg1_type */,
                        scalar_type /* arg2_type */);
 
-               break;
-
        case FUNCTION_MIX:
 
                return new FunctionObject::tenaryByComponent(function, "mix", Math::mix, variable_type /* res_type  */,
                                                                                                         variable_type /* arg1_type */, variable_type /* arg2_type */,
                                                                                                         variable_type /* arg3_type */);
 
-               break;
-
        case FUNCTION_MOD:
 
                return new FunctionObject::binaryByComponent<glw::GLdouble /* ResT */, glw::GLdouble /* Arg1T */,
@@ -14304,8 +14218,6 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                        function, "mod", Math::mod, variable_type /* res_type  */, variable_type /* arg1_type */,
                        variable_type /* arg2_type */);
 
-               break;
-
        case FUNCTION_MOD_AGAINST_SCALAR:
 
                return new FunctionObject::binaryByComponent<glw::GLdouble /* ResT */, glw::GLdouble /* Arg1T */,
@@ -14313,8 +14225,6 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                        function, "mod", Math::mod, variable_type /* res_type  */, variable_type /* arg1_type */,
                        scalar_type /* arg2_type */);
 
-               break;
-
        case FUNCTION_MODF:
 
                return new FunctionObject::unaryWithOutputByComponent<glw::GLdouble /* ResT */, glw::GLdouble /* ArgT */,
@@ -14322,8 +14232,6 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                        function, "modf", Math::modf, variable_type /* res_type */, variable_type /* arg_type */,
                        variable_type /* out_type */);
 
-               break;
-
        case FUNCTION_NORMALIZE:
 
                switch (variable_type)
@@ -14331,15 +14239,12 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                case Utils::VARIABLE_TYPE_DVEC2:
                        return new FunctionObject::unary<tcu::DVec2 /* ResT */, tcu::DVec2 /* ArgT */>(function, "normalize",
                                                                                                                                                                                   tcu::normalize);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC3:
                        return new FunctionObject::unary<tcu::DVec3 /* ResT */, tcu::DVec3 /* ArgT */>(function, "normalize",
                                                                                                                                                                                   tcu::normalize);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC4:
                        return new FunctionObject::unary<tcu::DVec4 /* ResT */, tcu::DVec4 /* ArgT */>(function, "normalize",
                                                                                                                                                                                   tcu::normalize);
-                       break;
                default:
                        break;
                }
@@ -14353,15 +14258,12 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                case Utils::VARIABLE_TYPE_DVEC2:
                        return new FunctionObject::binary<tcu::UVec2 /* ResT */, tcu::DVec2 /* Arg1T */, tcu::DVec2 /* Arg2T */>(
                                function, "notEqual", Math::notEqual);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC3:
                        return new FunctionObject::binary<tcu::UVec3 /* ResT */, tcu::DVec3 /* Arg1T */, tcu::DVec3 /* Arg2T */>(
                                function, "notEqual", Math::notEqual);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC4:
                        return new FunctionObject::binary<tcu::UVec4 /* ResT */, tcu::DVec4 /* Arg1T */, tcu::DVec4 /* Arg2T */>(
                                function, "notEqual", Math::notEqual);
-                       break;
                default:
                        break;
                }
@@ -14375,39 +14277,30 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                case Utils::VARIABLE_TYPE_DMAT2:
                        return new FunctionObject::binary<DMat2 /* ResT */, tcu::DVec2 /* Arg1T */, tcu::DVec2 /* Arg2T */>(
                                function, "outerProduct", Math::outerProduct);
-                       break;
                case Utils::VARIABLE_TYPE_DMAT2X3:
                        return new FunctionObject::binary<DMat2x3 /* ResT */, tcu::DVec3 /* Arg1T */, tcu::DVec2 /* Arg2T */>(
                                function, "outerProduct", Math::outerProduct);
-                       break;
                case Utils::VARIABLE_TYPE_DMAT2X4:
                        return new FunctionObject::binary<DMat2x4 /* ResT */, tcu::DVec4 /* Arg1T */, tcu::DVec2 /* Arg2T */>(
                                function, "outerProduct", Math::outerProduct);
-                       break;
                case Utils::VARIABLE_TYPE_DMAT3:
                        return new FunctionObject::binary<DMat3 /* ResT */, tcu::DVec3 /* Arg1T */, tcu::DVec3 /* Arg2T */>(
                                function, "outerProduct", Math::outerProduct);
-                       break;
                case Utils::VARIABLE_TYPE_DMAT3X2:
                        return new FunctionObject::binary<DMat3x2 /* ResT */, tcu::DVec2 /* Arg1T */, tcu::DVec3 /* Arg2T */>(
                                function, "outerProduct", Math::outerProduct);
-                       break;
                case Utils::VARIABLE_TYPE_DMAT3X4:
                        return new FunctionObject::binary<DMat3x4 /* ResT */, tcu::DVec4 /* Arg1T */, tcu::DVec3 /* Arg2T */>(
                                function, "outerProduct", Math::outerProduct);
-                       break;
                case Utils::VARIABLE_TYPE_DMAT4:
                        return new FunctionObject::binary<DMat4 /* ResT */, tcu::DVec4 /* Arg1T */, tcu::DVec4 /* Arg2T */>(
                                function, "outerProduct", Math::outerProduct);
-                       break;
                case Utils::VARIABLE_TYPE_DMAT4X2:
                        return new FunctionObject::binary<DMat4x2 /* ResT */, tcu::DVec2 /* Arg1T */, tcu::DVec4 /* Arg2T */>(
                                function, "outerProduct", Math::outerProduct);
-                       break;
                case Utils::VARIABLE_TYPE_DMAT4X3:
                        return new FunctionObject::binary<DMat4x3 /* ResT */, tcu::DVec3 /* Arg1T */, tcu::DVec4 /* Arg2T */>(
                                function, "outerProduct", Math::outerProduct);
-                       break;
                default:
                        break;
                }
@@ -14419,8 +14312,6 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                return new FunctionObject::unary<glw::GLdouble /* ResT */, tcu::UVec2 /* ArgT */>(function, "packDouble2x32",
                                                                                                                                                                                  Math::packDouble2x32);
 
-               break;
-
        case FUNCTION_REFLECT:
 
                switch (variable_type)
@@ -14428,15 +14319,12 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                case Utils::VARIABLE_TYPE_DVEC2:
                        return new FunctionObject::binary<tcu::DVec2 /* ResT */, tcu::DVec2 /* Arg1T */, tcu::DVec2 /* Arg2T */>(
                                function, "reflect", tcu::reflect);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC3:
                        return new FunctionObject::binary<tcu::DVec3 /* ResT */, tcu::DVec3 /* Arg1T */, tcu::DVec3 /* Arg2T */>(
                                function, "reflect", tcu::reflect);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC4:
                        return new FunctionObject::binary<tcu::DVec4 /* ResT */, tcu::DVec4 /* Arg1T */, tcu::DVec4 /* Arg2T */>(
                                function, "reflect", tcu::reflect);
-                       break;
                default:
                        break;
                }
@@ -14451,17 +14339,14 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                        return new FunctionObject::tenary<tcu::DVec2 /* ResT */, const tcu::DVec2& /* Arg1T */,
                                                                                          const tcu::DVec2& /* Arg2T */, glw::GLdouble /* Arg3T */>(
                                function, "refract", tcu::refract);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC3:
                        return new FunctionObject::tenary<tcu::DVec3 /* ResT */, const tcu::DVec3& /* Arg1T */,
                                                                                          const tcu::DVec3& /* Arg2T */, glw::GLdouble /* Arg3T */>(
                                function, "refract", tcu::refract);
-                       break;
                case Utils::VARIABLE_TYPE_DVEC4:
                        return new FunctionObject::tenary<tcu::DVec4 /* ResT */, const tcu::DVec4& /* Arg1T */,
                                                                                          const tcu::DVec4& /* Arg2T */, glw::GLdouble /* Arg3T */>(
                                function, "refract", tcu::refract);
-                       break;
                default:
                        break;
                }
@@ -14473,45 +14358,33 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                return new FunctionObject::unaryByComponent<glw::GLdouble /* ResT */>(
                        function, "round", Math::round, variable_type /* res_type */, variable_type /* arg_type */);
 
-               break;
-
        case FUNCTION_ROUNDEVEN:
 
                return new FunctionObject::unaryByComponent<glw::GLdouble /* ResT */>(
                        function, "roundEven", Math::roundEven, variable_type /* res_type */, variable_type /* arg_type */);
 
-               break;
-
        case FUNCTION_SIGN:
 
                return new FunctionObject::unaryByComponent<glw::GLdouble /* ResT */>(
                        function, "sign", Math::sign, variable_type /* res_type */, variable_type /* arg_type */);
 
-               break;
-
        case FUNCTION_SMOOTHSTEP:
 
                return new FunctionObject::tenaryByComponent(function, "smoothstep", Math::smoothStep,
                                                                                                         variable_type /* res_type  */, variable_type /* arg1_type */,
                                                                                                         variable_type /* arg2_type */, variable_type /* arg3_type */);
 
-               break;
-
        case FUNCTION_SMOOTHSTEP_AGAINST_SCALAR:
 
                return new FunctionObject::tenaryByComponent(function, "smoothstep", Math::smoothStep,
                                                                                                         variable_type /* res_type  */, scalar_type /* arg1_type */,
                                                                                                         scalar_type /* arg2_type */, variable_type /* arg3_type */);
 
-               break;
-
        case FUNCTION_SQRT:
 
                return new FunctionObject::unaryByComponent<glw::GLdouble /* ResT */>(
                        function, "sqrt", sqrt, variable_type /* res_type */, variable_type /* arg_type */);
 
-               break;
-
        case FUNCTION_STEP:
 
                return new FunctionObject::binaryByComponent<glw::GLdouble /* ResT */, glw::GLdouble /* Arg1T */,
@@ -14519,8 +14392,6 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                        function, "step", Math::step, variable_type /* res_type  */, variable_type /* arg1_type */,
                        variable_type /* arg2_type */);
 
-               break;
-
        case FUNCTION_STEP_AGAINST_SCALAR:
 
                return new FunctionObject::binaryByComponent<glw::GLdouble /* ResT */, glw::GLdouble /* Arg1T */,
@@ -14528,8 +14399,6 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                        function, "step", Math::step, variable_type /* res_type  */, scalar_type /* arg1_type */,
                        variable_type /* arg2_type */);
 
-               break;
-
        case FUNCTION_TRANSPOSE:
 
                switch (variable_type)
@@ -14537,39 +14406,30 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                case Utils::VARIABLE_TYPE_DMAT2:
                        return new FunctionObject::unary<DMat2 /* ResT */, DMat2 /* ArgT */>(function, "transpose",
                                                                                                                                                                 Math::transpose);
-                       break;
                case Utils::VARIABLE_TYPE_DMAT2X3:
                        return new FunctionObject::unary<DMat2x3 /* ResT */, DMat3x2 /* ArgT */>(function, "transpose",
                                                                                                                                                                         Math::transpose);
-                       break;
                case Utils::VARIABLE_TYPE_DMAT2X4:
                        return new FunctionObject::unary<DMat2x4 /* ResT */, DMat4x2 /* ArgT */>(function, "transpose",
                                                                                                                                                                         Math::transpose);
-                       break;
                case Utils::VARIABLE_TYPE_DMAT3:
                        return new FunctionObject::unary<DMat3 /* ResT */, DMat3 /* ArgT */>(function, "transpose",
                                                                                                                                                                 Math::transpose);
-                       break;
                case Utils::VARIABLE_TYPE_DMAT3X2:
                        return new FunctionObject::unary<DMat3x2 /* ResT */, DMat2x3 /* ArgT */>(function, "transpose",
                                                                                                                                                                         Math::transpose);
-                       break;
                case Utils::VARIABLE_TYPE_DMAT3X4:
                        return new FunctionObject::unary<DMat3x4 /* ResT */, DMat4x3 /* ArgT */>(function, "transpose",
                                                                                                                                                                         Math::transpose);
-                       break;
                case Utils::VARIABLE_TYPE_DMAT4:
                        return new FunctionObject::unary<DMat4 /* ResT */, DMat4 /* ArgT */>(function, "transpose",
                                                                                                                                                                 Math::transpose);
-                       break;
                case Utils::VARIABLE_TYPE_DMAT4X2:
                        return new FunctionObject::unary<DMat4x2 /* ResT */, DMat2x4 /* ArgT */>(function, "transpose",
                                                                                                                                                                         Math::transpose);
-                       break;
                case Utils::VARIABLE_TYPE_DMAT4X3:
                        return new FunctionObject::unary<DMat4x3 /* ResT */, DMat3x4 /* ArgT */>(function, "transpose",
                                                                                                                                                                         Math::transpose);
-                       break;
                default:
                        break;
                }
@@ -14581,33 +14441,24 @@ BuiltinFunctionTest::functionObject* BuiltinFunctionTest::getFunctionObject(Func
                return new FunctionObject::unaryByComponent<glw::GLdouble /* ResT */>(
                        function, "trunc", Math::trunc, variable_type /* res_type */, variable_type /* arg_type */);
 
-               break;
-
        case FUNCTION_UNPACKDOUBLE2X32:
 
                return new FunctionObject::unary<tcu::UVec2 /* ResT */, glw::GLdouble /* ArgT */>(function, "unpackDouble2x32",
                                                                                                                                                                                  Math::unpackDouble2x32);
 
-               break;
-
        case FUNCTION_ISNAN:
 
                return new FunctionObject::unaryByComponent<glw::GLuint /* ResT */>(
                        function, "isnan", Math::isnan_impl, uint_type /* res_type */, variable_type /* arg_type */);
 
-               break;
-
        case FUNCTION_ISINF:
 
                return new FunctionObject::unaryByComponent<glw::GLuint /* ResT */>(
                        function, "isinf", Math::isinf_impl, uint_type /* res_type */, variable_type /* arg_type */);
 
-               break;
-
        default:
                TCU_FAIL("Not implemented");
                return 0;
-               break;
        }
 
        TCU_FAIL("Not implemented");
@@ -14631,31 +14482,22 @@ BuiltinFunctionTest::uniformDMatFunctionPointer BuiltinFunctionTest::getUniformF
        {
        case Utils::VARIABLE_TYPE_DMAT2:
                return gl.uniformMatrix2dv;
-               break;
        case Utils::VARIABLE_TYPE_DMAT2X3:
                return gl.uniformMatrix2x3dv;
-               break;
        case Utils::VARIABLE_TYPE_DMAT2X4:
                return gl.uniformMatrix2x4dv;
-               break;
        case Utils::VARIABLE_TYPE_DMAT3:
                return gl.uniformMatrix3dv;
-               break;
        case Utils::VARIABLE_TYPE_DMAT3X2:
                return gl.uniformMatrix3x2dv;
-               break;
        case Utils::VARIABLE_TYPE_DMAT3X4:
                return gl.uniformMatrix3x4dv;
-               break;
        case Utils::VARIABLE_TYPE_DMAT4:
                return gl.uniformMatrix4dv;
-               break;
        case Utils::VARIABLE_TYPE_DMAT4X2:
                return gl.uniformMatrix4x2dv;
-               break;
        case Utils::VARIABLE_TYPE_DMAT4X3:
                return gl.uniformMatrix4x3dv;
-               break;
        default:
                break;
        }
@@ -14681,19 +14523,14 @@ BuiltinFunctionTest::uniformDVecFunctionPointer BuiltinFunctionTest::getUniformF
        {
        case Utils::VARIABLE_TYPE_DOUBLE:
                return gl.uniform1dv;
-               break;
        case Utils::VARIABLE_TYPE_DVEC2:
                return gl.uniform2dv;
-               break;
        case Utils::VARIABLE_TYPE_DVEC3:
                return gl.uniform3dv;
-               break;
        case Utils::VARIABLE_TYPE_DVEC4:
                return gl.uniform4dv;
-               break;
        default:
                TCU_FAIL("Not implemented");
-               break;
        }
 
        return 0;
@@ -14716,19 +14553,14 @@ BuiltinFunctionTest::uniformIVecFunctionPointer BuiltinFunctionTest::getUniformF
        {
        case Utils::VARIABLE_TYPE_INT:
                return gl.uniform1iv;
-               break;
        case Utils::VARIABLE_TYPE_IVEC2:
                return gl.uniform2iv;
-               break;
        case Utils::VARIABLE_TYPE_IVEC3:
                return gl.uniform3iv;
-               break;
        case Utils::VARIABLE_TYPE_IVEC4:
                return gl.uniform4iv;
-               break;
        default:
                TCU_FAIL("Not implemented");
-               break;
        }
 
        return 0;
@@ -14751,10 +14583,8 @@ BuiltinFunctionTest::uniformUVecFunctionPointer BuiltinFunctionTest::getUniformF
        {
        case Utils::VARIABLE_TYPE_UVEC2:
                return gl.uniform2uiv;
-               break;
        default:
                TCU_FAIL("Not implemented");
-               break;
        }
 
        return 0;
@@ -14772,17 +14602,13 @@ const glw::GLchar* BuiltinFunctionTest::getUniformName(glw::GLuint argument) con
        {
        case 0:
                return "uniform_0";
-               break;
        case 1:
                return "uniform_1";
-               break;
        case 2:
                return "uniform_2";
-               break;
        default:
                TCU_FAIL("Not implemented");
                return 0;
-               break;
        }
 }
 
@@ -14798,17 +14624,13 @@ const glw::GLchar* BuiltinFunctionTest::getVaryingName(glw::GLuint result) const
        {
        case 0:
                return "result_0";
-               break;
        case 1:
                return "result_1";
-               break;
        case 2:
                return "result_2";
-               break;
        default:
                TCU_FAIL("Not implemented");
                return 0;
-               break;
        }
 }
 
@@ -15005,7 +14827,6 @@ void BuiltinFunctionTest::prepareComponents(const functionObject& function_objec
        default:
                TCU_FAIL("Not implemented");
                return;
-               break;
        }
 
        switch (function_object.getFunctionEnum())
@@ -15097,7 +14918,6 @@ void BuiltinFunctionTest::prepareComponents(const functionObject& function_objec
        default:
                TCU_FAIL("Not implemented");
                return;
-               break;
        }
 }
 
@@ -15396,7 +15216,6 @@ void BuiltinFunctionTest::testBegin(const functionObject& function_object, glw::
                        break;
                        default:
                                TCU_FAIL("Not implemented");
-                               break;
                        }
                }
                else
index 68edc96..e94c4cb 100644 (file)
@@ -1095,7 +1095,6 @@ void Texture::CompressedImage(const glw::Functions& gl, glw::GLenum target, glw:
                break;
        default:
                TCU_FAIL("Invliad enum");
-               break;
        }
 }
 
@@ -1200,7 +1199,6 @@ void Texture::Image(const glw::Functions& gl, glw::GLenum target, glw::GLint lev
                break;
        default:
                TCU_FAIL("Invliad enum");
-               break;
        }
 }
 
@@ -1261,7 +1259,6 @@ void Texture::Storage(const glw::Functions& gl, glw::GLenum target, glw::GLsizei
                break;
        default:
                TCU_FAIL("Invliad enum");
-               break;
        }
 }
 
@@ -1313,7 +1310,6 @@ void Texture::SubImage(const glw::Functions& gl, glw::GLenum target, glw::GLint
                break;
        default:
                TCU_FAIL("Invliad enum");
-               break;
        }
 }
 
index c3ffc5e..ca399f2 100644 (file)
@@ -7849,14 +7849,11 @@ private:
                case GL_TEXTURE_2D_ARRAY:
                case GL_TEXTURE_3D:
                        return 1;
-                       break;
                case GL_TEXTURE_CUBE_MAP:
                case GL_TEXTURE_CUBE_MAP_ARRAY:
                        return 6;
-                       break;
                default:
                        throw tcu::InternalError("Not supported texture type", "", __FILE__, __LINE__);
-                       break;
                }
        }
 
index 605f5cb..06d8e6c 100644 (file)
@@ -1319,7 +1319,6 @@ const GLchar* Utils::programInterfaceToStr(glw::GLenum program_interface)
                break;
        default:
                TCU_FAIL("Not implemented");
-               break;
        }
 
        return string;
@@ -1384,7 +1383,6 @@ const GLchar* Utils::pnameToStr(glw::GLenum pname)
                break;
        default:
                TCU_FAIL("Not implemented");
-               break;
        }
 
        return string;
index 3a57190..58ac094 100644 (file)
@@ -1065,7 +1065,6 @@ std::string Utils::getVariableDefinition(VARIABLE_FLAVOUR flavour, const qualifi
                break;
        default:
                TCU_FAIL("Invliad enum");
-               break;
        }
 
        /* Get qualifiers list */
@@ -1137,7 +1136,6 @@ Utils::VARIABLE_FLAVOUR Utils::getVariableFlavour(SHADER_STAGES stage, VARIABLE_
                        break;
                default:
                        TCU_FAIL("Invliad enum");
-                       break;
                }
        }
 
@@ -1736,7 +1734,6 @@ int TestBase::maxImageUniforms(Utils::SHADER_STAGES stage) const
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
        return max_image_uniforms;
 }
@@ -3563,7 +3560,6 @@ void LineNumberingTest::prepareShaderSource(Utils::SHADER_STAGES in_stage, bool
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -3911,7 +3907,6 @@ void UTF8CharactersTest::prepareShaderSource(Utils::SHADER_STAGES in_stage, bool
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        switch (m_test_case.m_case)
@@ -4266,7 +4261,6 @@ void UTF8InSourceTest::prepareShaderSource(Utils::SHADER_STAGES in_stage, bool i
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -4536,7 +4530,6 @@ void ImplicitConversionsValidTest::prepareShaderSource(Utils::SHADER_STAGES in_s
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -4940,7 +4933,6 @@ void ImplicitConversionsInvalidTest::prepareShaderSource(Utils::SHADER_STAGES in
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -5243,7 +5235,6 @@ void ConstDynamicValueTest::prepareShaderSource(Utils::SHADER_STAGES in_stage, b
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -5501,7 +5492,6 @@ void ConstAssignmentTest::prepareShaderSource(Utils::SHADER_STAGES in_stage, boo
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        if (0 == m_current_test_case_index)
@@ -5723,7 +5713,6 @@ void ConstDynamicValueAsConstExprTest::prepareShaderSource(Utils::SHADER_STAGES
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -5943,7 +5932,6 @@ void QualifierOrderTest::prepareShaderSource(Utils::SHADER_STAGES in_stage, bool
        {
        case Utils::COMPUTE_SHADER:
                return;
-               break;
        case Utils::FRAGMENT_SHADER:
                shader_template = fragment_shader_template;
                break;
@@ -5961,7 +5949,6 @@ void QualifierOrderTest::prepareShaderSource(Utils::SHADER_STAGES in_stage, bool
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        const Utils::qualifierSet& test_case = getCurrentTestCase();
@@ -6328,7 +6315,6 @@ void QualifierOrderBlockTest::prepareShaderSource(Utils::SHADER_STAGES in_stage,
        {
        case Utils::COMPUTE_SHADER:
                return;
-               break;
        case Utils::FRAGMENT_SHADER:
                shader_template = fragment_shader_template;
                break;
@@ -6346,7 +6332,6 @@ void QualifierOrderBlockTest::prepareShaderSource(Utils::SHADER_STAGES in_stage,
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        const Utils::qualifierSet& test_case = getCurrentTestCase();
@@ -6694,7 +6679,6 @@ void QualifierOrderUniformTest::prepareShaderSource(Utils::SHADER_STAGES in_stag
        {
        case Utils::COMPUTE_SHADER:
                return;
-               break;
        case Utils::FRAGMENT_SHADER:
                shader_template = fragment_shader_template;
                location_string = "0";
@@ -6717,7 +6701,6 @@ void QualifierOrderUniformTest::prepareShaderSource(Utils::SHADER_STAGES in_stag
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        const Utils::qualifierSet& test_case = getCurrentTestCase();
@@ -7020,7 +7003,6 @@ void QualifierOrderFunctionInoutTest::prepareShaderSource(Utils::SHADER_STAGES i
        {
        case Utils::COMPUTE_SHADER:
                return;
-               break;
        case Utils::FRAGMENT_SHADER:
                shader_template = fragment_shader_template;
                break;
@@ -7038,7 +7020,6 @@ void QualifierOrderFunctionInoutTest::prepareShaderSource(Utils::SHADER_STAGES i
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        const std::string& uni_reference  = Utils::getVariableName(in_stage, Utils::UNIFORM, "test");
@@ -7337,7 +7318,6 @@ void QualifierOrderFunctionInputTest::prepareShaderSource(Utils::SHADER_STAGES i
        {
        case Utils::COMPUTE_SHADER:
                return;
-               break;
        case Utils::FRAGMENT_SHADER:
                shader_template = fragment_shader_template;
                break;
@@ -7355,7 +7335,6 @@ void QualifierOrderFunctionInputTest::prepareShaderSource(Utils::SHADER_STAGES i
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        const std::string& uni_reference  = Utils::getVariableName(in_stage, Utils::UNIFORM, "test");
@@ -7663,7 +7642,6 @@ void QualifierOrderFunctionOutputTest::prepareShaderSource(Utils::SHADER_STAGES
        {
        case Utils::COMPUTE_SHADER:
                return;
-               break;
        case Utils::FRAGMENT_SHADER:
                shader_template = fragment_shader_template;
                break;
@@ -7681,7 +7659,6 @@ void QualifierOrderFunctionOutputTest::prepareShaderSource(Utils::SHADER_STAGES
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        const std::string& uni_reference  = Utils::getVariableName(in_stage, Utils::UNIFORM, "test");
@@ -7909,7 +7886,6 @@ void QualifierOverrideLayoutTest::prepareShaderSource(Utils::SHADER_STAGES in_st
        {
        case Utils::COMPUTE_SHADER:
                return;
-               break;
        case Utils::FRAGMENT_SHADER:
                shader_template = fragment_shader_template;
                break;
@@ -7927,7 +7903,6 @@ void QualifierOverrideLayoutTest::prepareShaderSource(Utils::SHADER_STAGES in_st
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -8206,7 +8181,6 @@ void BindingUniformBlocksTest::prepareShaderSource(Utils::SHADER_STAGES in_stage
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -8300,7 +8274,6 @@ bool BindingUniformSingleBlockTest::prepareNextTestCase(glw::GLuint test_case_in
                break;
        default:
                return false;
-               break;
        }
 
        m_context.getTestContext().getLog() << tcu::TestLog::Message << "Tested stage: "
@@ -8506,7 +8479,6 @@ void BindingUniformSingleBlockTest::prepareShaderSource(Utils::SHADER_STAGES in_
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        if (in_stage == m_test_stage)
@@ -8790,7 +8762,6 @@ void BindingUniformBlockArrayTest::prepareShaderSource(Utils::SHADER_STAGES in_s
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -9112,7 +9083,6 @@ void BindingUniformDefaultTest::prepareShaderSource(Utils::SHADER_STAGES in_stag
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -9327,7 +9297,6 @@ void BindingUniformAPIOverirdeTest::prepareShaderSource(Utils::SHADER_STAGES in_
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -9586,7 +9555,6 @@ void BindingUniformGlobalBlockTest::prepareShaderSource(Utils::SHADER_STAGES in_
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -9825,7 +9793,6 @@ void BindingUniformInvalidTest::prepareShaderSource(Utils::SHADER_STAGES in_stag
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -9922,7 +9889,6 @@ bool BindingSamplersTest::prepareNextTestCase(glw::GLuint test_case_index)
                break;
        default:
                return false;
-               break;
        }
 
        m_context.getTestContext().getLog() << tcu::TestLog::Message
@@ -10146,7 +10112,6 @@ void BindingSamplersTest::prepareShaderSource(Utils::SHADER_STAGES in_stage, boo
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        switch (n_coordinates)
@@ -10310,7 +10275,6 @@ bool BindingSamplerSingleTest::prepareNextTestCase(glw::GLuint test_case_index)
                break;
        default:
                return false;
-               break;
        }
 
        m_context.getTestContext().getLog() << tcu::TestLog::Message << "Tested stage: "
@@ -10511,7 +10475,6 @@ void BindingSamplerSingleTest::prepareShaderSource(Utils::SHADER_STAGES in_stage
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        if (in_stage == m_test_stage)
@@ -10784,7 +10747,6 @@ void BindingSamplerArrayTest::prepareShaderSource(Utils::SHADER_STAGES in_stage,
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -11077,7 +11039,6 @@ void BindingSamplerDefaultTest::prepareShaderSource(Utils::SHADER_STAGES in_stag
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -11289,7 +11250,6 @@ void BindingSamplerAPIOverrideTest::prepareShaderSource(Utils::SHADER_STAGES in_
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -11583,7 +11543,6 @@ void BindingSamplerInvalidTest::prepareShaderSource(Utils::SHADER_STAGES in_stag
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -11687,7 +11646,6 @@ bool BindingImagesTest::prepareNextTestCase(glw::GLuint test_case_index)
                break;
        default:
                return false;
-               break;
        }
 
        m_context.getTestContext().getLog() << tcu::TestLog::Message
@@ -11940,7 +11898,6 @@ void BindingImagesTest::prepareShaderSource(Utils::SHADER_STAGES in_stage, bool
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        switch (n_coordinates)
@@ -12080,7 +12037,6 @@ bool BindingImageSingleTest::prepareNextTestCase(glw::GLuint test_case_index)
                break;
        default:
                return false;
-               break;
        }
 
        m_context.getTestContext().getLog() << tcu::TestLog::Message << "Tested stage: "
@@ -12310,7 +12266,6 @@ void BindingImageSingleTest::prepareShaderSource(Utils::SHADER_STAGES in_stage,
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        if (in_stage == m_test_stage)
@@ -12600,7 +12555,6 @@ void BindingImageArrayTest::prepareShaderSource(Utils::SHADER_STAGES in_stage, b
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -12902,7 +12856,6 @@ void BindingImageDefaultTest::prepareShaderSource(Utils::SHADER_STAGES in_stage,
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -13140,7 +13093,6 @@ void BindingImageAPIOverrideTest::prepareShaderSource(Utils::SHADER_STAGES in_st
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -13429,7 +13381,6 @@ void BindingImageInvalidTest::prepareShaderSource(Utils::SHADER_STAGES in_stage,
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -13730,7 +13681,6 @@ void InitializerListTest::prepareShaderSource(Utils::SHADER_STAGES in_stage, boo
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -13873,7 +13823,6 @@ std::string InitializerListTest::getArrayDefinition()
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        return array_definition;
@@ -13933,7 +13882,6 @@ std::string InitializerListTest::getExpectedValue()
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        value *= m_value;
@@ -14255,7 +14203,6 @@ std::string InitializerListTest::getInitialization()
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        return initialization;
@@ -14340,7 +14287,6 @@ void InitializerListTest::logTestCaseName()
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        message << tcu::TestLog::EndMessage;
@@ -14454,7 +14400,6 @@ std::string InitializerListTest::getSum()
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        return sum;
@@ -14534,7 +14479,6 @@ std::string InitializerListTest::getTypeDefinition()
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        return type_definition;
@@ -14596,7 +14540,6 @@ std::string InitializerListTest::getTypeName()
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        return type_name;
@@ -15025,7 +14968,6 @@ void InitializerListNegativeTest::prepareShaderSource(Utils::SHADER_STAGES in_st
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -15148,7 +15090,6 @@ std::string InitializerListNegativeTest::getInitialization()
 
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        return initialization;
@@ -15212,7 +15153,6 @@ void InitializerListNegativeTest::logTestCaseName()
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        message << tcu::TestLog::EndMessage;
@@ -15265,7 +15205,6 @@ std::string InitializerListNegativeTest::getSum()
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        return sum;
@@ -15314,7 +15253,6 @@ std::string InitializerListNegativeTest::getTypeDefinition()
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        return type_definition;
@@ -15356,7 +15294,6 @@ std::string InitializerListNegativeTest::getTypeName()
        case COMPONENTS_MAT_MORE_COLUMNS:
                type_name = "mat3";
                break;
-               break;
        case LIST_IN_CONSTRUCTOR:
        case STRUCT_LAYOUT_MEMBER_TYPE:
        case STRUCT_LAYOUT_MEMBER_COUNT_MORE:
@@ -15366,7 +15303,6 @@ std::string InitializerListNegativeTest::getTypeName()
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        return type_name;
@@ -16085,7 +16021,6 @@ void LengthOfVectorAndMatrixTest::prepareDrawShaderSource(Utils::SHADER_STAGES i
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        if (Utils::VERTEX_SHADER != in_stage)
@@ -16530,7 +16465,6 @@ void LengthOfComputeResultTest::prepareShaderSource(Utils::SHADER_STAGES in_stag
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -16873,7 +16807,6 @@ void ScalarSwizzlersTest::prepareShaderSource(Utils::SHADER_STAGES in_stage, boo
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -17169,7 +17102,6 @@ void ScalarSwizzlersInvalidTest::prepareShaderSource(Utils::SHADER_STAGES in_sta
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        switch (m_case)
@@ -17197,7 +17129,6 @@ void ScalarSwizzlersInvalidTest::prepareShaderSource(Utils::SHADER_STAGES in_sta
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -17408,7 +17339,6 @@ void BuiltInValuesTest::prepareShaderSource(Utils::SHADER_STAGES in_stage, bool
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        out_source.m_parts[0].m_code = shader_template;
@@ -17693,7 +17623,6 @@ void BuiltInAssignmentTest::prepareShaderSource(Utils::SHADER_STAGES in_stage, b
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        switch (m_case)
@@ -18666,7 +18595,6 @@ void Utils::texture::create(GLuint width, GLuint height, GLuint depth, GLenum in
                break;
        default:
                TCU_FAIL("Invliad enum");
-               break;
        }
 }
 
@@ -18824,7 +18752,6 @@ void Utils::texture::update(glw::GLuint width, glw::GLuint height, glw::GLuint d
                break;
        default:
                TCU_FAIL("Invliad enum");
-               break;
        }
 }
 
index 3097dd0..f7e3ce1 100644 (file)
@@ -251,7 +251,6 @@ void Texture::Storage(const Functions& gl, GLenum target, GLsizei levels, GLenum
                break;
        default:
                TCU_FAIL("Invliad enum");
-               break;
        }
 }
 
@@ -315,7 +314,6 @@ void Texture::SubImage(const glw::Functions& gl, glw::GLenum target, glw::GLint
                break;
        default:
                TCU_FAIL("Invliad enum");
-               break;
        }
 }
 
index d4c2ac7..2bdfa17 100644 (file)
@@ -960,7 +960,6 @@ GLuint FunctionalTest::prepareSourceTexture(GLenum internal_format, bool is_sten
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        /* Create texture */
@@ -1025,7 +1024,6 @@ void FunctionalTest::prepareSourceTextureData(GLenum internal_format, std::vecto
                break;
        default:
                TCU_FAIL("Invalid enum");
-               break;
        }
 
        line_size       = pixel_size * m_width;
@@ -1067,7 +1065,6 @@ void FunctionalTest::prepareSourceTextureData(GLenum internal_format, std::vecto
                                break;
                        default:
                                TCU_FAIL("Invalid value");
-                               break;
                        }
                }
        }
index 04876a5..3058f40 100644 (file)
@@ -370,7 +370,6 @@ NumberParsingCase::IterateResult NumberParsingCase::iterate(void)
                        return STOP;
                default:
                        TCU_FAIL("Shader compilation failed:\nVertex shader:\n" + m_vertexShader + "\nFragment shader:\n" + m_fragmentShader);
-                       break;
                }
 
        const std::vector<glu::VertexArrayBinding> vertexArrays =
index 7adc4f7..5a119b1 100644 (file)
@@ -675,7 +675,6 @@ protected:
                {
                        throw std::runtime_error("Invalid drawSizeX!");
                }
-               break;
                default:
                {
                        float drawStepX = 2.0f / static_cast<float>(drawSizeX);
@@ -796,7 +795,6 @@ protected:
                        break;
                default:
                        throw std::runtime_error("Unknown primitive type!");
-                       break;
                }
        }
 
@@ -814,16 +812,12 @@ protected:
                {
                case GL_READ_WRITE:
                        return "GL_READ_WRITE";
-                       break;
                case GL_READ_ONLY:
                        return "GL_READ_ONLY";
-                       break;
                case GL_WRITE_ONLY:
                        return "GL_WRITE_ONLY";
-                       break;
                default:
                        throw std::runtime_error("Invalid access type!");
-                       break;
                }
        }
 };
index 3258b2e..b673f98 100644 (file)
@@ -1196,10 +1196,8 @@ public:
                        return generateVertexShader(key, uniforms, subroutineUniforms, additionalDef, type);
                case GL_FRAGMENT_SHADER:
                        return generateFragmentShader(key, uniforms, subroutineUniforms, additionalDef, type);
-                       break;
                case GL_COMPUTE_SHADER:
                        return generateComputeShader(key, uniforms, subroutineUniforms, additionalDef, type);
-                       break;
                default:
                        assert(0);
                        return "";
index 0947ac3..90a8ba6 100644 (file)
@@ -843,14 +843,10 @@ std::string DrawElementsBaseVertexTestBase::getFunctionName(_function_type funct
                if (glu::isContextTypeES(m_context.getRenderContext().getType()))
                {
                        result = "glDrawElementsBaseVertexEXT()";
-
-                       break;
                }
                else
                {
                        result = "glDrawElementsBaseVertex()";
-
-                       break;
                }
 
                break;
@@ -861,14 +857,10 @@ std::string DrawElementsBaseVertexTestBase::getFunctionName(_function_type funct
                if (glu::isContextTypeES(m_context.getRenderContext().getType()))
                {
                        result = "glDrawElementsInstancedBaseVertexEXT()";
-
-                       break;
                }
                else
                {
                        result = "glDrawElementsInstancedBaseVertex()";
-
-                       break;
                }
 
                break;
@@ -879,14 +871,10 @@ std::string DrawElementsBaseVertexTestBase::getFunctionName(_function_type funct
                if (glu::isContextTypeES(m_context.getRenderContext().getType()))
                {
                        result = "glDrawRangeElementsBaseVertexEXT()";
-
-                       break;
                }
                else
                {
                        result = "glDrawRangeElementsBaseVertex()";
-
-                       break;
                }
 
                break;
@@ -897,14 +885,10 @@ std::string DrawElementsBaseVertexTestBase::getFunctionName(_function_type funct
                if (glu::isContextTypeES(m_context.getRenderContext().getType()))
                {
                        result = "glMultiDrawElementsBaseVertexEXT()";
-
-                       break;
                }
                else
                {
                        result = "glMultiDrawElementsBaseVertex()";
-
-                       break;
                }
 
                break;
@@ -913,8 +897,6 @@ std::string DrawElementsBaseVertexTestBase::getFunctionName(_function_type funct
        default:
        {
                TCU_FAIL("Unknown function type");
-
-               break;
        }
        } /* switch (function_type) */
 
index 2171b93..8ee9b0d 100644 (file)
@@ -1971,8 +1971,6 @@ void GeometryShaderRenderingPointsCase::verify(_draw_call_type drawcall_type, un
        default:
        {
                TCU_FAIL("Unsupported output layout qualifier requested.");
-
-               break;
        }
        } /* switch(m_output_type) */
 }
index e484e2a..fe7594b 100644 (file)
@@ -1020,7 +1020,6 @@ void prepareDepthTextureFace(const glw::Functions& gl, glw::GLint cube_face, glw
 
        default:
                TCU_FAIL("Not implemented case !");
-               break;
        }
 }
 
@@ -1242,7 +1241,6 @@ void prepareRGBAIntegerTextureFace(const glw::Functions& gl, glw::GLint cube_fac
 
        default:
                TCU_FAIL("Not implemented case !");
-               break;
        }
 }
 
@@ -1278,7 +1276,6 @@ void prepareRGBATextureFace(const glw::Functions& gl, glw::GLint cube_face, glw:
 
        default:
                TCU_FAIL("Not implemented case !");
-               break;
        }
 }
 
@@ -1308,7 +1305,6 @@ void prepareStencilTextureFace(const glw::Functions& gl, glw::GLint cube_face, g
 
        default:
                TCU_FAIL("Not implemented case !");
-               break;
        }
 }
 
@@ -1571,7 +1567,6 @@ void prepareTextureFace(const glw::Functions& gl, glw::GLint cube_face, glw::GLi
 
        default:
                TCU_FAIL("Not implemented case !");
-               break;
        }
 }
 
@@ -3068,7 +3063,6 @@ void TextureCubeMapArraySamplingTest::getShadowSamplingFunctionCall(
                /* fs_in_color = textureGrad(sampler, vs_out_texture_coordinates, vs_out_grad_x, vs_out_grad_y); */
                throw tcu::NotSupportedError("textureGrad operation is not available for samplerCubeArrayShadow", "", __FILE__,
                                                                         __LINE__);
-               break;
        case TextureGather:
                if (4 == n_components)
                {
@@ -4255,16 +4249,12 @@ const TextureCubeMapArraySamplingTest::programCollectionForFunction* TextureCube
        {
        case Texture:
                return &m_programs_for_texture;
-               break;
        case TextureLod:
                return &m_programs_for_textureLod;
-               break;
        case TextureGrad:
                return &m_programs_for_textureGrad;
-               break;
        case TextureGather:
                return &m_programs_for_textureGather;
-               break;
        }
 
        return 0;
@@ -4308,22 +4298,16 @@ const TextureCubeMapArraySamplingTest::programDefinition* TextureCubeMapArraySam
        {
        case Compute:
                return &program_with_sampling_compute_shader;
-               break;
        case Fragment:
                return &program_with_sampling_fragment_shader;
-               break;
        case Geometry:
                return &program_with_sampling_geometry_shader;
-               break;
        case Tesselation_Control:
                return &program_with_sampling_tesselation_control_shader;
-               break;
        case Tesselation_Evaluation:
                return &program_with_sampling_tesselation_evaluation_shader;
-               break;
        case Vertex:
                return &program_with_sampling_vertex_shader;
-               break;
        }
 
        return 0;
@@ -4416,22 +4400,16 @@ const TextureCubeMapArraySamplingTest::shaderDefinition* TextureCubeMapArraySamp
        {
        case Compute:
                return compute_shader;
-               break;
        case Fragment:
                return fragment_shader;
-               break;
        case Geometry:
                return geometry_shader;
-               break;
        case Tesselation_Control:
                return tesselation_control_shader;
-               break;
        case Tesselation_Evaluation:
                return tesselation_evaluation_shader;
-               break;
        case Vertex:
                return vertex_shader;
-               break;
        }
 
        return 0;
index f371b7d..032e9ce 100644 (file)
@@ -2451,8 +2451,8 @@ static inline ShaderBodyTextFunc getShaderBodyTextFunc (const TestType testType)
 {
        switch (testType)
        {
-               case TEST_TYPE_USING_RAY_QUERY:         return getRayQueryShaderBodyText;       break;
-               case TEST_TYPE_USING_RAY_TRACING:       return getRayTracingShaderBodyText;     break;
+               case TEST_TYPE_USING_RAY_QUERY:         return getRayQueryShaderBodyText;
+               case TEST_TYPE_USING_RAY_TRACING:       return getRayTracingShaderBodyText;
                default:                                                        TCU_THROW(InternalError, "Unknown test type");
        }
 }
index 89d8c77..f2e0347 100644 (file)
@@ -86,23 +86,18 @@ std::string stringifyDescriptorUpdateMethod(DescriptorUpdateMethod method)
        {
                case DESCRIPTOR_UPDATE_METHOD_NORMAL:
                        return "";
-                       break;
 
                case DESCRIPTOR_UPDATE_METHOD_WITH_TEMPLATE:
                        return "with_template";
-                       break;
 
                case DESCRIPTOR_UPDATE_METHOD_WITH_PUSH:
                        return "with_push";
-                       break;
 
                case DESCRIPTOR_UPDATE_METHOD_WITH_PUSH_TEMPLATE:
                        return "with_push_template";
-                       break;
 
                default:
                        return "N/A";
-                       break;
        }
 }
 
index d2f1da8..3d817b9 100644 (file)
@@ -1920,7 +1920,6 @@ bool isRayTracingStage (TestingStage stage)
        case TestingStage::MISS:
        case TestingStage::CALLABLE:
                return true;
-               break;
        default:
                break;
        }
@@ -2588,7 +2587,6 @@ bool isVertexStage (TestingStage stage)
        case TestingStage::TESS_EVAL:
        case TestingStage::GEOMETRY:
                return true;
-               break;
        default:
                break;
        }
@@ -2678,7 +2676,6 @@ void MutableTypesTest::checkSupport (Context& context) const
 
                        case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT:
                                TCU_THROW(InternalError, "Tests do not support update-after-bind with input attachments");
-                               break;
 
                        case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT:
                                {
@@ -2702,11 +2699,9 @@ void MutableTypesTest::checkSupport (Context& context) const
 
                        case VK_DESCRIPTOR_TYPE_MUTABLE_VALVE:
                                TCU_THROW(InternalError, "Found VK_DESCRIPTOR_TYPE_MUTABLE_VALVE in list of used descriptor types");
-                               break;
 
                        default:
                                TCU_THROW(InternalError, "Unexpected descriptor type found in list of used descriptor types: " + de::toString(descType));
-                               break;
                        }
                }
        }
@@ -2768,11 +2763,9 @@ void MutableTypesTest::checkSupport (Context& context) const
 
                        case VK_DESCRIPTOR_TYPE_MUTABLE_VALVE:
                                TCU_THROW(InternalError, "Found VK_DESCRIPTOR_TYPE_MUTABLE_VALVE in list of used array descriptor types");
-                               break;
 
                        default:
                                TCU_THROW(InternalError, "Unexpected descriptor type found in list of used descriptor types: " + de::toString(descType));
-                               break;
                        }
                }
        }
index bd42982..d28ced7 100644 (file)
@@ -782,7 +782,7 @@ tcu::TestStatus testLargePoints (Context& context)
                {
                        case VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES:                pointClippingOutside = true;                            break;
                        case VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY:  pointClippingOutside = false;                           break;
-                       case invalidClippingBehavior:                                                   TCU_FAIL("Clipping behavior read failure");     break;
+                       case invalidClippingBehavior:                                                   TCU_FAIL("Clipping behavior read failure");     // Does not fall through
                        default:
                        {
                                TCU_FAIL("Unexpected clipping behavior reported");
index d11d4b8..0270c29 100644 (file)
@@ -2217,7 +2217,6 @@ std::string CommonDescriptorInstance::getShaderAsm                                        (VkShaderStageFlagBits
                                        break;
                                default:
                                        TCU_THROW(InternalError, "Unexpected descriptor type");
-                                       break;
                        }
                        break;
                case VK_SHADER_STAGE_FRAGMENT_BIT:
@@ -2654,7 +2653,6 @@ std::string CommonDescriptorInstance::getShaderAsm                                        (VkShaderStageFlagBits
                                        break;
                                default:
                                        TCU_THROW(InternalError, "Unexpected descriptor type");
-                                       break;
                        }
                    break;
                case VK_SHADER_STAGE_COMPUTE_BIT:
@@ -2734,12 +2732,10 @@ std::string CommonDescriptorInstance::getShaderAsm                                      (VkShaderStageFlagBits
                                        break;
                                default:
                                        TCU_THROW(InternalError, "Unexpected descriptor type");
-                                       break;
                        }
                        break;
                default:
                        TCU_THROW(InternalError, "Unexpected stage");
-                       break;
        }
 
        return s.str();
index 1eae7a0..ef59091 100644 (file)
@@ -1431,7 +1431,6 @@ bool validateResultImage (const TestTexture&                                      texture,
                        UniquePtr<tcu::TextureCubeArrayView>    texView(getTextureCubeArrayView(texture, subresource, levels));
 
                        return validateResultImage(*texView, sampler, componentMapping, coordAccess, lodBounds, lookupPrecision, lookupScale, lookupBias, resultAccess, errorAccess);
-                       break;
                }
 
                case VK_IMAGE_VIEW_TYPE_3D:
index fcdd6f5..3c1686e 100644 (file)
@@ -2848,8 +2848,6 @@ bool ConservativeTraingleTestInstance::compareAndVerify (std::vector<TriangleSce
                                return compareAndVerifyOverestimatedDegenerate(triangles, resultImage);
                        else
                                return compareAndVerifyOverestimatedNormal(triangles, resultImage);
-
-                       break;
                }
 
                case VK_CONSERVATIVE_RASTERIZATION_MODE_UNDERESTIMATE_EXT:
@@ -2858,8 +2856,6 @@ bool ConservativeTraingleTestInstance::compareAndVerify (std::vector<TriangleSce
                                return compareAndVerifyUnderestimatedDegenerate(triangles, resultImage);
                        else
                                return compareAndVerifyUnderestimatedNormal(triangles, resultImage);
-
-                       break;
                }
 
                default:
@@ -3629,8 +3625,6 @@ bool ConservativeLineTestInstance::compareAndVerify (std::vector<LineSceneSpec::
                                return compareAndVerifyOverestimatedDegenerate(lines, resultImage);
                        else
                                return compareAndVerifyOverestimatedNormal(lines, resultImage);
-
-                       break;
                }
                case VK_CONSERVATIVE_RASTERIZATION_MODE_UNDERESTIMATE_EXT:
                {
@@ -3638,8 +3632,6 @@ bool ConservativeLineTestInstance::compareAndVerify (std::vector<LineSceneSpec::
                                return compareAndVerifyUnderestimatedDegenerate(lines, resultImage);
                        else
                                return compareAndVerifyUnderestimatedNormal(lines, resultImage);
-
-                       break;
                }
 
                default:
index 0eecec9..18340c3 100644 (file)
@@ -5860,32 +5860,32 @@ namespace vkt
                        {
                                switch (testType)
                                {
-                               case TEST_TYPE_FLOW:                                                                                                                                    return TestConfigurationFlow::getShaderBodyText;                                                                                                                        break;
-                               case TEST_TYPE_PRIMITIVE_ID:                                                                                                                    return TestConfigurationPrimitiveId::getShaderBodyText;                                                                                                         break;
-                               case TEST_TYPE_INSTANCE_ID:                                                                                                                             return TestConfigurationInstanceId::getShaderBodyText;                                                                                                          break;
-                               case TEST_TYPE_INSTANCE_CUSTOM_INDEX:                                                                                                   return TestConfigurationInstanceCustomIndex::getShaderBodyText;                                                                                         break;
-                               case TEST_TYPE_INTERSECTION_T_KHR:                                                                                                              return TestConfigurationIntersectionT::getShaderBodyText;                                                                                                       break;
-                               case TEST_TYPE_OBJECT_RAY_ORIGIN_KHR:                                                                                                   return TestConfigurationObjectRayOrigin::getShaderBodyText;                                                                                                     break;
-                               case TEST_TYPE_OBJECT_RAY_DIRECTION_KHR:                                                                                                return TestConfigurationObjectRayDirection::getShaderBodyText;                                                                                          break;
-                               case TEST_TYPE_OBJECT_TO_WORLD_KHR:                                                                                                             return TestConfigurationObjectToWorld::getShaderBodyText;                                                                                                       break;
-                               case TEST_TYPE_WORLD_TO_OBJECT_KHR:                                                                                                             return TestConfigurationWorldToObject::getShaderBodyText;                                                                                                       break;
-                               case TEST_TYPE_NULL_ACCELERATION_STRUCTURE:                                                                                             return TestConfigurationNullASStruct::getShaderBodyText;                                                                                                        break;
-                               case TEST_TYPE_USING_WRAPPER_FUNCTION:                                                                                                  return TestConfigurationUsingWrapperFunction::getShaderBodyText;                                                                                        break;
-                               case TEST_TYPE_GET_RAY_TMIN:                                                                                                                    return TestConfigurationGetRayTMin::getShaderBodyText;                                                                                                          break;
-                               case TEST_TYPE_GET_WORLD_RAY_ORIGIN:                                                                                                    return TestConfigurationGetWorldRayOrigin::getShaderBodyText;                                                                                           break;
-                               case TEST_TYPE_GET_WORLD_RAY_DIRECTION:                                                                                                 return TestConfigurationGetWorldRayDirection::getShaderBodyText;                                                                                        break;
-                               case TEST_TYPE_GET_INTERSECTION_CANDIDATE_AABB_OPAQUE:                                                                  return TestConfigurationGetIntersectionCandidateAABBOpaque::getShaderBodyText;                                                          break;
-                               case TEST_TYPE_GET_INTERSECTION_FRONT_FACE_CANDIDATE:                                                                   return TestConfigurationGetIntersectionFrontFace::getShaderBodyTextCandidate;                                                           break;
-                               case TEST_TYPE_GET_INTERSECTION_FRONT_FACE_COMMITTED:                                                                   return TestConfigurationGetIntersectionFrontFace::getShaderBodyTextCommitted;                                                           break;
-                               case TEST_TYPE_GET_INTERSECTION_GEOMETRY_INDEX_CANDIDATE:                                                               return TestConfigurationGetIntersectionGeometryIndex::getShaderBodyTextCandidate;                                                       break;
-                               case TEST_TYPE_GET_INTERSECTION_GEOMETRY_INDEX_COMMITTED:                                                               return TestConfigurationGetIntersectionGeometryIndex::getShaderBodyTextCommitted;                                                       break;
-                               case TEST_TYPE_GET_INTERSECTION_BARYCENTRICS_CANDIDATE:                                                                 return TestConfigurationGetIntersectionBarycentrics::getShaderBodyTextCandidate;                                                        break;
-                               case TEST_TYPE_GET_INTERSECTION_BARYCENTRICS_COMMITTED:                                                                 return TestConfigurationGetIntersectionBarycentrics::getShaderBodyTextCommitted;                                                        break;
-                               case TEST_TYPE_GET_INTERSECTION_INSTANCE_SHADER_BINDING_TABLE_RECORD_OFFSET_CANDIDATE:  return TestConfigurationGetIntersectionInstanceShaderBindingTableRecordOffset::getShaderBodyTextCandidate;      break;
-                               case TEST_TYPE_GET_INTERSECTION_INSTANCE_SHADER_BINDING_TABLE_RECORD_OFFSET_COMMITTED:  return TestConfigurationGetIntersectionInstanceShaderBindingTableRecordOffset::getShaderBodyTextCommitted;      break;
-                               case TEST_TYPE_RAY_QUERY_TERMINATE:                                                                                                             return TestConfigurationRayQueryTerminate::getShaderBodyText;                                                                                           break;
-                               case TEST_TYPE_GET_INTERSECTION_TYPE_CANDIDATE:                                                                                 return TestConfigurationGetIntersectionType::getShaderBodyTextCandidate;                                                                        break;
-                               case TEST_TYPE_GET_INTERSECTION_TYPE_COMMITTED:                                                                                 return TestConfigurationGetIntersectionType::getShaderBodyTextCommitted;                                                                        break;
+                               case TEST_TYPE_FLOW:                                                                                                                                    return TestConfigurationFlow::getShaderBodyText;
+                               case TEST_TYPE_PRIMITIVE_ID:                                                                                                                    return TestConfigurationPrimitiveId::getShaderBodyText;
+                               case TEST_TYPE_INSTANCE_ID:                                                                                                                             return TestConfigurationInstanceId::getShaderBodyText;
+                               case TEST_TYPE_INSTANCE_CUSTOM_INDEX:                                                                                                   return TestConfigurationInstanceCustomIndex::getShaderBodyText;
+                               case TEST_TYPE_INTERSECTION_T_KHR:                                                                                                              return TestConfigurationIntersectionT::getShaderBodyText;
+                               case TEST_TYPE_OBJECT_RAY_ORIGIN_KHR:                                                                                                   return TestConfigurationObjectRayOrigin::getShaderBodyText;
+                               case TEST_TYPE_OBJECT_RAY_DIRECTION_KHR:                                                                                                return TestConfigurationObjectRayDirection::getShaderBodyText;
+                               case TEST_TYPE_OBJECT_TO_WORLD_KHR:                                                                                                             return TestConfigurationObjectToWorld::getShaderBodyText;
+                               case TEST_TYPE_WORLD_TO_OBJECT_KHR:                                                                                                             return TestConfigurationWorldToObject::getShaderBodyText;
+                               case TEST_TYPE_NULL_ACCELERATION_STRUCTURE:                                                                                             return TestConfigurationNullASStruct::getShaderBodyText;
+                               case TEST_TYPE_USING_WRAPPER_FUNCTION:                                                                                                  return TestConfigurationUsingWrapperFunction::getShaderBodyText;
+                               case TEST_TYPE_GET_RAY_TMIN:                                                                                                                    return TestConfigurationGetRayTMin::getShaderBodyText;
+                               case TEST_TYPE_GET_WORLD_RAY_ORIGIN:                                                                                                    return TestConfigurationGetWorldRayOrigin::getShaderBodyText;
+                               case TEST_TYPE_GET_WORLD_RAY_DIRECTION:                                                                                                 return TestConfigurationGetWorldRayDirection::getShaderBodyText;;
+                               case TEST_TYPE_GET_INTERSECTION_CANDIDATE_AABB_OPAQUE:                                                                  return TestConfigurationGetIntersectionCandidateAABBOpaque::getShaderBodyText;
+                               case TEST_TYPE_GET_INTERSECTION_FRONT_FACE_CANDIDATE:                                                                   return TestConfigurationGetIntersectionFrontFace::getShaderBodyTextCandidate;
+                               case TEST_TYPE_GET_INTERSECTION_FRONT_FACE_COMMITTED:                                                                   return TestConfigurationGetIntersectionFrontFace::getShaderBodyTextCommitted;
+                               case TEST_TYPE_GET_INTERSECTION_GEOMETRY_INDEX_CANDIDATE:                                                               return TestConfigurationGetIntersectionGeometryIndex::getShaderBodyTextCandidate;
+                               case TEST_TYPE_GET_INTERSECTION_GEOMETRY_INDEX_COMMITTED:                                                               return TestConfigurationGetIntersectionGeometryIndex::getShaderBodyTextCommitted;
+                               case TEST_TYPE_GET_INTERSECTION_BARYCENTRICS_CANDIDATE:                                                                 return TestConfigurationGetIntersectionBarycentrics::getShaderBodyTextCandidate;
+                               case TEST_TYPE_GET_INTERSECTION_BARYCENTRICS_COMMITTED:                                                                 return TestConfigurationGetIntersectionBarycentrics::getShaderBodyTextCommitted;
+                               case TEST_TYPE_GET_INTERSECTION_INSTANCE_SHADER_BINDING_TABLE_RECORD_OFFSET_CANDIDATE:  return TestConfigurationGetIntersectionInstanceShaderBindingTableRecordOffset::getShaderBodyTextCandidate;
+                               case TEST_TYPE_GET_INTERSECTION_INSTANCE_SHADER_BINDING_TABLE_RECORD_OFFSET_COMMITTED:  return TestConfigurationGetIntersectionInstanceShaderBindingTableRecordOffset::getShaderBodyTextCommitted;
+                               case TEST_TYPE_RAY_QUERY_TERMINATE:                                                                                                             return TestConfigurationRayQueryTerminate::getShaderBodyText;
+                               case TEST_TYPE_GET_INTERSECTION_TYPE_CANDIDATE:                                                                                 return TestConfigurationGetIntersectionType::getShaderBodyTextCandidate;
+                               case TEST_TYPE_GET_INTERSECTION_TYPE_COMMITTED:                                                                                 return TestConfigurationGetIntersectionType::getShaderBodyTextCommitted;
 
                                default:                                                                        TCU_THROW(InternalError, "Unknown test type");
                                }
@@ -5898,7 +5898,7 @@ namespace vkt
 
                                switch (testType)
                                {
-                               case TEST_TYPE_NULL_ACCELERATION_STRUCTURE:     return TestConfigurationNullASStruct::checkSupport;     break;
+                               case TEST_TYPE_NULL_ACCELERATION_STRUCTURE:     return TestConfigurationNullASStruct::checkSupport;
                                default:                                                                        return DE_NULL;
                                }
                        }
index 11ea386..1ac0ed0 100644 (file)
@@ -2206,8 +2206,8 @@ static inline ShaderBodyTextFunc getShaderBodyTextFunc (const TestType testType)
 {
        switch (testType)
        {
-               case TEST_TYPE_NO_MISS:         return getShaderBodyText;       break;
-               case TEST_TYPE_SINGLE_HIT:      return getShaderBodyText;       break;
+               case TEST_TYPE_NO_MISS:         return getShaderBodyText;
+               case TEST_TYPE_SINGLE_HIT:      return getShaderBodyText;
                default:                                        TCU_THROW(InternalError, "Unknown test type");
        }
 }
index 123ee79..fde7d91 100644 (file)
@@ -466,7 +466,6 @@ void TestShaderBindingTablesConfiguration::initShaderBindingTables (de::MovePtr<
                        break;
                default:
                        TCU_THROW(InternalError, "Wrong test type");
-                       break;
                }
        }
 }
index e8bce27..807ee6d 100644 (file)
@@ -1997,7 +1997,6 @@ std::string getTypeSpirv(const glu::DataType type, const bool packFloat16Bit = f
        default:
                DE_ASSERT(0);
                return "";
-               break;
        }
 }
 
@@ -2051,7 +2050,6 @@ std::string scalarComparison(const std::string operation, const int operationNdx
        default:
                DE_ASSERT(0);
                return "";
-               break;
        }
 
        src << "\n"
index dc10946..8894237 100644 (file)
@@ -1377,7 +1377,6 @@ BaseAttributeType getAttributeType(const glu::DataType dataType)
        case TYPE_FLOAT_MAT4:           return MAT4;
        default:
                TCU_THROW(InternalError, "Not supported");
-               break;
        }
 }
 
index 269c5b9..d229e09 100644 (file)
@@ -2519,16 +2519,12 @@ deUint32 getResultBinding (const VkShaderStageFlagBits shaderStage)
        {
                case VK_SHADER_STAGE_VERTEX_BIT:
                        return 0u;
-                       break;
                case VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT:
                        return 1u;
-                       break;
                case VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT:
                        return 2u;
-                       break;
                case VK_SHADER_STAGE_GEOMETRY_BIT:
                        return 3u;
-                       break;
                default:
                        DE_ASSERT(0);
                        return -1;
index 566a314..c901f11 100644 (file)
@@ -283,18 +283,18 @@ tcu::TestStatus DisplayCoverageTestInstance::iterate (void)
 {
        switch (m_testId)
        {
-               case DISPLAY_TEST_INDEX_GET_DISPLAY_PROPERTIES:                                 return testGetPhysicalDeviceDisplayPropertiesKHR();                     break;
-               case DISPLAY_TEST_INDEX_GET_DISPLAY_PLANES:                                             return testGetPhysicalDeviceDisplayPlanePropertiesKHR();        break;
-               case DISPLAY_TEST_INDEX_GET_DISPLAY_PLANE_SUPPORTED_DISPLAY:    return testGetDisplayPlaneSupportedDisplaysKHR();                       break;
-               case DISPLAY_TEST_INDEX_GET_DISPLAY_MODE:                                               return testGetDisplayModePropertiesKHR();                                       break;
-               case DISPLAY_TEST_INDEX_CREATE_DISPLAY_MODE:                                    return testCreateDisplayModeKHR();                                                      break;
-               case DISPLAY_TEST_INDEX_GET_DISPLAY_PLANE_CAPABILITIES:                 return testGetDisplayPlaneCapabilitiesKHR();                            break;
-               case DISPLAY_TEST_INDEX_CREATE_DISPLAY_PLANE_SURFACE:                   return testDisplaySurface(SURFACE_CREATE);                                      break;
-               case DISPLAY_TEST_INDEX_SURFACE_COUNTERS:                                               return testDisplaySurface(SURFACE_COUNTERS);                            break;
-               case DISPLAY_TEST_INDEX_GET_DISPLAY_PROPERTIES2:                                return testGetPhysicalDeviceDisplayProperties2KHR();            break;
-               case DISPLAY_TEST_INDEX_GET_DISPLAY_PLANES2:                                    return testGetPhysicalDeviceDisplayPlaneProperties2KHR();       break;
-               case DISPLAY_TEST_INDEX_GET_DISPLAY_MODE2:                                              return testGetDisplayModeProperties2KHR();                                      break;
-               case DISPLAY_TEST_INDEX_GET_DISPLAY_PLANE_CAPABILITIES2:                return testGetDisplayPlaneCapabilities2KHR();                           break;
+               case DISPLAY_TEST_INDEX_GET_DISPLAY_PROPERTIES:                                 return testGetPhysicalDeviceDisplayPropertiesKHR();
+               case DISPLAY_TEST_INDEX_GET_DISPLAY_PLANES:                                             return testGetPhysicalDeviceDisplayPlanePropertiesKHR();
+               case DISPLAY_TEST_INDEX_GET_DISPLAY_PLANE_SUPPORTED_DISPLAY:    return testGetDisplayPlaneSupportedDisplaysKHR();
+               case DISPLAY_TEST_INDEX_GET_DISPLAY_MODE:                                               return testGetDisplayModePropertiesKHR();
+               case DISPLAY_TEST_INDEX_CREATE_DISPLAY_MODE:                                    return testCreateDisplayModeKHR();
+               case DISPLAY_TEST_INDEX_GET_DISPLAY_PLANE_CAPABILITIES:                 return testGetDisplayPlaneCapabilitiesKHR();
+               case DISPLAY_TEST_INDEX_CREATE_DISPLAY_PLANE_SURFACE:                   return testDisplaySurface(SURFACE_CREATE);
+               case DISPLAY_TEST_INDEX_SURFACE_COUNTERS:                                               return testDisplaySurface(SURFACE_COUNTERS);
+               case DISPLAY_TEST_INDEX_GET_DISPLAY_PROPERTIES2:                                return testGetPhysicalDeviceDisplayProperties2KHR();
+               case DISPLAY_TEST_INDEX_GET_DISPLAY_PLANES2:                                    return testGetPhysicalDeviceDisplayPlaneProperties2KHR();
+               case DISPLAY_TEST_INDEX_GET_DISPLAY_MODE2:                                              return testGetDisplayModeProperties2KHR();
+               case DISPLAY_TEST_INDEX_GET_DISPLAY_PLANE_CAPABILITIES2:                return testGetDisplayPlaneCapabilities2KHR();
                default:
                {
                        DE_FATAL("Impossible");
index 42b3431..9a59e76 100644 (file)
@@ -44,23 +44,19 @@ static deStreamResult fileIOStream_read (deStreamData* stream, void* buf, deInt3
        {
                case  DE_FILERESULT_SUCCESS:
                        return DE_STREAMRESULT_SUCCESS;
-                       break;
 
                case DE_FILERESULT_ERROR:
                        fileStream->error       = "deFile: DE_FILERESULT_ERROR";
                        fileStream->status      = DE_STREAMSTATUS_ERROR;
                        return DE_STREAMRESULT_ERROR;
-                       break;
 
                case DE_FILERESULT_END_OF_FILE:
                        return DE_STREAMRESULT_END_OF_STREAM;
-                       break;
 
                default:
                        fileStream->error       = "Uknown: DE_FILERESULT";
                        fileStream->status      = DE_STREAMSTATUS_ERROR;
                        return DE_STREAMRESULT_ERROR;
-                       break;
        }
 }
 
@@ -76,23 +72,19 @@ static deStreamResult fileIOStream_write (deStreamData* stream, const void* buf,
        {
                case  DE_FILERESULT_SUCCESS:
                        return DE_STREAMRESULT_SUCCESS;
-                       break;
 
                case DE_FILERESULT_ERROR:
                        fileStream->error       = "deFile: DE_FILERESULT_ERROR";
                        fileStream->status      = DE_STREAMSTATUS_ERROR;
                        return DE_STREAMRESULT_ERROR;
-                       break;
 
                case DE_FILERESULT_END_OF_FILE:
                        return DE_STREAMRESULT_END_OF_STREAM;
-                       break;
 
                default:
                        fileStream->error       = "Uknown: DE_FILERESULT";
                        fileStream->status      = DE_STREAMSTATUS_ERROR;
                        return DE_STREAMRESULT_ERROR;
-                       break;
        }
 }
 
index 24bb797..3de6753 100644 (file)
@@ -680,7 +680,6 @@ GlxDrawable* createDrawable (GlxVisual& visual, const RenderConfig& config)
 
                case RenderConfig::SURFACETYPE_WINDOW:
                        return new GlxWindow(visual, config);
-                       break;
 
                case RenderConfig::SURFACETYPE_OFFSCREEN_NATIVE:
                        // \todo [2013-11-28 lauri] Pixmaps
index dcb1579..7f96d59 100644 (file)
@@ -259,22 +259,18 @@ vk::wsi::Display* VulkanPlatform::createWsiDisplay (vk::wsi::Type wsiType) const
 #if defined (DEQP_SUPPORT_X11)
        case vk::wsi::TYPE_XLIB:
                return new VulkanDisplayXlib(MovePtr<x11::DisplayBase>(new x11::XlibDisplay(m_eventState,X11_DISPLAY)));
-               break;
 #endif // DEQP_SUPPORT_X11
 #if defined (DEQP_SUPPORT_XCB)
        case vk::wsi::TYPE_XCB:
                return new VulkanDisplayXcb(MovePtr<x11::DisplayBase>(new x11::XcbDisplay(m_eventState,X11_DISPLAY)));
-               break;
 #endif // DEQP_SUPPORT_XCB
 #if defined (DEQP_SUPPORT_WAYLAND)
        case vk::wsi::TYPE_WAYLAND:
                return new VulkanDisplayWayland(MovePtr<wayland::Display>(new wayland::Display(m_eventState, WAYLAND_DISPLAY)));
-               break;
 #endif // DEQP_SUPPORT_WAYLAND
 #if defined (DEQP_SUPPORT_HEADLESS)
        case vk::wsi::TYPE_HEADLESS:
                return new VulkanDisplayHeadless();
-               break;
 #endif // DEQP_SUPPORT_HEADLESS
 
        default:
index aa74215..e8048d4 100644 (file)
@@ -258,15 +258,11 @@ public:
                EGLint  renderableType = EGL_OPENGL_ES_BIT;
                switch (m_apiType) {
                        case EGL14:
-                               if (m_eglVersion >= EGL_MAKE_VERSION(1, 4)) return true;
-                               return false;
-                               break;
+                               return m_eglVersion >= EGL_MAKE_VERSION(1, 4);
                        case EGL15:
                                // With Android Q, EGL 1.5 entry points must have valid
                                // GetProcAddress.
-                               if (m_eglVersion >= EGL_MAKE_VERSION(1, 5)) return true;
-                               return false;
-                               break;
+                               return m_eglVersion >= EGL_MAKE_VERSION(1, 5);
                        case GLES:
                        case GLES2:
                        case GLES3:
index acaf390..9fdc679 100644 (file)
@@ -1043,7 +1043,6 @@ bool GLESImageApi::RenderReadPixelsRenderbuffer::invokeGLES (GLESImageApi& api,
                default:
                        // Skip, not in the list of allowed render buffer formats for GLES.
                        throw tcu::NotSupportedError("Image format not allowed for glReadPixels.");
-                       break;
        }
 
        const glw::Functions&   gl                              = api.m_gl;
index f114660..9a3aff0 100644 (file)
@@ -947,7 +947,6 @@ FragmentOutputCase::IterateResult FragmentOutputCase::iterate (void)
 
                        default:
                                TCU_FAIL("Unsupported comparison");
-                               break;
                }
 
                if (!isOk)
index d00049c..2e52054 100644 (file)
@@ -1321,11 +1321,11 @@ glw::GLenum TextureSizeCase::getGLTextureTarget() const
 {
        switch (m_textureSpec.type)
        {
-               case TEXTURETYPE_2D:            return GL_TEXTURE_2D;           break;
-               case TEXTURETYPE_CUBE_MAP:      return GL_TEXTURE_CUBE_MAP;     break;
-               case TEXTURETYPE_2D_ARRAY:      return GL_TEXTURE_2D_ARRAY;     break;
-               case TEXTURETYPE_3D:            return GL_TEXTURE_3D;           break;
-               default:                                        DE_ASSERT(DE_FALSE);            break;
+               case TEXTURETYPE_2D:            return GL_TEXTURE_2D;
+               case TEXTURETYPE_CUBE_MAP:      return GL_TEXTURE_CUBE_MAP;
+               case TEXTURETYPE_2D_ARRAY:      return GL_TEXTURE_2D_ARRAY;
+               case TEXTURETYPE_3D:            return GL_TEXTURE_3D;
+               default:                                        DE_ASSERT(DE_FALSE);
        }
        return 0;
 }
index e28c6b7..af51db7 100644 (file)
@@ -1234,12 +1234,10 @@ bool Renderer::isFramebufferAttachmentSRGB (const deUint32 targetType, const deU
                case GL_SRGB:
                {
                        return true;
-                       break;
                }
                case GL_LINEAR:
                {
                        return false;
-                       break;
                }
                default:
                {
index a202ce0..23cd0f4 100644 (file)
@@ -1085,18 +1085,15 @@ IVec2 TextureGatherCase::getOffsetRange (void) const
        {
                case OFFSETSIZE_NONE:
                        return IVec2(0);
-                       break;
 
                case OFFSETSIZE_MINIMUM_REQUIRED:
                        // \note Defined by spec.
                        return IVec2(SPEC_MAX_MIN_OFFSET,
                                                 SPEC_MIN_MAX_OFFSET);
-                       break;
 
                case OFFSETSIZE_IMPLEMENTATION_MAXIMUM:
                        return IVec2(m_context.getContextInfo().getInt(GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET),
                                                 m_context.getContextInfo().getInt(GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET));
-                       break;
 
                default:
                        DE_ASSERT(false);
index f2e3fb0..4b0818e 100644 (file)
@@ -550,52 +550,40 @@ float GLValue::toFloat (void) const
        {
                case DrawTestSpec::INPUTTYPE_FLOAT:
                        return fl.getValue();
-                       break;
 
                case DrawTestSpec::INPUTTYPE_BYTE:
                        return b.getValue();
-                       break;
 
                case DrawTestSpec::INPUTTYPE_UNSIGNED_BYTE:
                        return ub.getValue();
-                       break;
 
                case DrawTestSpec::INPUTTYPE_SHORT:
                        return s.getValue();
-                       break;
 
                case DrawTestSpec::INPUTTYPE_UNSIGNED_SHORT:
                        return us.getValue();
-                       break;
 
                case DrawTestSpec::INPUTTYPE_FIXED:
                {
                        int maxValue = 65536;
                        return (float)(double(2 * fi.getValue() + 1) / (maxValue - 1));
-
-                       break;
                }
 
                case DrawTestSpec::INPUTTYPE_UNSIGNED_INT:
                        return (float)ui.getValue();
-                       break;
 
                case DrawTestSpec::INPUTTYPE_INT:
                        return (float)i.getValue();
-                       break;
 
                case DrawTestSpec::INPUTTYPE_HALF:
                        return h.to<float>();
-                       break;
 
                case DrawTestSpec::INPUTTYPE_DOUBLE:
                        return d.to<float>();
-                       break;
 
                default:
                        DE_ASSERT(false);
                        return 0.0f;
-                       break;
        }
 }
 
index 563e344..557539f 100644 (file)
@@ -339,7 +339,7 @@ void setUniformValue (sglr::Context& ctx, int location, rsg::ConstValueAccess va
                                case 2:         ctx.uniform2fv(location, 1, (float*)value.value().getValuePtr());       break;
                                case 3:         ctx.uniform3fv(location, 1, (float*)value.value().getValuePtr());       break;
                                case 4:         ctx.uniform4fv(location, 1, (float*)value.value().getValuePtr());       break;
-                               default:        TCU_FAIL("Unsupported type");                                                                           break;
+                               default:        TCU_FAIL("Unsupported type");
                        }
                        break;
 
@@ -353,7 +353,7 @@ void setUniformValue (sglr::Context& ctx, int location, rsg::ConstValueAccess va
                                case 2:         ctx.uniform2iv(location, 1, (int*)value.value().getValuePtr());         break;
                                case 3:         ctx.uniform3iv(location, 1, (int*)value.value().getValuePtr());         break;
                                case 4:         ctx.uniform4iv(location, 1, (int*)value.value().getValuePtr());         break;
-                               default:        TCU_FAIL("Unsupported type");                                                                           break;
+                               default:        TCU_FAIL("Unsupported type");
                        }
                        break;
 
index 3195d28..a53bb2c 100644 (file)
@@ -48,33 +48,26 @@ static const char* glErrorToString (deUint32 error)
        {
                case GL_OUT_OF_MEMORY:
                        return "GL_OUT_OF_MEMORY";
-                       break;
 
                case GL_INVALID_ENUM:
                        return "GL_INVALID_ENUM";
-                       break;
 
                case GL_INVALID_FRAMEBUFFER_OPERATION:
                        return "GL_INVALID_FRAMEBUFFER_OPERATION";
-                       break;
 
                case GL_INVALID_OPERATION:
                        return "GL_INVALID_OPERATION";
-                       break;
 
                case GL_INVALID_VALUE:
                        return "GL_INVALID_VALUE";
-                       break;
 
                case 0:
                        return "<none>";
-                       break;
 
                default:
                        // \todo [mika] Handle uknown errors?
                        DE_ASSERT(false);
                        return NULL;
-                       break;
        }
 }
 
@@ -764,51 +757,39 @@ const char* MemObjectAllocator::resultToString (Result result)
        {
                case RESULT_GOT_BAD_ALLOC:
                        return "Caught std::bad_alloc";
-                       break;
 
                case RESULT_GEN_TEXTURES_FAILED:
                        return "glGenTextures failed";
-                       break;
 
                case RESULT_GEN_BUFFERS_FAILED:
                        return "glGenBuffers failed";
-                       break;
 
                case RESULT_BUFFER_DATA_FAILED:
                        return "glBufferData failed";
-                       break;
 
                case RESULT_BUFFER_SUB_DATA_FAILED:
                        return "glBufferSubData failed";
-                       break;
 
                case RESULT_TEXTURE_IMAGE_FAILED:
                        return "glTexImage2D failed";
-                       break;
 
                case RESULT_TEXTURE_SUB_IMAGE_FAILED:
                        return "glTexSubImage2D failed";
-                       break;
 
                case RESULT_BIND_TEXTURE_FAILED:
                        return "glBindTexture failed";
-                       break;
 
                case RESULT_BIND_BUFFER_FAILED:
                        return "glBindBuffer failed";
-                       break;
 
                case RESULT_DELETE_TEXTURES_FAILED:
                        return "glDeleteTextures failed";
-                       break;
 
                case RESULT_DELETE_BUFFERS_FAILED:
                        return "glDeleteBuffers failed";
-                       break;
 
                case RESULT_RENDER_FAILED:
                        return "Rendering result failed";
-                       break;
 
                default:
                        DE_ASSERT(false);
index 9edd854..7c0433d 100644 (file)
@@ -382,7 +382,7 @@ void setUniformValue (int location, rsg::ConstValueAccess value)
                                case 2:         glUniform2fv(location, 1, (float*)value.value().getValuePtr());         break;
                                case 3:         glUniform3fv(location, 1, (float*)value.value().getValuePtr());         break;
                                case 4:         glUniform4fv(location, 1, (float*)value.value().getValuePtr());         break;
-                               default:        TCU_FAIL("Unsupported type");                                                                           break;
+                               default:        TCU_FAIL("Unsupported type");
                        }
                        break;
 
@@ -396,7 +396,7 @@ void setUniformValue (int location, rsg::ConstValueAccess value)
                                case 2:         glUniform2iv(location, 1, (int*)value.value().getValuePtr());           break;
                                case 3:         glUniform3iv(location, 1, (int*)value.value().getValuePtr());           break;
                                case 4:         glUniform4iv(location, 1, (int*)value.value().getValuePtr());           break;
-                               default:        TCU_FAIL("Unsupported type");                                                                           break;
+                               default:        TCU_FAIL("Unsupported type");
                        }
                        break;
 
index 78fa572..d65ec4b 100644 (file)
@@ -690,8 +690,6 @@ const char* MultiTextureSamplerTest::selectFragmentShader (GLenum target)
                        "\t${FRAG_COLOR} = vec4(0.75, 0.75, 0.75, 1.0) * (texture(u_sampler1, v_texCoord) + texture(u_sampler2, v_texCoord));\n"
                        "}";
 
-                       break;
-
                case GL_TEXTURE_3D:
                        return
                        "${FRAG_HDR}"
index 5956d21..0ec471b 100644 (file)
@@ -1255,52 +1255,40 @@ float GLValue::toFloat (void) const
        {
                case Array::INPUTTYPE_FLOAT:
                        return fl.getValue();
-                       break;
 
                case Array::INPUTTYPE_BYTE:
                        return b.getValue();
-                       break;
 
                case Array::INPUTTYPE_UNSIGNED_BYTE:
                        return ub.getValue();
-                       break;
 
                case Array::INPUTTYPE_SHORT:
                        return s.getValue();
-                       break;
 
                case Array::INPUTTYPE_UNSIGNED_SHORT:
                        return us.getValue();
-                       break;
 
                case Array::INPUTTYPE_FIXED:
                {
                        int maxValue = 65536;
                        return (float)(double(2 * fi.getValue() + 1) / (maxValue - 1));
-
-                       break;
                }
 
                case Array::INPUTTYPE_UNSIGNED_INT:
                        return (float)ui.getValue();
-                       break;
 
                case Array::INPUTTYPE_INT:
                        return (float)i.getValue();
-                       break;
 
                case Array::INPUTTYPE_HALF:
                        return h.to<float>();
-                       break;
 
                case Array::INPUTTYPE_DOUBLE:
                        return (float)d.getValue();
-                       break;
 
                default:
                        DE_ASSERT(false);
                        return 0.0f;
-                       break;
        }
 }