Remove extra semicolons
authorMika Väinölä <mika.vainola@siru.fi>
Thu, 26 Aug 2021 14:10:28 +0000 (17:10 +0300)
committerPeter Kohaut <peter.kohaut@arm.com>
Thu, 2 Sep 2021 15:46:33 +0000 (15:46 +0000)
Fix warnings for Clang builds with -Wextra-semi, -Wextra-semi-stmt and
-Wc++98-compat-extra-semi.

Components: Framework, OpenGL, OpenGL ES, Vulkan

VK-GL-CTS issue: 3080

Change-Id: I1caa81b65415a1e94797c6df48fc8a4539e9635a

234 files changed:
execserver/xsProtocol.hpp
external/openglcts/modules/common/glcKHRDebugTests.cpp
external/openglcts/modules/common/glcMultipleContextsTests.cpp
external/openglcts/modules/common/glcPackedPixelsTests.cpp
external/openglcts/modules/common/glcRobustBufferAccessBehaviorTests.cpp
external/openglcts/modules/common/glcTestPackage.hpp
external/openglcts/modules/common/glcUniformBlockCase.hpp
external/openglcts/modules/common/glcViewportArrayTests.hpp
external/openglcts/modules/gl/gl3cCullDistanceTests.hpp
external/openglcts/modules/gl/gl3cTextureSwizzleTests.cpp
external/openglcts/modules/gl/gl3cTransformFeedbackTests.cpp
external/openglcts/modules/gl/gl3cTransformFeedbackTests.hpp
external/openglcts/modules/gl/gl4cDirectStateAccessFramebuffersAndRenderbuffersTests.cpp
external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.hpp
external/openglcts/modules/gl/gl4cGPUShaderFP64Tests.cpp
external/openglcts/modules/gl/gl4cGetTextureSubImageTests.cpp
external/openglcts/modules/gl/gl4cMultiBindTests.cpp
external/openglcts/modules/gl/gl4cProgramInterfaceQueryTests.cpp
external/openglcts/modules/gl/gl4cShaderAtomicCountersTests.cpp
external/openglcts/modules/gl/gl4cShaderSubroutineTests.cpp
external/openglcts/modules/gl/gl4cShadingLanguage420PackTests.cpp
external/openglcts/modules/gl/gl4cTextureFilterMinmaxTests.hpp
external/openglcts/modules/gl/gl4cTextureGatherTests.cpp
external/openglcts/modules/gles2/es2cTestPackage.hpp
external/openglcts/modules/gles2/es2cTexture3DTests.cpp
external/openglcts/modules/gles3/es3cCopyTexImageConversionsTests.cpp
external/openglcts/modules/gles3/es3cTestPackage.hpp
external/openglcts/modules/gles31/es31cArrayOfArraysTests.cpp
external/openglcts/modules/glesext/esextcTestPackage.hpp
external/openglcts/modules/glesext/geometry_shader/esextcGeometryShaderOutput.hpp
external/openglcts/modules/glesext/gpu_shader5/esextcGPUShader5TextureGatherOffset.cpp
external/openglcts/modules/glesext/texture_border_clamp/esextcTextureBorderClampSamplingTexture.cpp
external/openglcts/modules/glesext/texture_buffer/esextcTextureBufferOperations.cpp
external/openglcts/modules/glesext/texture_cube_map_array/esextcTextureCubeMapArrayImageTextureSize.cpp
external/openglcts/modules/glesext/texture_cube_map_array/esextcTextureCubeMapArraySampling.cpp
external/openglcts/modules/glesext/texture_cube_map_array/esextcTextureCubeMapArrayStencilAttachments.cpp
external/vulkancts/framework/vulkan/vkBasicTypes.inl
external/vulkancts/framework/vulkan/vkQueryUtil.hpp
external/vulkancts/framework/vulkan/vkRayTracingUtil.cpp
external/vulkancts/framework/vulkan/vkRayTracingUtil.hpp
external/vulkancts/framework/vulkan/vkSpirVProgram.hpp
external/vulkancts/modules/vulkan/api/vktApiCommandBuffersTests.cpp
external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
external/vulkancts/modules/vulkan/api/vktApiMemoryRequirementInvarianceTests.cpp
external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorUpdateASTests.cpp
external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp
external/vulkancts/modules/vulkan/compute/vktComputeShaderBuiltinVarTests.cpp
external/vulkancts/modules/vulkan/compute/vktComputeWorkgroupMemoryExplicitLayoutTests.cpp
external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalClearAttachmentTests.cpp
external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalDispatchTests.cpp
external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalDrawTests.cpp
external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.cpp
external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTestsUtils.cpp
external/vulkancts/modules/vulkan/draw/vktDrawDiscardRectanglesTests.cpp
external/vulkancts/modules/vulkan/draw/vktDrawExplicitVertexParameterTests.cpp
external/vulkancts/modules/vulkan/draw/vktDrawImageObjectUtil.cpp
external/vulkancts/modules/vulkan/draw/vktDrawIndexedTest.cpp
external/vulkancts/modules/vulkan/draw/vktDrawIndirectTest.cpp
external/vulkancts/modules/vulkan/draw/vktDrawMultipleClearsWithinRenderPass.cpp
external/vulkancts/modules/vulkan/draw/vktDrawScissorTests.cpp
external/vulkancts/modules/vulkan/fragment_shading_rate/vktFragmentShadingRateTests.cpp
external/vulkancts/modules/vulkan/geometry/vktGeometryBasicClass.hpp
external/vulkancts/modules/vulkan/geometry/vktGeometryLayeredRenderingTests.cpp
external/vulkancts/modules/vulkan/geometry/vktGeometryTestsUtil.cpp
external/vulkancts/modules/vulkan/image/vktImageCompressionTranscodingSupport.cpp
external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp
external/vulkancts/modules/vulkan/image/vktImageMisalignedCubeTests.cpp
external/vulkancts/modules/vulkan/image/vktImageQualifiersTests.cpp
external/vulkancts/modules/vulkan/image/vktImageSubresourceLayoutTests.cpp
external/vulkancts/modules/vulkan/image/vktImageTexture.hpp
external/vulkancts/modules/vulkan/memory/vktMemoryBindingTests.cpp
external/vulkancts/modules/vulkan/memory_model/vktMemoryModelSharedLayoutCase.hpp
external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderTests.cpp
external/vulkancts/modules/vulkan/pipeline/vktPipelineBlendOperationAdvancedTests.cpp
external/vulkancts/modules/vulkan/pipeline/vktPipelineCacheTests.cpp
external/vulkancts/modules/vulkan/pipeline/vktPipelineCreationCacheControlTests.cpp
external/vulkancts/modules/vulkan/pipeline/vktPipelineCreationFeedbackTests.cpp
external/vulkancts/modules/vulkan/pipeline/vktPipelineDepthRangeUnrestrictedTests.cpp
external/vulkancts/modules/vulkan/pipeline/vktPipelineDepthTests.cpp
external/vulkancts/modules/vulkan/pipeline/vktPipelineExecutablePropertiesTests.cpp
external/vulkancts/modules/vulkan/pipeline/vktPipelineExtendedDynamicStateTests.cpp
external/vulkancts/modules/vulkan/pipeline/vktPipelineMaxVaryingsTests.cpp
external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleSampleLocationsExtTests.cpp
external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleTests.cpp
external/vulkancts/modules/vulkan/pipeline/vktPipelinePushConstantTests.cpp
external/vulkancts/modules/vulkan/pipeline/vktPipelinePushDescriptorTests.cpp
external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp
external/vulkancts/modules/vulkan/rasterization/vktRasterizationProvokingVertexTests.cpp
external/vulkancts/modules/vulkan/rasterization/vktRasterizationTests.cpp
external/vulkancts/modules/vulkan/ray_query/vktRayQueryAccelerationStructuresTests.cpp
external/vulkancts/modules/vulkan/ray_query/vktRayQueryBuiltinTests.cpp
external/vulkancts/modules/vulkan/ray_query/vktRayQueryCullRayFlagsTests.cpp
external/vulkancts/modules/vulkan/ray_query/vktRayQueryNonUniformArgsTests.cpp
external/vulkancts/modules/vulkan/ray_query/vktRayQueryTraversalControlTests.cpp
external/vulkancts/modules/vulkan/ray_query/vktRayQueryWatertightnessTests.cpp
external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBarrierTests.cpp
external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBarycentricCoordinatesTests.cpp
external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingComplexControlFlowTests.cpp
external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingDataSpillTests.cpp
external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingDirectionTests.cpp
external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingMiscTests.cpp
external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingNonUniformArgsTests.cpp
external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleTests.cpp
external/vulkancts/modules/vulkan/renderpass/vktRenderPassSparseRenderTargetTests.cpp
external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp
external/vulkancts/modules/vulkan/renderpass/vktRenderPassUnusedAttachmentTests.cpp
external/vulkancts/modules/vulkan/shaderexecutor/vktAtomicOperationTests.cpp
external/vulkancts/modules/vulkan/shaderexecutor/vktShaderBuiltinPrecisionTests.cpp
external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp
external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderOperatorTests.cpp
external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBase.cpp
external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageAlignedMipSize.cpp
external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageBlockShapes.cpp
external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageSparseResidency.cpp
external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsBase.cpp
external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm16bitStorageTests.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm8bitStorageTests.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderCase.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmCrossStageInterfaceTests.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmIndexingTests.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmTypeTests.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmUtils.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmVariableInitTests.cpp
external/vulkancts/modules/vulkan/synchronization/vktSynchronizationNoneStageTests.cpp
external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSmokeTests.cpp
external/vulkancts/modules/vulkan/synchronization/vktSynchronizationUtil.cpp
external/vulkancts/modules/vulkan/tessellation/vktTessellationGeometryPassthroughTests.cpp
external/vulkancts/modules/vulkan/tessellation/vktTessellationInvarianceTests.cpp
external/vulkancts/modules/vulkan/texture/vktTextureFilteringExplicitLodTests.cpp
external/vulkancts/modules/vulkan/transform_feedback/vktTransformFeedbackFuzzLayoutCase.hpp
external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.hpp
external/vulkancts/modules/vulkan/util/vktConstexprVectorUtil.hpp
external/vulkancts/modules/vulkan/vktTestCase.cpp
external/vulkancts/modules/vulkan/vktTestCaseUtil.hpp
external/vulkancts/modules/vulkan/ycbcr/vktYCbCrStorageImageWriteTests.cpp
external/vulkancts/scripts/gen_framework.py
framework/common/tcuCPUWarmup.cpp
framework/common/tcuCPUWarmup.hpp
framework/common/tcuCompressedTexture.cpp
framework/common/tcuRasterizationVerifier.cpp
framework/delibs/decpp/deMath.hpp
framework/delibs/destream/deFileStream.c
framework/opengl/gluVarType.hpp
framework/platform/lnx/tcuLnxVulkanPlatform.cpp
framework/randomshaders/rsgBinaryOps.hpp
framework/referencerenderer/rrFragmentOperations.cpp
framework/referencerenderer/rrShaders.hpp
modules/egl/teglCreateSurfaceTests.cpp
modules/egl/teglGLES2SharingThreadedTests.cpp
modules/egl/teglImageFormatTests.cpp
modules/egl/teglMakeCurrentPerfTests.cpp
modules/egl/teglMultiThreadTests.cpp
modules/egl/teglRobustnessTests.cpp
modules/egl/teglSyncTests.cpp
modules/gles2/accuracy/es2aTextureFilteringTests.cpp
modules/gles2/functional/es2fBooleanStateQueryTests.cpp
modules/gles2/functional/es2fBufferObjectQueryTests.cpp
modules/gles2/functional/es2fDefaultVertexAttributeTests.cpp
modules/gles2/functional/es2fDepthStencilTests.cpp
modules/gles2/functional/es2fFboRenderTest.cpp
modules/gles2/functional/es2fFloatStateQueryTests.cpp
modules/gles2/functional/es2fIntegerStateQueryTests.cpp
modules/gles2/functional/es2fPrerequisiteTests.cpp
modules/gles2/functional/es2fShaderLoopTests.cpp
modules/gles2/functional/es2fShaderMatrixTests.cpp
modules/gles2/functional/es2fShaderOperatorTests.cpp
modules/gles2/functional/es2fStencilTests.cpp
modules/gles2/functional/es2fTextureCompletenessTests.cpp
modules/gles2/functional/es2fTextureFilteringTests.cpp
modules/gles2/functional/es2fTextureStateQueryTests.cpp
modules/gles2/functional/es2fTextureWrapTests.cpp
modules/gles2/functional/es2fUniformApiTests.cpp
modules/gles2/functional/es2fVertexTextureTests.cpp
modules/gles2/performance/es2pShaderCompilationCases.cpp
modules/gles2/performance/es2pStateChangeCallTests.cpp
modules/gles2/performance/es2pTextureUploadTests.cpp
modules/gles2/tes2TestPackage.hpp
modules/gles3/accuracy/es3aTextureFilteringTests.cpp
modules/gles3/functional/es3fBooleanStateQueryTests.cpp
modules/gles3/functional/es3fBufferObjectQueryTests.cpp
modules/gles3/functional/es3fDefaultVertexAttributeTests.cpp
modules/gles3/functional/es3fDepthStencilTests.cpp
modules/gles3/functional/es3fFboRenderTest.cpp
modules/gles3/functional/es3fFboTestCase.cpp
modules/gles3/functional/es3fFloatStateQueryTests.cpp
modules/gles3/functional/es3fInteger64StateQueryTests.cpp
modules/gles3/functional/es3fIntegerStateQueryTests.cpp
modules/gles3/functional/es3fLifetimeTests.cpp
modules/gles3/functional/es3fPrerequisiteTests.cpp
modules/gles3/functional/es3fSamplerStateQueryTests.cpp
modules/gles3/functional/es3fShaderLoopTests.cpp
modules/gles3/functional/es3fShaderOperatorTests.cpp
modules/gles3/functional/es3fStencilTests.cpp
modules/gles3/functional/es3fTextureStateQueryTests.cpp
modules/gles3/functional/es3fTextureWrapTests.cpp
modules/gles3/functional/es3fUniformApiTests.cpp
modules/gles3/functional/es3fVertexArrayObjectTests.cpp
modules/gles3/functional/es3fVertexTextureTests.cpp
modules/gles3/performance/es3pBufferDataUploadTests.cpp
modules/gles3/performance/es3pDepthTests.cpp
modules/gles3/performance/es3pShaderCompilationCases.cpp
modules/gles3/performance/es3pStateChangeCallTests.cpp
modules/gles3/tes3TestPackage.hpp
modules/gles31/functional/es31fBooleanStateQueryTests.cpp
modules/gles31/functional/es31fCopyImageTests.cpp
modules/gles31/functional/es31fDrawBuffersIndexedTests.cpp
modules/gles31/functional/es31fFramebufferDefaultStateQueryTests.cpp
modules/gles31/functional/es31fGeometryShaderTests.cpp
modules/gles31/functional/es31fNegativeBufferApiTests.cpp
modules/gles31/functional/es31fProgramInterfaceDefinitionUtil.hpp
modules/gles31/functional/es31fProgramInterfaceQueryTestCase.cpp
modules/gles31/functional/es31fProgramPipelineStateQueryTests.cpp
modules/gles31/functional/es31fProgramStateQueryTests.cpp
modules/gles31/functional/es31fProgramUniformTests.cpp
modules/gles31/functional/es31fSRGBDecodeTests.cpp
modules/gles31/functional/es31fSamplerStateQueryTests.cpp
modules/gles31/functional/es31fShaderFramebufferFetchTests.cpp
modules/gles31/functional/es31fTessellationTests.cpp
modules/gles31/functional/es31fTextureBorderClampTests.cpp
modules/gles31/functional/es31fTextureLevelStateQueryTests.cpp
modules/gles31/functional/es31fTextureStateQueryTests.cpp
modules/gles31/tes31TestPackage.hpp
modules/gles31/tgl45TestPackage.hpp
modules/glshared/glsBuiltinPrecisionTests.cpp
modules/glshared/glsDrawTest.cpp
modules/glshared/glsFboCompletenessTests.cpp
modules/glshared/glsFboUtil.hpp
modules/glshared/glsLifetimeTests.cpp
modules/glshared/glsUniformBlockCase.hpp
modules/glshared/glsVertexArrayTests.cpp

index e8ce3d2..72e2d5e 100644 (file)
@@ -122,7 +122,7 @@ public:
 
                                        ExecuteBinaryMessage    (const deUint8* data, size_t dataSize);
                                        ExecuteBinaryMessage    (void) : Message(MESSAGETYPE_EXECUTE_BINARY) {}
-                                       ~ExecuteBinaryMessage   (void) {};
+                                       ~ExecuteBinaryMessage   (void) {}
 
        void                    write                   (std::vector<deUint8>& buf) const;
 };
index 8d0a0c8..efad8c4 100644 (file)
@@ -57,7 +57,7 @@ namespace KHRDebug
  * @param error_message  Message logged if generated error is not the expected one
  **/
 #define CHECK_ERROR(expected_error, error_message)                                                      \
-       {                                                                                                   \
+       do {                                                                                                \
                GLenum generated_error = m_gl->getError();                                                      \
                                                                                                         \
                if (expected_error != generated_error)                                                          \
@@ -70,7 +70,7 @@ namespace KHRDebug
                        TestBase::done();                                                                           \
                        TCU_FAIL("Invalid error generated");                                                        \
                }                                                                                               \
-       }
+       } while (0)
 
 /** Pop all groups from stack
  *
index df78d0d..7c0293e 100644 (file)
@@ -716,7 +716,7 @@ bool UniformPreservationTest::testCase(const glw::GLuint bit_field[5])
        for (GLuint i = 0; i < m_n_shared_contexts + 1; ++i)
        {
                subroutine_indices[i].set(bit_field[i], m_subroutine_indices);
-       };
+       }
 
        /* Update subroutine uniforms, each context gets different set */
        for (GLuint i = 0; i < m_n_shared_contexts; ++i)
index 596c798..c778d4c 100644 (file)
@@ -1189,7 +1189,7 @@ void RectangleTest::createGradient()
                break;
        default:
                TCU_FAIL("Unsupported type");
-       };
+       }
 }
 
 template <typename Type>
@@ -2511,7 +2511,6 @@ bool RectangleTest::compare(GLvoid* gradient, GLvoid* data, const PixelFormat& o
                                                // internal format positive range (otherwise it may wrap and
                                                // yield negative internalformat values)
                                                inputValue = clampUnsignedValue(bit3 - 1, inputValue);
-                                       ;
 
                                        inputValue = clampSignedValue(bit3, inputValue);
                                        if (isCopy)
index 520540d..7890ea8 100644 (file)
@@ -2614,7 +2614,7 @@ std::string ImageLoadStoreTest::getComputeShader(VERSION version, GLuint coord_o
                break;
        default:
                TCU_FAIL("Invalid enum");
-       };
+       }
 
        m_specializationMap["SRC_COORD_OFFSET"]  = "0";
        m_specializationMap["SRC_SAMPLE_OFFSET"] = "0";
index e74e3fc..cd088e4 100644 (file)
@@ -136,7 +136,7 @@ private:
                {
                        array.elementType = DE_NULL;
                        array.size                = 0;
-               };
+               }
        } m_data;
 };
 
index b50babb..7220953 100644 (file)
@@ -220,8 +220,8 @@ public:
        class DepthFuncWrapper
        {
        public:
-               DepthFuncWrapper(deqp::Context& context) : m_gl(context.getRenderContext().getFunctions()){};
-               ~DepthFuncWrapper(){};
+               DepthFuncWrapper(deqp::Context& context) : m_gl(context.getRenderContext().getFunctions()){}
+               ~DepthFuncWrapper(){}
 
                void depthRangeArray(glw::GLuint first, glw::GLsizei count, const glw::GLfloat* v)
                {
index 1280d05..850fcd9 100644 (file)
@@ -258,7 +258,7 @@ private:
        Tests(const CullDistance::Tests& other);
        Tests& operator=(const CullDistance::Tests& other);
 };
-};
+}
 /* CullDistance namespace */
 } /* glcts namespace */
 
index af2021e..a7f842c 100644 (file)
@@ -1930,7 +1930,7 @@ const _out_ch_desc& get_descriptor_for_channel(const _texture_format& format, co
        default:
                TCU_FAIL("Invalid value");
                break;
-       };
+       }
 
        switch (desc->m_internal_format)
        {
index 3197a7c..ab1c3ae 100644 (file)
@@ -4393,7 +4393,7 @@ void gl3cts::TransformFeedback::DrawXFB::bindBOForXFB(glw::GLenum capture_mode,
                break;
        default:
                throw 0;
-       };
+       }
 }
 
 void gl3cts::TransformFeedback::DrawXFB::bindBOForDraw(glw::GLuint program_id, glw::GLenum capture_mode,
index 31ba85c..27fcf4a 100644 (file)
@@ -529,7 +529,7 @@ public:
        virtual IterateResult iterate(void)
        {
                return CaptureGeometryInterleaved::iterate();
-       };
+       }
 
 protected:
        glw::GLuint* m_buffers;
@@ -538,27 +538,27 @@ protected:
        virtual void draw(glw::GLenum primitive_type)
        {
                CaptureGeometryInterleaved::draw(primitive_type);
-       };
+       }
        virtual void fetchLimits(void)
        {
                CaptureVertexSeparate::fetchLimits();
-       };
+       }
        virtual void createTransformFeedbackBuffer(void)
        {
                CaptureVertexSeparate::createTransformFeedbackBuffer();
-       };
+       }
        virtual void bindBuffer(BindBufferCase bind_case)
        {
                CaptureVertexSeparate::bindBuffer(bind_case);
-       };
+       }
        virtual void cleanBuffer(void)
        {
                CaptureVertexSeparate::cleanBuffer();
-       };
+       }
        virtual bool checkTransformFeedbackBuffer(BindBufferCase bind_case, glw::GLenum primitive_type)
        {
                return CaptureVertexSeparate::checkTransformFeedbackBuffer(bind_case, primitive_type);
-       };
+       }
 };
 
 /** GetXFBVaryingVertexInterleaved
index 838cc06..dc4b788 100644 (file)
@@ -5708,7 +5708,7 @@ void DrawReadBuffersErrorsTest::PrepareObjects()
                case GL_RIGHT:
                case GL_FRONT_AND_BACK:
                        is_attachment = true;
-               };
+               }
 
                for (glw::GLint i = 0; i < m_max_color_attachments; ++i)
                {
@@ -6027,10 +6027,10 @@ void InvalidateDataAndSubDataErrorsTest::PrepareObjects()
                case GL_STENCIL_ATTACHMENT:
                case GL_DEPTH_STENCIL_ATTACHMENT:
                        continue;
-               };
+               }
 
                break;
-       };
+       }
 
        /* Invalid color attachment. */
        glw::GLint max_color_attachments = 8; /* Spec default. */
@@ -6053,7 +6053,7 @@ void InvalidateDataAndSubDataErrorsTest::PrepareObjects()
                case GL_DEPTH:
                case GL_STENCIL:
                        continue;
-               };
+               }
 
                break;
        }
index 2d866f1..ede6977 100644 (file)
@@ -580,10 +580,10 @@ struct ShaderInterface
 {
        ShaderInterface(Shader::STAGES stage);
 
-       DEFINE_VARIABLE_CLASS(Input, Variable::VARYING_INPUT, m_inputs);
-       DEFINE_VARIABLE_CLASS(Output, Variable::VARYING_OUTPUT, m_outputs);
-       DEFINE_VARIABLE_CLASS(Uniform, Variable::UNIFORM, m_uniforms);
-       DEFINE_VARIABLE_CLASS(SSB, Variable::SSB, m_ssb_blocks);
+       DEFINE_VARIABLE_CLASS(Input, Variable::VARYING_INPUT, m_inputs)
+       DEFINE_VARIABLE_CLASS(Output, Variable::VARYING_OUTPUT, m_outputs)
+       DEFINE_VARIABLE_CLASS(Uniform, Variable::UNIFORM, m_uniforms)
+       DEFINE_VARIABLE_CLASS(SSB, Variable::SSB, m_ssb_blocks)
 
        /**/
        std::string GetDefinitionsGlobals() const;
index 667c5f6..8ce76ce 100644 (file)
@@ -579,7 +579,7 @@ std::string Utils::getFPVariableTypeStringForVariableType(_variable_type type)
        {
                TCU_FAIL("Unrecognized variable type");
        }
-       }; /* switch (type) */
+       } /* switch (type) */
 
        return result;
 }
@@ -1458,7 +1458,7 @@ std::string Utils::getVariableTypeString(_variable_type type)
        {
                TCU_FAIL("Unrecognized variable type");
        }
-       }; /* switch (type) */
+       } /* switch (type) */
 
        return result;
 }
@@ -1551,7 +1551,7 @@ bool Utils::isScalarVariableType(_variable_type type)
                break;
        default:
                break;
-       }; /* switch (type) */
+       } /* switch (type) */
 
        return result;
 }
@@ -3923,7 +3923,7 @@ void GPUShaderFP64Test2::prepareProgram(shaderStage shader_stage, const uniformT
 
        default:
                break;
-       };
+       }
 
        /* Select shaders that will be used by program */
        const glw::GLchar* cs_c_str  = 0;
@@ -15006,7 +15006,7 @@ void BuiltinFunctionTest::prepareComponents(const functionObject& function_objec
                TCU_FAIL("Not implemented");
                return;
                break;
-       };
+       }
 
        switch (function_object.getFunctionEnum())
        {
index 9b2ef0c..ae624b6 100644 (file)
@@ -906,7 +906,7 @@ void gl4cts::GetTextureSubImage::Functional::prepare(glw::GLenum target, bool is
                        break;
                default:
                        throw 0;
-               };
+               }
        }
        else
        {
@@ -958,7 +958,7 @@ void gl4cts::GetTextureSubImage::Functional::prepare(glw::GLenum target, bool is
                        break;
                default:
                        throw 0;
-               };
+               }
        }
 }
 
index 24f38ed..68edc96 100644 (file)
@@ -1374,7 +1374,7 @@ static const size_t s_n_texture_tragets = sizeof(s_texture_infos) / sizeof(s_tex
  * @param error_message  Message logged if generated error is not the expected one
  **/
 #define CHECK_ERROR(expected_error, error_message)                                                      \
-       {                                                                                                   \
+       do {                                                                                                   \
                GLenum generated_error = gl.getError();                                                         \
                                                                                                         \
                if (expected_error != generated_error)                                                          \
@@ -1386,7 +1386,7 @@ static const size_t s_n_texture_tragets = sizeof(s_texture_infos) / sizeof(s_tex
                                << tcu::TestLog::EndMessage;                                                            \
                        TCU_FAIL("Invalid error generated");                                                        \
                }                                                                                               \
-       }
+       } while (0)
 
 /* Prototypes */
 void replaceToken(const GLchar* token, size_t& search_position, const GLchar* text, std::string& string);
index f47a156..60014dd 100644 (file)
@@ -2089,7 +2089,7 @@ protected:
                           "   gl_TessLevelOuter[1] = 1.0;                                                  \n"
                           "   gl_TessLevelOuter[2] = 1.0;                                                  \n"
                           "}";
-       };
+       }
 
        virtual std::string TessEvalShader()
        {
index 2cb6b42..6bc07f2 100644 (file)
@@ -2547,7 +2547,7 @@ class AdvancedUsageManyCounters : public SACSubcaseBase
                {
                        glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + i, rt_[i], 0);
                        draw_buffers[i] = GL_COLOR_ATTACHMENT0 + i;
-               };
+               }
                glDrawBuffers(8, draw_buffers);
                glBindFramebuffer(GL_FRAMEBUFFER, 0);
 
index 0d3d37a..605f5cb 100644 (file)
@@ -1320,7 +1320,7 @@ const GLchar* Utils::programInterfaceToStr(glw::GLenum program_interface)
        default:
                TCU_FAIL("Not implemented");
                break;
-       };
+       }
 
        return string;
 }
@@ -1385,7 +1385,7 @@ const GLchar* Utils::pnameToStr(glw::GLenum pname)
        default:
                TCU_FAIL("Not implemented");
                break;
-       };
+       }
 
        return string;
 }
@@ -2418,7 +2418,7 @@ std::string FunctionalTest1_2::getVertexShaderBody(const Utils::_variable_type&
        if (array_size > 1)
        {
                result_sstream << "[" << array_size << "]";
-       };
+       }
 
        result_sstream << ";\n";
 
@@ -11417,7 +11417,7 @@ std::string NegativeTest5::getFragmentShaderBody(bool include_invalid_subroutine
                result_sstream << "subroutine void subroutineTestTypeFS(out vec4 test);\n"
                                                  "\n"
                                                  "subroutine uniform subroutineTestTypeFS test_subroutineFS;\n";
-       };
+       }
 
        result_sstream << "\n"
                                          "out vec4 result;\n"
@@ -11464,7 +11464,7 @@ std::string NegativeTest5::getGeometryShaderBody(bool include_invalid_subroutine
                result_sstream << "subroutine void subroutineTestTypeGS(out vec4 test);\n"
                                                  "\n"
                                                  "subroutine uniform subroutineTestTypeGS test_subroutineGS;\n";
-       };
+       }
 
        result_sstream << "\n"
                                          "void main()\n"
@@ -11509,7 +11509,7 @@ std::string NegativeTest5::getTessellationControlShaderBody(bool include_invalid
                result_sstream << "subroutine void subroutineTestTypeTC(out vec4 test);\n"
                                                  "\n"
                                                  "subroutine uniform subroutineTestTypeTC test_subroutineTC;\n";
-       };
+       }
 
        result_sstream << "\n"
                                          "void main()\n"
@@ -11554,7 +11554,7 @@ std::string NegativeTest5::getTessellationEvaluationShaderBody(
                result_sstream << "subroutine void subroutineTestTypeTE(out vec4 test);\n"
                                                  "\n"
                                                  "subroutine uniform subroutineTestTypeTE test_subroutineTE;\n";
-       };
+       }
 
        result_sstream << "\n"
                                          "void main()\n"
@@ -11596,7 +11596,7 @@ std::string NegativeTest5::getVertexShaderBody(bool include_invalid_subroutine_u
                result_sstream << "subroutine void subroutineTestTypeVS(out vec4 test);\n"
                                                  "\n"
                                                  "subroutine uniform subroutineTestTypeVS test_subroutineVS;\n";
-       };
+       }
 
        result_sstream << "\n"
                                          "void main()\n"
@@ -11809,7 +11809,7 @@ std::string NegativeTest6::getFragmentShaderBody(bool include_invalid_declaratio
                                                  "}\n"
                                                  "\n"
                                                  "subroutine uniform subroutineTestTypeFS test_subroutineFS;\n";
-       };
+       }
 
        result_sstream << "\n"
                                          "out vec4 result;\n"
@@ -11865,7 +11865,7 @@ std::string NegativeTest6::getGeometryShaderBody(bool include_invalid_declaratio
                                                  "}\n"
                                                  "\n"
                                                  "subroutine uniform subroutineTestTypeGS test_subroutineGS;\n";
-       };
+       }
 
        result_sstream << "\n"
                                          "void main()\n"
@@ -11919,7 +11919,7 @@ std::string NegativeTest6::getTessellationControlShaderBody(bool include_invalid
                                                  "}\n"
                                                  "\n"
                                                  "subroutine uniform subroutineTestTypeTC test_subroutineTC;\n";
-       };
+       }
 
        result_sstream << "\n"
                                          "void main()\n"
@@ -11972,7 +11972,7 @@ std::string NegativeTest6::getTessellationEvaluationShaderBody(bool include_inva
                                                  "}\n"
                                                  "\n"
                                                  "subroutine uniform subroutineTestTypeTE test_subroutineTE;\n";
-       };
+       }
 
        result_sstream << "\n"
                                          "void main()\n"
@@ -12023,7 +12023,7 @@ std::string NegativeTest6::getVertexShaderBody(bool include_invalid_declaration)
                                                  "}\n"
                                                  "\n"
                                                  "subroutine uniform subroutineTestTypeVS test_subroutineVS;\n";
-       };
+       }
 
        result_sstream << "\n"
                                          "void main()\n"
@@ -12474,7 +12474,7 @@ std::string NegativeTest8::getFragmentShaderBody(bool include_invalid_declaratio
                                                  "subroutine(subroutineTestTypeFS) void test_impl1(out vec4 test);\n"
                                                  "\n"
                                                  "subroutine uniform subroutineTestTypeFS test_subroutineFS;\n";
-       };
+       }
 
        result_sstream << "\n"
                                          "out vec4 result;\n"
@@ -12522,7 +12522,7 @@ std::string NegativeTest8::getGeometryShaderBody(bool include_invalid_declaratio
                                                  "subroutine(subroutineTestTypeGS) void test_impl1(out vec4 test);\n"
                                                  "\n"
                                                  "subroutine uniform subroutineTestTypeGS test_subroutineGS;\n";
-       };
+       }
 
        result_sstream << "\n"
                                          "void main()\n"
@@ -12568,7 +12568,7 @@ std::string NegativeTest8::getTessellationControlShaderBody(bool include_invalid
                                                  "subroutine(subroutineTestTypeTC) void test_impl1(out vec4 test);\n"
                                                  "\n"
                                                  "subroutine uniform subroutineTestTypeTC test_subroutineTC;\n";
-       };
+       }
 
        result_sstream << "\n"
                                          "void main()\n"
@@ -12613,7 +12613,7 @@ std::string NegativeTest8::getTessellationEvaluationShaderBody(bool include_inva
                                                  "subroutine(subroutineTestTypeTE) void test_impl1(out vec4 test);\n"
                                                  "\n"
                                                  "subroutine uniform subroutineTestTypeTE test_subroutineTE;\n";
-       };
+       }
 
        result_sstream << "\n"
                                          "void main()\n"
@@ -12656,7 +12656,7 @@ std::string NegativeTest8::getVertexShaderBody(bool include_invalid_declaration)
                                                  "subroutine(subroutineTestTypeVS) void test_impl1(out vec4 test);\n"
                                                  "\n"
                                                  "subroutine uniform subroutineTestTypeVS test_subroutineVS;\n";
-       };
+       }
 
        result_sstream << "\n"
                                          "void main()\n"
index 283ab52..3a57190 100644 (file)
@@ -262,7 +262,7 @@ const GLchar* Utils::getQualifierString(Utils::QUALIFIERS qualifier)
                break;
        default:
                TCU_FAIL("Invalid enum");
-       };
+       }
 
        return result;
 }
@@ -323,7 +323,7 @@ Utils::qualifierSet Utils::prepareQualifiersSet(const qualifierSet& in_qualifier
                if (false == doesStageSupportQualifier(stage, storage, qualifier))
                {
                        continue;
-               };
+               }
 
                /* Replace wrong storage qualifiers */
                if ((Utils::INPUT == storage) && ((Utils::QUAL_UNIFORM == qualifier) || (Utils::QUAL_OUT == qualifier)))
@@ -2838,7 +2838,7 @@ void LineContinuationTest::prepareShaderSourceForDraw(Utils::SHADER_STAGES stage
                break;
        default:
                break;
-       };
+       }
        const GLuint store_results_length  = static_cast<GLuint>(strlen(store_results));
        const GLuint pass_condition_length = static_cast<GLuint>(strlen(pass_condition));
 
@@ -3147,7 +3147,7 @@ bool LineContinuationTest::isShaderMultipart() const
        case PART_NEXT_TO_TERMINATION_NON_NULL:
                result = true;
                break;
-       };
+       }
 
        return result;
 }
@@ -3280,7 +3280,7 @@ void LineContinuationTest::replaceAllCaseTokens(std::string& source) const
        case DEBUG_CASE: /* intended fall through */
        default:
                break; /* no line continuations */
-       };
+       }
 
        Utils::replaceAllTokens(token_assignment_after_operator_case, assignment_after_operator_case, source);
        Utils::replaceAllTokens(token_assignment_before_operator_case, assignment_before_operator_case, source);
@@ -3326,7 +3326,7 @@ bool LineContinuationTest::useSourceLengths() const
        case PART_NEXT_TO_TERMINATION_NON_NULL:
                result = true;
                break;
-       };
+       }
 
        return result;
 }
@@ -5761,7 +5761,7 @@ bool QualifierOrderTest::prepareNextTestCase(glw::GLuint test_case_index)
 
        if ((glw::GLuint)-1 == test_case_index)
        {
-               /* Nothing to be done here */;
+               /* Nothing to be done here */
        }
        else if (m_test_cases.size() <= test_case_index)
        {
@@ -6130,7 +6130,7 @@ bool QualifierOrderBlockTest::prepareNextTestCase(glw::GLuint test_case_index)
 
        if ((glw::GLuint)-1 == test_case_index)
        {
-               /* Nothing to be done here */;
+               /* Nothing to be done here */
        }
        else if (m_test_cases.size() <= test_case_index)
        {
@@ -6517,7 +6517,7 @@ bool QualifierOrderUniformTest::prepareNextTestCase(glw::GLuint test_case_index)
 
        if ((glw::GLuint)-1 == test_case_index)
        {
-               /* Nothing to be done here */;
+               /* Nothing to be done here */
        }
        else if (m_test_cases.size() <= test_case_index)
        {
@@ -6832,7 +6832,7 @@ bool QualifierOrderFunctionInoutTest::prepareNextTestCase(glw::GLuint test_case_
 
        if ((glw::GLuint)-1 == test_case_index)
        {
-               /* Nothing to be done here */;
+               /* Nothing to be done here */
        }
        else if (m_test_cases.size() <= test_case_index)
        {
@@ -7151,7 +7151,7 @@ bool QualifierOrderFunctionInputTest::prepareNextTestCase(glw::GLuint test_case_
 
        if ((glw::GLuint)-1 == test_case_index)
        {
-               /* Nothing to be done here */;
+               /* Nothing to be done here */
        }
        else if (m_test_cases.size() <= test_case_index)
        {
@@ -7475,7 +7475,7 @@ bool QualifierOrderFunctionOutputTest::prepareNextTestCase(glw::GLuint test_case
 
        if ((glw::GLuint)-1 == test_case_index)
        {
-               /* Nothing to be done here */;
+               /* Nothing to be done here */
        }
        else if (m_test_cases.size() <= test_case_index)
        {
@@ -17198,7 +17198,7 @@ void ScalarSwizzlersInvalidTest::prepareShaderSource(Utils::SHADER_STAGES in_sta
        default:
                TCU_FAIL("Invalid enum");
                break;
-       };
+       }
 
        out_source.m_parts[0].m_code = shader_template;
 
index dbb1c3e..9cc2263 100644 (file)
@@ -99,7 +99,7 @@ public:
        public:
                SupportedTextureType(glw::GLenum type, const std::string& shaderTexcoordType,
                                                         const std::string& shaderSamplerType);
-               virtual ~SupportedTextureType(){};
+               virtual ~SupportedTextureType(){}
 
                inline glw::GLenum getType() const
                {
index 4fe0ef4..a8569f3 100644 (file)
@@ -3206,7 +3206,7 @@ class GatherGeometryShader : public GatherBase
                           "   gl_Position = vec4(0, 0, 0, 1); \n"
                           "   d = v_in_0;                     \n"
                           "}";
-       };
+       }
 
        virtual std::string GeometryShader()
        {
index 4220464..cca0c63 100644 (file)
@@ -1106,7 +1106,6 @@ CompressedTexture3DCase::IterateResult CompressedTexture3DCase::iterate(void)
                deInt32 partWidth  = de::max(width >> levelIndex, 1);
                deInt32 partHeight = de::max(height >> levelIndex, 1);
                deInt32 partDepth  = de::max(depth >> levelIndex, 1);
-               ;
 
                tcu::CompressedTexture dataPart(format, partWidth, partHeight, partDepth);
                const int                          dataSize = dataPart.getDataSize();
index 0814658..e2611b2 100644 (file)
@@ -4778,7 +4778,7 @@ TestBase::TestBase(deqp::Context& context, GLenum source_attachment_type, GLenum
                attachment_name_map[GL_TEXTURE_2D_ARRAY]                        = "texture_array";
                attachment_name_map[GL_TEXTURE_3D]                                      = "texture3d";
                attachment_name_map[GL_RENDERBUFFER]                            = "renderbuffer";
-       };
+       }
 
        m_name = attachment_name_map[m_source_attachment_type] + "_" + attachment_name_map[m_destination_attachment_type];
 }
@@ -8697,7 +8697,6 @@ bool RequiredCase::getRawDataFromPixelData(std::vector<char>& result, PixelData
                                unsigned int* result_traveller32 = (unsigned int*)result_traveller;
 
                                *result_traveller32 = channels[0]->unsigned_integer_data;
-                               ;
                                result_traveller += 4;
                        }
                        else
index b79991d..2cbb3fd 100644 (file)
@@ -392,7 +392,7 @@ void initializeMap()
  * @param SOURCE Tested shader source
  **/
 #define DEFAULT_MAIN_ENDING(TYPE, SOURCE)                           \
-       {                                                               \
+       do {                                                            \
                /* Apply stage specific stuff */                            \
                switch (TYPE)                                               \
                {                                                           \
@@ -418,7 +418,7 @@ void initializeMap()
                                                                     \
                /* End main function */                                     \
                SOURCE += shader_end;                                       \
-       }
+       } while (0)
 
 /** Macro executes positive test selected on USE_ALL_SHADER_STAGES
  *
@@ -427,7 +427,7 @@ void initializeMap()
  * @param DELETE Selects if program should be deleted afterwards
  **/
 #define EXECUTE_POSITIVE_TEST(TYPE, SOURCE, DELETE, GPU5)                              \
-       {                                                                                  \
+       do {                                                                               \
                const std::string* cs  = &empty_string;                                        \
                const std::string* vs  = &default_vertex_shader_source;                        \
                const std::string* tcs = &default_tc_shader_source;                            \
@@ -473,7 +473,7 @@ void initializeMap()
                {                                                                              \
                        this->execute_positive_test(*vs, *fs, DELETE, GPU5);                       \
                }                                                                              \
-       }
+       } while (0)
 
 /** Macro executes either positive or negative test
  *
@@ -481,15 +481,17 @@ void initializeMap()
  * @param TYPE Tested shader stage
  * @param SOURCE Tested shader source
  **/
-#define EXECUTE_SHADER_TEST(S, TYPE, SOURCE)              \
-       if (S)                                                \
-       {                                                     \
-               EXECUTE_POSITIVE_TEST(TYPE, SOURCE, true, false); \
-       }                                                     \
-       else                                                  \
-       {                                                     \
-               this->execute_negative_test(TYPE, SOURCE);        \
-       }
+#define EXECUTE_SHADER_TEST(S, TYPE, SOURCE)                  \
+       do {                                                      \
+               if (S)                                                \
+               {                                                     \
+                       EXECUTE_POSITIVE_TEST(TYPE, SOURCE, true, false); \
+               }                                                     \
+               else                                                  \
+               {                                                     \
+                       this->execute_negative_test(TYPE, SOURCE);        \
+               }                                                     \
+       } while (0)
 
 /** Test case constructor.
  *
@@ -8688,7 +8690,7 @@ void AtomicUsageTest<API>::execute(typename TestCaseBase<API>::TestShaderType te
        default:
                TCU_FAIL("Invalid enum");
                break;
-       };
+       }
 
        /* Prepare valid source */
        valid_shader_source += varying_definition;
@@ -8754,7 +8756,7 @@ void AtomicUsageTest<API>::execute(typename TestCaseBase<API>::TestShaderType te
                default:
                        TCU_FAIL("Invalid enum");
                        break;
-               };
+               }
 
                if (API::USE_ALL_SHADER_STAGES)
                {
index 22e66ac..5d7c4ee 100644 (file)
@@ -33,7 +33,7 @@ class GeometryShaderOutput : public TestCaseBase
 protected:
        /* Protected methods */
        GeometryShaderOutput(Context& context, const ExtParameters& extParams, const char* name, const char* description);
-       virtual ~GeometryShaderOutput(){};
+       virtual ~GeometryShaderOutput(){}
 
        /* Protected variables */
        static const char* const m_fragment_shader_code_white_color;
@@ -66,7 +66,7 @@ public:
        /* Public methods */
        GeometryShaderDuplicateOutputLayoutQualifierTest(Context& context, const ExtParameters& extParams, const char* name,
                                                                                                         const char* description);
-       virtual ~GeometryShaderDuplicateOutputLayoutQualifierTest(){};
+       virtual ~GeometryShaderDuplicateOutputLayoutQualifierTest(){}
 
        virtual IterateResult iterate(void);
 
@@ -100,7 +100,7 @@ public:
        /* Public methods */
        GeometryShaderDuplicateMaxVerticesLayoutQualifierTest(Context& context, const ExtParameters& extParams,
                                                                                                                  const char* name, const char* description);
-       virtual ~GeometryShaderDuplicateMaxVerticesLayoutQualifierTest(){};
+       virtual ~GeometryShaderDuplicateMaxVerticesLayoutQualifierTest(){}
 
        virtual IterateResult iterate(void);
 
@@ -127,7 +127,7 @@ protected:
        /* Protected methods */
        GeometryShaderOutputRenderingBase(Context& context, const ExtParameters& extParams, const char* name,
                                                                          const char* description, const char* geometry_shader_code);
-       virtual ~GeometryShaderOutputRenderingBase(){};
+       virtual ~GeometryShaderOutputRenderingBase(){}
 
        void initTest(void);
 
@@ -185,7 +185,7 @@ public:
        /* Public methods */
        GeometryShaderIfVertexEmitIsDoneAtEndTest(Context& context, const ExtParameters& extParams, const char* name,
                                                                                          const char* description);
-       virtual ~GeometryShaderIfVertexEmitIsDoneAtEndTest(){};
+       virtual ~GeometryShaderIfVertexEmitIsDoneAtEndTest(){}
 
        virtual bool verifyResult(const unsigned char* result_image, unsigned int width, unsigned int height,
                                                          unsigned int pixel_size) const;
@@ -218,7 +218,7 @@ public:
        /* Public methods */
        GeometryShaderMissingEndPrimitiveCallTest(Context& context, const ExtParameters& extParams, const char* name,
                                                                                          const char* description);
-       virtual ~GeometryShaderMissingEndPrimitiveCallTest(){};
+       virtual ~GeometryShaderMissingEndPrimitiveCallTest(){}
 
        virtual bool verifyResult(const unsigned char* result_image, unsigned int width, unsigned int height,
                                                          unsigned int pixel_size) const;
@@ -255,7 +255,7 @@ public:
        /* Public methods */
        GeometryShaderMissingEndPrimitiveCallForSinglePrimitiveTest(Context& context, const ExtParameters& extParams,
                                                                                                                                const char* name, const char* description);
-       virtual ~GeometryShaderMissingEndPrimitiveCallForSinglePrimitiveTest(){};
+       virtual ~GeometryShaderMissingEndPrimitiveCallForSinglePrimitiveTest(){}
 
        virtual IterateResult iterate(void);
 
index 89a05aa..b7d6c9b 100644 (file)
@@ -2776,7 +2776,7 @@ bool GPUShader5TextureGatherOffsetDepth2DClampToBorderCaseTest::checkResult(cons
                        wrap_matrix[1] = 1;
                }
                break;
-       };
+       }
 
        /* Apply integral part of texture coordinates to wrap_matrix */
        for (unsigned int i = 0; i < m_n_components_per_varying; ++i)
index 971e7a8..5448874 100644 (file)
@@ -475,7 +475,7 @@ tcu::TestNode::IterateResult TextureBorderClampSamplingTexture<InputType, Output
        default:
                throw tcu::TestError("Unsupported sized internal format. Should never happen!", "", __FILE__, __LINE__);
                break;
-       };
+       }
        GLU_EXPECT_NO_ERROR(gl.getError(), "Error setting border color parameter!");
 
        /* Set sampler's GL_TEXTURE_WRAP_* parameters values to GL_CLAMP_TO_BORDER_EXT */
index e2b06e5..0d80ba0 100644 (file)
@@ -617,7 +617,7 @@ void TextureBufferOperations::checkFramebufferStatus(glw::GLenum framebuffer)
                {
                        TCU_FAIL("Framebuffer incomplete, status not recognized");
                }
-               };
+               }
        } /* if (GL_FRAMEBUFFER_COMPLETE != framebuffer_status) */
 }
 
index 736118b..cfb69b6 100644 (file)
@@ -1269,7 +1269,7 @@ void TextureCubeMapArrayTextureSizeRTBase::checkFramebufferStatus(glw::GLenum fr
                {
                        TCU_FAIL("Framebuffer incomplete, status not recognized");
                }
-               }; /* switch (framebuffer_status) */
+               } /* switch (framebuffer_status) */
        }         /* if (GL_FRAMEBUFFER_COMPLETE != framebuffer_status) */
 }
 
index 5a8740c..e484e2a 100644 (file)
@@ -1408,7 +1408,7 @@ void prepareTextureCoordinatesForFace(glw::GLfloat* data, glw::GLuint width, glw
                vectorSet4(data, 7, middle, bottom, negative, layer);
                vectorSet4(data, 8, right, bottom, negative, layer);
                break;
-       };
+       }
 
        vectorNormalize<3, 4>(data, 0);
        vectorNormalize<3, 4>(data, 1);
@@ -1517,7 +1517,7 @@ void prepareTextureCoordinatesForGatherForFace(glw::GLfloat* data, glw::GLuint w
                vectorSet4(data, 7, middle, bottom, negative, layer);
                vectorSet4(data, 8, right, bottom, negative, layer);
                break;
-       };
+       }
 
        vectorNormalize<3, 4>(data, 0);
        vectorNormalize<3, 4>(data, 1);
@@ -1957,7 +1957,7 @@ void TextureCubeMapArraySamplingTest::getAttributes(samplerType                                   sampler_type
                out_attribute_definitions = 0;
                out_n_attributes                  = 0;
                break;
-       };
+       }
 }
 
 /** Get attributes specific for sampling function
@@ -2010,7 +2010,7 @@ void TextureCubeMapArraySamplingTest::getAttributes(samplingFunction                      sampling_
                out_attribute_definitions = textureGather_attributes;
                out_n_attributes                  = n_textureGather_attributes;
                break;
-       };
+       }
 }
 
 /** Get information about color type for type of sampler
@@ -2064,7 +2064,7 @@ void TextureCubeMapArraySamplingTest::getColorType(samplerType sampler_type, con
                out_n_components           = 1;
                out_is_shadow              = false;
                break;
-       };
+       }
 }
 
 /** Get information about color type for type of sampler
@@ -2109,7 +2109,7 @@ void TextureCubeMapArraySamplingTest::getColorType(samplerType sampler_type, con
                out_image_type   = image_uint;
                out_image_layout = "r32ui";
                break;
-       };
+       }
 }
 
 /** Prepare code for passthrough fragment shader
@@ -2467,7 +2467,7 @@ void TextureCubeMapArraySamplingTest::getSamplingComputeShaderCode(const sampler
                /* imageStore(image, image_coord, color);*/
                stream << compute_shader_color;
                break;
-       };
+       }
 
        stream << ");\n";
 
@@ -4265,7 +4265,7 @@ const TextureCubeMapArraySamplingTest::programCollectionForFunction* TextureCube
        case TextureGather:
                return &m_programs_for_textureGather;
                break;
-       };
+       }
 
        return 0;
 }
index 5cf6275..4a75d92 100644 (file)
@@ -431,7 +431,7 @@ void TextureCubeMapArrayStencilAttachments::checkFramebufferStatus(glw::GLenum f
                {
                        TCU_FAIL("Framebuffer incomplete, status not recognized");
                }
-               }; /* switch (framebuffer_status) */
+               } /* switch (framebuffer_status) */
        }         /* if (GL_FRAMEBUFFER_COMPLETE != framebuffer_status) */
 }
 
index 46938f7..6f03d79 100644 (file)
@@ -3966,29 +3966,29 @@ static const VkAccessFlagBits2KHR VK_ACCESS_2_FRAGMENT_DENSITY_MAP_READ_BIT_EXT
 static const VkAccessFlagBits2KHR VK_ACCESS_2_COLOR_ATTACHMENT_READ_NONCOHERENT_BIT_EXT                = 0x00080000ULL;
 static const VkAccessFlagBits2KHR VK_ACCESS_2_INVOCATION_MASK_READ_BIT_HUAWEI                          = 0x8000000000ULL;
 
-VK_DEFINE_PLATFORM_TYPE(XlibDisplayPtr,                                void*);
-VK_DEFINE_PLATFORM_TYPE(XlibWindow,                                    uintptr_t);
-VK_DEFINE_PLATFORM_TYPE(XlibVisualID,                          uint32_t);
-VK_DEFINE_PLATFORM_TYPE(XcbConnectionPtr,                      void*);
-VK_DEFINE_PLATFORM_TYPE(XcbWindow,                                     uintptr_t);
-VK_DEFINE_PLATFORM_TYPE(XcbVisualid,                           uint32_t);
-VK_DEFINE_PLATFORM_TYPE(WaylandDisplayPtr,                     void*);
-VK_DEFINE_PLATFORM_TYPE(WaylandSurfacePtr,                     void*);
-VK_DEFINE_PLATFORM_TYPE(MirConnectionPtr,                      void*);
-VK_DEFINE_PLATFORM_TYPE(MirSurfacePtr,                         void*);
-VK_DEFINE_PLATFORM_TYPE(AndroidNativeWindowPtr,                void*);
-VK_DEFINE_PLATFORM_TYPE(Win32InstanceHandle,           void*);
-VK_DEFINE_PLATFORM_TYPE(Win32WindowHandle,                     void*);
-VK_DEFINE_PLATFORM_TYPE(Win32Handle,                           void*);
-VK_DEFINE_PLATFORM_TYPE(Win32SecurityAttributesPtr,    const void*);
-VK_DEFINE_PLATFORM_TYPE(AndroidHardwareBufferPtr,      void*);
-VK_DEFINE_PLATFORM_TYPE(Win32MonitorHandle,                    void*);
-VK_DEFINE_PLATFORM_TYPE(Win32LPCWSTR,                          const void*);
-VK_DEFINE_PLATFORM_TYPE(RROutput,                                      void*);
-VK_DEFINE_PLATFORM_TYPE(zx_handle_t,                           int32_t);
-VK_DEFINE_PLATFORM_TYPE(GgpFrameToken,                         int32_t);
-VK_DEFINE_PLATFORM_TYPE(GgpStreamDescriptor,           int32_t);
-VK_DEFINE_PLATFORM_TYPE(CAMetalLayer,                          void*);
+VK_DEFINE_PLATFORM_TYPE(XlibDisplayPtr,                                void*)
+VK_DEFINE_PLATFORM_TYPE(XlibWindow,                                    uintptr_t)
+VK_DEFINE_PLATFORM_TYPE(XlibVisualID,                          uint32_t)
+VK_DEFINE_PLATFORM_TYPE(XcbConnectionPtr,                      void*)
+VK_DEFINE_PLATFORM_TYPE(XcbWindow,                                     uintptr_t)
+VK_DEFINE_PLATFORM_TYPE(XcbVisualid,                           uint32_t)
+VK_DEFINE_PLATFORM_TYPE(WaylandDisplayPtr,                     void*)
+VK_DEFINE_PLATFORM_TYPE(WaylandSurfacePtr,                     void*)
+VK_DEFINE_PLATFORM_TYPE(MirConnectionPtr,                      void*)
+VK_DEFINE_PLATFORM_TYPE(MirSurfacePtr,                         void*)
+VK_DEFINE_PLATFORM_TYPE(AndroidNativeWindowPtr,                void*)
+VK_DEFINE_PLATFORM_TYPE(Win32InstanceHandle,           void*)
+VK_DEFINE_PLATFORM_TYPE(Win32WindowHandle,                     void*)
+VK_DEFINE_PLATFORM_TYPE(Win32Handle,                           void*)
+VK_DEFINE_PLATFORM_TYPE(Win32SecurityAttributesPtr,    const void*)
+VK_DEFINE_PLATFORM_TYPE(AndroidHardwareBufferPtr,      void*)
+VK_DEFINE_PLATFORM_TYPE(Win32MonitorHandle,                    void*)
+VK_DEFINE_PLATFORM_TYPE(Win32LPCWSTR,                          const void*)
+VK_DEFINE_PLATFORM_TYPE(RROutput,                                      void*)
+VK_DEFINE_PLATFORM_TYPE(zx_handle_t,                           int32_t)
+VK_DEFINE_PLATFORM_TYPE(GgpFrameToken,                         int32_t)
+VK_DEFINE_PLATFORM_TYPE(GgpStreamDescriptor,           int32_t)
+VK_DEFINE_PLATFORM_TYPE(CAMetalLayer,                          void*)
 #define VK_KHR_SURFACE_SPEC_VERSION 25
 #define VK_KHR_SWAPCHAIN_SPEC_VERSION 70
 #define VK_KHR_DISPLAY_SPEC_VERSION 23
index 28bb56d..9b4aa83 100644 (file)
@@ -143,7 +143,7 @@ StructType*                                                                 findStructure                                                   (void* first)
 
 struct initVulkanStructure
 {
-       initVulkanStructure     (void*  pNext = DE_NULL)        : m_next(pNext) {};
+       initVulkanStructure     (void*  pNext = DE_NULL)        : m_next(pNext) {}
 
        template<class StructType>
        operator StructType()
@@ -174,7 +174,7 @@ void addToChainVulkanStructure (void***     chainPNextPtr, StructType&      structType)
 
 struct initVulkanStructureConst
 {
-       initVulkanStructureConst        (const void*    pNext = DE_NULL)        : m_next(pNext) {};
+       initVulkanStructureConst        (const void*    pNext = DE_NULL)        : m_next(pNext) {}
 
        template<class StructType>
        operator const StructType()
@@ -195,7 +195,7 @@ private:
 
 struct getPhysicalDeviceExtensionProperties
 {
-       getPhysicalDeviceExtensionProperties (const InstanceInterface&  vki, VkPhysicalDevice physicalDevice) : m_vki(vki), m_physicalDevice(physicalDevice) {};
+       getPhysicalDeviceExtensionProperties (const InstanceInterface&  vki, VkPhysicalDevice physicalDevice) : m_vki(vki), m_physicalDevice(physicalDevice) {}
 
        template<class ExtensionProperties>
        operator ExtensionProperties ()
index bb5048f..0a4f250 100644 (file)
@@ -147,7 +147,7 @@ de::SharedPtr<RaytracedGeometryBase> makeRaytracedGeometry (VkGeometryTypeKHR ge
                                case VK_INDEX_TYPE_UINT32:              return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<tcu::Vec2, deUint32>(builderParams));
                                case VK_INDEX_TYPE_NONE_KHR:    return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<tcu::Vec2, EmptyIndex>(builderParams));
                                default:                                                TCU_THROW(InternalError, "Wrong index type");
-                       };
+                       }
                case VK_FORMAT_R32G32B32_SFLOAT:
                        switch (indexType)
                        {
@@ -155,7 +155,7 @@ de::SharedPtr<RaytracedGeometryBase> makeRaytracedGeometry (VkGeometryTypeKHR ge
                                case VK_INDEX_TYPE_UINT32:              return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<tcu::Vec3, deUint32>(builderParams));
                                case VK_INDEX_TYPE_NONE_KHR:    return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<tcu::Vec3, EmptyIndex>(builderParams));
                                default:                                                TCU_THROW(InternalError, "Wrong index type");
-                       };
+                       }
                case VK_FORMAT_R32G32B32A32_SFLOAT:
                        switch (indexType)
                        {
@@ -163,7 +163,7 @@ de::SharedPtr<RaytracedGeometryBase> makeRaytracedGeometry (VkGeometryTypeKHR ge
                                case VK_INDEX_TYPE_UINT32:              return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<tcu::Vec4, deUint32>(builderParams));
                                case VK_INDEX_TYPE_NONE_KHR:    return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<tcu::Vec4, EmptyIndex>(builderParams));
                                default:                                                TCU_THROW(InternalError, "Wrong index type");
-                       };
+                       }
                case VK_FORMAT_R16G16_SFLOAT:
                        switch (indexType)
                        {
@@ -171,7 +171,7 @@ de::SharedPtr<RaytracedGeometryBase> makeRaytracedGeometry (VkGeometryTypeKHR ge
                                case VK_INDEX_TYPE_UINT32:              return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<Vec2_16, deUint32>(builderParams));
                                case VK_INDEX_TYPE_NONE_KHR:    return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<Vec2_16, EmptyIndex>(builderParams));
                                default:                                                TCU_THROW(InternalError, "Wrong index type");
-                       };
+                       }
                case VK_FORMAT_R16G16B16_SFLOAT:
                        switch (indexType)
                        {
@@ -179,7 +179,7 @@ de::SharedPtr<RaytracedGeometryBase> makeRaytracedGeometry (VkGeometryTypeKHR ge
                                case VK_INDEX_TYPE_UINT32:              return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<Vec3_16, deUint32>(builderParams));
                                case VK_INDEX_TYPE_NONE_KHR:    return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<Vec3_16, EmptyIndex>(builderParams));
                                default:                                                TCU_THROW(InternalError, "Wrong index type");
-                       };
+                       }
                case VK_FORMAT_R16G16B16A16_SFLOAT:
                        switch (indexType)
                        {
@@ -187,7 +187,7 @@ de::SharedPtr<RaytracedGeometryBase> makeRaytracedGeometry (VkGeometryTypeKHR ge
                                case VK_INDEX_TYPE_UINT32:              return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<Vec4_16, deUint32>(builderParams));
                                case VK_INDEX_TYPE_NONE_KHR:    return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<Vec4_16, EmptyIndex>(builderParams));
                                default:                                                TCU_THROW(InternalError, "Wrong index type");
-                       };
+                       }
                case VK_FORMAT_R16G16_SNORM:
                        switch (indexType)
                        {
@@ -195,7 +195,7 @@ de::SharedPtr<RaytracedGeometryBase> makeRaytracedGeometry (VkGeometryTypeKHR ge
                                case VK_INDEX_TYPE_UINT32:              return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<Vec2_16SNorm, deUint32>(builderParams));
                                case VK_INDEX_TYPE_NONE_KHR:    return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<Vec2_16SNorm, EmptyIndex>(builderParams));
                                default:                                                TCU_THROW(InternalError, "Wrong index type");
-                       };
+                       }
                case VK_FORMAT_R16G16B16_SNORM:
                        switch (indexType)
                        {
@@ -203,7 +203,7 @@ de::SharedPtr<RaytracedGeometryBase> makeRaytracedGeometry (VkGeometryTypeKHR ge
                                case VK_INDEX_TYPE_UINT32:              return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<Vec3_16SNorm, deUint32>(builderParams));
                                case VK_INDEX_TYPE_NONE_KHR:    return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<Vec3_16SNorm, EmptyIndex>(builderParams));
                                default:                                                TCU_THROW(InternalError, "Wrong index type");
-                       };
+                       }
                case VK_FORMAT_R16G16B16A16_SNORM:
                        switch (indexType)
                        {
@@ -211,7 +211,7 @@ de::SharedPtr<RaytracedGeometryBase> makeRaytracedGeometry (VkGeometryTypeKHR ge
                                case VK_INDEX_TYPE_UINT32:              return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<Vec4_16SNorm, deUint32>(builderParams));
                                case VK_INDEX_TYPE_NONE_KHR:    return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<Vec4_16SNorm, EmptyIndex>(builderParams));
                                default:                                                TCU_THROW(InternalError, "Wrong index type");
-                       };
+                       }
                case VK_FORMAT_R64G64_SFLOAT:
                        switch (indexType)
                        {
@@ -219,7 +219,7 @@ de::SharedPtr<RaytracedGeometryBase> makeRaytracedGeometry (VkGeometryTypeKHR ge
                                case VK_INDEX_TYPE_UINT32:              return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<tcu::DVec2, deUint32>(builderParams));
                                case VK_INDEX_TYPE_NONE_KHR:    return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<tcu::DVec2, EmptyIndex>(builderParams));
                                default:                                                TCU_THROW(InternalError, "Wrong index type");
-                       };
+                       }
                case VK_FORMAT_R64G64B64_SFLOAT:
                        switch (indexType)
                        {
@@ -227,7 +227,7 @@ de::SharedPtr<RaytracedGeometryBase> makeRaytracedGeometry (VkGeometryTypeKHR ge
                                case VK_INDEX_TYPE_UINT32:              return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<tcu::DVec3, deUint32>(builderParams));
                                case VK_INDEX_TYPE_NONE_KHR:    return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<tcu::DVec3, EmptyIndex>(builderParams));
                                default:                                                TCU_THROW(InternalError, "Wrong index type");
-                       };
+                       }
                case VK_FORMAT_R64G64B64A64_SFLOAT:
                        switch (indexType)
                        {
@@ -235,7 +235,7 @@ de::SharedPtr<RaytracedGeometryBase> makeRaytracedGeometry (VkGeometryTypeKHR ge
                                case VK_INDEX_TYPE_UINT32:              return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<tcu::DVec4, deUint32>(builderParams));
                                case VK_INDEX_TYPE_NONE_KHR:    return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<tcu::DVec4, EmptyIndex>(builderParams));
                                default:                                                TCU_THROW(InternalError, "Wrong index type");
-                       };
+                       }
                case VK_FORMAT_R8G8_SNORM:
                        switch (indexType)
                        {
@@ -243,7 +243,7 @@ de::SharedPtr<RaytracedGeometryBase> makeRaytracedGeometry (VkGeometryTypeKHR ge
                                case VK_INDEX_TYPE_UINT32:              return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<Vec2_8SNorm, deUint32>(builderParams));
                                case VK_INDEX_TYPE_NONE_KHR:    return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<Vec2_8SNorm, EmptyIndex>(builderParams));
                                default:                                                TCU_THROW(InternalError, "Wrong index type");
-                       };
+                       }
                case VK_FORMAT_R8G8B8_SNORM:
                        switch (indexType)
                        {
@@ -251,7 +251,7 @@ de::SharedPtr<RaytracedGeometryBase> makeRaytracedGeometry (VkGeometryTypeKHR ge
                                case VK_INDEX_TYPE_UINT32:              return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<Vec3_8SNorm, deUint32>(builderParams));
                                case VK_INDEX_TYPE_NONE_KHR:    return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<Vec3_8SNorm, EmptyIndex>(builderParams));
                                default:                                                TCU_THROW(InternalError, "Wrong index type");
-                       };
+                       }
                case VK_FORMAT_R8G8B8A8_SNORM:
                        switch (indexType)
                        {
@@ -259,10 +259,10 @@ de::SharedPtr<RaytracedGeometryBase> makeRaytracedGeometry (VkGeometryTypeKHR ge
                                case VK_INDEX_TYPE_UINT32:              return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<Vec4_8SNorm, deUint32>(builderParams));
                                case VK_INDEX_TYPE_NONE_KHR:    return de::SharedPtr<RaytracedGeometryBase>(buildRaytracedGeometry<Vec4_8SNorm, EmptyIndex>(builderParams));
                                default:                                                TCU_THROW(InternalError, "Wrong index type");
-                       };
+                       }
                default:
                        TCU_THROW(InternalError, "Wrong vertex format");
-       };
+       }
 
 }
 
@@ -2850,16 +2850,16 @@ public:
                                                                                                                                                 const VkPhysicalDevice         physicalDevice);
        virtual                                 ~RayTracingPropertiesKHR                                        ();
 
-       virtual deUint32                getShaderGroupHandleSize                                        (void)  { return m_rayTracingPipelineProperties.shaderGroupHandleSize;                                          };
-       virtual deUint32                getMaxRecursionDepth                                            (void)  { return m_rayTracingPipelineProperties.maxRayRecursionDepth;                                           };
-       virtual deUint32                getMaxShaderGroupStride                                         (void)  { return m_rayTracingPipelineProperties.maxShaderGroupStride;                                           };
-       virtual deUint32                getShaderGroupBaseAlignment                                     (void)  { return m_rayTracingPipelineProperties.shaderGroupBaseAlignment;                                       };
-       virtual deUint64                getMaxGeometryCount                                                     (void)  { return m_accelerationStructureProperties.maxGeometryCount;                                            };
-       virtual deUint64                getMaxInstanceCount                                                     (void)  { return m_accelerationStructureProperties.maxInstanceCount;                                            };
-       virtual deUint64                getMaxPrimitiveCount                                            (void)  { return m_accelerationStructureProperties.maxPrimitiveCount;                                           };
-       virtual deUint32                getMaxDescriptorSetAccelerationStructures       (void)  { return m_accelerationStructureProperties.maxDescriptorSetAccelerationStructures;      };
-       deUint32                                getMaxRayDispatchInvocationCount                        (void)  { return m_rayTracingPipelineProperties.maxRayDispatchInvocationCount;                          };
-       deUint32                                getMaxRayHitAttributeSize                                       (void)  { return m_rayTracingPipelineProperties.maxRayHitAttributeSize;                                         };
+       virtual deUint32                getShaderGroupHandleSize                                        (void)  { return m_rayTracingPipelineProperties.shaderGroupHandleSize;                                          }
+       virtual deUint32                getMaxRecursionDepth                                            (void)  { return m_rayTracingPipelineProperties.maxRayRecursionDepth;                                           }
+       virtual deUint32                getMaxShaderGroupStride                                         (void)  { return m_rayTracingPipelineProperties.maxShaderGroupStride;                                           }
+       virtual deUint32                getShaderGroupBaseAlignment                                     (void)  { return m_rayTracingPipelineProperties.shaderGroupBaseAlignment;                                       }
+       virtual deUint64                getMaxGeometryCount                                                     (void)  { return m_accelerationStructureProperties.maxGeometryCount;                                            }
+       virtual deUint64                getMaxInstanceCount                                                     (void)  { return m_accelerationStructureProperties.maxInstanceCount;                                            }
+       virtual deUint64                getMaxPrimitiveCount                                            (void)  { return m_accelerationStructureProperties.maxPrimitiveCount;                                           }
+       virtual deUint32                getMaxDescriptorSetAccelerationStructures       (void)  { return m_accelerationStructureProperties.maxDescriptorSetAccelerationStructures;      }
+       deUint32                                getMaxRayDispatchInvocationCount                        (void)  { return m_rayTracingPipelineProperties.maxRayDispatchInvocationCount;                          }
+       deUint32                                getMaxRayHitAttributeSize                                       (void)  { return m_rayTracingPipelineProperties.maxRayHitAttributeSize;                                         }
 
 protected:
        VkPhysicalDeviceAccelerationStructurePropertiesKHR      m_accelerationStructureProperties;
index 79aa1ef..7e1a3a3 100644 (file)
@@ -861,12 +861,12 @@ protected:
 class RayTracingProperties
 {
 protected:
-                                                                       RayTracingProperties                                            () {};
+                                                                       RayTracingProperties                                            () {}
 
 public:
                                                                        RayTracingProperties                                            (const InstanceInterface&       vki,
-                                                                                                                                                                const VkPhysicalDevice         physicalDevice) { DE_UNREF(vki); DE_UNREF(physicalDevice); };
-       virtual                                                 ~RayTracingProperties                                           () {};
+                                                                                                                                                                const VkPhysicalDevice         physicalDevice) { DE_UNREF(vki); DE_UNREF(physicalDevice); }
+       virtual                                                 ~RayTracingProperties                                           () {}
 
        virtual deUint32                                getShaderGroupHandleSize                                        (void)  = DE_NULL;
        virtual deUint32                                getMaxRecursionDepth                                            (void)  = DE_NULL;
index 5cc2197..896618b 100644 (file)
@@ -78,7 +78,7 @@ struct SpirVAsmSource
        {
                buildOptions = buildOptions_;
                return *this;
-       };
+       }
 
        SpirVAsmBuildOptions    buildOptions;
        std::string                             source;
index c0dc424..be26400 100644 (file)
@@ -1139,7 +1139,7 @@ tcu::TestStatus recordLargePrimaryBufferTest(Context &context)
 
                        // record resetting event
                        vk.cmdResetEvent(*primCmdBuf, *event,stageMask);
-               };
+               }
 
        }
        endCommandBuffer(vk, *primCmdBuf);
@@ -1289,7 +1289,7 @@ tcu::TestStatus recordLargeSecondaryBufferTest(Context &context)
 
                                // record resetting event
                                vk.cmdResetEvent(*primCmdBuf, *event,stageMask);
-                       };
+                       }
                }
 
                // end recording of secondary buffers
@@ -3175,7 +3175,7 @@ tcu::TestStatus submitBufferWaitManySemaphores(Context& context)
                // create semaphores for use in this test
                semaphoreArray[idx] = createSemaphore(vk, vkDevice);
                semaphores[idx] = semaphoreArray[idx].get();
-       };
+       }
 
        {
                // create submit info for buffer - signal semaphores
@@ -3641,7 +3641,7 @@ tcu::TestStatus executeSecondaryBufferTwiceTest(Context& context)
                }
                // end recording of secondary buffers
                endCommandBuffer(vk, cmdBuffers[ndx]);
-       };
+       }
 
        // record primary command buffer one
        VK_CHECK(vk.beginCommandBuffer(*primCmdBufOne, &primCmdBufBeginInfo));
index 00f7a91..452b6bb 100644 (file)
@@ -8844,7 +8844,7 @@ void addImageToImageArrayTests (tcu::TestCaseGroup* group, AllocationKind alloca
                        group->addChild(new CopyImageToImageMipmapTestCase(testCtx, testName.str(), "copy 2d array mipmap image to 2d array mipmap image all at once", paramsArrayToArray));
                }
        }
-};
+}
 
 void addImageToImageTests (tcu::TestCaseGroup* group, AllocationKind allocationKind, ExtensionUse extensionUse)
 {
index 68c76a3..c2dc7b0 100644 (file)
@@ -59,8 +59,8 @@ const MemoryRequirement       legalMemoryTypes[legalMemoryTypeCount]  =
 class IObjectAllocator
 {
 public:
-                                       IObjectAllocator        ()      {};
-       virtual                 ~IObjectAllocator       ()      {};
+                                       IObjectAllocator        ()      {}
+       virtual                 ~IObjectAllocator       ()      {}
        virtual void    allocate                        (Context&       context)        = 0;
        virtual void    deallocate                      (Context&       context)        = 0;
        virtual size_t  getSize                         (Context&       context)        = 0;
index 0f5a6d7..eb338ae 100644 (file)
@@ -2946,9 +2946,9 @@ template<>                         inline bool isNullHandleOnAllocationFailure<VkCommandBuffer> (Cont
 template<>                      inline bool isNullHandleOnAllocationFailure<VkDescriptorSet> (Context& context) { return hasDeviceExtension(context, "VK_KHR_maintenance1"); }
 template<>                      inline bool isNullHandleOnAllocationFailure<VkPipeline>          (Context&)             { return true;  }
 
-template<typename T> inline bool isPooledObject                                         (void) { return false; };
-template<>                      inline bool isPooledObject<VkCommandBuffer> (void) { return true;  };
-template<>                      inline bool isPooledObject<VkDescriptorSet> (void) { return true;  };
+template<typename T> inline bool isPooledObject                                         (void) { return false; }
+template<>                      inline bool isPooledObject<VkCommandBuffer> (void) { return true;  }
+template<>                      inline bool isPooledObject<VkDescriptorSet> (void) { return true;  }
 
 template<typename Object>
 tcu::TestStatus allocCallbackFailMultipleObjectsTest (Context& context, typename Object::Parameters params)
index 04e13bb..f371b7d 100644 (file)
@@ -346,7 +346,7 @@ class BindingAcceleratioStructureTestInstance : public TestInstance
 public:
                                                                                                                                        BindingAcceleratioStructureTestInstance         (Context&                       context,
                                                                                                                                                                                                                                 const TestParams&      testParams);
-       virtual                                                                                                                 ~BindingAcceleratioStructureTestInstance        () {};
+       virtual                                                                                                                 ~BindingAcceleratioStructureTestInstance        () {}
        virtual tcu::TestStatus                                                                                 iterate                                                                         (void);
 
 protected:
@@ -724,7 +724,7 @@ public:
 
                                                                                BindingAcceleratioStructureGraphicsTestInstance         (Context&                       context,
                                                                                                                                                                                         const TestParams&      testParams);
-       virtual                                                         ~BindingAcceleratioStructureGraphicsTestInstance        () {};
+       virtual                                                         ~BindingAcceleratioStructureGraphicsTestInstance        () {}
 
 protected:
        virtual void                                            initPipeline                                                                            (void) override;
@@ -733,9 +733,9 @@ protected:
        void                                                            initVertexBuffer                                                                        (void);
        Move<VkPipeline>                                        makeGraphicsPipeline                                                            (void);
 
-       virtual deUint32                                        getExtraAccelerationDescriptorCount                                     (void) override                                                                 { return 0; };
+       virtual deUint32                                        getExtraAccelerationDescriptorCount                                     (void) override                                                                 { return 0; }
        virtual VkShaderStageFlags                      getShaderStageFlags                                                                     (void) override                                                                 { return VK_SHADER_STAGE_ALL_GRAPHICS; }
-       virtual VkPipelineBindPoint                     getPipelineBindPoint                                                            (void) override                                                                 { return VK_PIPELINE_BIND_POINT_GRAPHICS; };
+       virtual VkPipelineBindPoint                     getPipelineBindPoint                                                            (void) override                                                                 { return VK_PIPELINE_BIND_POINT_GRAPHICS; }
 
        VkFormat                                                        m_framebufferFormat;
        Move<VkImage>                                           m_framebufferImage;
@@ -1256,7 +1256,7 @@ public:
                                                                        BindingAcceleratioStructureComputeTestInstance  (Context&                       context,
                                                                                                                                                                         const TestParams&      testParams);
 
-       virtual                                                 ~BindingAcceleratioStructureComputeTestInstance () {};
+       virtual                                                 ~BindingAcceleratioStructureComputeTestInstance () {}
 
        static void                                             checkSupport                                                                    (Context&                       context,
                                                                                                                                                                         const TestParams&      testParams);
@@ -1267,9 +1267,9 @@ protected:
        virtual void                                    initPipeline                                                                    (void) override;
        virtual void                                    fillCommandBuffer                                                               (VkCommandBuffer        commandBuffer) override;
 
-       virtual deUint32                                getExtraAccelerationDescriptorCount                             (void) override                                                                 { return 0; };
+       virtual deUint32                                getExtraAccelerationDescriptorCount                             (void) override                                                                 { return 0; }
        virtual VkShaderStageFlags              getShaderStageFlags                                                             (void) override                                                                 { return VK_SHADER_STAGE_COMPUTE_BIT; }
-       virtual VkPipelineBindPoint             getPipelineBindPoint                                                    (void) override                                                                 { return VK_PIPELINE_BIND_POINT_COMPUTE; };
+       virtual VkPipelineBindPoint             getPipelineBindPoint                                                    (void) override                                                                 { return VK_PIPELINE_BIND_POINT_COMPUTE; }
 
        Move<VkShaderModule>                    m_shaderModule;
 };
@@ -1349,7 +1349,7 @@ class BindingAcceleratioStructureRayTracingTestInstance : public BindingAccelera
 public:
                                                                                                        BindingAcceleratioStructureRayTracingTestInstance       (Context&                                                       context,
                                                                                                                                                                                                                 const TestParams&                                      testParams);
-       virtual                                                                                 ~BindingAcceleratioStructureRayTracingTestInstance      () {};
+       virtual                                                                                 ~BindingAcceleratioStructureRayTracingTestInstance      () {}
 
        static void                                                                             checkSupport                                                                            (Context&                                                       context,
                                                                                                                                                                                                                 const TestParams&                                      testParams);
@@ -1369,9 +1369,9 @@ protected:
                                                                                                                                                                                                                 de::MovePtr<RayTracingPipeline>&       rayTracingPipeline,
                                                                                                                                                                                                                 const deUint32                                         group);
 
-       virtual deUint32                                                                getExtraAccelerationDescriptorCount                                     (void) override                                                                                                 { return 1; };
+       virtual deUint32                                                                getExtraAccelerationDescriptorCount                                     (void) override                                                                                                 { return 1; }
        virtual VkShaderStageFlags                                              getShaderStageFlags                                                                     (void) override                                                                                                 { return ALL_RAY_TRACING_STAGES; }
-       virtual VkPipelineBindPoint                                             getPipelineBindPoint                                                            (void) override                                                                                                 { return VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR; };
+       virtual VkPipelineBindPoint                                             getPipelineBindPoint                                                            (void) override                                                                                                 { return VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR; }
 
        deUint32                                                                                m_shaders;
        deUint32                                                                                m_raygenShaderGroup;
@@ -1791,7 +1791,7 @@ class BindingAcceleratioStructureRayTracingRayTracingTestInstance : public Bindi
 public:
                                                                                                        BindingAcceleratioStructureRayTracingRayTracingTestInstance             (Context&                                                       context,
                                                                                                                                                                                                                                         const TestParams&                                      testParams);
-       virtual                                                                                 ~BindingAcceleratioStructureRayTracingRayTracingTestInstance    () {};
+       virtual                                                                                 ~BindingAcceleratioStructureRayTracingRayTracingTestInstance    () {}
 
        static void                                                                             checkSupport                                                                                                    (Context&                                                       context,
                                                                                                                                                                                                                                         const TestParams&                                      testParams);
@@ -1820,9 +1820,9 @@ protected:
                                                                                                                                                                                                                                         const deUint32                                         group,
                                                                                                                                                                                                                                         const deUint32                                         groupCount = 1);
 
-       virtual deUint32                                                                getExtraAccelerationDescriptorCount                                                             (void) override                                                                                                 { return 1; };
+       virtual deUint32                                                                getExtraAccelerationDescriptorCount                                                             (void) override                                                                                                 { return 1; }
        virtual VkShaderStageFlags                                              getShaderStageFlags                                                                                             (void) override                                                                                                 { return ALL_RAY_TRACING_STAGES; }
-       virtual VkPipelineBindPoint                                             getPipelineBindPoint                                                                                    (void) override                                                                                                 { return VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR; };
+       virtual VkPipelineBindPoint                                             getPipelineBindPoint                                                                                    (void) override                                                                                                 { return VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR; }
 
        deUint32                                                                                m_shaders;
        deUint32                                                                                m_raygenShaderGroup;
index 2f35700..89d8c77 100644 (file)
@@ -2046,8 +2046,8 @@ public:
                                                                                                                                         deUint32                                                       numDescriptorSets,
                                                                                                                                         const vk::VkDescriptorSetLayout*       descriptorSetLayouts);
 
-       inline vk::VkPipeline                                   getPipeline                             (void) const { return *m_pipeline;                      };
-       inline vk::VkPipelineLayout                             getPipelineLayout               (void) const { return *m_pipelineLayout;        };
+       inline vk::VkPipeline                                   getPipeline                             (void) const { return *m_pipeline;                      }
+       inline vk::VkPipelineLayout                             getPipelineLayout               (void) const { return *m_pipelineLayout;        }
 
 private:
        static vk::Move<vk::VkPipelineLayout>   createPipelineLayout    (const vk::DeviceInterface&                     vki,
@@ -2475,7 +2475,7 @@ vk::Move<vk::VkDescriptorSetLayout> BufferComputeInstance::createDescriptorSetLa
 
                default:
                        DE_FATAL("Impossible");
-       };
+       }
 
        return builder.build(m_vki, m_device, extraFlags);
 }
@@ -4747,7 +4747,7 @@ vk::Move<vk::VkDescriptorSetLayout> ImageFetchComputeInstance::createDescriptorS
 
                default:
                        DE_FATAL("Impossible");
-       };
+       }
 
        return builder.build(m_vki, m_device, extraFlags);
 }
@@ -6488,7 +6488,7 @@ vk::Move<vk::VkDescriptorSetLayout> ImageSampleComputeInstance::createDescriptor
 
                default:
                        DE_FATAL("Impossible");
-       };
+       }
 
        return builder.build(m_vki, m_device, extraFlags);
 }
@@ -8590,7 +8590,7 @@ vk::Move<vk::VkDescriptorSetLayout> TexelBufferComputeInstance::createDescriptor
 
                default:
                        DE_FATAL("Impossible");
-       };
+       }
 
        return builder.build(m_vki, m_device, extraFlags);
 }
index d8edb35..2211f48 100644 (file)
@@ -152,7 +152,7 @@ public:
        TestInstance*                   createInstance                  (Context& context) const
        {
                return new ComputeBuiltinVarInstance(context, m_subCases, m_varType, this);
-       };
+       }
 
        virtual void                    initPrograms                    (SourceCollections& programCollection) const;
        virtual UVec3                   computeReference                (const UVec3& numWorkGroups, const UVec3& workGroupSize, const UVec3& workGroupID, const UVec3& localInvocationID) const = 0;
index 2e310a4..5a5d0a1 100644 (file)
@@ -519,7 +519,7 @@ std::string makeArray(const std::string& type, const std::vector<deUint64>& valu
                s << type << "(" << std::to_string(values[i]) << ")";
                if (i != values.size() - 1)
                        s << ", ";
-       };
+       }
        s << ")";
        return s.str();
 }
index 43fbb93..202b0da 100644 (file)
@@ -78,7 +78,7 @@ ConditionalClearAttachmentTest::ConditionalClearAttachmentTest (Context &context
        initialize();
 
        m_secondaryCmdBuffer = vk::allocateCommandBuffer(m_vk, m_context.getDevice(), *m_cmdPool, vk::VK_COMMAND_BUFFER_LEVEL_SECONDARY);
-};
+}
 
 tcu::TestStatus ConditionalClearAttachmentTest::iterate (void)
 {
@@ -218,7 +218,7 @@ tcu::TestStatus ConditionalClearAttachmentTest::iterate (void)
        }
 
        return tcu::TestStatus(res, qpGetTestResultName(res));
-};
+}
 
 }      // anonymous
 
index 4287075..8dffe08 100644 (file)
@@ -147,7 +147,7 @@ ConditionalDispatchTestInstance::ConditionalDispatchTestInstance (Context &conte
        , m_numCalls(testSpec.numCalls)
        , m_conditionalData(testSpec.conditionalData)
 {
-};
+}
 
 void ConditionalDispatchTestInstance::recordDispatch (const vk::DeviceInterface& vk,
                                                                                                          vk::VkCommandBuffer cmdBuffer,
@@ -354,7 +354,7 @@ tcu::TestStatus ConditionalDispatchTestInstance::iterate (void)
        }
 
        return tcu::TestStatus(res, qpGetTestResultName(res));
-};
+}
 
 }      // anonymous
 
index e84d114..1eb66f0 100644 (file)
@@ -152,7 +152,7 @@ ConditionalDraw::ConditionalDraw (Context &context, ConditionalTestSpec testSpec
        initialize();
 
        m_secondaryCmdBuffer = vk::allocateCommandBuffer(m_vk, m_context.getDevice(), *m_cmdPool, vk::VK_COMMAND_BUFFER_LEVEL_SECONDARY);
-};
+}
 
 void ConditionalDraw::createAndBindIndexBuffer (vk::VkCommandBuffer cmdBuffer)
 {
@@ -502,7 +502,7 @@ tcu::TestStatus ConditionalDraw::iterate (void)
        }
 
        return tcu::TestStatus(res, qpGetTestResultName(res));
-};
+}
 
 }      // anonymous
 
index dab2c5e..d11d4b8 100644 (file)
@@ -3600,7 +3600,7 @@ void SamplerInstance::createAndPopulateDescriptors                                        (IterateCommonVariables&
                {
                        imageExtent.width *= 2;
                        imageExtent.height *= 2;
-               };
+               }
 
                createImages(variables.descriptorsImages, variables.descriptorsBufferInfos, variables.descriptorsBuffer,
                        VK_BUFFER_USAGE_TRANSFER_SRC_BIT, imageExtent, m_colorFormat, VK_IMAGE_LAYOUT_UNDEFINED, 1, m_testParams.usesMipMaps);
index 1af4103..cb04eb5 100644 (file)
@@ -481,7 +481,7 @@ VkAccessFlags pipelineAccessFromStage (VkPipelineStageFlagBits stage, bool readO
 
        case VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT:
                readAccess = static_cast<VkAccessFlagBits>(VK_ACCESS_UNIFORM_READ_BIT | VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_INPUT_ATTACHMENT_READ_BIT);
-               writeAccess = VK_ACCESS_SHADER_READ_BIT;;
+               writeAccess = VK_ACCESS_SHADER_READ_BIT;
                break;
 
        case VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT:
index 7093662..a812a10 100644 (file)
@@ -427,7 +427,7 @@ class DiscardRectanglesTestInstance : public TestInstance
 public:
                                                        DiscardRectanglesTestInstance           (Context& context,
                                                                                                                                 TestParams params);
-       virtual                                 ~DiscardRectanglesTestInstance          (void) {};
+       virtual                                 ~DiscardRectanglesTestInstance          (void) {}
        virtual tcu::TestStatus iterate                                                         (void);
 
 private:
@@ -617,7 +617,7 @@ public:
                                                                                                                         const char *name,
                                                                                                                         const char *description,
                                                                                                                         TestParams params);
-       virtual                                         ~DiscardRectanglesTestCase      (void) {};
+       virtual                                         ~DiscardRectanglesTestCase      (void) {}
 
        virtual TestInstance*           createInstance                          (Context& context)      const;
        virtual void                            initPrograms                            (SourceCollections& programCollection) const;
index a872a69..1766a00 100644 (file)
@@ -83,7 +83,7 @@ struct PositionValueVertex {
        PositionValueVertex(tcu::Vec4 pos, float val)
        : position(pos)
        , value(val)
-       {};
+       {}
 public:
        tcu::Vec4       position;
        float           value;
index e89654e..337c915 100644 (file)
@@ -289,7 +289,7 @@ void Image::readUsingBuffer (vk::VkQueue                            queue,
                                                         vk::VkImageAspectFlagBits      aspect,
                                                         void *                                         data)
 {
-       DE_ASSERT(layout == vk::VK_IMAGE_LAYOUT_GENERAL || layout == vk::VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);;
+       DE_ASSERT(layout == vk::VK_IMAGE_LAYOUT_GENERAL || layout == vk::VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
 
        de::SharedPtr<Buffer> stagingResource;
 
index 85b6d2c..7f43bdc 100644 (file)
@@ -130,7 +130,7 @@ DrawIndexed::DrawIndexed (Context &context, TestSpec testSpec)
        m_data.push_back(VertexElementData(tcu::Vec4(   -1.0f,   1.0f,  1.0f,   1.0f), tcu::RGBA::blue().toVec(), -1));
 
        initialize();
-};
+}
 
 tcu::TestStatus DrawIndexed::iterate (void)
 {
@@ -207,7 +207,7 @@ tcu::TestStatus DrawIndexed::iterate (void)
        }
 
        return tcu::TestStatus(res, qpGetTestResultName(res));
-};
+}
 
 DrawInstancedIndexed::DrawInstancedIndexed (Context &context, TestSpec testSpec)
        : DrawIndexed   (context, testSpec)
index 55d12df..0c45c77 100644 (file)
@@ -85,7 +85,7 @@ struct DrawTypedTestSpec : public TestSpecBase
                : drawType(DRAWTYPE_LAST)
                , testFirstInstanceNdx(false)
                , testIndirectCountExt(IndirectCountType::NONE)
-       {};
+       {}
 
        DrawType                        drawType;
        bool                            testFirstInstanceNdx;
index f22749e..8425e2d 100644 (file)
@@ -274,7 +274,7 @@ MultipleClearsTest::MultipleClearsTest (Context &context, const TestParams& para
                                VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL));     // finalLayout
 
                        const ImageViewCreateInfo       depthTargetViewInfo                     (m_depthTargetImage->object(), VK_IMAGE_VIEW_TYPE_2D, m_params.depthFormat);
-                       m_depthTargetView                                                                               = createImageView(vk, device, &depthTargetViewInfo);;
+                       m_depthTargetView                                                                               = createImageView(vk, device, &depthTargetViewInfo);
                        attachments.push_back(*m_depthTargetView);
                }
                const VkAttachmentReference colorAttachmentReference            = hasColor ? makeAttachmentReference(0u, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL) : AttachmentReference();
index ca4817d..ea04127 100644 (file)
@@ -88,8 +88,8 @@ ColorQuad scissorQuad (ColorQuad quad, VkRect2D scissor, VkExtent2D framebufferS
 class TestCommand
 {
        public:
-                                                                                       TestCommand             (void) {};
-               virtual                                                         ~TestCommand    (void) {};
+                                                                                       TestCommand             (void) {}
+               virtual                                                         ~TestCommand    (void) {}
 
                virtual vector<PositionColorVertex>     getVertices             (deUint32 offset) { DE_UNREF(offset); return vector<PositionColorVertex>(); }
                virtual void                                            addCommands             (const DeviceInterface& vk, VkCommandBuffer cmdBuffer) = 0;
@@ -228,7 +228,7 @@ vector<VkRect2D> DynamicScissorTestCommand::updateScissors (vector<VkRect2D> sci
 
 struct TestParams
 {
-       TestParams() : framebufferSize({WIDTH,HEIGHT}) {};
+       TestParams() : framebufferSize({WIDTH,HEIGHT}) {}
 
        bool                                    dynamicScissor;
        vector<VkRect2D>                staticScissors;
index 3bdf32b..eb5562b 100644 (file)
@@ -318,7 +318,7 @@ tcu::TestStatus testShadingRates(Context& context)
                                if (fsr.sampleCounts & highestSampleCount)
                                        break;
                                highestSampleCount >>= 1;
-                       };
+                       }
 
                        // Check that the highest sample count in sampleCounts is less than or equal to maxFragmentShadingRateRasterizationSamples limit
                        if (highestSampleCount > static_cast<deUint32>(fragmentShadingRateProperties.maxFragmentShadingRateRasterizationSamples))
index 4154eab..c46ad4e 100644 (file)
@@ -49,7 +49,7 @@ protected:
                                                                                                                                                 const vk::VkDevice                             /*device*/,
                                                                                                                                                 vk::Allocator&                                 /*memAlloc*/,
                                                                                                                                                 const vk::VkCommandBuffer&             /*cmdBuffer*/,
-                                                                                                                                                const vk::VkPipelineLayout&    /*pipelineLayout*/){};
+                                                                                                                                                const vk::VkPipelineLayout&    /*pipelineLayout*/){}
        virtual void                                            drawCommand                                             (const vk::VkCommandBuffer&             cmdBuffer);
 
        const vk::VkPrimitiveTopology   m_primitiveType;
index 3866ab7..0fb32a0 100644 (file)
@@ -802,7 +802,7 @@ bool verifyLayerContent (tcu::TestLog& log, const TestType testType, const tcu::
                default:
                        DE_ASSERT(0);
                        return false;
-       };
+       }
 }
 
 std::string getLayerDescription (const VkImageViewType viewType, const int layer)
@@ -1170,7 +1170,7 @@ void initPrograms (SourceCollections& programCollection, const TestParams params
                                DE_ASSERT(params.image.viewType == VK_IMAGE_VIEW_TYPE_3D);
                                imageViewString = "image3D";
                                break;
-               };
+               }
 
                std::ostringstream src;
                src << glu::getGLSLVersionDeclaration(glu::GLSL_VERSION_450) << "\n"
@@ -1200,7 +1200,7 @@ void initPrograms (SourceCollections& programCollection, const TestParams params
                                default:
                                        src << "    ivec3 coord = ivec3(int(gl_FragCoord.x), int(gl_FragCoord.y), gl_Layer);\n";
                                        break;
-                       };
+                       }
 
                        src << "    vec4 src_color = imageLoad(storageImage, coord);\n"
                                << "    o_color = (vert_color + src_color) / 2.0;\n"
index d93a268..bac2271 100644 (file)
@@ -163,7 +163,7 @@ Move<VkPipeline> GraphicsPipelineBuilder::build (const DeviceInterface&     vk,
                        break;
                default:
                        break;
-       };
+       }
 
        const VkPipelineInputAssemblyStateCreateInfo pipelineInputAssemblyStateInfo =
        {
index 8f696bb..5a0b235 100644 (file)
@@ -649,7 +649,7 @@ TestStatus BasicComputeTestInstance::iterate (void)
                                offset += getCompressedImageSizeInBytes(m_parameters.formatCompressed, mipMapSizes[mipNdx]);
                        }
                }
-       };
+       }
        if (!decompressImage(*cmdBuffer, imageData, mipMapSizes))
                        return TestStatus::fail("Fail");
 
index de29199..fd4f4a2 100644 (file)
@@ -1926,7 +1926,7 @@ public:
                                                                                                                                                         const VkFormat                 writeFormat,
                                                                                                                                                         bool                                   relaxedPrecision);
 
-       virtual                                                 ~ImageExtendOperandTestInstance                 (void) {};
+       virtual                                                 ~ImageExtendOperandTestInstance                 (void) {}
 
 protected:
 
index bbe97a7..3099e43 100644 (file)
@@ -253,7 +253,7 @@ tcu::TestStatus MisalignedCubeTestInstance::iterate (void)
        {
                const deUint32  layerUsed               = cube0LayerStart + layerNdx;
                const float             componentValue  = float(16 * layerUsed) / 255.0f;
-               const tcu::Vec4 expectedColor   = tcu::Vec4(componentValue, componentValue, componentValue, 1.0f);;
+               const tcu::Vec4 expectedColor   = tcu::Vec4(componentValue, componentValue, componentValue, 1.0f);
                const tcu::Vec4 resultColor             = readVec4(resultBufferAlloc.getHostPtr(), layerNdx);
                const tcu::Vec4 delta                   = expectedColor - resultColor;
 
@@ -266,7 +266,7 @@ tcu::TestStatus MisalignedCubeTestInstance::iterate (void)
        {
                const deUint32  layerUsed               = cube1LayerStart + layerNdx;
                const float             componentValue  = float(16 * layerUsed) / 255.0f;
-               const tcu::Vec4 expectedColor   = tcu::Vec4(componentValue, componentValue, componentValue, 1.0f);;
+               const tcu::Vec4 expectedColor   = tcu::Vec4(componentValue, componentValue, componentValue, 1.0f);
                const tcu::Vec4 resultColor             = readVec4(resultBufferAlloc.getHostPtr(), layerNdx + 6u);
                const tcu::Vec4 delta                   = expectedColor - resultColor;
 
index 3c1233d..61373f7 100644 (file)
@@ -322,7 +322,7 @@ public:
                                                                                                                                         const tcu::UVec3&                      imageSize,
                                                                                                                                         const tcu::TextureFormat&      format);
 
-       virtual                                                 ~MemoryQualifierInstanceBase    (void) {};
+       virtual                                                 ~MemoryQualifierInstanceBase    (void) {}
 
        virtual tcu::TestStatus                 iterate                                                 (void);
 
@@ -479,7 +479,7 @@ public:
                                                                                                                 const tcu::TextureFormat&      format)
                                                        : MemoryQualifierInstanceBase(context, name, imageType, imageSize, format) {}
 
-       virtual                         ~MemoryQualifierInstanceImage   (void) {};
+       virtual                         ~MemoryQualifierInstanceImage   (void) {}
 
        virtual void            prepareResources                                (const VkDeviceSize                     bufferSizeInBytes);
 
@@ -619,7 +619,7 @@ public:
                                                                                                                 const tcu::TextureFormat&      format)
                                                        : MemoryQualifierInstanceBase(context, name, imageType, imageSize, format) {}
 
-       virtual                         ~MemoryQualifierInstanceBuffer  (void) {};
+       virtual                         ~MemoryQualifierInstanceBuffer  (void) {}
 
        virtual void            prepareResources                                (const VkDeviceSize                     bufferSizeInBytes);
 
index 8b05ea0..435eb66 100644 (file)
@@ -129,7 +129,7 @@ BufferLevels::BufferLevels (VkImageType type, VkFormat format, VkExtent3D levelZ
 
                currentOffset += level.size;
                ++levelCount;
-       };
+       }
 }
 
 VkDeviceSize BufferLevels::totalSize () const
index 8b46c81..6197e7b 100644 (file)
@@ -47,7 +47,7 @@ public:
        int                                     dimension               (void) const;                                                   //!< Coordinate dimension used for addressing (e.g. 3 (x,y,z) for 2d array)
        int                                     layerDimension  (void) const;                                                   //!< Coordinate dimension used for addressing a single layer (e.g. 2 (x,y) for 2d array)
 
-       int                                     numMipmapLevels (void) const { return m_numMipmapLevels; };     //!< Number of levels of detail (mipmap texture)
+       int                                     numMipmapLevels (void) const { return m_numMipmapLevels; }      //!< Number of levels of detail (mipmap texture)
 
 private:
        void                            checkInvariants (void) const;
index 15f085f..6b36abb 100644 (file)
@@ -545,7 +545,7 @@ void                                                                        createMemory<VkBuffer, DE_TRUE>         (BuffersList&                   targets,
 
                vk.getBufferMemoryRequirements(vkDevice, **targets[i], &memReqs);
 
-               ConstDedicatedInfo                              dedicatedAllocationInfo                         = makeDedicatedAllocationInfo(**targets[i]);;
+               ConstDedicatedInfo                              dedicatedAllocationInfo                         = makeDedicatedAllocationInfo(**targets[i]);
                VkMemoryPriorityAllocateInfoEXT priority                                                        = makeMemoryPriorityAllocateInfo(&dedicatedAllocationInfo, ((float)i)/((float)count));
                const VkMemoryAllocateInfo              memAlloc                                                        = makeMemoryAllocateInfo(memReqs, params.usePriority ? &priority : (const void *)&dedicatedAllocationInfo);
                VkDeviceMemory                                  rawMemory                                                       = DE_NULL;
index f9fbd19..2631bfe 100644 (file)
@@ -74,7 +74,7 @@ public:
        const std::string                       getInstanceName                 (void) const                    { return m_instanceName; }
 
        void                                            addMember                               (SharedStructVar var)   { m_members.push_back(var); }
-       int                                                     getNumMembers                   (void)                                  { return static_cast<int>(m_members.size()); };
+       int                                                     getNumMembers                   (void)                                  { return static_cast<int>(m_members.size()); }
 
        inline iterator                         begin                                   (void)                                  { return m_members.begin(); }
        inline const_iterator           begin                                   (void) const                    { return m_members.begin(); }
@@ -95,14 +95,14 @@ private:
 class ShaderInterface
 {
 public:
-                                                                               ShaderInterface         (void) {};
-                                                                               ~ShaderInterface        (void) {};
+                                                                               ShaderInterface         (void) {}
+                                                                               ~ShaderInterface        (void) {}
 
        SharedStruct&                                           allocSharedObject       (const std::string& name, const std::string& instanceName);
        NamedStructSP                                           allocStruct                     (const std::string& name);
 
-       std::vector<NamedStructSP>&                     getStructs                      (void)                  { return m_structs; };
-       int                                                                     getNumStructs           (void)                  { return static_cast<int>(m_structs.size()); };
+       std::vector<NamedStructSP>&                     getStructs                      (void)                  { return m_structs; }
+       int                                                                     getNumStructs           (void)                  { return static_cast<int>(m_structs.size()); }
 
        int                                                                     getNumSharedObjects     (void) const    { return static_cast<int>(m_sharedMemoryObjects.size()); }
        std::vector<SharedStruct>&                      getSharedObjects        (void)                  { return m_sharedMemoryObjects; }
index 0568cff..1f4f100 100644 (file)
@@ -798,7 +798,7 @@ void MultiViewRenderTestInstance::madeShaderModule (map<VkShaderStageFlagBits, S
                default:
                        DE_ASSERT(0);
                break;
-       };
+       }
 
        VkPipelineShaderStageCreateInfo pipelineShaderStage     =
        {
@@ -3766,7 +3766,7 @@ void multiViewRenderCreateTests (tcu::TestCaseGroup* group)
                                default:
                                        DE_ASSERT(0);
                                        break;
-                       };
+                       }
                }
 
                targetGroup->addChild(groupViewIndex.release());
index f3e0ceb..2733523 100644 (file)
@@ -252,7 +252,7 @@ Vec3 calculateWeightingFactors(BlendOperationAdvancedParam param,
                break;
        default:
                DE_FATAL("Unsupported Advanced Blend Overlap Mode");
-       };
+       }
        return p;
 }
 
@@ -325,7 +325,7 @@ Vec3 calculateWeightingFactors(BlendOperationAdvancedParam param,
 
        default:
                DE_FATAL("Unsupported f/X/Y/Z Advanced Blend Operations Mode");
-       };
+       }
 
        return xyz;
 }
@@ -659,7 +659,7 @@ Vec3 calculateFFunction(VkBlendOp op,
 
        default:
                DE_FATAL("Unsupported f/X/Y/Z Advanced Blend Operations Mode");
-       };
+       }
 
        return f;
 }
@@ -738,7 +738,7 @@ Vec4 additionalRGBBlendOperations(VkBlendOp op,
 
        default:
                DE_FATAL("Unsupported blend operation");
-       };
+       }
        return res;
 }
 
index 41d505b..0b9dad7 100644 (file)
@@ -102,7 +102,7 @@ std::string getShaderFlagStr (const VkShaderStageFlagBits   shader,
                desc << "unknown shader stage!";
                DE_FATAL("Unknown shader Stage!");
                break;
-       };
+       }
 
        return desc.str();
 }
@@ -752,7 +752,7 @@ void GraphicsCacheTest::initPrograms (SourceCollections& programCollection) cons
                                default:
                                        DE_FATAL("Unknown Shader Stage!");
                                        break;
-                       };
+                       }
                }
        }
 }
@@ -772,7 +772,7 @@ void GraphicsCacheTest::checkSupport (Context& context) const
                                break;
                        default:
                                break;
-               };
+               }
        }
 }
 
@@ -984,7 +984,7 @@ GraphicsCacheTestInstance::GraphicsCacheTestInstance (Context&                              context,
                        default:
                                DE_FATAL("Unknown Shader Stage!");
                                break;
-               };
+               }
        }
 
        // Create pipeline layout
index 8e2673f..1b4cdf6 100644 (file)
@@ -290,8 +290,8 @@ struct TestParams
                static constexpr VariantArray BATCH_NOCOMPILE_COMPILE_NOCOMPILE = VariantArray{NO_COMPILE, NORMAL, NO_COMPILE};
                static constexpr VariantArray BATCH_RETURN_COMPILE_NOCOMPILE = VariantArray{EARLY_RETURN, NORMAL, NO_COMPILE};
 
-               inline constexpr Iteration() : variants{}, validators{} {};
-               inline constexpr Iteration(const VariantArray& v, const ValidatorArray& f) : variants{v}, validators{f} {};
+               inline constexpr Iteration() : variants{}, validators{} {}
+               inline constexpr Iteration(const VariantArray& v, const ValidatorArray& f) : variants{v}, validators{f} {}
 
                VariantArray   variants;
                ValidatorArray validators;
index e59314b..b3963da 100644 (file)
@@ -100,7 +100,7 @@ std::string getShaderFlagStr (const VkShaderStageFlagBits   shader,
                desc << "unknown shader stage!";
                DE_FATAL("Unknown shader Stage!");
                break;
-       };
+       }
 
        return desc.str();
 }
@@ -129,7 +129,7 @@ std::string getCaseStr (const deUint32 ndx)
                desc << "Unknown case";
                DE_FATAL("Unknown case!");
                break;
-       };
+       }
 
        return desc.str();
 }
@@ -717,7 +717,7 @@ void GraphicsCacheTest::initPrograms (SourceCollections& programCollection) cons
                                default:
                                        DE_FATAL("Unknown Shader Stage!");
                                        break;
-               };
+               }
        }
 }
 
@@ -736,7 +736,7 @@ void GraphicsCacheTest::checkSupport (Context& context) const
                        break;
                default:
                        break;
-               };
+               }
        }
 }
 
@@ -807,7 +807,7 @@ GraphicsCacheTestInstance::GraphicsCacheTestInstance (Context&                              context,
                        default:
                                DE_FATAL("Unknown Shader Stage!");
                                break;
-                       };
+                       }
                }
                if (ndx == PIPELINE_CACHE_NDX_CACHED && !param->isDelayedDestroy())
                {
index 1d02c9b..374d102 100644 (file)
@@ -144,7 +144,7 @@ deBool isFloatingPointDepthFormat (VkFormat format)
                return DE_FALSE;
        default:
                DE_FATAL("No depth format");
-       };
+       }
        return DE_FALSE;
 }
 
@@ -161,7 +161,7 @@ deBool depthFormatHasStencilComponent (VkFormat format)
                return DE_FALSE;
        default:
                DE_FATAL("No depth format");
-       };
+       }
        return DE_FALSE;
 }
 
@@ -200,7 +200,7 @@ deBool compareDepthResult (VkCompareOp compare, float depth, float clearValue)
        default:
                result = false;
                break;
-       };
+       }
        return result;
 }
 
index c715290..29f01cf 100644 (file)
@@ -471,7 +471,7 @@ DepthTestInstance::DepthTestInstance (Context&                              context,
        // Create pipeline
        {
                const std::vector<VkViewport>                           viewports                                                       (1, makeViewport(m_renderSize));
-               const std::vector<VkRect2D>                                     scissors                                                        (1, makeRect2D(m_renderSize));;
+               const std::vector<VkRect2D>                                     scissors                                                        (1, makeRect2D(m_renderSize));
 
                const VkVertexInputBindingDescription           vertexInputBindingDescription           =
                {
index 3e58d29..7eb987a 100644 (file)
@@ -136,7 +136,7 @@ std::string getShaderFlagStr (const VkShaderStageFlagBits   shader,
                desc << "unknown shader stage!";
                DE_FATAL("Unknown shader Stage!");
                break;
-       };
+       }
 
        return desc.str();
 }
@@ -1194,7 +1194,7 @@ void GraphicsExecutablePropertiesTest::initPrograms (SourceCollections& programC
                                default:
                                        DE_FATAL("Unknown Shader Stage!");
                                        break;
-               };
+               }
        }
 }
 
@@ -1284,7 +1284,7 @@ GraphicsExecutablePropertiesTestInstance::GraphicsExecutablePropertiesTestInstan
                        default:
                                DE_FATAL("Unknown Shader Stage!");
                                break;
-                       };
+                       }
 
                }
 
index f39d48e..f4681b6 100644 (file)
@@ -1430,7 +1430,6 @@ void ExtendedDynamicStateTest::initPrograms (vk::SourceCollections& programColle
                        << "                 gl_in[1].gl_Position * gl_TessCoord.y + \n"
                        << "                 gl_in[2].gl_Position * gl_TessCoord.z);\n"
                        << "}\n";
-                       ;
        }
 
 
index da8d064..1490c26 100644 (file)
@@ -951,7 +951,7 @@ deInt32 getMaxIOComponents(deBool input, VkShaderStageFlags stage, VkPhysicalDev
                break;
        default:
                DE_FATAL("Unsupported shader");
-       };
+       }
 
        return data;
 }
index 12687fe..fda5e41 100644 (file)
@@ -1263,7 +1263,7 @@ std::string declareSampleDataSSBO (void)
                << "    vec2  data[];\n"
                << "} sb_data;\n";
        return str.str();
-};
+}
 
 void addProgramsVerifyLocationGeometry (SourceCollections& programCollection, const TestParams)
 {
index 29c063a..3d82798 100644 (file)
@@ -802,9 +802,9 @@ protected:
 
        struct SampleCoverage
        {
-               SampleCoverage() {};
+               SampleCoverage() {}
                SampleCoverage(deUint32 min_, deUint32 max_)
-                       : min(min_), max(max_) {};
+                       : min(min_), max(max_) {}
 
                deUint32        min;
                deUint32        max;
@@ -3408,7 +3408,7 @@ void MultisampleRenderer::initialize (Context&                                                                    context,
                                VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL                                                                        // VkImageLayout                                        finalLayout;
                        };
                        attachmentDescriptions.push_back(depthStencilAttachmentDescription);
-               };
+               }
 
                const VkAttachmentReference colorAttachmentReference =
                {
@@ -4137,7 +4137,7 @@ void MultisampleRenderer::initialize (Context&                                                                    context,
                        };
                        imageLayoutBarriers.push_back(depthStencilImageBarrier);
                        dstStageMask |= VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT;
-               };
+               }
 
                m_cmdBuffer = allocateCommandBuffer(vk, vkDevice, *m_cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY);
 
index 11fe81e..c079e9a 100644 (file)
@@ -1515,7 +1515,7 @@ std::string getColorReadStr (deUint32 size)
        const std::string       arrayNdx                = (size == 128u)        ? "[7]"
                                                                                : (size == 32u)         ? "[1]"
                                                                                : "";
-       const std::string       colorReadStr    = getSwizzleStr(size) + " += matInst.color" + arrayNdx + ";\n";;
+       const std::string       colorReadStr    = getSwizzleStr(size) + " += matInst.color" + arrayNdx + ";\n";
 
        return colorReadStr;
 }
index 7cd1c08..eb1daf7 100644 (file)
@@ -1464,7 +1464,7 @@ void PushDescriptorImageGraphicsTestInstance::init (void)
                        default:
                                DE_FATAL("unexpected descriptor type");
                                break;
-               };
+               }
 
                const VkDescriptorSetLayoutCreateInfo   descriptorSetLayoutCreateInfo   =
                {
@@ -2196,7 +2196,7 @@ void PushDescriptorImageComputeTestInstance::init (void)
                        default:
                                DE_FATAL("unexpected descriptor type");
                                break;
-               };
+               }
 
                const VkDescriptorSetLayoutBinding              descriptorSetLayoutBindingOutputBuffer  =
                {
@@ -2510,7 +2510,7 @@ tcu::TestStatus PushDescriptorImageComputeTestInstance::verifyOutput (void)
                default:
                        DE_FATAL("unexpected descriptor type");
                        break;
-       };
+       }
 
        // Verify result
        const auto                      bufferDataPtr           = reinterpret_cast<const char*>(m_outputBufferAlloc->getHostPtr());
@@ -4306,7 +4306,7 @@ tcu::TestCaseGroup* createPushDescriptorTests (tcu::TestContext& testCtx)
                        default:
                                DE_FATAL("Unexpected descriptor type");
                                break;
-               };
+               }
        }
 
        pushDescriptorTests->addChild(graphicsTests.release());
index edf830b..c121ecb 100644 (file)
@@ -100,28 +100,28 @@ std::string getPipelineStageFlagStr (const VkPipelineStageFlagBits stage,
                        GEN_DESC_STRING(p, stage);             \
                        break;                                 \
                }
-               STAGE_CASE(TOP_OF_PIPE);
-               STAGE_CASE(DRAW_INDIRECT);
-               STAGE_CASE(VERTEX_INPUT);
-               STAGE_CASE(VERTEX_SHADER);
-               STAGE_CASE(TESSELLATION_CONTROL_SHADER);
-               STAGE_CASE(TESSELLATION_EVALUATION_SHADER);
-               STAGE_CASE(GEOMETRY_SHADER);
-               STAGE_CASE(FRAGMENT_SHADER);
-               STAGE_CASE(EARLY_FRAGMENT_TESTS);
-               STAGE_CASE(LATE_FRAGMENT_TESTS);
-               STAGE_CASE(COLOR_ATTACHMENT_OUTPUT);
-               STAGE_CASE(COMPUTE_SHADER);
-               STAGE_CASE(TRANSFER);
-               STAGE_CASE(HOST);
-               STAGE_CASE(ALL_GRAPHICS);
-               STAGE_CASE(ALL_COMMANDS);
+               STAGE_CASE(TOP_OF_PIPE)
+               STAGE_CASE(DRAW_INDIRECT)
+               STAGE_CASE(VERTEX_INPUT)
+               STAGE_CASE(VERTEX_SHADER)
+               STAGE_CASE(TESSELLATION_CONTROL_SHADER)
+               STAGE_CASE(TESSELLATION_EVALUATION_SHADER)
+               STAGE_CASE(GEOMETRY_SHADER)
+               STAGE_CASE(FRAGMENT_SHADER)
+               STAGE_CASE(EARLY_FRAGMENT_TESTS)
+               STAGE_CASE(LATE_FRAGMENT_TESTS)
+               STAGE_CASE(COLOR_ATTACHMENT_OUTPUT)
+               STAGE_CASE(COMPUTE_SHADER)
+               STAGE_CASE(TRANSFER)
+               STAGE_CASE(HOST)
+               STAGE_CASE(ALL_GRAPHICS)
+               STAGE_CASE(ALL_COMMANDS)
 #undef STAGE_CASE
          default:
                desc << "unknown stage!";
                DE_FATAL("Unknown Stage!");
                break;
-       };
+       }
 
        return desc.str();
 }
@@ -172,7 +172,7 @@ std::string getTransferMethodStr (const TransferMethod      method,
                desc << "unknown method!";
                DE_FATAL("Unknown method!");
                break;
-       };
+       }
 
        return desc.str();
 }
@@ -1952,7 +1952,7 @@ void AdvGraphicsTestInstance::featureSupportCheck (void)
                        case VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT:
                        default:
                                break;
-               };
+               }
        }
 }
 
@@ -2634,7 +2634,7 @@ void TransferTestInstance::configCommandBuffer (void)
                default:
                        DE_FATAL("Unknown Transfer Method!");
                        break;
-       };
+       }
 
        deUint32 timestampEntry = 0u;
 
index 0a39bbf..e792176 100644 (file)
@@ -340,7 +340,7 @@ tcu::TestStatus ProvokingVertexTestInstance::iterate (void)
                const Unique<VkShaderModule>                                                                    vertexShader                                    (createShaderModule(vk, device, m_context.getBinaryCollection().get("vert"), 0));
                const Unique<VkShaderModule>                                                                    fragmentShader                                  (createShaderModule(vk, device, m_context.getBinaryCollection().get("frag"), 0));
                const std::vector<VkViewport>                                                                   viewports                                               (1, makeViewport(tcu::UVec2(m_params.size)));
-               const std::vector<VkRect2D>                                                                             scissors                                                (1, makeRect2D(tcu::UVec2(m_params.size)));;
+               const std::vector<VkRect2D>                                                                             scissors                                                (1, makeRect2D(tcu::UVec2(m_params.size)));
                const Move<VkPipelineLayout>                                                                    pipelineLayout                                  = makePipelineLayout(vk, device, 0, DE_NULL);
 
                const VkVertexInputBindingDescription                                                   vertexInputBindingDescription   =
index bb355d9..fcdd6f5 100644 (file)
@@ -193,7 +193,7 @@ protected:
                                                                                                                                                                                VkImage image, VkImage resolvedImage, VkFramebuffer frameBuffer, const deUint32 renderSize, VkBuffer resultBuffer, const Allocation& resultBufferMemory);
        virtual float                                                                   getLineWidth                                    (void) const;
        virtual float                                                                   getPointSize                                    (void) const;
-       virtual bool                                                                    getLineStippleDynamic                   (void) const { return false; };
+       virtual bool                                                                    getLineStippleDynamic                   (void) const { return false; }
 
        virtual
        const VkPipelineRasterizationStateCreateInfo*   getRasterizationStateCreateInfo (void) const;
@@ -1061,7 +1061,7 @@ public:
        virtual tcu::TestStatus         iterate                                 (void);
        virtual float                           getLineWidth                    (void) const;
        bool                                            getLineStippleEnable    (void) const { return m_stipple != LINESTIPPLE_DISABLED; }
-       virtual bool                            getLineStippleDynamic   (void) const { return m_stipple == LINESTIPPLE_DYNAMIC; };
+       virtual bool                            getLineStippleDynamic   (void) const { return m_stipple == LINESTIPPLE_DYNAMIC; }
 
        virtual
        VkPipelineRasterizationLineStateCreateInfoEXT   initLineRasterizationStateCreateInfo    (void) const;
@@ -4549,7 +4549,7 @@ public:
                                                                }
 
        bool                                    getLineStippleEnable    (void) const { return m_stipple != LINESTIPPLE_DISABLED; }
-       virtual bool                    getLineStippleDynamic   (void) const { return m_stipple == LINESTIPPLE_DYNAMIC; };
+       virtual bool                    getLineStippleDynamic   (void) const { return m_stipple == LINESTIPPLE_DYNAMIC; }
 
 protected:
        const PrimitiveWideness                         m_wideness;
index d3023fb..fd2db3f 100644 (file)
@@ -482,7 +482,7 @@ void GraphicsConfiguration::initConfiguration (Context&                                             context,
                        break;
                default:
                        TCU_THROW(InternalError, "Wrong shader source type");
-       };
+       }
 
        const VkVertexInputBindingDescription vertexInputBindingDescription =
        {
@@ -740,7 +740,7 @@ bool GraphicsConfiguration::verifyImage (BufferWithMemory*                                  resultBuffer,
                        break;
                default:
                        TCU_THROW(InternalError, "Wrong shader source type");
-       };
+       }
 
        // compare result and reference
        return tcu::intThresholdCompare(context.getTestContext().getLog(), "Result comparison", "", referenceAccess, resultAccess, tcu::UVec4(0), tcu::COMPARE_LOG_RESULT);
index 94ec31c..0eecec9 100644 (file)
@@ -129,8 +129,8 @@ namespace vkt
                        class PipelineConfiguration
                        {
                        public:
-                               PipelineConfiguration() {};
-                               virtual                 ~PipelineConfiguration() {};
+                               PipelineConfiguration() {}
+                               virtual                 ~PipelineConfiguration() {}
 
                                virtual void    initConfiguration(const TestEnvironment& env,
                                        TestParams& testParams) = 0;
@@ -379,7 +379,7 @@ namespace vkt
                                        const TestParams& testParams);
 
                                GraphicsConfiguration();
-                               virtual                                                 ~GraphicsConfiguration() {};
+                               virtual                                                 ~GraphicsConfiguration() {}
 
                                void                                                    initVertexBuffer(const TestEnvironment& env,
                                        TestParams& testParams);
@@ -1005,7 +1005,7 @@ namespace vkt
                        {
                        public:
                                ComputeConfiguration();
-                               virtual                                         ~ComputeConfiguration() {};
+                               virtual                                         ~ComputeConfiguration() {}
 
                                static void                                     checkSupport(Context& context,
                                        const TestParams& testParams);
@@ -1142,7 +1142,7 @@ namespace vkt
                        {
                        public:
                                RayTracingConfiguration();
-                               virtual                                                                                 ~RayTracingConfiguration() {};
+                               virtual                                                                                 ~RayTracingConfiguration() {}
 
                                static void                                                                             checkSupport(Context& context,
                                        const TestParams& testParams);
@@ -5147,7 +5147,6 @@ namespace vkt
                                                "  }\n"
                                                "\n"
                                                "  imageStore(result, pos, ivec4(result_i32, 0, 0, 0));\n";
-                                               ;
 
                                        return result;
                                }
index a383e54..f97f0fd 100644 (file)
@@ -469,7 +469,7 @@ void GraphicsConfiguration::initConfiguration (Context&                                             context,
                        break;
                default:
                        TCU_THROW(InternalError, "Wrong shader source type");
-       };
+       }
 
        const VkVertexInputBindingDescription vertexInputBindingDescription =
        {
@@ -724,7 +724,7 @@ bool GraphicsConfiguration::verifyImage (BufferWithMemory*                                  resultBuffer,
                        break;
                default:
                        TCU_THROW(InternalError, "Wrong shader source type");
-       };
+       }
 
        // compare result and reference
        return tcu::intThresholdCompare(context.getTestContext().getLog(), "Result comparison", "", referenceAccess, resultAccess, tcu::UVec4(0), tcu::COMPARE_LOG_RESULT);
index 0a23f72..13a0052 100644 (file)
@@ -156,7 +156,6 @@ void NonUniformArgsCase::initPrograms (vk::SourceCollections& programCollection)
                << "  }\n"
                << "  result.candidateFound = candidateFoundVal;\n"
                << "}\n";
-               ;
 
        programCollection.glslSources.add("comp") << glu::ComputeSource(comp.str()) << buildOptions;
 }
index e36d68a..0f46545 100644 (file)
@@ -388,7 +388,7 @@ void GraphicsConfiguration::initConfiguration (Context&                                             context,
                        break;
                default:
                        TCU_THROW(InternalError, "Wrong shader source type");
-       };
+       }
 
        const VkVertexInputBindingDescription vertexInputBindingDescription =
        {
@@ -680,7 +680,7 @@ bool GraphicsConfiguration::verifyImage (BufferWithMemory*                                  resultBuffer,
                        break;
                default:
                        TCU_THROW(InternalError, "Wrong shader source type");
-       };
+       }
 
        // compare result and reference
        return tcu::intThresholdCompare(context.getTestContext().getLog(), "Result comparison", "", referenceAccess, resultAccess, tcu::UVec4(0), tcu::COMPARE_LOG_RESULT);
index ce19094..11ea386 100644 (file)
@@ -88,8 +88,8 @@ typedef const std::string (*ShaderBodyTextFunc)(const TestParams& testParams);
 class PipelineConfiguration
 {
 public:
-                                       PipelineConfiguration   ()      {};
-       virtual                 ~PipelineConfiguration  ()      {};
+                                       PipelineConfiguration   ()      {}
+       virtual                 ~PipelineConfiguration  ()      {}
 
        virtual void    initConfiguration       (Context&                                                       context,
                                                                                 TestParams&                                            testParams) = 0;
@@ -338,7 +338,7 @@ public:
                                                                                                                         const TestParams&                                      testParams);
 
                                                                        GraphicsConfiguration   ();
-       virtual                                                 ~GraphicsConfiguration  () {};
+       virtual                                                 ~GraphicsConfiguration  () {}
 
        void                                                    initVertexBuffer                (Context&                                                       context,
                                                                                                                         TestParams&                                            testParams);
@@ -925,7 +925,7 @@ class ComputeConfiguration : public PipelineConfiguration
 {
 public:
                                                                ComputeConfiguration    ();
-       virtual                                         ~ComputeConfiguration   () {};
+       virtual                                         ~ComputeConfiguration   () {}
 
        static void                                     checkSupport                    (Context&                                                       context,
                                                                                                                 const TestParams&                                      testParams);
@@ -1062,7 +1062,7 @@ class RayTracingConfiguration : public PipelineConfiguration
 {
 public:
                                                                                                        RayTracingConfiguration                         ();
-       virtual                                                                                 ~RayTracingConfiguration                        () {};
+       virtual                                                                                 ~RayTracingConfiguration                        () {}
 
        static void                                                                             checkSupport                                            (Context&                                                       context,
                                                                                                                                                                                 const TestParams&                                      testParams);
index e84bfe7..af56ba9 100644 (file)
@@ -477,7 +477,7 @@ void BarrierTestCase::initPrograms (SourceCollections& programCollection) const
                        << writerCalcAndWrite
                        << "  hitAttribute = vec3(0.0f, 0.0f, 0.0f);\n"
                        << "  reportIntersectionEXT(1.0f, 0);\n"
-                       << "}\n";
+                       << "}\n"
                        ;
                programCollection.glslSources.add("writer_isect") << glu::IntersectionSource(updateRayTracingGLSL(isect.str())) << buildOptions;
        }
@@ -496,7 +496,7 @@ void BarrierTestCase::initPrograms (SourceCollections& programCollection) const
                        << "{\n"
                        << rayTracingIds
                        << writerCalcAndWrite
-                       << "}\n";
+                       << "}\n"
                        ;
                programCollection.glslSources.add("writer_ahit") << glu::AnyHitSource(updateRayTracingGLSL(ahit.str())) << buildOptions;
        }
@@ -515,7 +515,7 @@ void BarrierTestCase::initPrograms (SourceCollections& programCollection) const
                        << "{\n"
                        << rayTracingIds
                        << writerCalcAndWrite
-                       << "}\n";
+                       << "}\n"
                        ;
                programCollection.glslSources.add("writer_chit") << glu::ClosestHitSource(updateRayTracingGLSL(chit.str())) << buildOptions;
        }
@@ -533,7 +533,7 @@ void BarrierTestCase::initPrograms (SourceCollections& programCollection) const
                        << "{\n"
                        << rayTracingIds
                        << writerCalcAndWrite
-                       << "}\n";
+                       << "}\n"
                        ;
                programCollection.glslSources.add("writer_miss") << glu::MissSource(updateRayTracingGLSL(miss.str())) << buildOptions;
        }
@@ -565,7 +565,7 @@ void BarrierTestCase::initPrograms (SourceCollections& programCollection) const
                        << "{\n"
                        << rayTracingIds
                        << writerCalcAndWrite
-                       << "}\n";
+                       << "}\n"
                        ;
                programCollection.glslSources.add("writer_callable") << glu::CallableSource(updateRayTracingGLSL(callable.str())) << buildOptions;
        }
@@ -653,7 +653,7 @@ void BarrierTestCase::initPrograms (SourceCollections& programCollection) const
                        << readerReadAndSave
                        << "  hitAttribute = vec3(0.0f, 0.0f, 0.0f);\n"
                        << "  reportIntersectionEXT(1.0f, 0);\n"
-                       << "}\n";
+                       << "}\n"
                        ;
                programCollection.glslSources.add("reader_isect") << glu::IntersectionSource(updateRayTracingGLSL(isect.str())) << buildOptions;
        }
@@ -672,7 +672,7 @@ void BarrierTestCase::initPrograms (SourceCollections& programCollection) const
                        << "{\n"
                        << rayTracingIds
                        << readerReadAndSave
-                       << "}\n";
+                       << "}\n"
                        ;
                programCollection.glslSources.add("reader_ahit") << glu::AnyHitSource(updateRayTracingGLSL(ahit.str())) << buildOptions;
        }
@@ -691,7 +691,7 @@ void BarrierTestCase::initPrograms (SourceCollections& programCollection) const
                        << "{\n"
                        << rayTracingIds
                        << readerReadAndSave
-                       << "}\n";
+                       << "}\n"
                        ;
                programCollection.glslSources.add("reader_chit") << glu::ClosestHitSource(updateRayTracingGLSL(chit.str())) << buildOptions;
        }
@@ -709,7 +709,7 @@ void BarrierTestCase::initPrograms (SourceCollections& programCollection) const
                        << "{\n"
                        << rayTracingIds
                        << readerReadAndSave
-                       << "}\n";
+                       << "}\n"
                        ;
                programCollection.glslSources.add("reader_miss") << glu::MissSource(updateRayTracingGLSL(miss.str())) << buildOptions;
        }
@@ -741,7 +741,7 @@ void BarrierTestCase::initPrograms (SourceCollections& programCollection) const
                        << "{\n"
                        << rayTracingIds
                        << readerReadAndSave
-                       << "}\n";
+                       << "}\n"
                        ;
                programCollection.glslSources.add("reader_callable") << glu::CallableSource(updateRayTracingGLSL(callable.str())) << buildOptions;
        }
index 2ebc1be..8dd8583 100644 (file)
@@ -167,7 +167,6 @@ void BarycentricCoordinatesCase::initPrograms (vk::SourceCollections& programCol
                << "{\n"
                << "  coordinates.values[gl_LaunchIDEXT.x] = vec4(-1.0, -1.0, -1.0, -1.0);\n"
                << "}\n";
-               ;
 
        programCollection.glslSources.add("rgen") << glu::RaygenSource(updateRayTracingGLSL(rgen.str())) << buildOptions;
        programCollection.glslSources.add("miss") << glu::MissSource(updateRayTracingGLSL(miss.str())) << buildOptions;
index bef7ff6..0b961fc 100644 (file)
@@ -719,7 +719,7 @@ std::vector<deUint32> RayTracingComplexControlFlowInstance::getExpectedValues (v
                                        case 2: { v0 = v1 = v3 = p.b; v2 = p.c & id; break; }
                                        case 3: { v0 = v1 = v2 = p.b; v3 = p.c & id; break; }
                                        default: { v0 = v1 = v2 = v3 = 0; break; }
-                               };
+                               }
 
                                if (!fixed)
                                        result[plain8Ofs + id] = p.c & id;
index 07617dd..0701b5e 100644 (file)
@@ -1222,7 +1222,6 @@ void DataSpillTestCase::initPrograms (vk::SourceCollections& programCollection)
                                calcEqual
                                        << "%component_after_" << i << " = OpLoad %" << componentTypeName << " %component_ptr_" << i << "\n"
                                        << "%equal_" << i << " = " << opEqual << " %bool %component_" << i << " %component_after_" << i << "\n";
-                                       ;
                                if (i > 0)
                                        calcEqual << "%and_" << i << " = OpLogicalAnd %bool %equal_" << (i - 1) << " %equal_" << i << "\n";
                                if (i == numComponents - 1)
@@ -1301,7 +1300,7 @@ void DataSpillTestCase::initPrograms (vk::SourceCollections& programCollection)
                        << "void main()\n"
                        << "{\n"
                        << "    calleeBuffer.val = 1u;\n"
-                       << "}\n";
+                       << "}\n"
                        ;
                programCollection.glslSources.add("chit") << glu::ClosestHitSource(updateRayTracingGLSL(chit.str())) << buildOptions;
        }
@@ -1363,7 +1362,7 @@ void DataSpillTestCase::initPrograms (vk::SourceCollections& programCollection)
                        << "void main()\n"
                        << "{\n"
                        << "    calleeBuffer.val = 1u;\n"
-                       << "}\n";
+                       << "}\n"
                        ;
                programCollection.glslSources.add("ahit") << glu::AnyHitSource(updateRayTracingGLSL(ahit.str())) << buildOptions;
        }
@@ -2074,7 +2073,7 @@ void DataSpillPipelineInterfaceTestCase::initPrograms (vk::SourceCollections& pr
                        << "{\n"
                        << "  storageBuffer.val[1] = uint(hitValue.x + hitValue.y + hitValue.z);\n"
                        << "  hitValue = vec3(hitValue.x + 1.0, hitValue.y + 1.0, hitValue.z + 1.0);\n"
-                       << "}\n";
+                       << "}\n"
                        ;
                programCollection.glslSources.add("chit") << glu::ClosestHitSource(updateRayTracingGLSL(chit.str())) << buildOptions;
        }
@@ -2154,7 +2153,7 @@ void DataSpillPipelineInterfaceTestCase::initPrograms (vk::SourceCollections& pr
                        << "void main()\n"
                        << "{\n"
                        << "  storageBuffer.val[2] = uint(attribs.x + attribs.y + attribs.z);\n"
-                       << "}\n";
+                       << "}\n"
                        ;
                programCollection.glslSources.add("chit") << glu::ClosestHitSource(updateRayTracingGLSL(chit.str())) << buildOptions;
 
index b43ea25..9e313d4 100644 (file)
@@ -389,7 +389,6 @@ void DirectionTestCase::initPrograms (vk::SourceCollections& programCollection)
                << "{\n"
                << "  outBuffer.val = -10000.0f;\n"
                << "}\n";
-               ;
 
        programCollection.glslSources.add("miss") << glu::MissSource(updateRayTracingGLSL(miss.str())) << buildOptions;
 }
index b864120..ffddb60 100644 (file)
@@ -1714,7 +1714,7 @@ public:
 
                memBarrier.dstAccessMask        = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT;
                memBarrier.pNext                        = nullptr;
-               memBarrier.srcAccessMask        = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT;;
+               memBarrier.srcAccessMask        = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT;
                memBarrier.sType                        = VK_STRUCTURE_TYPE_MEMORY_BARRIER;
 
                context.getDeviceInterface().cmdPipelineBarrier(commandBuffer,
index ba05a6b..fe98268 100644 (file)
@@ -171,7 +171,7 @@ void NonUniformArgsCase::initPrograms (vk::SourceCollections& programCollection)
                << "    args.direction.xyz,\n"
                << "    args.Tmax,\n"
                << "    0);\n"
-               << "}\n";
+               << "}\n"
                ;
 
        std::ostringstream chit;
@@ -186,7 +186,7 @@ void NonUniformArgsCase::initPrograms (vk::SourceCollections& programCollection)
                << "void main()\n"
                << "{\n"
                << "  result.shaderId = chitShaderId;\n"
-               << "}\n";
+               << "}\n"
                ;
 
        std::ostringstream miss;
@@ -201,7 +201,7 @@ void NonUniformArgsCase::initPrograms (vk::SourceCollections& programCollection)
                << "void main()\n"
                << "{\n"
                << "  result.shaderId = missShaderId;\n"
-               << "}\n";
+               << "}\n"
                ;
 
        programCollection.glslSources.add("rgen") << glu::RaygenSource(rgen.str()) << buildOptions;
index a150ea8..1d1f80b 100644 (file)
@@ -715,7 +715,7 @@ Move<VkRenderPass> createRenderPass (const DeviceInterface& vkd,
 
                                dependencies.push_back(dependency);
                        }
-               };
+               }
                // the last subpass must synchronize with all prior subpasses
                for (deUint32 splitSubpassIndex = 0; splitSubpassIndex < (splitSubpassCount - 1); splitSubpassIndex++)
                {
index 840525d..3e54bf6 100644 (file)
@@ -645,7 +645,7 @@ struct Programs
                                        "}\n";
                        }
                        break;
-               };
+               }
 
                dst.glslSources.add("quad-frag") << glu::FragmentSource(fragmentShader.str());
        }
index 68ee0d4..7c52992 100644 (file)
@@ -1771,7 +1771,7 @@ public:
        deUint32                                                getColorAttachmentIndex                 (deUint32 attachmentNdx) const { return m_colorAttachments[attachmentNdx].getAttachment(); }
        const Attachment&                               getColorAttachment                              (deUint32 attachmentNdx) const { return m_colorAttachmentInfo[attachmentNdx]; }
        Maybe<VkImageLayout>                    getDepthStencilAttachmentLayout (void) const { return m_depthStencilAttachment ? tcu::just(m_depthStencilAttachment->getImageLayout()) : tcu::nothing<VkImageLayout>(); }
-       Maybe<deUint32>                                 getDepthStencilAttachmentIndex  (void) const { return m_depthStencilAttachment ? tcu::just(m_depthStencilAttachment->getAttachment()) : tcu::nothing<deUint32>(); };
+       Maybe<deUint32>                                 getDepthStencilAttachmentIndex  (void) const { return m_depthStencilAttachment ? tcu::just(m_depthStencilAttachment->getAttachment()) : tcu::nothing<deUint32>(); }
        const Maybe<Attachment>&                getDepthStencilAttachment               (void) const { return m_depthStencilAttachmentInfo; }
        VkSubpassDescriptionFlags               getSubpassFlags                                 (void) const { return m_flags; }
 
index e8afdf7..de8d2a0 100644 (file)
@@ -947,7 +947,7 @@ std::string loadOpToString (VkAttachmentLoadOp loadOp)
                default:
                        DE_FATAL("unexpected attachment load op");
                        return "";
-       };
+       }
 }
 
 std::string storeOpToString (VkAttachmentStoreOp storeOp)
@@ -961,7 +961,7 @@ std::string storeOpToString (VkAttachmentStoreOp storeOp)
                default:
                        DE_FATAL("unexpected attachment store op");
                        return "";
-       };
+       }
 }
 
 } // anonymous
index 7462387..a2de892 100644 (file)
@@ -250,7 +250,7 @@ public:
 
        virtual void checkResults(tcu::ResultCollector& resultCollector) = 0;
 
-       virtual ~BufferInterface() {};
+       virtual ~BufferInterface() {}
 };
 
 template<typename dataTypeT>
@@ -598,7 +598,7 @@ void TestBuffer<T>::checkOperation (const BufferData<T>&    original,
                        default:
                                DE_FATAL("Unexpected atomic operation.");
                                break;
-               };
+               }
 
                const T resIo           = result.inout[elementNdx];
                const T resOutput0      = result.output[elementNdx];
@@ -802,7 +802,7 @@ void TestBufferFloatingPoint<T>::checkOperationFloatingPoint(const BufferDataFlo
                default:
                        DE_FATAL("Unexpected atomic operation.");
                        break;
-               };
+               }
 
                const T resIo = result.inout[elementNdx];
                const T resOutput0 = result.output[elementNdx];
index cc14b34..8fe371c 100644 (file)
@@ -3012,18 +3012,18 @@ typedef  InverseSqrt< Signature<deFloat16, deFloat16> > InverseSqrt16Bit;
 typedef         InverseSqrt< Signature<float, float> >                 InverseSqrt32Bit;
 typedef InverseSqrt< Signature<double, double> >               InverseSqrt64Bit;
 
-DEFINE_DERIVED_FLOAT1(Sqrt32Bit,               sqrt,           x,              constant(1.0f) / app<InverseSqrt32Bit>(x));
-DEFINE_DERIVED_FLOAT1_16BIT(Sqrt16Bit, sqrt,           x,              constant((deFloat16)FLOAT16_1_0) / app<InverseSqrt16Bit>(x));
-DEFINE_DERIVED_DOUBLE1(Sqrt64Bit,              sqrt,           x,              constant(1.0) / app<InverseSqrt64Bit>(x));
-DEFINE_DERIVED_FLOAT2(Pow,                             pow,            x,      y,      exp2<float>(y * log2(x)));
-DEFINE_DERIVED_FLOAT2_16BIT(Pow16,             pow,            x,      y,      exp2<deFloat16>(y * log2(x)));
-DEFINE_DERIVED_DOUBLE2(Pow64,                  pow,            x,      y,      exp2<double>(y * log2(x)));
-DEFINE_DERIVED_FLOAT1(Radians,                 radians,        d,              (constant(DE_PI) / constant(180.0f)) * d);
-DEFINE_DERIVED_FLOAT1_16BIT(Radians16, radians,        d,              (constant((deFloat16)DE_PI_16BIT) / constant((deFloat16)FLOAT16_180_0)) * d);
-DEFINE_DERIVED_DOUBLE1(Radians64,              radians,        d,              (constant((double)(DE_PI)) / constant(180.0)) * d);
-DEFINE_DERIVED_FLOAT1(Degrees,                 degrees,        r,              (constant(180.0f) / constant(DE_PI)) * r);
-DEFINE_DERIVED_FLOAT1_16BIT(Degrees16, degrees,        r,              (constant((deFloat16)FLOAT16_180_0) / constant((deFloat16)DE_PI_16BIT)) * r);
-DEFINE_DERIVED_DOUBLE1(Degrees64,              degrees,        r,              (constant(180.0) / constant((double)(DE_PI))) * r);
+DEFINE_DERIVED_FLOAT1(Sqrt32Bit,               sqrt,           x,              constant(1.0f) / app<InverseSqrt32Bit>(x))
+DEFINE_DERIVED_FLOAT1_16BIT(Sqrt16Bit, sqrt,           x,              constant((deFloat16)FLOAT16_1_0) / app<InverseSqrt16Bit>(x))
+DEFINE_DERIVED_DOUBLE1(Sqrt64Bit,              sqrt,           x,              constant(1.0) / app<InverseSqrt64Bit>(x))
+DEFINE_DERIVED_FLOAT2(Pow,                             pow,            x,      y,      exp2<float>(y * log2(x)))
+DEFINE_DERIVED_FLOAT2_16BIT(Pow16,             pow,            x,      y,      exp2<deFloat16>(y * log2(x)))
+DEFINE_DERIVED_DOUBLE2(Pow64,                  pow,            x,      y,      exp2<double>(y * log2(x)))
+DEFINE_DERIVED_FLOAT1(Radians,                 radians,        d,              (constant(DE_PI) / constant(180.0f)) * d)
+DEFINE_DERIVED_FLOAT1_16BIT(Radians16, radians,        d,              (constant((deFloat16)DE_PI_16BIT) / constant((deFloat16)FLOAT16_180_0)) * d)
+DEFINE_DERIVED_DOUBLE1(Radians64,              radians,        d,              (constant((double)(DE_PI)) / constant(180.0)) * d)
+DEFINE_DERIVED_FLOAT1(Degrees,                 degrees,        r,              (constant(180.0f) / constant(DE_PI)) * r)
+DEFINE_DERIVED_FLOAT1_16BIT(Degrees16, degrees,        r,              (constant((deFloat16)FLOAT16_180_0) / constant((deFloat16)DE_PI_16BIT)) * r)
+DEFINE_DERIVED_DOUBLE1(Degrees64,              degrees,        r,              (constant(180.0) / constant((double)(DE_PI))) * r)
 
 /*Proper parameters for template T
        Signature<float, float>         32bit tests
@@ -3206,9 +3206,9 @@ ExprP<float> cos (const ExprP<float>& x) { return app<Cos<Signature<float, float
 ExprP<deFloat16> cos (const ExprP<deFloat16>& x) { return app<Cos<Signature<deFloat16, deFloat16> > >(x); }
 ExprP<double> cos (const ExprP<double>& x) { return app<Cos<Signature<double, double> > >(x); }
 
-DEFINE_DERIVED_FLOAT1_INPUTRANGE(Tan, tan, x, sin(x) * (constant(1.0f) / cos(x)), Interval(false, -DE_PI_DOUBLE, DE_PI_DOUBLE));
-DEFINE_DERIVED_FLOAT1_INPUTRANGE_16BIT(Tan16Bit, tan, x, sin(x) * (constant((deFloat16)FLOAT16_1_0) / cos(x)), Interval(false, -DE_PI_DOUBLE, DE_PI_DOUBLE));
-DEFINE_DERIVED_DOUBLE1_INPUTRANGE(Tan64Bit, tan, x, sin(x) * (constant(1.0) / cos(x)), Interval(false, -DE_PI_DOUBLE, DE_PI_DOUBLE));
+DEFINE_DERIVED_FLOAT1_INPUTRANGE(Tan, tan, x, sin(x) * (constant(1.0f) / cos(x)), Interval(false, -DE_PI_DOUBLE, DE_PI_DOUBLE))
+DEFINE_DERIVED_FLOAT1_INPUTRANGE_16BIT(Tan16Bit, tan, x, sin(x) * (constant((deFloat16)FLOAT16_1_0) / cos(x)), Interval(false, -DE_PI_DOUBLE, DE_PI_DOUBLE))
+DEFINE_DERIVED_DOUBLE1_INPUTRANGE(Tan64Bit, tan, x, sin(x) * (constant(1.0) / cos(x)), Interval(false, -DE_PI_DOUBLE, DE_PI_DOUBLE))
 
 template <class T>
 class ATan : public CFloatFunc1<T>
@@ -3282,41 +3282,41 @@ ExprP<deFloat16> atan2  (const ExprP<deFloat16>& x, const ExprP<deFloat16>& y)  {
 ExprP<double> atan2    (const ExprP<double>& x, const ExprP<double>& y)        { return app<ATan2<Signature<double, double, double> > >(x, y); }
 
 
-DEFINE_DERIVED_FLOAT1(Sinh, sinh, x, (exp<float>(x) - exp<float>(-x)) / constant(2.0f));
-DEFINE_DERIVED_FLOAT1(Cosh, cosh, x, (exp<float>(x) + exp<float>(-x)) / constant(2.0f));
-DEFINE_DERIVED_FLOAT1(Tanh, tanh, x, sinh(x) / cosh(x));
+DEFINE_DERIVED_FLOAT1(Sinh, sinh, x, (exp<float>(x) - exp<float>(-x)) / constant(2.0f))
+DEFINE_DERIVED_FLOAT1(Cosh, cosh, x, (exp<float>(x) + exp<float>(-x)) / constant(2.0f))
+DEFINE_DERIVED_FLOAT1(Tanh, tanh, x, sinh(x) / cosh(x))
 
-DEFINE_DERIVED_FLOAT1_16BIT(Sinh16Bit, sinh, x, (exp(x) - exp(-x)) / constant((deFloat16)FLOAT16_2_0));
-DEFINE_DERIVED_FLOAT1_16BIT(Cosh16Bit, cosh, x, (exp(x) + exp(-x)) / constant((deFloat16)FLOAT16_2_0));
-DEFINE_DERIVED_FLOAT1_16BIT(Tanh16Bit, tanh, x, sinh(x) / cosh(x));
+DEFINE_DERIVED_FLOAT1_16BIT(Sinh16Bit, sinh, x, (exp(x) - exp(-x)) / constant((deFloat16)FLOAT16_2_0))
+DEFINE_DERIVED_FLOAT1_16BIT(Cosh16Bit, cosh, x, (exp(x) + exp(-x)) / constant((deFloat16)FLOAT16_2_0))
+DEFINE_DERIVED_FLOAT1_16BIT(Tanh16Bit, tanh, x, sinh(x) / cosh(x))
 
-DEFINE_DERIVED_DOUBLE1(Sinh64Bit, sinh, x, (exp<double>(x) - exp<double>(-x)) / constant(2.0));
-DEFINE_DERIVED_DOUBLE1(Cosh64Bit, cosh, x, (exp<double>(x) + exp<double>(-x)) / constant(2.0));
-DEFINE_DERIVED_DOUBLE1(Tanh64Bit, tanh, x, sinh(x) / cosh(x));
+DEFINE_DERIVED_DOUBLE1(Sinh64Bit, sinh, x, (exp<double>(x) - exp<double>(-x)) / constant(2.0))
+DEFINE_DERIVED_DOUBLE1(Cosh64Bit, cosh, x, (exp<double>(x) + exp<double>(-x)) / constant(2.0))
+DEFINE_DERIVED_DOUBLE1(Tanh64Bit, tanh, x, sinh(x) / cosh(x))
 
-DEFINE_DERIVED_FLOAT1(ASin, asin, x, atan2(x, sqrt(constant(1.0f) - x * x)));
-DEFINE_DERIVED_FLOAT1(ACos, acos, x, atan2(sqrt(constant(1.0f) - x * x), x));
-DEFINE_DERIVED_FLOAT1(ASinh, asinh, x, log(x + sqrt(x * x + constant(1.0f))));
+DEFINE_DERIVED_FLOAT1(ASin, asin, x, atan2(x, sqrt(constant(1.0f) - x * x)))
+DEFINE_DERIVED_FLOAT1(ACos, acos, x, atan2(sqrt(constant(1.0f) - x * x), x))
+DEFINE_DERIVED_FLOAT1(ASinh, asinh, x, log(x + sqrt(x * x + constant(1.0f))))
 DEFINE_DERIVED_FLOAT1(ACosh, acosh, x, log(x + sqrt(alternatives((x + constant(1.0f)) * (x - constant(1.0f)),
-                                                                                                                                (x * x - constant(1.0f))))));
+                                                                                                                                (x * x - constant(1.0f))))))
 DEFINE_DERIVED_FLOAT1(ATanh, atanh, x, constant(0.5f) * log((constant(1.0f) + x) /
-                                                                                                                       (constant(1.0f) - x)));
+                                                                                                                       (constant(1.0f) - x)))
 
-DEFINE_DERIVED_FLOAT1_16BIT(ASin16Bit, asin, x, atan2(x, sqrt(constant((deFloat16)FLOAT16_1_0) - x * x)));
-DEFINE_DERIVED_FLOAT1_16BIT(ACos16Bit, acos, x, atan2(sqrt(constant((deFloat16)FLOAT16_1_0) - x * x), x));
-DEFINE_DERIVED_FLOAT1_16BIT(ASinh16Bit, asinh, x, log(x + sqrt(x * x + constant((deFloat16)FLOAT16_1_0))));
+DEFINE_DERIVED_FLOAT1_16BIT(ASin16Bit, asin, x, atan2(x, sqrt(constant((deFloat16)FLOAT16_1_0) - x * x)))
+DEFINE_DERIVED_FLOAT1_16BIT(ACos16Bit, acos, x, atan2(sqrt(constant((deFloat16)FLOAT16_1_0) - x * x), x))
+DEFINE_DERIVED_FLOAT1_16BIT(ASinh16Bit, asinh, x, log(x + sqrt(x * x + constant((deFloat16)FLOAT16_1_0))))
 DEFINE_DERIVED_FLOAT1_16BIT(ACosh16Bit, acosh, x, log(x + sqrt(alternatives((x + constant((deFloat16)FLOAT16_1_0)) * (x - constant((deFloat16)FLOAT16_1_0)),
-                                                                                                                                (x * x - constant((deFloat16)FLOAT16_1_0))))));
+                                                                                                                                (x * x - constant((deFloat16)FLOAT16_1_0))))))
 DEFINE_DERIVED_FLOAT1_16BIT(ATanh16Bit, atanh, x, constant((deFloat16)FLOAT16_0_5) * log((constant((deFloat16)FLOAT16_1_0) + x) /
-                                                                                                                       (constant((deFloat16)FLOAT16_1_0) - x)));
+                                                                                                                       (constant((deFloat16)FLOAT16_1_0) - x)))
 
-DEFINE_DERIVED_DOUBLE1(ASin64Bit, asin, x, atan2(x, sqrt(constant(1.0) - pow(x, constant(2.0)))));
-DEFINE_DERIVED_DOUBLE1(ACos64Bit, acos, x, atan2(sqrt(constant(1.0) - pow(x, constant(2.0))), x));
-DEFINE_DERIVED_DOUBLE1(ASinh64Bit, asinh, x, log(x + sqrt(x * x + constant(1.0))));
+DEFINE_DERIVED_DOUBLE1(ASin64Bit, asin, x, atan2(x, sqrt(constant(1.0) - pow(x, constant(2.0)))))
+DEFINE_DERIVED_DOUBLE1(ACos64Bit, acos, x, atan2(sqrt(constant(1.0) - pow(x, constant(2.0))), x))
+DEFINE_DERIVED_DOUBLE1(ASinh64Bit, asinh, x, log(x + sqrt(x * x + constant(1.0))))
 DEFINE_DERIVED_DOUBLE1(ACosh64Bit, acosh, x, log(x + sqrt(alternatives((x + constant(1.0)) * (x - constant(1.0)),
-                                                                                                                                (x * x - constant(1.0))))));
+                                                                                                                                (x * x - constant(1.0))))))
 DEFINE_DERIVED_DOUBLE1(ATanh64Bit, atanh, x, constant(0.5) * log((constant(1.0) + x) /
-                                                                                                                       (constant(1.0) - x)));
+                                                                                                                       (constant(1.0) - x)))
 
 template <typename T>
 class GetComponent : public PrimitiveFunc<Signature<typename T::Element, T, int> >
@@ -4223,9 +4223,9 @@ typedef Trunc< Signature<double, double> > Trunc64Bit;
 typedef Trunc< Signature<float, float> > Trunc32Bit;
 typedef Trunc< Signature<deFloat16, deFloat16> > Trunc16Bit;
 
-DEFINE_DERIVED_FLOAT1(Fract, fract, x, x - app<Floor32Bit>(x));
-DEFINE_DERIVED_FLOAT1_16BIT(Fract16Bit, fract, x, x - app<Floor16Bit>(x));
-DEFINE_DERIVED_DOUBLE1(Fract64Bit, fract, x, x - app<Floor64Bit>(x));
+DEFINE_DERIVED_FLOAT1(Fract, fract, x, x - app<Floor32Bit>(x))
+DEFINE_DERIVED_FLOAT1_16BIT(Fract16Bit, fract, x, x - app<Floor16Bit>(x))
+DEFINE_DERIVED_DOUBLE1(Fract64Bit, fract, x, x - app<Floor64Bit>(x))
 
 template <class T>
 class PreciseFunc2 : public CFloatFunc2<T>
@@ -4236,13 +4236,13 @@ protected:
        double  precision               (const EvalContext&, double, double, double) const { return 0.0; }
 };
 
-DEFINE_DERIVED_FLOAT2(Mod32Bit, mod, x, y, x - y * app<Floor32Bit>(x / y));
-DEFINE_DERIVED_FLOAT2_16BIT(Mod16Bit, mod, x, y, x - y * app<Floor16Bit>(x / y));
-DEFINE_DERIVED_DOUBLE2(Mod64Bit, mod, x, y, x - y * app<Floor64Bit>(x / y));
+DEFINE_DERIVED_FLOAT2(Mod32Bit, mod, x, y, x - y * app<Floor32Bit>(x / y))
+DEFINE_DERIVED_FLOAT2_16BIT(Mod16Bit, mod, x, y, x - y * app<Floor16Bit>(x / y))
+DEFINE_DERIVED_DOUBLE2(Mod64Bit, mod, x, y, x - y * app<Floor64Bit>(x / y))
 
-DEFINE_CASED_DERIVED_FLOAT2(FRem32Bit, frem, x, y, x - y * app<Trunc32Bit>(x / y), SPIRV_CASETYPE_FREM);
-DEFINE_CASED_DERIVED_FLOAT2_16BIT(FRem16Bit, frem, x, y, x - y * app<Trunc16Bit>(x / y), SPIRV_CASETYPE_FREM);
-DEFINE_CASED_DERIVED_DOUBLE2(FRem64Bit, frem, x, y, x - y * app<Trunc64Bit>(x / y), SPIRV_CASETYPE_FREM);
+DEFINE_CASED_DERIVED_FLOAT2(FRem32Bit, frem, x, y, x - y * app<Trunc32Bit>(x / y), SPIRV_CASETYPE_FREM)
+DEFINE_CASED_DERIVED_FLOAT2_16BIT(FRem16Bit, frem, x, y, x - y * app<Trunc16Bit>(x / y), SPIRV_CASETYPE_FREM)
+DEFINE_CASED_DERIVED_DOUBLE2(FRem64Bit, frem, x, y, x - y * app<Trunc64Bit>(x / y), SPIRV_CASETYPE_FREM)
 
 template <class T>
 class Modf : public PrimitiveFunc<T>
@@ -4366,13 +4366,13 @@ ExprP<double> nanIfGreaterOrEqual(const ExprP<double>& edge0, const ExprP<double
 }
 
 DEFINE_DERIVED_FLOAT3(Mix, mix, x, y, a, alternatives((x * (constant(1.0f) - a)) + y * a,
-                                                                                                         x + (y - x) * a));
+                                                                                                         x + (y - x) * a))
 
 DEFINE_DERIVED_FLOAT3_16BIT(Mix16Bit, mix, x, y, a, alternatives((x * (constant((deFloat16)FLOAT16_1_0) - a)) + y * a,
-                                                                                                         x + (y - x) * a));
+                                                                                                         x + (y - x) * a))
 
 DEFINE_DERIVED_DOUBLE3(Mix64Bit, mix, x, y, a, alternatives((x * (constant(1.0) - a)) + y * a,
-                                                                                                         x + (y - x) * a));
+                                                                                                         x + (y - x) * a))
 
 static double step (double edge, double x)
 {
@@ -5604,7 +5604,7 @@ class Sampling
 public:
        virtual void    genFixeds                       (const FloatFormat&, const Precision, vector<T>&, const Interval&)      const {}
        virtual T               genRandom                       (const FloatFormat&,const Precision, Random&, const Interval&)          const { return T(); }
-       virtual void    removeNotInRange        (vector<T>&, const Interval&, const Precision)                                  const {};
+       virtual void    removeNotInRange        (vector<T>&, const Interval&, const Precision)                                          const {}
 };
 
 template <>
@@ -6582,7 +6582,7 @@ struct InputLess<InTuple<In> >
                if (inputLess(in1.d, in2.d))
                        return true;
                return false;
-       };
+       }
 };
 
 template<typename In>
index d86e491..e8bce27 100644 (file)
@@ -1542,7 +1542,7 @@ static deUint32 getVecStd430ByteAlignment (glu::DataType type)
        switch (glu::getDataTypeScalarSize(type))
        {
                case 1:         return baseSize;
-               case 2:         return baseSize * 2u;;
+               case 2:         return baseSize * 2u;
                case 3:         // fallthrough.
                case 4:         return baseSize * 4u;
                default:
@@ -2133,7 +2133,7 @@ std::string generateSpirv(const ShaderSpec& spec, const bool are16Bit, const boo
        default:
                DE_ASSERT(false);
                break;
-       };
+       }
 
        std::ostringstream      src;
        src << "; SPIR-V\n"
index 2b31903..083514e 100644 (file)
@@ -129,42 +129,42 @@ inline Vector<T, Size> smoothStepScalarScalarVec (T s0, T s1, const Vector<T, Si
        return res;
 }
 
-inline int             addOne (int v)          { return v + 1; };
-inline int             subOne (int v)          { return v - 1; };
-inline deUint32        addOne (deUint32 v)     { return v + 1; };
-inline deUint32        subOne (deUint32 v)     { return v - 1; };
+inline int             addOne (int v)          { return v + 1; }
+inline int             subOne (int v)          { return v - 1; }
+inline deUint32        addOne (deUint32 v)     { return v + 1; }
+inline deUint32        subOne (deUint32 v)     { return v - 1; }
 
-template<int Size> inline Vector<float, Size>          addOne (const Vector<float, Size>& v)           { return v + 1.0f; };
-template<int Size> inline Vector<float, Size>          subOne (const Vector<float, Size>& v)           { return v - 1.0f; };
-template<int Size> inline Vector<int, Size>                    addOne (const Vector<int, Size>& v)                     { return v + 1; };
-template<int Size> inline Vector<int, Size>                    subOne (const Vector<int, Size>& v)                     { return v - 1; };
-template<int Size> inline Vector<deUint32, Size>       addOne (const Vector<deUint32, Size>& v)        { return v + 1U; };
-template<int Size> inline Vector<deUint32, Size>       subOne (const Vector<deUint32, Size>& v)        { return (v.asInt() - 1).asUint(); };
+template<int Size> inline Vector<float, Size>          addOne (const Vector<float, Size>& v)           { return v + 1.0f; }
+template<int Size> inline Vector<float, Size>          subOne (const Vector<float, Size>& v)           { return v - 1.0f; }
+template<int Size> inline Vector<int, Size>                    addOne (const Vector<int, Size>& v)                     { return v + 1; }
+template<int Size> inline Vector<int, Size>                    subOne (const Vector<int, Size>& v)                     { return v - 1; }
+template<int Size> inline Vector<deUint32, Size>       addOne (const Vector<deUint32, Size>& v)        { return v + 1U; }
+template<int Size> inline Vector<deUint32, Size>       subOne (const Vector<deUint32, Size>& v)        { return (v.asInt() - 1).asUint(); }
 
-template<typename T> inline T selection        (bool cond, T a, T b)   { return cond ? a : b; };
+template<typename T> inline T selection        (bool cond, T a, T b)   { return cond ? a : b; }
 
 // Vec-scalar and scalar-vec binary operators.
 
 // \note This one is done separately due to how the overloaded minus operator is implemented for vector-scalar operands.
-template<int Size>                             inline Vector<deUint32, Size>   subVecScalar                    (const Vector<deUint32, Size>& v, deUint32 s)   { return (v.asInt() - (int)s).asUint(); };
-
-template<typename T, int Size> inline Vector<T, Size>                  addVecScalar                    (const Vector<T, Size>& v, T s)                                 { return v + s; };
-template<typename T, int Size> inline Vector<T, Size>                  subVecScalar                    (const Vector<T, Size>& v, T s)                                 { return v - s; };
-template<typename T, int Size> inline Vector<T, Size>                  mulVecScalar                    (const Vector<T, Size>& v, T s)                                 { return v * s; };
-template<typename T, int Size> inline Vector<T, Size>                  divVecScalar                    (const Vector<T, Size>& v, T s)                                 { return v / s; };
-template<typename T, int Size> inline Vector<T, Size>                  modVecScalar                    (const Vector<T, Size>& v, T s)                                 { return mod(v, Vector<T, Size>(s)); };
-template<typename T, int Size> inline Vector<T, Size>                  bitwiseAndVecScalar             (const Vector<T, Size>& v, T s)                                 { return bitwiseAnd(v, Vector<T, Size>(s)); };
-template<typename T, int Size> inline Vector<T, Size>                  bitwiseOrVecScalar              (const Vector<T, Size>& v, T s)                                 { return bitwiseOr(v, Vector<T, Size>(s)); };
-template<typename T, int Size> inline Vector<T, Size>                  bitwiseXorVecScalar             (const Vector<T, Size>& v, T s)                                 { return bitwiseXor(v, Vector<T, Size>(s)); };
-
-template<typename T, int Size> inline Vector<T, Size>                  addScalarVec                    (T s, const Vector<T, Size>& v)                                 { return s + v; };
-template<typename T, int Size> inline Vector<T, Size>                  subScalarVec                    (T s, const Vector<T, Size>& v)                                 { return s - v; };
-template<typename T, int Size> inline Vector<T, Size>                  mulScalarVec                    (T s, const Vector<T, Size>& v)                                 { return s * v; };
-template<typename T, int Size> inline Vector<T, Size>                  divScalarVec                    (T s, const Vector<T, Size>& v)                                 { return s / v; };
-template<typename T, int Size> inline Vector<T, Size>                  modScalarVec                    (T s, const Vector<T, Size>& v)                                 { return mod(Vector<T, Size>(s), v); };
-template<typename T, int Size> inline Vector<T, Size>                  bitwiseAndScalarVec             (T s, const Vector<T, Size>& v)                                 { return bitwiseAnd(Vector<T, Size>(s), v); };
-template<typename T, int Size> inline Vector<T, Size>                  bitwiseOrScalarVec              (T s, const Vector<T, Size>& v)                                 { return bitwiseOr(Vector<T, Size>(s), v); };
-template<typename T, int Size> inline Vector<T, Size>                  bitwiseXorScalarVec             (T s, const Vector<T, Size>& v)                                 { return bitwiseXor(Vector<T, Size>(s), v); };
+template<int Size>                             inline Vector<deUint32, Size>   subVecScalar                    (const Vector<deUint32, Size>& v, deUint32 s)   { return (v.asInt() - (int)s).asUint(); }
+
+template<typename T, int Size> inline Vector<T, Size>                  addVecScalar                    (const Vector<T, Size>& v, T s)                                 { return v + s; }
+template<typename T, int Size> inline Vector<T, Size>                  subVecScalar                    (const Vector<T, Size>& v, T s)                                 { return v - s; }
+template<typename T, int Size> inline Vector<T, Size>                  mulVecScalar                    (const Vector<T, Size>& v, T s)                                 { return v * s; }
+template<typename T, int Size> inline Vector<T, Size>                  divVecScalar                    (const Vector<T, Size>& v, T s)                                 { return v / s; }
+template<typename T, int Size> inline Vector<T, Size>                  modVecScalar                    (const Vector<T, Size>& v, T s)                                 { return mod(v, Vector<T, Size>(s)); }
+template<typename T, int Size> inline Vector<T, Size>                  bitwiseAndVecScalar             (const Vector<T, Size>& v, T s)                                 { return bitwiseAnd(v, Vector<T, Size>(s)); }
+template<typename T, int Size> inline Vector<T, Size>                  bitwiseOrVecScalar              (const Vector<T, Size>& v, T s)                                 { return bitwiseOr(v, Vector<T, Size>(s)); }
+template<typename T, int Size> inline Vector<T, Size>                  bitwiseXorVecScalar             (const Vector<T, Size>& v, T s)                                 { return bitwiseXor(v, Vector<T, Size>(s)); }
+
+template<typename T, int Size> inline Vector<T, Size>                  addScalarVec                    (T s, const Vector<T, Size>& v)                                 { return s + v; }
+template<typename T, int Size> inline Vector<T, Size>                  subScalarVec                    (T s, const Vector<T, Size>& v)                                 { return s - v; }
+template<typename T, int Size> inline Vector<T, Size>                  mulScalarVec                    (T s, const Vector<T, Size>& v)                                 { return s * v; }
+template<typename T, int Size> inline Vector<T, Size>                  divScalarVec                    (T s, const Vector<T, Size>& v)                                 { return s / v; }
+template<typename T, int Size> inline Vector<T, Size>                  modScalarVec                    (T s, const Vector<T, Size>& v)                                 { return mod(Vector<T, Size>(s), v); }
+template<typename T, int Size> inline Vector<T, Size>                  bitwiseAndScalarVec             (T s, const Vector<T, Size>& v)                                 { return bitwiseAnd(Vector<T, Size>(s), v); }
+template<typename T, int Size> inline Vector<T, Size>                  bitwiseOrScalarVec              (T s, const Vector<T, Size>& v)                                 { return bitwiseOr(Vector<T, Size>(s), v); }
+template<typename T, int Size> inline Vector<T, Size>                  bitwiseXorScalarVec             (T s, const Vector<T, Size>& v)                                 { return bitwiseXor(Vector<T, Size>(s), v); }
 
 // Reference functions for specific sequence operations for the sequence operator tests.
 
@@ -1224,8 +1224,8 @@ DECLARE_BOOL_VEC_CWISE_COMPARE_FUNCS(notEqual)
        void eval_##GLSL_NAME##_bvec3   (ShaderEvalContext& c) { c.color.xyz()  = FUNC_NAME(greaterThan(c.in[0].swizzle(2, 0, 1), Vec3(0.0f))).asFloat(); }     \
        void eval_##GLSL_NAME##_bvec4   (ShaderEvalContext& c) { c.color.xyzw() = FUNC_NAME(greaterThan(c.in[0].swizzle(1, 2, 3, 0), Vec4(0.0f))).asFloat(); }
 
-DECLARE_UNARY_SCALAR_BVEC_FUNCS(any, boolAny);
-DECLARE_UNARY_SCALAR_BVEC_FUNCS(all, boolAll);
+DECLARE_UNARY_SCALAR_BVEC_FUNCS(any, boolAny)
+DECLARE_UNARY_SCALAR_BVEC_FUNCS(all, boolAll)
 
 // ShaderOperatorTests.
 
index 9676539..45d64c2 100644 (file)
@@ -41,7 +41,7 @@ namespace
 
 struct QueueFamilyQueuesCount
 {
-       QueueFamilyQueuesCount() : queueCount(0u) {};
+       QueueFamilyQueuesCount() : queueCount(0u) {}
 
        deUint32 queueCount;
 };
index b3ff118..0c54c44 100644 (file)
@@ -63,7 +63,7 @@ public:
                                                                         const tcu::UVec3&      imageSize,
                                                                         const VkFormat         format);
 
-       void                    initPrograms    (SourceCollections&     sourceCollections) const {DE_UNREF(sourceCollections);};
+       void                    initPrograms    (SourceCollections&     sourceCollections) const {DE_UNREF(sourceCollections);}
        TestInstance*   createInstance  (Context&                       context) const;
        virtual void    checkSupport    (Context&                       context) const;
 
index a8a5eb8..24d3ed7 100644 (file)
@@ -64,7 +64,7 @@ public:
                                                                         const VkFormat         format,
                                                                         deUint32                       numSamples);
 
-       void                    initPrograms                    (SourceCollections&                     sourceCollections) const {DE_UNREF(sourceCollections);};
+       void                    initPrograms                    (SourceCollections&                     sourceCollections) const {DE_UNREF(sourceCollections);}
        TestInstance*   createInstance                  (Context&                                       context) const;
        virtual void    checkSupport                    (Context&                                       context) const;
 
@@ -263,7 +263,7 @@ tcu::TestStatus ImageBlockShapesInstance::iterate (void)
                                        expectedGranularity.height = 16;
                                        expectedGranularity.depth = 16;
                                        break;
-                       };
+                       }
                }
                else if (m_numSamples == 2)
                {
@@ -295,7 +295,7 @@ tcu::TestStatus ImageBlockShapesInstance::iterate (void)
                                        expectedGranularity.width = 32;
                                        expectedGranularity.height = 64;
                                        break;
-                       };
+                       }
                }
                else if (m_numSamples == 4)
                {
@@ -327,7 +327,7 @@ tcu::TestStatus ImageBlockShapesInstance::iterate (void)
                                        expectedGranularity.width = 32;
                                        expectedGranularity.height = 32;
                                        break;
-                       };
+                       }
                }
                else if (m_numSamples == 8)
                {
@@ -359,7 +359,7 @@ tcu::TestStatus ImageBlockShapesInstance::iterate (void)
                                        expectedGranularity.width = 16;
                                        expectedGranularity.height = 32;
                                        break;
-                       };
+                       }
                }
                else if (m_numSamples == 16)
                {
@@ -391,7 +391,7 @@ tcu::TestStatus ImageBlockShapesInstance::iterate (void)
                                        expectedGranularity.width = 16;
                                        expectedGranularity.height = 16;
                                        break;
-                       };
+                       }
                }
                else
                {
@@ -425,7 +425,7 @@ tcu::TestStatus ImageBlockShapesInstance::iterate (void)
                                        expectedGranularity.width = 64;
                                        expectedGranularity.height = 64;
                                        break;
-                       };
+                       }
                }
 
                if (   imageGranularity.width  != expectedGranularity.width
index c292e58..7ccb5a7 100755 (executable)
@@ -767,7 +767,7 @@ tcu::TestStatus ImageSparseResidencyInstance::iterate (void)
                        tcu::ConstPixelBufferAccess     pixelBuffer                                     = vk::getChannelAccess(compatibleFormatDescription, compatibleShaderGridSize, planeRowPitches, (const void* const*)planePointers, channelNdx);
                        std::ostringstream str;
                        str << "image" << channelNdx;
-                       m_context.getTestContext().getLog() << tcu::LogImage(str.str(), str.str(), pixelBuffer);;
+                       m_context.getTestContext().getLog() << tcu::LogImage(str.str(), str.str(), pixelBuffer);
                }
 
                // Validate results
index ee64327..e02753c 100755 (executable)
@@ -176,7 +176,7 @@ std::string getOpTypeImageSparse (const ImageType                   imageType,
                default :
                        DE_FATAL("Unexpected image type");
                break;
-       };
+       }
 
        if (requiresSampler)
                src << "1 ";
@@ -243,7 +243,7 @@ std::string getOpTypeImageSparse (const ImageType                   imageType,
                default:
                        DE_FATAL("Unexpected channel type");
                break;
-       };
+       }
 
        return src.str();
 }
@@ -283,7 +283,7 @@ std::string getOpTypeImageSparse (const ImageType           imageType,
                default :
                        DE_FATAL("Unexpected image type");
                break;
-       };
+       }
 
        if (requiresSampler)
                src << "1 ";
@@ -406,7 +406,7 @@ std::string getOpTypeImageResidency (const ImageType imageType)
                default :
                        DE_FATAL("Unexpected image type");
                break;
-       };
+       }
 
        return src.str();
 }
index 6725269..b89bda1 100644 (file)
@@ -983,7 +983,7 @@ bool checkSparseSupportForImageType (const InstanceInterface&       instance,
                default:
                        DE_FATAL("Unexpected image type");
                        return false;
-       };
+       }
 }
 
 bool checkSparseSupportForImageFormat (const InstanceInterface&        instance,
index 4dad8c7..f772bba 100644 (file)
@@ -4036,7 +4036,7 @@ void addShaderCode16BitStorageInputOutput16To16x2 (vk::SourceCollections& dst, T
                default:
                        DE_FATAL("Unexpected data type");
                        break;
-       };
+       }
 
        // Read input data from binding 1, location 2. Should have value(s) of 0.5 in 16bit float or 32767 in 16bit int.
        // Store the value to two outputs (dataOut0 and 1).
index 9b6aafb..e163511 100644 (file)
@@ -3136,7 +3136,7 @@ void addGraphics8BitStorageUniformInt8To32Group (tcu::TestCaseGroup* testGroup)
                                        default:
                                                DE_FATAL("Impossible");
                                                break;
-                                       };
+                                       }
                                }
                                else
                                {
@@ -3966,7 +3966,7 @@ void addGraphics8BitStorageUniformInt8To16Group (tcu::TestCaseGroup* testGroup)
                                        default:
                                                DE_FATAL("Impossible");
                                                break;
-                                       };
+                                       }
                                }
                                else
                                {
index eb22247..fb102e1 100644 (file)
@@ -884,7 +884,7 @@ tcu::TestStatus SpvAsmComputeShaderInstance::iterate (void)
        {
                for (size_t outputNdx = 0; outputNdx < m_shaderSpec.outputs.size(); ++outputNdx)
                {
-                       const BufferSp& expectedOutput = m_shaderSpec.outputs[outputNdx].getBuffer();;
+                       const BufferSp& expectedOutput = m_shaderSpec.outputs[outputNdx].getBuffer();
                        vector<deUint8> expectedBytes;
 
                        expectedOutput->getBytes(expectedBytes);
index 7ba0874..29c4e40 100644 (file)
@@ -622,12 +622,12 @@ void CrossStageTestInstance::redFill (tcu::Texture2DArray& referenceFrame)
 struct Decorations
 {
        Decorations()
-       {};
+       {}
        Decorations(const string& f, const string& v, const string& o)
                : fragment      (f)
                , vertex        (v)
                , others        (o)
-       {};
+       {}
        string fragment;
        string vertex;
        string others;
index c5aeaa3..d0c6041 100644 (file)
@@ -4468,7 +4468,7 @@ InstanceContext GraphicsTestGroupBuilder::createInstanceContext(const OperationT
        {
                // Check various code fragments
                const FloatStatementUsageFlags  commandsFloatConstMask                          = B_STATEMENT_USAGE_COMMANDS_CONST_FLOAT | B_STATEMENT_USAGE_COMMANDS_CONST_FP16;
-               const bool                                              commandsUsesFloatConstant                       = (testCaseInfo.operation.statementUsageFlags & commandsFloatConstMask) != 0;;
+               const bool                                              commandsUsesFloatConstant                       = (testCaseInfo.operation.statementUsageFlags & commandsFloatConstMask) != 0;
                const FloatStatementUsageFlags  argumentsFloatConstMask                         = B_STATEMENT_USAGE_ARGS_CONST_FLOAT | B_STATEMENT_USAGE_ARGS_CONST_FP16;
                const bool                                              argumentsUsesFloatConstant                      = (specOpData.argumentsUsesFloatConstant & argumentsFloatConstMask) != 0;
                bool                                                    hasFP16ConstsInCommandsOrArguments      = commandsUsesFloatConstant || argumentsUsesFloatConstant;
index 8e87700..92afa06 100644 (file)
@@ -2985,7 +2985,7 @@ VkImageAspectFlags getImageAspectFlags (VkFormat format)
                aspectFlags |= VK_IMAGE_ASPECT_COLOR_BIT;
 
        return aspectFlags;
-};
+}
 
 TestStatus runAndVerifyUnusedVariablePipeline (Context &context, UnusedVariableContext unusedVariableContext)
 {
@@ -4034,7 +4034,7 @@ TestStatus runAndVerifyDefaultPipeline (Context& context, InstanceContext instan
                        sizeof(Vec4),                                           // deUint32     offsetInBytes;
                };
                vertexAttribs.push_back(attr1);
-       };
+       }
 
        // If the test instantiation has additional input/output interface variables, we need to create additional bindings.
        // Right now we only support one additional input varible for the vertex stage, and that will be bound to binding #1
@@ -4675,7 +4675,7 @@ const vector<ShaderElement>& getVertFragPipelineStages (void)
        {
                vertFragPipelineStages.push_back(ShaderElement("vert", "main", VK_SHADER_STAGE_VERTEX_BIT));
                vertFragPipelineStages.push_back(ShaderElement("frag", "main", VK_SHADER_STAGE_FRAGMENT_BIT));
-       };
+       }
        return vertFragPipelineStages;
 }
 
@@ -4688,7 +4688,7 @@ const vector<ShaderElement>& getTessPipelineStages (void)
                tessPipelineStages.push_back(ShaderElement("tessc", "main", VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT));
                tessPipelineStages.push_back(ShaderElement("tesse", "main", VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT));
                tessPipelineStages.push_back(ShaderElement("frag", "main", VK_SHADER_STAGE_FRAGMENT_BIT));
-       };
+       }
        return tessPipelineStages;
 }
 
@@ -4700,7 +4700,7 @@ const vector<ShaderElement>& getGeomPipelineStages (void)
                geomPipelineStages.push_back(ShaderElement("vert", "main", VK_SHADER_STAGE_VERTEX_BIT));
                geomPipelineStages.push_back(ShaderElement("geom", "main", VK_SHADER_STAGE_GEOMETRY_BIT));
                geomPipelineStages.push_back(ShaderElement("frag", "main", VK_SHADER_STAGE_FRAGMENT_BIT));
-       };
+       }
        return geomPipelineStages;
 }
 
index 29be83b..3987515 100644 (file)
@@ -226,7 +226,7 @@ void addComputeIndexingStructTests (tcu::TestCaseGroup* group)
                                                vulkanFeatures.extVariablePointers = EXTVARIABLEPOINTERSFEATURES_VARIABLE_POINTERS_STORAGEBUFFER;
                                                spec.extensions.push_back("VK_KHR_variable_pointers");
                                                break;
-                               };
+                               }
 
                                spec.inputs.push_back(BufferSp(new Float32Buffer(inputData)));
                                spec.inputs.push_back(BufferSp(new Buffer<UVec4>(indexSelectorData)));
@@ -475,7 +475,7 @@ void addGraphicsIndexingStructTests (tcu::TestCaseGroup* group)
                                                vulkanFeatures.extVariablePointers      = EXTVARIABLEPOINTERSFEATURES_VARIABLE_POINTERS_STORAGEBUFFER;
                                                element = 1;
                                                break;
-                               };
+                               }
 
                                outputData.reserve(numItems);
                                for (deUint32 numIdx = 0; numIdx < numItems; ++numIdx)
index 2c855e4..afccfb9 100644 (file)
@@ -3940,89 +3940,89 @@ tcu::TestCaseGroup* createTypeTests (tcu::TestContext& testCtx)
                uint64Tests[ndx]        = de::MovePtr<SpvAsmTypeUint64Tests>(new SpvAsmTypeUint64Tests(testCtx, ndx + 1));
        }
 
-       MAKE_TEST_SV_I_8136("negate", SpvOpSNegate, negate, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_I_8136("add", SpvOpIAdd, add, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_I_8136("sub", SpvOpISub, sub, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_I_8136("mul", SpvOpIMul, mul, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_I_8136("div", SpvOpSDiv, div, FILTER_ZERO, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_U_8136("div", SpvOpUDiv, div, FILTER_ZERO, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_I_8136("rem", SpvOpSRem, rem, FILTER_NEGATIVES_AND_ZERO, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_I_8136("mod", SpvOpSMod, mod, FILTER_NEGATIVES_AND_ZERO, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_U_8136("mod", SpvOpUMod, mod, FILTER_ZERO, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_I_8136("abs", GLSLstd450SAbs, abs, FILTER_NONE, RANGE_FULL, "GLSL.std.450");
-       MAKE_TEST_SV_I_8136("sign", GLSLstd450SSign, sign, FILTER_NONE, RANGE_FULL, "GLSL.std.450");
-       MAKE_TEST_SV_I_8136("min", GLSLstd450SMin, min, FILTER_NONE, RANGE_FULL, "GLSL.std.450");
-       MAKE_TEST_SV_U_8136("min", GLSLstd450UMin, min, FILTER_NONE, RANGE_FULL, "GLSL.std.450");
-       MAKE_TEST_SV_I_8136("max", GLSLstd450SMax, max, FILTER_NONE, RANGE_FULL, "GLSL.std.450");
-       MAKE_TEST_SV_U_8136("max", GLSLstd450UMax, max, FILTER_NONE, RANGE_FULL, "GLSL.std.450");
-       MAKE_TEST_SV_I_8136("clamp", GLSLstd450SClamp, clamp, FILTER_MIN_GT_MAX, RANGE_FULL, "GLSL.std.450");
-       MAKE_TEST_SV_U_8136("clamp", GLSLstd450UClamp, clamp, FILTER_MIN_GT_MAX, RANGE_FULL, "GLSL.std.450");
-       MAKE_TEST_SV_I_3("find_lsb", GLSLstd450FindILsb, lsb, FILTER_NONE, RANGE_FULL, "GLSL.std.450");
-       MAKE_TEST_SV_I_3("find_msb", GLSLstd450FindSMsb, msb, FILTER_NONE, RANGE_FULL, "GLSL.std.450");
-       MAKE_TEST_SV_U_3("find_msb", GLSLstd450FindUMsb, msb, FILTER_NONE, RANGE_FULL, "GLSL.std.450");
-       MAKE_TEST_SV_I_1("mul_sdiv", DE_NULL, mul_div, FILTER_ZERO, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_U_1("mul_udiv", DE_NULL, mul_div, FILTER_ZERO, RANGE_FULL, DE_NULL);
-
-       MAKE_TEST_SV_U_8136_W("shift_right_logical", SpvOpShiftRightLogical, lsr, FILTER_NONE, RANGE_BIT_WIDTH, DE_NULL);
-       MAKE_TEST_SV_I_8136_W("shift_right_logical", SpvOpShiftRightLogical, lsr, FILTER_NONE, RANGE_BIT_WIDTH, DE_NULL);
-       MAKE_TEST_SV_U_8136_W("shift_right_arithmetic", SpvOpShiftRightArithmetic, asr, FILTER_NONE, RANGE_BIT_WIDTH, DE_NULL);
-       MAKE_TEST_SV_I_8136_W("shift_right_arithmetic", SpvOpShiftRightArithmetic, asr, FILTER_NONE, RANGE_BIT_WIDTH, DE_NULL);
-       MAKE_TEST_SV_U_8136_W("shift_left_logical", SpvOpShiftLeftLogical, lsl, FILTER_NONE, RANGE_BIT_WIDTH, DE_NULL);
-       MAKE_TEST_SV_I_8136_W("shift_left_logical", SpvOpShiftLeftLogical, lsl, FILTER_NONE, RANGE_BIT_WIDTH, DE_NULL);
-
-       MAKE_TEST_SV_U_8136("bitwise_or", SpvOpBitwiseOr, bitwise_or, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_I_8136("bitwise_or", SpvOpBitwiseOr, bitwise_or , FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_U_8136("bitwise_xor", SpvOpBitwiseXor, bitwise_xor, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_I_8136("bitwise_xor", SpvOpBitwiseXor, bitwise_xor, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_U_8136("bitwise_and", SpvOpBitwiseAnd, bitwise_and, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_I_8136("bitwise_and", SpvOpBitwiseAnd, bitwise_and, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_U_8136("not", SpvOpNot, not, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_I_8136("not", SpvOpNot, not, FILTER_NONE, RANGE_FULL, DE_NULL);
-
-       MAKE_TEST_SV_U_8136_N("iequal", SpvOpIEqual, iequal, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_I_8136_N("iequal", SpvOpIEqual, iequal, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_U_8136_N("inotequal", SpvOpINotEqual, inotequal, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_I_8136_N("inotequal", SpvOpINotEqual, inotequal, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_U_8136_N("ugreaterthan", SpvOpUGreaterThan, ugreaterthan, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_I_8136_N("ugreaterthan", SpvOpUGreaterThan, ugreaterthan, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_U_8136_N("sgreaterthan", SpvOpSGreaterThan, sgreaterthan, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_I_8136_N("sgreaterthan", SpvOpSGreaterThan, sgreaterthan, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_U_8136_N("ugreaterthanequal", SpvOpUGreaterThanEqual, ugreaterthanequal, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_I_8136_N("ugreaterthanequal", SpvOpUGreaterThanEqual, ugreaterthanequal, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_U_8136_N("sgreaterthanequal", SpvOpSGreaterThanEqual, sgreaterthanequal, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_I_8136_N("sgreaterthanequal", SpvOpSGreaterThanEqual, sgreaterthanequal, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_U_8136_N("ulessthan", SpvOpULessThan, ulessthan, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_I_8136_N("ulessthan", SpvOpULessThan, ulessthan, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_U_8136_N("slessthan", SpvOpSLessThan, slessthan, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_I_8136_N("slessthan", SpvOpSLessThan, slessthan, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_U_8136_N("ulessthanequal", SpvOpULessThanEqual, ulessthanequal, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_I_8136_N("ulessthanequal", SpvOpULessThanEqual, ulessthanequal, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_U_8136_N("slessthanequal", SpvOpSLessThanEqual, slessthanequal, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_I_8136_N("slessthanequal", SpvOpSLessThanEqual, slessthanequal, FILTER_NONE, RANGE_FULL, DE_NULL);
-
-       MAKE_TEST_SV_U_3_W("bit_field_insert", SpvOpBitFieldInsert, bitFieldInsert, FILTER_NONE, RANGE_BIT_WIDTH_SUM, DE_NULL);
-       MAKE_TEST_SV_I_3_W("bit_field_insert", SpvOpBitFieldInsert, bitFieldInsert, FILTER_NONE, RANGE_BIT_WIDTH_SUM, DE_NULL);
-       MAKE_TEST_SV_U_3_W("bit_field_s_extract", SpvOpBitFieldSExtract, bitFieldSExtract, FILTER_NONE, RANGE_BIT_WIDTH_SUM, DE_NULL);
-       MAKE_TEST_SV_I_3_W("bit_field_s_extract", SpvOpBitFieldSExtract, bitFieldSExtract, FILTER_NONE, RANGE_BIT_WIDTH_SUM, DE_NULL);
-       MAKE_TEST_SV_U_3_W("bit_field_u_extract", SpvOpBitFieldUExtract, bitFieldUExtract, FILTER_NONE, RANGE_BIT_WIDTH_SUM, DE_NULL);
-       MAKE_TEST_SV_I_3_W("bit_field_u_extract", SpvOpBitFieldUExtract, bitFieldUExtract, FILTER_NONE, RANGE_BIT_WIDTH_SUM, DE_NULL);
-       MAKE_TEST_SV_U_3("bit_reverse", SpvOpBitReverse, bitReverse, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_I_3("bit_reverse", SpvOpBitReverse, bitReverse, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_U_3("bit_count", SpvOpBitCount, bitCount, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_I_3("bit_count", SpvOpBitCount, bitCount, FILTER_NONE, RANGE_FULL, DE_NULL);
-
-       MAKE_TEST_S_U_8136("constant", SpvOpConstant, constant, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_S_I_8136("constant", SpvOpConstant, constant, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_V_U_8136("constant_composite", SpvOpConstantComposite, constant, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_V_I_8136("constant_composite", SpvOpConstantComposite, constant, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_V_U_8136("constant_null", SpvOpConstantNull, constant, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_V_I_8136("constant_null", SpvOpConstantNull, constant, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_U_8136("variable_initializer", SpvOpVariable, constant, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_SV_I_8136("variable_initializer", SpvOpVariable, constant, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_S_U_8136("spec_constant_initializer", SpvOpSpecConstant, constant, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_S_I_8136("spec_constant_initializer", SpvOpSpecConstant, constant, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_V_U_8136("spec_constant_composite_initializer", SpvOpSpecConstantComposite, constant, FILTER_NONE, RANGE_FULL, DE_NULL);
-       MAKE_TEST_V_I_8136("spec_constant_composite_initializer", SpvOpSpecConstantComposite, constant, FILTER_NONE, RANGE_FULL, DE_NULL);
+       MAKE_TEST_SV_I_8136("negate", SpvOpSNegate, negate, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_I_8136("add", SpvOpIAdd, add, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_I_8136("sub", SpvOpISub, sub, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_I_8136("mul", SpvOpIMul, mul, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_I_8136("div", SpvOpSDiv, div, FILTER_ZERO, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_U_8136("div", SpvOpUDiv, div, FILTER_ZERO, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_I_8136("rem", SpvOpSRem, rem, FILTER_NEGATIVES_AND_ZERO, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_I_8136("mod", SpvOpSMod, mod, FILTER_NEGATIVES_AND_ZERO, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_U_8136("mod", SpvOpUMod, mod, FILTER_ZERO, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_I_8136("abs", GLSLstd450SAbs, abs, FILTER_NONE, RANGE_FULL, "GLSL.std.450")
+       MAKE_TEST_SV_I_8136("sign", GLSLstd450SSign, sign, FILTER_NONE, RANGE_FULL, "GLSL.std.450")
+       MAKE_TEST_SV_I_8136("min", GLSLstd450SMin, min, FILTER_NONE, RANGE_FULL, "GLSL.std.450")
+       MAKE_TEST_SV_U_8136("min", GLSLstd450UMin, min, FILTER_NONE, RANGE_FULL, "GLSL.std.450")
+       MAKE_TEST_SV_I_8136("max", GLSLstd450SMax, max, FILTER_NONE, RANGE_FULL, "GLSL.std.450")
+       MAKE_TEST_SV_U_8136("max", GLSLstd450UMax, max, FILTER_NONE, RANGE_FULL, "GLSL.std.450")
+       MAKE_TEST_SV_I_8136("clamp", GLSLstd450SClamp, clamp, FILTER_MIN_GT_MAX, RANGE_FULL, "GLSL.std.450")
+       MAKE_TEST_SV_U_8136("clamp", GLSLstd450UClamp, clamp, FILTER_MIN_GT_MAX, RANGE_FULL, "GLSL.std.450")
+       MAKE_TEST_SV_I_3("find_lsb", GLSLstd450FindILsb, lsb, FILTER_NONE, RANGE_FULL, "GLSL.std.450")
+       MAKE_TEST_SV_I_3("find_msb", GLSLstd450FindSMsb, msb, FILTER_NONE, RANGE_FULL, "GLSL.std.450")
+       MAKE_TEST_SV_U_3("find_msb", GLSLstd450FindUMsb, msb, FILTER_NONE, RANGE_FULL, "GLSL.std.450")
+       MAKE_TEST_SV_I_1("mul_sdiv", DE_NULL, mul_div, FILTER_ZERO, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_U_1("mul_udiv", DE_NULL, mul_div, FILTER_ZERO, RANGE_FULL, DE_NULL)
+
+       MAKE_TEST_SV_U_8136_W("shift_right_logical", SpvOpShiftRightLogical, lsr, FILTER_NONE, RANGE_BIT_WIDTH, DE_NULL)
+       MAKE_TEST_SV_I_8136_W("shift_right_logical", SpvOpShiftRightLogical, lsr, FILTER_NONE, RANGE_BIT_WIDTH, DE_NULL)
+       MAKE_TEST_SV_U_8136_W("shift_right_arithmetic", SpvOpShiftRightArithmetic, asr, FILTER_NONE, RANGE_BIT_WIDTH, DE_NULL)
+       MAKE_TEST_SV_I_8136_W("shift_right_arithmetic", SpvOpShiftRightArithmetic, asr, FILTER_NONE, RANGE_BIT_WIDTH, DE_NULL)
+       MAKE_TEST_SV_U_8136_W("shift_left_logical", SpvOpShiftLeftLogical, lsl, FILTER_NONE, RANGE_BIT_WIDTH, DE_NULL)
+       MAKE_TEST_SV_I_8136_W("shift_left_logical", SpvOpShiftLeftLogical, lsl, FILTER_NONE, RANGE_BIT_WIDTH, DE_NULL)
+
+       MAKE_TEST_SV_U_8136("bitwise_or", SpvOpBitwiseOr, bitwise_or, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_I_8136("bitwise_or", SpvOpBitwiseOr, bitwise_or , FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_U_8136("bitwise_xor", SpvOpBitwiseXor, bitwise_xor, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_I_8136("bitwise_xor", SpvOpBitwiseXor, bitwise_xor, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_U_8136("bitwise_and", SpvOpBitwiseAnd, bitwise_and, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_I_8136("bitwise_and", SpvOpBitwiseAnd, bitwise_and, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_U_8136("not", SpvOpNot, not, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_I_8136("not", SpvOpNot, not, FILTER_NONE, RANGE_FULL, DE_NULL)
+
+       MAKE_TEST_SV_U_8136_N("iequal", SpvOpIEqual, iequal, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_I_8136_N("iequal", SpvOpIEqual, iequal, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_U_8136_N("inotequal", SpvOpINotEqual, inotequal, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_I_8136_N("inotequal", SpvOpINotEqual, inotequal, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_U_8136_N("ugreaterthan", SpvOpUGreaterThan, ugreaterthan, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_I_8136_N("ugreaterthan", SpvOpUGreaterThan, ugreaterthan, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_U_8136_N("sgreaterthan", SpvOpSGreaterThan, sgreaterthan, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_I_8136_N("sgreaterthan", SpvOpSGreaterThan, sgreaterthan, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_U_8136_N("ugreaterthanequal", SpvOpUGreaterThanEqual, ugreaterthanequal, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_I_8136_N("ugreaterthanequal", SpvOpUGreaterThanEqual, ugreaterthanequal, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_U_8136_N("sgreaterthanequal", SpvOpSGreaterThanEqual, sgreaterthanequal, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_I_8136_N("sgreaterthanequal", SpvOpSGreaterThanEqual, sgreaterthanequal, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_U_8136_N("ulessthan", SpvOpULessThan, ulessthan, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_I_8136_N("ulessthan", SpvOpULessThan, ulessthan, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_U_8136_N("slessthan", SpvOpSLessThan, slessthan, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_I_8136_N("slessthan", SpvOpSLessThan, slessthan, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_U_8136_N("ulessthanequal", SpvOpULessThanEqual, ulessthanequal, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_I_8136_N("ulessthanequal", SpvOpULessThanEqual, ulessthanequal, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_U_8136_N("slessthanequal", SpvOpSLessThanEqual, slessthanequal, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_I_8136_N("slessthanequal", SpvOpSLessThanEqual, slessthanequal, FILTER_NONE, RANGE_FULL, DE_NULL)
+
+       MAKE_TEST_SV_U_3_W("bit_field_insert", SpvOpBitFieldInsert, bitFieldInsert, FILTER_NONE, RANGE_BIT_WIDTH_SUM, DE_NULL)
+       MAKE_TEST_SV_I_3_W("bit_field_insert", SpvOpBitFieldInsert, bitFieldInsert, FILTER_NONE, RANGE_BIT_WIDTH_SUM, DE_NULL)
+       MAKE_TEST_SV_U_3_W("bit_field_s_extract", SpvOpBitFieldSExtract, bitFieldSExtract, FILTER_NONE, RANGE_BIT_WIDTH_SUM, DE_NULL)
+       MAKE_TEST_SV_I_3_W("bit_field_s_extract", SpvOpBitFieldSExtract, bitFieldSExtract, FILTER_NONE, RANGE_BIT_WIDTH_SUM, DE_NULL)
+       MAKE_TEST_SV_U_3_W("bit_field_u_extract", SpvOpBitFieldUExtract, bitFieldUExtract, FILTER_NONE, RANGE_BIT_WIDTH_SUM, DE_NULL)
+       MAKE_TEST_SV_I_3_W("bit_field_u_extract", SpvOpBitFieldUExtract, bitFieldUExtract, FILTER_NONE, RANGE_BIT_WIDTH_SUM, DE_NULL)
+       MAKE_TEST_SV_U_3("bit_reverse", SpvOpBitReverse, bitReverse, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_I_3("bit_reverse", SpvOpBitReverse, bitReverse, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_U_3("bit_count", SpvOpBitCount, bitCount, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_I_3("bit_count", SpvOpBitCount, bitCount, FILTER_NONE, RANGE_FULL, DE_NULL)
+
+       MAKE_TEST_S_U_8136("constant", SpvOpConstant, constant, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_S_I_8136("constant", SpvOpConstant, constant, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_V_U_8136("constant_composite", SpvOpConstantComposite, constant, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_V_I_8136("constant_composite", SpvOpConstantComposite, constant, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_V_U_8136("constant_null", SpvOpConstantNull, constant, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_V_I_8136("constant_null", SpvOpConstantNull, constant, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_U_8136("variable_initializer", SpvOpVariable, constant, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_SV_I_8136("variable_initializer", SpvOpVariable, constant, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_S_U_8136("spec_constant_initializer", SpvOpSpecConstant, constant, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_S_I_8136("spec_constant_initializer", SpvOpSpecConstant, constant, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_V_U_8136("spec_constant_composite_initializer", SpvOpSpecConstantComposite, constant, FILTER_NONE, RANGE_FULL, DE_NULL)
+       MAKE_TEST_V_I_8136("spec_constant_composite_initializer", SpvOpSpecConstantComposite, constant, FILTER_NONE, RANGE_FULL, DE_NULL)
 
        int8Tests[0]->createSwitchTests();
        int16Tests[0]->createSwitchTests();
index 89036df..806c5de 100644 (file)
@@ -73,61 +73,61 @@ bool isCoreFeaturesSupported (const Context&                                                context,
 {
        const VkPhysicalDeviceFeatures& availableFeatures       = context.getDeviceFeatures();
 
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, robustBufferAccess);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, fullDrawIndexUint32);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, imageCubeArray);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, independentBlend);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, geometryShader);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, tessellationShader);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, sampleRateShading);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, dualSrcBlend);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, logicOp);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, multiDrawIndirect);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, drawIndirectFirstInstance);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, depthClamp);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, depthBiasClamp);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, fillModeNonSolid);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, depthBounds);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, wideLines);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, largePoints);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, alphaToOne);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, multiViewport);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, samplerAnisotropy);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, textureCompressionETC2);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, textureCompressionASTC_LDR);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, textureCompressionBC);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, occlusionQueryPrecise);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, pipelineStatisticsQuery);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, vertexPipelineStoresAndAtomics);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, fragmentStoresAndAtomics);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderTessellationAndGeometryPointSize);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderImageGatherExtended);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderStorageImageExtendedFormats);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderStorageImageMultisample);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderStorageImageReadWithoutFormat);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderStorageImageWriteWithoutFormat);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderUniformBufferArrayDynamicIndexing);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderSampledImageArrayDynamicIndexing);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderStorageBufferArrayDynamicIndexing);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderStorageImageArrayDynamicIndexing);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderClipDistance);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderCullDistance);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderFloat64);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderInt64);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderInt16);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderResourceResidency);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderResourceMinLod);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, sparseBinding);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, sparseResidencyBuffer);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, sparseResidencyImage2D);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, sparseResidencyImage3D);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, sparseResidency2Samples);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, sparseResidency4Samples);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, sparseResidency8Samples);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, sparseResidency16Samples);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, sparseResidencyAliased);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, variableMultisampleRate);
-       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, inheritedQueries);
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, robustBufferAccess)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, fullDrawIndexUint32)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, imageCubeArray)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, independentBlend)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, geometryShader)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, tessellationShader)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, sampleRateShading)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, dualSrcBlend)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, logicOp)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, multiDrawIndirect)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, drawIndirectFirstInstance)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, depthClamp)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, depthBiasClamp)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, fillModeNonSolid)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, depthBounds)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, wideLines)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, largePoints)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, alphaToOne)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, multiViewport)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, samplerAnisotropy)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, textureCompressionETC2)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, textureCompressionASTC_LDR)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, textureCompressionBC)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, occlusionQueryPrecise)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, pipelineStatisticsQuery)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, vertexPipelineStoresAndAtomics)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, fragmentStoresAndAtomics)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderTessellationAndGeometryPointSize)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderImageGatherExtended)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderStorageImageExtendedFormats)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderStorageImageMultisample)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderStorageImageReadWithoutFormat)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderStorageImageWriteWithoutFormat)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderUniformBufferArrayDynamicIndexing)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderSampledImageArrayDynamicIndexing)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderStorageBufferArrayDynamicIndexing)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderStorageImageArrayDynamicIndexing)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderClipDistance)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderCullDistance)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderFloat64)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderInt64)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderInt16)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderResourceResidency)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, shaderResourceMinLod)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, sparseBinding)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, sparseResidencyBuffer)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, sparseResidencyImage2D)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, sparseResidencyImage3D)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, sparseResidency2Samples)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, sparseResidency4Samples)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, sparseResidency8Samples)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, sparseResidency16Samples)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, sparseResidencyAliased)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, variableMultisampleRate)
+       IS_CORE_FEATURE_AVAILABLE(toCheck, availableFeatures, inheritedQueries)
 
        return true;
 }
index c7dc701..805f9d8 100644 (file)
@@ -203,7 +203,7 @@ void addComputeVariableInitPrivateTest (tcu::TestCaseGroup* group)
                                spec.requestedVulkanFeatures.extVariablePointers = EXTVARIABLEPOINTERSFEATURES_VARIABLE_POINTERS;
                                spec.extensions.push_back("VK_KHR_variable_pointers");
                                break;
-               };
+               }
 
                if (testParams[paramIdx].type == "matrix")
                {
index 988d9f4..49ce903 100644 (file)
@@ -531,7 +531,7 @@ Move<VkRenderPass> NoneStageTestInstance::buildBasicRenderPass(VkFormat outputFo
                DE_NULL                                                                                                 // const deUint32*                                      pCorrelatedViewMasks
        };
 
-       return vk::createRenderPass2(m_context.getDeviceInterface(), m_context.getDevice(), &renderPassInfo);;
+       return vk::createRenderPass2(m_context.getDeviceInterface(), m_context.getDevice(), &renderPassInfo);
 }
 
 Move<VkRenderPass> NoneStageTestInstance::buildComplexRenderPass(VkFormat intermediateFormat,  VkImageLayout intermediateLayout, VkImageAspectFlags intermediateAspect,
index 0075efc..0844ff9 100644 (file)
@@ -174,7 +174,7 @@ Move<VkDevice> createTestDevice (Context& context, SemaphoreTestConfig& config,
        *outQueueFamilyIndex                                    = queueInfo.queueFamilyIndex;
 
        return createCustomDevice(validationEnabled, vkp, instance, vki, physicalDevice, &deviceInfo);
-};
+}
 
 struct BufferParameters
 {
index e3f25c7..8f0183b 100644 (file)
@@ -1071,7 +1071,7 @@ VkDependencyInfoKHR makeCommonDependencyInfo(const VkMemoryBarrier2KHR* pMemoryB
                !!pImageMemoryBarrier,                                          // deUint32                                                     imageMemoryBarrierCount
                pImageMemoryBarrier                                                     // const VkImageMemoryBarrier2KHR*      pImageMemoryBarriers
        };
-};
+}
 
 PipelineCacheData::PipelineCacheData (void)
 {
index 2c3ca8c..2f04d95 100644 (file)
@@ -650,7 +650,7 @@ TestInstance* IdentityGeometryShaderTestCase::createInstance (Context& context)
                                         "Using additive blending to detect overlap.\n";
 
        return new PassthroughTestInstance(context, params);
-};
+}
 
 TestInstance* IdentityTessellationShaderTestCase::createInstance (Context& context) const
 {
@@ -682,7 +682,7 @@ TestInstance* IdentityTessellationShaderTestCase::createInstance (Context& conte
                                         "Using additive blending to detect overlap.\n";
 
        return new PassthroughTestInstance(context, params);
-};
+}
 
 inline TestCase* makeIdentityGeometryShaderCase (tcu::TestContext& testCtx, const TessPrimitiveType primitiveType)
 {
index 3be1785..0d26dae 100644 (file)
@@ -174,7 +174,7 @@ inline std::string getProgramDescription (const Winding winding, const bool useP
        std::ostringstream str;
        str << "winding mode " << getWindingShaderName(winding) << ", " << (usePointMode ? "" : "don't ") << "use point mode";
        return str.str();
-};
+}
 
 template <typename T, int N>
 std::vector<T> arrayToVector (const T (&arr)[N])
@@ -1025,7 +1025,7 @@ public:
        TestInstance* createInstance (Context& context) const
        {
                return new OuterEdgeDivisionTestInstance(context, m_caseDef);
-       };
+       }
 
        void checkSupport (Context& context) const
        {
@@ -1055,7 +1055,7 @@ public:
        TestInstance* createInstance (Context& context) const
        {
                return new OuterEdgeIndexIndependenceTestInstance(context, m_caseDef);
-       };
+       }
 
        void checkSupport (Context& context) const
        {
@@ -1084,7 +1084,7 @@ public:
        TestInstance* createInstance (Context& context) const
        {
                return new SymmetricOuterEdgeTestInstance(context, m_caseDef);
-       };
+       }
 
        void checkSupport (Context& context) const
        {
index 1be2d70..5ae2bd3 100644 (file)
@@ -105,7 +105,7 @@ std::vector<de::SharedPtr<tcu::FloatFormat>> getPrecision (VkFormat format, int
                        default:
                                DE_FATAL("Unexpected channel class.");
                        break;
-               };
+               }
        }
 
        return floatFormats;
index 04e33bf..a77f02f 100644 (file)
@@ -120,7 +120,7 @@ private:
                {
                        array.elementType       = DE_NULL;
                        array.size                      = 0;
-               };
+               }
        } m_data;
 };
 
index 158b5a8..030fed1 100644 (file)
@@ -128,7 +128,7 @@ private:
                {
                        array.elementType       = DE_NULL;
                        array.size                      = 0;
-               };
+               }
        } m_data;
 };
 
index 792d211..3653314 100644 (file)
@@ -48,7 +48,7 @@ public:
        using const_pointer = const value_type*;
        using const_iterator = const value_type*;
 
-       inline constexpr ConstexprVector() noexcept : values{}, count{0} {};
+       inline constexpr ConstexprVector() noexcept : values{}, count{0} {}
 
        /*--------------------------------------------------------------------*//*!
         * MSVC v140 chokes on this if it is a raw variadic template list.
index 18df21f..3b8c60d 100644 (file)
@@ -288,7 +288,7 @@ Move<VkDevice> createDefaultDevice (const PlatformInterface&                        vkp,
        deviceInfo.pEnabledFeatures                             = enabledFeatures.pNext ? DE_NULL : &enabledFeatures.features;
 
        return createDevice(vkp, instance, vki, physicalDevice, &deviceInfo);
-};
+}
 
 } // anonymous
 
index 33f726b..7af8cea 100644 (file)
@@ -163,7 +163,7 @@ private:
 
 struct NoSupport0
 {
-       void                    checkSupport    (Context&) const {};
+       void                    checkSupport    (Context&) const {}
 };
 
 class FunctionSupport0
@@ -184,7 +184,7 @@ private:
 template<typename Arg0>
 struct NoSupport1
 {
-       void                    checkSupport    (Context&, Arg0) const {};
+       void                    checkSupport    (Context&, Arg0) const {}
 };
 
 template<typename Arg0>
index 6265c37..327f52f 100644 (file)
@@ -365,7 +365,7 @@ tcu::TestStatus testStorageImageWrite (Context& context, TestParameters params)
                tcu::ConstPixelBufferAccess     pixelBuffer                                     = vk::getChannelAccess(compatibleFormatDescription, compatibleShaderGridSize, planeRowPitches, (const void* const*)planePointers, channelNdx);
                std::ostringstream str;
                str << "image" << channelNdx;
-               context.getTestContext().getLog() << tcu::LogImage(str.str(), str.str(), pixelBuffer);;
+               context.getTestContext().getLog() << tcu::LogImage(str.str(), str.str(), pixelBuffer);
        }
 
        // verify data
index d6c0d8e..075e493 100755 (executable)
@@ -996,7 +996,7 @@ def writeBasicTypes (api, filename):
                        for line in genBitfield64Src(bitfield64):
                                yield line
 
-               for line in indentLines(["VK_DEFINE_PLATFORM_TYPE(%s,\t%s);" % (s[0], c) for n, s, c in PLATFORM_TYPES]):
+               for line in indentLines(["VK_DEFINE_PLATFORM_TYPE(%s,\t%s)" % (s[0], c) for n, s, c in PLATFORM_TYPES]):
                        yield line
 
                for ext in api.extensions:
index 13b6e0f..9071a55 100644 (file)
@@ -36,7 +36,7 @@ namespace warmupCPUInternal
 
 volatile Dummy g_dummy;
 
-};
+}
 
 template <typename T, int Size>
 static inline float floatMedian (const T (&v)[Size])
index 879487d..3ab0e70 100644 (file)
@@ -45,7 +45,7 @@ public:
 
 extern volatile Dummy g_dummy;
 
-};
+}
 
 } // tcu
 
index 3af1a7f..f485805 100644 (file)
@@ -1319,7 +1319,7 @@ inline deInt8 extractModeBc6 (deUint8 src)
                case 0x1b:
                case 0x1f:
                        return -1;
-       };
+       }
 
        switch (src & 0x3)
        {
@@ -1327,7 +1327,7 @@ inline deInt8 extractModeBc6 (deUint8 src)
                case 1: return 1;
                case 2: return (deInt8)(2 + ((src >> 2) & 0x7));
                case 3: return (deInt8)(10 + ((src >> 2) & 0x7));
-       };
+       }
 
        return -1;
 }
@@ -2135,7 +2135,7 @@ void decompressBc6H (const PixelBufferAccess& dst, const deUint8* src, bool hasS
                        b[0] |= getBits128(low, high, 64, 59) << 10;
                        deltaBitsR = deltaBitsG = deltaBitsB = 4;
                        break;
-       };
+       }
 
        if (hasSign)
        {
index 88650f9..aad1d8d 100644 (file)
@@ -2837,7 +2837,7 @@ bool verifyTriangleGroupRasterization (const tcu::Surface& surface, const Triang
 
                        default:
                                DE_ASSERT(false);
-               };
+               }
        }
 
        if (((mode == VERIFICATIONMODE_STRICT) && (missingPixels + unexpectedPixels > 0)) ||
index b213430..8644e5b 100644 (file)
@@ -29,8 +29,8 @@
 #include <limits>
 
 DE_INLINE double       deToDouble      (deFloat16 x)   { return deFloat16To64(x); }
-DE_INLINE double       deToDouble      (float x)               { return x; };
-DE_INLINE double       deToDouble      (double x)              { return x; };
+DE_INLINE double       deToDouble      (float x)               { return x; }
+DE_INLINE double       deToDouble      (double x)              { return x; }
 
 template <typename T>
 inline T deToFloatType(double x)
@@ -47,21 +47,21 @@ inline deFloat16 deToFloatType<deFloat16>(double x)
 // These helpers make the C helpers usable from templates.  Because some of
 // these deal with signaling NaN, it's important that no implicit float
 // conversion operations happen.
-DE_INLINE deBool       deIsPositiveZero        (deFloat16 x)   { return deHalfIsPositiveZero(x); };
-DE_INLINE deBool       deIsPositiveZero        (float x)               { return deFloatIsPositiveZero(x); };
-DE_INLINE deBool       deIsPositiveZero        (double x)              { return deDoubleIsPositiveZero(x); };
-DE_INLINE deBool       deIsNegativeZero        (deFloat16 x)   { return deHalfIsNegativeZero(x); };
-DE_INLINE deBool       deIsNegativeZero        (float x)               { return deFloatIsNegativeZero(x); };
-DE_INLINE deBool       deIsNegativeZero        (double x)              { return deDoubleIsNegativeZero(x); };
-DE_INLINE deBool       deIsIEEENaN                     (deFloat16 x)   { return deHalfIsIEEENaN(x); };
-DE_INLINE deBool       deIsIEEENaN                     (float x)               { return deFloatIsIEEENaN(x); };
-DE_INLINE deBool       deIsIEEENaN                     (double x)              { return deDoubleIsIEEENaN(x); };
-DE_INLINE deBool       deIsSignalingNaN        (deFloat16 x)   { return deHalfIsSignalingNaN(x); };
-DE_INLINE deBool       deIsSignalingNaN        (float x)               { return deFloatIsSignalingNaN(x); };
-DE_INLINE deBool       deIsSignalingNaN        (double x)              { return deDoubleIsSignalingNaN(x); };
-DE_INLINE deBool       deIsQuietNaN            (deFloat16 x)   { return deHalfIsQuietNaN(x); };
-DE_INLINE deBool       deIsQuietNaN            (float x)               { return deFloatIsQuietNaN(x); };
-DE_INLINE deBool       deIsQuietNaN            (double x)              { return deDoubleIsQuietNaN(x); };
+DE_INLINE deBool       deIsPositiveZero        (deFloat16 x)   { return deHalfIsPositiveZero(x); }
+DE_INLINE deBool       deIsPositiveZero        (float x)               { return deFloatIsPositiveZero(x); }
+DE_INLINE deBool       deIsPositiveZero        (double x)              { return deDoubleIsPositiveZero(x); }
+DE_INLINE deBool       deIsNegativeZero        (deFloat16 x)   { return deHalfIsNegativeZero(x); }
+DE_INLINE deBool       deIsNegativeZero        (float x)               { return deFloatIsNegativeZero(x); }
+DE_INLINE deBool       deIsNegativeZero        (double x)              { return deDoubleIsNegativeZero(x); }
+DE_INLINE deBool       deIsIEEENaN                     (deFloat16 x)   { return deHalfIsIEEENaN(x); }
+DE_INLINE deBool       deIsIEEENaN                     (float x)               { return deFloatIsIEEENaN(x); }
+DE_INLINE deBool       deIsIEEENaN                     (double x)              { return deDoubleIsIEEENaN(x); }
+DE_INLINE deBool       deIsSignalingNaN        (deFloat16 x)   { return deHalfIsSignalingNaN(x); }
+DE_INLINE deBool       deIsSignalingNaN        (float x)               { return deFloatIsSignalingNaN(x); }
+DE_INLINE deBool       deIsSignalingNaN        (double x)              { return deDoubleIsSignalingNaN(x); }
+DE_INLINE deBool       deIsQuietNaN            (deFloat16 x)   { return deHalfIsQuietNaN(x); }
+DE_INLINE deBool       deIsQuietNaN            (float x)               { return deFloatIsQuietNaN(x); }
+DE_INLINE deBool       deIsQuietNaN            (double x)              { return deDoubleIsQuietNaN(x); }
 
 template<typename T>
 inline T deQuietNaN()
index 66e5267..42b3431 100644 (file)
@@ -61,7 +61,7 @@ static deStreamResult fileIOStream_read (deStreamData* stream, void* buf, deInt3
                        fileStream->status      = DE_STREAMSTATUS_ERROR;
                        return DE_STREAMRESULT_ERROR;
                        break;
-       };
+       }
 }
 
 static deStreamResult fileIOStream_write (deStreamData* stream, const void* buf, deInt32 bufSize, deInt32* numWritten)
@@ -93,7 +93,7 @@ static deStreamResult fileIOStream_write (deStreamData* stream, const void* buf,
                        fileStream->status      = DE_STREAMSTATUS_ERROR;
                        return DE_STREAMRESULT_ERROR;
                        break;
-       };
+       }
 }
 
 static const char* fileIOStream_getError (deStreamData* stream)
@@ -212,5 +212,5 @@ void deFileOutStream_init (deOutStream* stream, const char* filename, deFileMode
        fileStream->error       = DE_NULL;
 
        if (!fileStream->file)
-               fileStream->status = DE_STREAMSTATUS_ERROR;;
+               fileStream->status = DE_STREAMSTATUS_ERROR;
 }
index 4e18496..f8ed9ea 100644 (file)
@@ -113,7 +113,7 @@ private:
                {
                        array.elementType       = DE_NULL;
                        array.size                      = 0;
-               };
+               }
        } m_data;
 } DE_WARN_UNUSED_TYPE;
 
index a4dffc2..dcb1579 100644 (file)
@@ -280,7 +280,7 @@ vk::wsi::Display* VulkanPlatform::createWsiDisplay (vk::wsi::Type wsiType) const
        default:
                TCU_THROW(NotSupportedError, "WSI type not supported");
 
-       };
+       }
 }
 bool VulkanPlatform::hasDisplay (vk::wsi::Type wsiType) const
 {
@@ -305,7 +305,7 @@ bool VulkanPlatform::hasDisplay (vk::wsi::Type wsiType) const
        default:
                return false;
 
-       };
+       }
 }
 vk::Library* VulkanPlatform::createLibrary (void) const
 {
index cb76ac9..49c6396 100644 (file)
@@ -199,7 +199,7 @@ class LessOrEqualOp : public LessOrEqualBase
 {
 public:
                                                                LessOrEqualOp           (GeneratorState& state, ConstValueRangeAccess valueRange);
-       virtual                                         ~LessOrEqualOp          (void) {};
+       virtual                                         ~LessOrEqualOp          (void) {}
 
        static float                            getWeight                       (const GeneratorState& state, ConstValueRangeAccess valueRange);
 };
@@ -253,7 +253,7 @@ class GreaterOrEqualOp : public GreaterOrEqualBase
 {
 public:
                                                                GreaterOrEqualOp        (GeneratorState& state, ConstValueRangeAccess valueRange);
-       virtual                                         ~GreaterOrEqualOp       (void) {};
+       virtual                                         ~GreaterOrEqualOp       (void) {}
 
        static float                            getWeight                       (const GeneratorState& state, ConstValueRangeAccess valueRange);
 };
index d385776..fdf8236 100644 (file)
@@ -609,38 +609,42 @@ void FragmentProcessor::executeAdvancedBlend (BlendEquationAdvanced equation)
 {
        using namespace advblend;
 
-#define SAMPLE_REGISTER_ADV_BLEND(FUNCTION_NAME)                                                                                       \
-       for (int regSampleNdx = 0; regSampleNdx < SAMPLE_REGISTER_SIZE; regSampleNdx++)                 \
-       {                                                                                                                                                                               \
-               if (m_sampleRegister[regSampleNdx].isAlive)                                                                                     \
-               {                                                                                                                                                                       \
-                       SampleData&     sample          = m_sampleRegister[regSampleNdx];                                               \
-                       const Vec4&     srcColor        = sample.clampedBlendSrcColor;                                                  \
-                       const Vec4&     dstColor        = sample.clampedBlendDstColor;                                                  \
-                       const Vec3&     bias            = sample.blendSrcFactorRGB;                                                             \
-                       const float     p0                      = sample.blendSrcFactorA;                                                               \
-                       const float     r                       = FUNCTION_NAME(srcColor[0], dstColor[0])*p0 + bias[0]; \
-                       const float     g                       = FUNCTION_NAME(srcColor[1], dstColor[1])*p0 + bias[1]; \
-                       const float     b                       = FUNCTION_NAME(srcColor[2], dstColor[2])*p0 + bias[2]; \
-                                                                                                                                                                                       \
-                       sample.blendedRGB = Vec3(r, g, b);                                                                                              \
-               }                                                                                                                                                                       \
-       }
-
-#define SAMPLE_REGISTER_ADV_BLEND_HSL(COLOR_EXPRESSION)                                                                                \
-       for (int regSampleNdx = 0; regSampleNdx < SAMPLE_REGISTER_SIZE; regSampleNdx++)                 \
-       {                                                                                                                                                                               \
-               if (m_sampleRegister[regSampleNdx].isAlive)                                                                                     \
-               {                                                                                                                                                                       \
-                       SampleData&     sample          = m_sampleRegister[regSampleNdx];                                               \
-                       const Vec3      srcColor        = sample.clampedBlendSrcColor.swizzle(0,1,2);                   \
-                       const Vec3      dstColor        = sample.clampedBlendDstColor.swizzle(0,1,2);                   \
-                       const Vec3&     bias            = sample.blendSrcFactorRGB;                                                             \
-                       const float     p0                      = sample.blendSrcFactorA;                                                               \
-                                                                                                                                                                                       \
-                       sample.blendedRGB = (COLOR_EXPRESSION)*p0 + bias;                                                               \
-               }                                                                                                                                                                       \
-       }
+#define SAMPLE_REGISTER_ADV_BLEND(FUNCTION_NAME)                                                                                               \
+       do {                                                                                                                                                                            \
+               for (int regSampleNdx = 0; regSampleNdx < SAMPLE_REGISTER_SIZE; regSampleNdx++)                 \
+               {                                                                                                                                                                               \
+                       if (m_sampleRegister[regSampleNdx].isAlive)                                                                                     \
+                       {                                                                                                                                                                       \
+                               SampleData&     sample          = m_sampleRegister[regSampleNdx];                                               \
+                               const Vec4&     srcColor        = sample.clampedBlendSrcColor;                                                  \
+                               const Vec4&     dstColor        = sample.clampedBlendDstColor;                                                  \
+                               const Vec3&     bias            = sample.blendSrcFactorRGB;                                                             \
+                               const float     p0                      = sample.blendSrcFactorA;                                                               \
+                               const float     r                       = FUNCTION_NAME(srcColor[0], dstColor[0])*p0 + bias[0]; \
+                               const float     g                       = FUNCTION_NAME(srcColor[1], dstColor[1])*p0 + bias[1]; \
+                               const float     b                       = FUNCTION_NAME(srcColor[2], dstColor[2])*p0 + bias[2]; \
+                                                                                                                                                                                               \
+                               sample.blendedRGB = Vec3(r, g, b);                                                                                              \
+                       }                                                                                                                                                                       \
+               }                                                                                                                                                                               \
+       } while (0)
+
+#define SAMPLE_REGISTER_ADV_BLEND_HSL(COLOR_EXPRESSION)                                                                                        \
+       do {                                                                                                                                                                            \
+               for (int regSampleNdx = 0; regSampleNdx < SAMPLE_REGISTER_SIZE; regSampleNdx++)                 \
+               {                                                                                                                                                                               \
+                       if (m_sampleRegister[regSampleNdx].isAlive)                                                                                     \
+                       {                                                                                                                                                                       \
+                               SampleData&     sample          = m_sampleRegister[regSampleNdx];                                               \
+                               const Vec3      srcColor        = sample.clampedBlendSrcColor.swizzle(0,1,2);                   \
+                               const Vec3      dstColor        = sample.clampedBlendDstColor.swizzle(0,1,2);                   \
+                               const Vec3&     bias            = sample.blendSrcFactorRGB;                                                             \
+                               const float     p0                      = sample.blendSrcFactorA;                                                               \
+                                                                                                                                                                                               \
+                               sample.blendedRGB = (COLOR_EXPRESSION)*p0 + bias;                                                               \
+                       }                                                                                                                                                                       \
+               }                                                                                                                                                                               \
+       } while (0)
 
        // Pre-compute factors & compute alpha \todo [2014-03-18 pyry] Re-using variable names.
        // \note clampedBlend*Color contains clamped & unpremultiplied colors
index ca47d3e..748980b 100644 (file)
@@ -107,7 +107,7 @@ public:
        const std::vector<VertexOutputInfo>&    getOutputs                      (void) const    { return m_outputs;     }
 
 protected:
-                                                                                       ~VertexShader           (void) {}; // \note Renderer will not delete any objects passed in.
+                                                                                       ~VertexShader           (void) {} // \note Renderer will not delete any objects passed in.
 
        std::vector<VertexInputInfo>                    m_inputs;
        std::vector<VertexOutputInfo>                   m_outputs;
@@ -130,7 +130,7 @@ public:
        virtual void                                                    shadeFragments          (FragmentPacket* packets, const int numPackets, const FragmentShadingContext& context) const = 0; // \note numPackets must be greater than zero.
 
 protected:
-                                                                                       ~FragmentShader         (void) {}; // \note Renderer will not delete any objects passed in.
+                                                                                       ~FragmentShader         (void) {} // \note Renderer will not delete any objects passed in.
 
        std::vector<FragmentInputInfo>                  m_inputs;
        std::vector<FragmentOutputInfo>                 m_outputs;
index 61ed6cf..eada759 100644 (file)
@@ -249,7 +249,7 @@ public:
                                        TCU_THROW(NotSupportedError, "Native pixmap doesn't support eglCreatePlatformPixmapSurface()");
                        }
                        break;
-               };
+               }
 
                log << TestLog::Message << "Creating pixmap surface with config ID " << id << TestLog::EndMessage;
                EGLU_CHECK_MSG(egl, "init");
index da3c859..5e8f833 100644 (file)
@@ -2929,7 +2929,7 @@ tcu::TestCase::IterateResult GLES2SharingRandomTest::iterate (void)
                                default:
                                        DE_ASSERT(false);
                                        isOk = false;
-                       };
+                       }
                }
 
                if (notSupported)
@@ -3744,7 +3744,7 @@ tcu::TestCase::IterateResult GLES2ThreadedSharingTest::iterate (void)
                                default:
                                        DE_ASSERT(false);
                                        isOk = false;
-                       };
+                       }
                }
 
                if (notSupported)
index 47dbb66..acaf390 100644 (file)
@@ -1792,7 +1792,7 @@ bool isCompatibleFormats (GLenum createFormat, GLenum modifyFormat, GLenum modif
                                default:
                                        DE_FATAL("Unknown modify type");
                                        return false;
-                       };
+                       }
 
                default:
                        DE_FATAL("Unknown modify format");
index f235c43..93c21d7 100644 (file)
@@ -246,7 +246,7 @@ void MakeCurrentPerfCase::createSurfaces (void)
 
                        default:
                                DE_ASSERT(false);
-               };
+               }
        }
 }
 
index 9a98245..e7c550e 100644 (file)
@@ -1186,7 +1186,7 @@ void MultiThreadedObjectTest::createDestroyObjects (TestThread& thread, int coun
 
                                default:
                                        DE_ASSERT(false);
-                       };
+                       }
                }
                else
                {
index 0953e3a..6e0b5cc 100644 (file)
@@ -208,7 +208,7 @@ public:
        class Params
        {
        public:
-                                                       Params                                  (void) {};
+                                                       Params                                  (void) {}
 
                                                        Params                                  (const string&                          name,
                                                                                                         const string&                          description,
@@ -571,7 +571,7 @@ public:
                                                ContextReset                            (glw::Functions& gl, tcu::TestLog& log, ShaderType shaderType);
                                                ContextReset                            (glw::Functions& gl, tcu::TestLog& log, ShaderType shaderType, ResourceType resourceType, ReadWriteType readWriteType);
 
-       virtual                         ~ContextReset                           (void) {};
+       virtual                         ~ContextReset                           (void) {}
 
        virtual void            setup                                           (void) = 0;
        virtual void            draw                                            (void) = 0;
@@ -1602,7 +1602,7 @@ class ContextResetCase : public RobustnessTestCase
 
 public:
                                                        ContextResetCase                (EglTestContext& eglTestCtx, const char* name, const char* description, Params params);
-       virtual                                 ~ContextResetCase               (void) {};
+       virtual                                 ~ContextResetCase               (void) {}
 
        virtual void                    provokeReset                    (de::SharedPtr<ContextReset>& contextReset) = 0;
        virtual void                    waitForReset                    (de::SharedPtr<ContextReset>& contextReset) = 0;
index 4c00cee..3e641a3 100644 (file)
@@ -454,7 +454,7 @@ public:
                }
 
                TCU_CHECK(m_sync == eglNoSync);
-       };
+       }
 
        IterateResult   iterate                                         (void)
        {
@@ -644,7 +644,7 @@ public:
                }
 
                TCU_CHECK(m_sync == eglNoSync);
-       };
+       }
 
        IterateResult   iterate                                         (void)
        {
@@ -783,7 +783,7 @@ public:
 
                TCU_CHECK(status == condSatisfied);
                EGLU_CHECK_MSG(egl, clientWaitSyncMsgChk.c_str());
-       };
+       }
 
        IterateResult   iterate                                 (void)
        {
@@ -868,7 +868,7 @@ public:
                        TestLog::EndMessage;
 
                TCU_CHECK(result == condSatisfied);
-       };
+       }
 
        IterateResult   iterate                                 (void)
        {
@@ -1463,7 +1463,7 @@ public:
 
                TCU_CHECK(result == EGL_FALSE);
                TCU_CHECK(condition == 0xF0F0F);
-       };
+       }
 
        IterateResult   iterate                                         (void)
        {
index 3305d4a..f4efb9e 100644 (file)
@@ -745,7 +745,7 @@ void TextureFilteringTests::init (void)
                                                                                                                 wrapModes[wrapMode].mode,
                                                                                                                 formats[format].format, formats[format].dataType,
                                                                                                                 sizes2D[size].width, sizes2D[size].height));
-               })))));
+               })))))
 
        // Cubemap cases.
        FOR_EACH(minFilter,             minFilterModes,
@@ -779,7 +779,7 @@ void TextureFilteringTests::init (void)
                                                                                                                         wrapModes[wrapMode].mode,
                                                                                                                         formats[format].format, formats[format].dataType,
                                                                                                                         sizesCube[size].width, sizesCube[size].height));
-               })))));
+               })))))
 }
 
 } // Accuracy
index 8d27a43..26a3efd 100644 (file)
@@ -525,12 +525,14 @@ private:
        StateVerifier*  m_verifier;
 };
 
-#define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK)                                                                                               \
-       for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++)        \
-       {                                                                                                                                                                                       \
-               StateVerifier* verifier = (VERIFIERS)[_verifierNdx];                                                                    \
-               CODE_BLOCK;                                                                                                                                                             \
-       }
+#define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK)                                                                                                       \
+       do {                                                                                                                                                                                    \
+               for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++)        \
+               {                                                                                                                                                                                       \
+                       StateVerifier* verifier = (VERIFIERS)[_verifierNdx];                                                                    \
+                       CODE_BLOCK;                                                                                                                                                             \
+               }                                                                                                                                                                                       \
+       } while (0)
 
 } // anonymous
 
index 8812db0..5a7efb6 100644 (file)
@@ -264,8 +264,8 @@ void BufferObjectQueryTests::init (void)
        m_verifierInt           = new GetBufferParameterIVerifier       (m_context.getRenderContext().getFunctions(), m_context.getTestContext().getLog());
        BufferParamVerifier* verifiers[] = {m_verifierInt};
 
-       FOR_EACH_VERIFIER(verifiers, addChild(new BufferSizeCase                (m_context, verifier,   (std::string("buffer_size")                             + verifier->getTestNamePostfix()).c_str(), "BUFFER_SIZE")));
-       FOR_EACH_VERIFIER(verifiers, addChild(new BufferUsageCase               (m_context, verifier,   (std::string("buffer_usage")                    + verifier->getTestNamePostfix()).c_str(), "BUFFER_USAGE")));
+       FOR_EACH_VERIFIER(verifiers, addChild(new BufferSizeCase                (m_context, verifier,   (std::string("buffer_size")                             + verifier->getTestNamePostfix()).c_str(), "BUFFER_SIZE")))
+       FOR_EACH_VERIFIER(verifiers, addChild(new BufferUsageCase               (m_context, verifier,   (std::string("buffer_usage")                    + verifier->getTestNamePostfix()).c_str(), "BUFFER_USAGE")))
 }
 
 void BufferObjectQueryTests::deinit (void)
index b6c44d7..a16c993 100644 (file)
@@ -76,7 +76,7 @@ tcu::Vector<T1, S1> convertToTypeVec (const tcu::Vector<T2, S2>& v)
 class FloatLoader
 {
 public:
-       virtual                         ~FloatLoader    (void) {};
+       virtual                         ~FloatLoader    (void) {}
 
        // returns the value loaded
        virtual tcu::Vec4       load                    (glu::CallLogWrapper& gl, int index, const tcu::Vec4& v) const = 0;
index eacda9e..da74a49 100644 (file)
@@ -295,7 +295,7 @@ void generateBaseClearAndDepthCommands (const TestRenderTarget& target, vector<C
 
                                        RenderCommand renderCmd;
                                        renderCmd.params.visibleFace            = rr::FACETYPE_FRONT;
-                                       renderCmd.params.depth                          = depthValues[y1*numL1CellsX + x1];;
+                                       renderCmd.params.depth                          = depthValues[y1*numL1CellsX + x1];
                                        renderCmd.params.depthTestEnabled       = true;
                                        renderCmd.params.depthFunc                      = GL_ALWAYS;
                                        renderCmd.params.depthWriteMask         = true;
index 64cbba3..82a1bce 100644 (file)
@@ -997,7 +997,7 @@ class StencilClearsTest : public FboRenderCase
 {
 public:
                                                StencilClearsTest               (Context& context, const FboConfig& config);
-       virtual                         ~StencilClearsTest              (void) {};
+       virtual                         ~StencilClearsTest              (void) {}
 
        void                            render                                  (sglr::Context& context, Surface& dst);
 
@@ -1092,7 +1092,7 @@ class StencilTest : public FboRenderCase
 {
 public:
                                                StencilTest                             (Context& context, const FboConfig& config, bool npot = false);
-       virtual                         ~StencilTest                    (void) {};
+       virtual                         ~StencilTest                    (void) {}
 
        void                            render                                  (sglr::Context& context, Surface& dst);
 
@@ -1195,7 +1195,7 @@ class SharedColorbufferTest : public FboRenderCase
 {
 public:
                                                SharedColorbufferTest                   (Context& context, const FboConfig& config);
-       virtual                         ~SharedColorbufferTest                  (void) {};
+       virtual                         ~SharedColorbufferTest                  (void) {}
 
        void                            render                                                  (sglr::Context& context, Surface& dst);
 };
@@ -1428,7 +1428,7 @@ class SharedDepthbufferTest : public FboRenderCase
 {
 public:
                                        SharedDepthbufferTest           (Context& context, const FboConfig& config);
-       virtual                 ~SharedDepthbufferTest          (void) {};
+       virtual                 ~SharedDepthbufferTest          (void) {}
 
        static bool             isConfigSupported                       (const FboConfig& config);
        void                    render                                          (sglr::Context& context, Surface& dst);
index eb51dce..82a10af 100644 (file)
@@ -1091,12 +1091,14 @@ private:
        StateVerifier*  m_verifier;
 };
 
-#define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK)                                                                                               \
-       for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++)        \
-       {                                                                                                                                                                                       \
-               StateVerifier* verifier = (VERIFIERS)[_verifierNdx];                                                                    \
-               CODE_BLOCK;                                                                                                                                                             \
-       }
+#define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK)                                                                                                       \
+       do {                                                                                                                                                                                    \
+               for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++)        \
+               {                                                                                                                                                                                       \
+                       StateVerifier* verifier = (VERIFIERS)[_verifierNdx];                                                                    \
+                       CODE_BLOCK;                                                                                                                                                             \
+               }                                                                                                                                                                                       \
+       } while (0)
 
 } // anonymous
 
index ed5831c..cbb05e1 100644 (file)
@@ -2016,19 +2016,23 @@ static const char* getQueryTypeSuffix (QueryType type)
        }
 }
 
-#define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK)                                                                                               \
-       for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++)        \
-       {                                                                                                                                                                                       \
-               StateVerifier* verifier = (VERIFIERS)[_verifierNdx];                                                                    \
-               CODE_BLOCK;                                                                                                                                                             \
-       }
-
-#define FOR_EACH_QUERYTYPE(QUERYTYPES, CODE_BLOCK)                                                                                                     \
-       for (int _queryTypeNdx = 0; _queryTypeNdx < DE_LENGTH_OF_ARRAY(QUERYTYPES); _queryTypeNdx++)    \
-       {                                                                                                                                                                                               \
-               const QueryType queryType = (QUERYTYPES)[_queryTypeNdx];                                                                        \
-               CODE_BLOCK;                                                                                                                                                                     \
-       }
+#define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK)                                                                                                       \
+       do {                                                                                                                                                                                    \
+               for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++)        \
+               {                                                                                                                                                                                       \
+                       StateVerifier* verifier = (VERIFIERS)[_verifierNdx];                                                                    \
+                       CODE_BLOCK;                                                                                                                                                             \
+               }                                                                                                                                                                                       \
+       } while (0)
+
+#define FOR_EACH_QUERYTYPE(QUERYTYPES, CODE_BLOCK)                                                                                                             \
+       do {                                                                                                                                                                                            \
+               for (int _queryTypeNdx = 0; _queryTypeNdx < DE_LENGTH_OF_ARRAY(QUERYTYPES); _queryTypeNdx++)    \
+               {                                                                                                                                                                                               \
+                       const QueryType queryType = (QUERYTYPES)[_queryTypeNdx];                                                                        \
+                       CODE_BLOCK;                                                                                                                                                                     \
+               }                                                                                                                                                                                               \
+       } while (0)                                                                                                                                                                                     \
 
 } // anonymous
 
index 6bd9af1..c28c64c 100644 (file)
@@ -136,7 +136,7 @@ TestCase::IterateResult ClearColorCase::iterate (void)
                        a = (int)(deRandom_getUint32(&rnd) & 0xFF);
                        break;
 
-       };
+       }
 
        glClearColor(float(r)/255.0f, float(g)/255.0f, float(b)/255.0f, float(a)/255.0f);
        glClear(GL_COLOR_BUFFER_BIT);
index ccfe9f3..2c8b24f 100644 (file)
@@ -1248,7 +1248,7 @@ static ShaderLoopCase* createSpecialLoopCase (Context& context, const char* case
                requirement = LOOPREQUIREMENT_DYNAMIC;
 
        return new ShaderLoopCase(context, caseName, description, isVertexCase, evalFunc, requirement, vertexShaderSource.c_str(), fragmentShaderSource.c_str());
-};
+}
 
 // ShaderLoopTests.
 
index 9feb4dc..4f8316f 100644 (file)
@@ -608,7 +608,7 @@ ShaderEvalFunc getEvalFunc (const ShaderInput& in0, const ShaderInput& in1, Matr
        MAKE_EVAL_CASE(OP_SUB,                  IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);    \
        MAKE_EVAL_CASE(OP_MUL,                  IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);    \
        MAKE_EVAL_CASE(OP_DIV,                  IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);    \
-       MAKE_EVAL_CASE(OP_COMP_MUL,             IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE);
+       MAKE_EVAL_CASE(OP_COMP_MUL,             IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)
 
 #define MUL_OP(IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)     \
        MAKE_EVAL_CASE(OP_MUL, IN0TYPE, IN0DATATYPE, IN1TYPE, IN1DATATYPE)
index 46ef98d..2fdbe4a 100644 (file)
@@ -130,27 +130,27 @@ DEFINE_FLOAT_FLOAT_VEC_FUNCTION   (smoothStepFloatFloatVec,       smoothStep)
 #undef DEFINE_VEC_FLOAT_FLOAT_FUNCTION
 #undef DEFINE_FLOAT_FLOAT_VEC_FUNCTION
 
-inline float   addOne (float v)        { return v + 1.0f; };
-inline float   subOne (float v)        { return v - 1.0f; };
-inline int             addOne (int v)          { return v + 1; };
-inline int             subOne (int v)          { return v - 1; };
+inline float   addOne (float v)        { return v + 1.0f; }
+inline float   subOne (float v)        { return v - 1.0f; }
+inline int             addOne (int v)          { return v + 1; }
+inline int             subOne (int v)          { return v - 1; }
 
-template<int Size> inline Vector<float, Size>  addOne (const Vector<float, Size>& v)   { return v + 1.0f; };
-template<int Size> inline Vector<float, Size>  subOne (const Vector<float, Size>& v)   { return v - 1.0f; };
-template<int Size> inline Vector<int, Size>            addOne (const Vector<int, Size>& v)             { return v + 1; };
-template<int Size> inline Vector<int, Size>            subOne (const Vector<int, Size>& v)             { return v - 1; };
+template<int Size> inline Vector<float, Size>  addOne (const Vector<float, Size>& v)   { return v + 1.0f; }
+template<int Size> inline Vector<float, Size>  subOne (const Vector<float, Size>& v)   { return v - 1.0f; }
+template<int Size> inline Vector<int, Size>            addOne (const Vector<int, Size>& v)             { return v + 1; }
+template<int Size> inline Vector<int, Size>            subOne (const Vector<int, Size>& v)             { return v - 1; }
 
-template<typename T> inline T selection        (bool cond, T a, T b)   { return cond ? a : b; };
+template<typename T> inline T selection        (bool cond, T a, T b)   { return cond ? a : b; }
 
-template<typename T, int Size> inline Vector<T, Size> addVecScalar     (const Vector<T, Size>& v, T s) { return v + s; };
-template<typename T, int Size> inline Vector<T, Size> subVecScalar     (const Vector<T, Size>& v, T s) { return v - s; };
-template<typename T, int Size> inline Vector<T, Size> mulVecScalar     (const Vector<T, Size>& v, T s) { return v * s; };
-template<typename T, int Size> inline Vector<T, Size> divVecScalar     (const Vector<T, Size>& v, T s) { return v / s; };
+template<typename T, int Size> inline Vector<T, Size> addVecScalar     (const Vector<T, Size>& v, T s) { return v + s; }
+template<typename T, int Size> inline Vector<T, Size> subVecScalar     (const Vector<T, Size>& v, T s) { return v - s; }
+template<typename T, int Size> inline Vector<T, Size> mulVecScalar     (const Vector<T, Size>& v, T s) { return v * s; }
+template<typename T, int Size> inline Vector<T, Size> divVecScalar     (const Vector<T, Size>& v, T s) { return v / s; }
 
-template<typename T, int Size> inline Vector<T, Size> addScalarVec     (T s, const Vector<T, Size>& v) { return s + v; };
-template<typename T, int Size> inline Vector<T, Size> subScalarVec     (T s, const Vector<T, Size>& v) { return s - v; };
-template<typename T, int Size> inline Vector<T, Size> mulScalarVec     (T s, const Vector<T, Size>& v) { return s * v; };
-template<typename T, int Size> inline Vector<T, Size> divScalarVec     (T s, const Vector<T, Size>& v) { return s / v; };
+template<typename T, int Size> inline Vector<T, Size> addScalarVec     (T s, const Vector<T, Size>& v) { return s + v; }
+template<typename T, int Size> inline Vector<T, Size> subScalarVec     (T s, const Vector<T, Size>& v) { return s - v; }
+template<typename T, int Size> inline Vector<T, Size> mulScalarVec     (T s, const Vector<T, Size>& v) { return s * v; }
+template<typename T, int Size> inline Vector<T, Size> divScalarVec     (T s, const Vector<T, Size>& v) { return s / v; }
 
 // Reference functions for specific sequence operations for the sequence operator tests.
 
@@ -901,8 +901,8 @@ DECLARE_BOOL_CWISE_COMPARE_FUNCS(notEqual)
        void eval_##GLSL_NAME##_bvec3   (ShaderEvalContext& c) { c.color.xyz()  = FUNC_NAME(greaterThan(c.in[0].swizzle(2, 0, 1), Vec3(0.0f))).asFloat(); }     \
        void eval_##GLSL_NAME##_bvec4   (ShaderEvalContext& c) { c.color.xyzw() = FUNC_NAME(greaterThan(c.in[0].swizzle(1, 2, 3, 0), Vec4(0.0f))).asFloat(); }
 
-DECLARE_UNARY_SCALAR_BVEC_FUNCS(any, boolAny);
-DECLARE_UNARY_SCALAR_BVEC_FUNCS(all, boolAll);
+DECLARE_UNARY_SCALAR_BVEC_FUNCS(any, boolAny)
+DECLARE_UNARY_SCALAR_BVEC_FUNCS(all, boolAll)
 
 void ShaderOperatorTests::init (void)
 {
index 4417127..c7636ef 100644 (file)
@@ -423,22 +423,22 @@ void StencilTests::init (void)
                        // \note Unused bits are set to 1, clear should mask them out
                        int mask = (1<<stencilBits)-1;
                        dst.push_back(StencilOp::clearStencil(targetStencil | ~mask));
-               });
+               })
 
        // Replace in different points
        STENCIL_CASE(stencil_fail_replace, "Set stencil on stencil fail",
                {
                        dst.push_back(StencilOp::quad(GL_NEVER, targetStencil, GL_ALWAYS, 0.0f, GL_REPLACE, GL_KEEP, GL_KEEP));
-               });
+               })
        STENCIL_CASE(depth_fail_replace, "Set stencil on depth fail",
                {
                        dst.push_back(StencilOp::clearDepth(0.0f));
                        dst.push_back(StencilOp::quad(GL_ALWAYS, targetStencil, GL_LESS, 0.5f, GL_KEEP, GL_REPLACE, GL_KEEP));
-               });
+               })
        STENCIL_CASE(depth_pass_replace, "Set stencil on depth pass",
                {
                        dst.push_back(StencilOp::quad(GL_ALWAYS, targetStencil, GL_LESS, 0.0f, GL_KEEP, GL_KEEP, GL_REPLACE));
-               });
+               })
 
        // Increment, decrement
        STENCIL_CASE(incr_stencil_fail, "Increment on stencil fail",
@@ -450,7 +450,7 @@ void StencilTests::init (void)
                        }
                        else
                                dst.push_back(StencilOp::clearStencil(targetStencil));
-               });
+               })
        STENCIL_CASE(decr_stencil_fail, "Decrement on stencil fail",
                {
                        int maxStencil = (1<<stencilBits)-1;
@@ -461,19 +461,19 @@ void StencilTests::init (void)
                        }
                        else
                                dst.push_back(StencilOp::clearStencil(targetStencil));
-               });
+               })
        STENCIL_CASE(incr_wrap_stencil_fail, "Increment (wrap) on stencil fail",
                {
                        int maxStencil = (1<<stencilBits)-1;
                        dst.push_back(StencilOp::clearStencil((targetStencil-1)&maxStencil));
                        dst.push_back(StencilOp::quad(GL_EQUAL, targetStencil, GL_ALWAYS, 0.0f, GL_INCR_WRAP, GL_KEEP, GL_KEEP));
-               });
+               })
        STENCIL_CASE(decr_wrap_stencil_fail, "Decrement (wrap) on stencil fail",
                {
                        int maxStencil = (1<<stencilBits)-1;
                        dst.push_back(StencilOp::clearStencil((targetStencil+1)&maxStencil));
                        dst.push_back(StencilOp::quad(GL_EQUAL, targetStencil, GL_ALWAYS, 0.0f, GL_DECR_WRAP, GL_KEEP, GL_KEEP));
-               });
+               })
 
        // Zero, Invert
        STENCIL_CASE(zero_stencil_fail, "Zero on stencil fail",
@@ -481,13 +481,13 @@ void StencilTests::init (void)
                        dst.push_back(StencilOp::clearStencil(targetStencil));
                        dst.push_back(StencilOp::quad(GL_NOTEQUAL, targetStencil, GL_ALWAYS, 0.0f, GL_ZERO, GL_KEEP, GL_KEEP));
                        dst.push_back(StencilOp::quad(GL_EQUAL, targetStencil, GL_ALWAYS, 0.0f, GL_REPLACE, GL_KEEP, GL_KEEP));
-               });
+               })
        STENCIL_CASE(invert_stencil_fail, "Invert on stencil fail",
                {
                        int mask = (1<<stencilBits)-1;
                        dst.push_back(StencilOp::clearStencil((~targetStencil)&mask));
                        dst.push_back(StencilOp::quad(GL_EQUAL, targetStencil, GL_ALWAYS, 0.0f, GL_INVERT, GL_KEEP, GL_KEEP));
-               });
+               })
 
        // Comparison modes
        STENCIL_CASE(cmp_equal, "Equality comparison",
@@ -497,7 +497,7 @@ void StencilTests::init (void)
                        dst.push_back(StencilOp::clearStencil(inv));
                        dst.push_back(StencilOp::quad(GL_EQUAL, inv, GL_ALWAYS, 0.0f, GL_KEEP, GL_KEEP, GL_INVERT));
                        dst.push_back(StencilOp::quad(GL_EQUAL, inv, GL_ALWAYS, 0.0f, GL_KEEP, GL_KEEP, GL_INVERT));
-               });
+               })
        STENCIL_CASE(cmp_not_equal, "Equality comparison",
                {
                        int mask = (1<<stencilBits)-1;
@@ -505,7 +505,7 @@ void StencilTests::init (void)
                        dst.push_back(StencilOp::clearStencil(inv));
                        dst.push_back(StencilOp::quad(GL_NOTEQUAL, targetStencil, GL_ALWAYS, 0.0f, GL_KEEP, GL_KEEP, GL_INVERT));
                        dst.push_back(StencilOp::quad(GL_NOTEQUAL, targetStencil, GL_ALWAYS, 0.0f, GL_KEEP, GL_KEEP, GL_INVERT));
-               });
+               })
        STENCIL_CASE(cmp_less_than, "Less than comparison",
                {
                        int maxStencil = (1<<stencilBits)-1;
@@ -517,7 +517,7 @@ void StencilTests::init (void)
                        }
                        else
                                dst.push_back(StencilOp::clearStencil(targetStencil));
-               });
+               })
        STENCIL_CASE(cmp_less_or_equal, "Less or equal comparison",
                {
                        int maxStencil = (1<<stencilBits)-1;
@@ -529,7 +529,7 @@ void StencilTests::init (void)
                        }
                        else
                                dst.push_back(StencilOp::clearStencil(targetStencil));
-               });
+               })
        STENCIL_CASE(cmp_greater_than, "Greater than comparison",
                {
                        if (targetStencil > 0)
@@ -540,7 +540,7 @@ void StencilTests::init (void)
                        }
                        else
                                dst.push_back(StencilOp::clearStencil(targetStencil));
-               });
+               })
        STENCIL_CASE(cmp_greater_or_equal, "Greater or equal comparison",
                {
                        if (targetStencil > 0)
@@ -551,7 +551,7 @@ void StencilTests::init (void)
                        }
                        else
                                dst.push_back(StencilOp::clearStencil(targetStencil));
-               });
+               })
        STENCIL_CASE(cmp_mask_equal, "Equality comparison with mask",
                {
                        int valMask = (1<<stencilBits)-1;
@@ -560,7 +560,7 @@ void StencilTests::init (void)
                        StencilOp op = StencilOp::quad(GL_EQUAL, (~targetStencil | ~mask) & valMask, GL_ALWAYS, 0.0f, GL_KEEP, GL_KEEP, GL_INVERT);
                        op.stencilMask = mask;
                        dst.push_back(op);
-               });
+               })
 }
 
 } // Functional
index c81cd94..a43292b 100644 (file)
@@ -123,7 +123,7 @@ class Tex2DCompletenessCase : public tcu::TestCase
 {
 public:
                                                        Tex2DCompletenessCase   (tcu::TestContext& testCtx, glu::RenderContext& renderCtx, const char* name, const char* description);
-                                                       ~Tex2DCompletenessCase  (void) {};
+                                                       ~Tex2DCompletenessCase  (void) {}
 
        IterateResult                   iterate                                 (void);
 
@@ -180,7 +180,7 @@ class TexCubeCompletenessCase : public tcu::TestCase
 {
 public:
                                                        TexCubeCompletenessCase         (tcu::TestContext& testCtx, glu::RenderContext& renderCtx, const char* name, const char* description);
-                                                       ~TexCubeCompletenessCase        (void) {};
+                                                       ~TexCubeCompletenessCase        (void) {}
 
        IterateResult                   iterate                                         (void);
 
index 38b391c..6a3be0d 100644 (file)
@@ -729,7 +729,7 @@ void TextureFilteringTests::init (void)
                                                                                                                 wrapModes[wrapMode].mode,
                                                                                                                 formats[format].format, formats[format].dataType,
                                                                                                                 sizes2D[size].width, sizes2D[size].height));
-               })))));
+               })))))
 
        // 2D ETC1 texture cases.
        {
@@ -750,7 +750,7 @@ void TextureFilteringTests::init (void)
                                                                                                                         wrapModes[wrapMode].mode,
                                                                                                                         wrapModes[wrapMode].mode,
                                                                                                                         filenames));
-                       })));
+                       })))
        }
 
        // Cubemap cases.
@@ -785,7 +785,7 @@ void TextureFilteringTests::init (void)
                                                                                                                         wrapModes[wrapMode].mode,
                                                                                                                         formats[format].format, formats[format].dataType,
                                                                                                                         sizesCube[size].width, sizesCube[size].height));
-               })))));
+               })))))
 
        // Cubemap ETC1 cases
        {
@@ -809,7 +809,7 @@ void TextureFilteringTests::init (void)
                                                                                                                                 GL_CLAMP_TO_EDGE,
                                                                                                                                 GL_CLAMP_TO_EDGE,
                                                                                                                                 filenames));
-                       }));
+                       }))
        }
 }
 
index f4b99f5..dfb6c03 100644 (file)
@@ -342,12 +342,14 @@ public:
 
 } // anonymous
 
-#define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK)                                                                                               \
-       for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++)        \
-       {                                                                                                                                                                                       \
-               TexParamVerifier* verifier = (VERIFIERS)[_verifierNdx];                                                                 \
-               CODE_BLOCK;                                                                                                                                                             \
-       }
+#define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK)                                                                                                       \
+       do {                                                                                                                                                                                    \
+               for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++)        \
+               {                                                                                                                                                                                       \
+                       TexParamVerifier* verifier = (VERIFIERS)[_verifierNdx];                                                                 \
+                       CODE_BLOCK;                                                                                                                                                             \
+               }                                                                                                                                                                                       \
+       } while (0)
 
 TextureStateQueryTests::TextureStateQueryTests (Context& context)
        : TestCaseGroup         (context, "texture", "Texture State Query tests")
index 0a3bfa2..06b032d 100644 (file)
@@ -325,7 +325,7 @@ void TextureWrapTests::init (void)
                                                                                 filteringModes[filter].mode, filteringModes[filter].mode,
                                                                                 sizes[size].width, sizes[size].height));
 
-               })))));
+               })))))
 
        // Power-of-two ETC1 texture
        std::vector<std::string> potFilenames;
@@ -342,7 +342,7 @@ void TextureWrapTests::init (void)
                                                                                 filteringModes[filter].mode, filteringModes[filter].mode,
                                                                                 potFilenames));
 
-               })));
+               })))
 
        std::vector<std::string> npotFilenames;
        npotFilenames.push_back("data/etc1/photo_helsinki_113x89.pkm");
index ba1fbd2..3c87496 100644 (file)
@@ -487,7 +487,7 @@ private:
        vector<const StructType*>       m_structTypes;
 };
 
-}; // anonymous
+} // anonymous
 
 static VarValue getSamplerFillValue (const VarValue& sampler)
 {
index 8e6eb97..5e7903e 100644 (file)
@@ -1108,7 +1108,7 @@ void VertexTextureTests::init (void)
                                                                                                                           magFilterModes[magFilter].mode,
                                                                                                                           wrapModes[wrapMode].mode,
                                                                                                                           wrapModes[wrapMode].mode));
-               })));
+               })))
 
        FOR_EACH(wrapSMode,             wrapModes,
        FOR_EACH(wrapTMode,             wrapModes,
@@ -1121,7 +1121,7 @@ void VertexTextureTests::init (void)
                                                                                                                  GL_LINEAR,
                                                                                                                  wrapModes[wrapSMode].mode,
                                                                                                                  wrapModes[wrapTMode].mode));
-               }));
+               }))
 
        // Cube map cases.
 
@@ -1137,7 +1137,7 @@ void VertexTextureTests::init (void)
                                                                                                                                   magFilterModes[magFilter].mode,
                                                                                                                                   wrapModes[wrapMode].mode,
                                                                                                                                   wrapModes[wrapMode].mode));
-               })));
+               })))
 
        FOR_EACH(wrapSMode,             wrapModes,
        FOR_EACH(wrapTMode,             wrapModes,
@@ -1150,7 +1150,7 @@ void VertexTextureTests::init (void)
                                                                                                                          GL_LINEAR,
                                                                                                                          wrapModes[wrapSMode].mode,
                                                                                                                          wrapModes[wrapTMode].mode));
-               }));
+               }))
 }
 
 } // Functional
index 7a921ba..2c9cca8 100644 (file)
@@ -2095,7 +2095,7 @@ ShaderCompilerCase::IterateResult ShaderCompilerCase::iterate (void)
                                string  statNamePrefix  = isEntireRange ? "" : "LowestHalf";
                                float   rangeSizeRatio  = isEntireRange ? 1.0f : 0.5f;
 
-#define LOG_TIME(NAME, DESC, DATA) log << TestLog::Float(statNamePrefix + (NAME) + singular, singular + " of " + (DESC), "ms", QP_KEY_TAG_TIME, func(vectorLowestPercentage((DATA), rangeSizeRatio))/1000.0f);
+#define LOG_TIME(NAME, DESC, DATA) log << TestLog::Float(statNamePrefix + (NAME) + singular, singular + " of " + (DESC), "ms", QP_KEY_TAG_TIME, func(vectorLowestPercentage((DATA), rangeSizeRatio))/1000.0f)
 
                                log << TestLog::Message << (isEntireRange ? "For all measurements:" : "\nFor only the lowest 50% of the measurements:") << TestLog::EndMessage;
                                LOG_TIME("ShaderSourceSetTime",                 "shader source set time",                       sourceSetTimes);
@@ -2621,7 +2621,7 @@ InvalidShaderCompilerCase::IterateResult InvalidShaderCompilerCase::iterate (voi
                                string  statNamePrefix  = isEntireRange ? "" : "LowestHalf";
                                float   rangeSizeRatio  = isEntireRange ? 1.0f : 0.5f;
 
-#define LOG_TIME(NAME, DESC, DATA) log << TestLog::Float(statNamePrefix + (NAME) + singular, singular + " of " + (DESC), "ms", QP_KEY_TAG_TIME, func(vectorLowestPercentage((DATA), rangeSizeRatio))/1000.0f);
+#define LOG_TIME(NAME, DESC, DATA) log << TestLog::Float(statNamePrefix + (NAME) + singular, singular + " of " + (DESC), "ms", QP_KEY_TAG_TIME, func(vectorLowestPercentage((DATA), rangeSizeRatio))/1000.0f)
 
                                log << TestLog::Message << (isEntireRange ? "For all measurements:" : "\nFor only the lowest 50% of the measurements:") << TestLog::EndMessage;
                                LOG_TIME("ShaderSourceSetTime",                 "shader source set time",                       sourceSetTimes);
index b164bbd..dad6c2f 100644 (file)
@@ -199,7 +199,7 @@ void StateChangeCallTests::init (void)
                        GL_BLEND,
                        GL_DITHER
                })
-       );
+       )
 
        ADD_ARG_CASE1(disable, "Test cost of glDisable() calls",
                disable,
@@ -215,7 +215,7 @@ void StateChangeCallTests::init (void)
                        GL_BLEND,
                        GL_DITHER
                })
-       );
+       )
 
        ADD_ARG_CASE1(depth_func, "Test cost of glDepthFunc() calls",
                depthFunc,
@@ -230,7 +230,7 @@ void StateChangeCallTests::init (void)
                        GL_GEQUAL,
                        GL_NOTEQUAL
                })
-       );
+       )
 
        ADD_ARG_CASE1(depth_mask, "Test cost of glDepthMask() calls",
                depthMask,
@@ -239,7 +239,7 @@ void StateChangeCallTests::init (void)
                        GL_TRUE,
                        GL_FALSE
                })
-       );
+       )
 
        ADD_ARG_CASE1(stencil_mask, "Test cost of glStencilMask() calls",
                stencilMask,
@@ -248,7 +248,7 @@ void StateChangeCallTests::init (void)
                        GL_TRUE,
                        GL_FALSE
                })
-       );
+       )
 
        ADD_ARG_CASE1(clear_depth, "Test cost of glClearDepth() calls",
                clearDepthf,
@@ -258,7 +258,7 @@ void StateChangeCallTests::init (void)
                        0.5f,
                        1.0f
                })
-       );
+       )
 
        ADD_ARG_CASE1(clear_stencil, "Test cost of glClearStencil() calls",
                clearStencil,
@@ -268,7 +268,7 @@ void StateChangeCallTests::init (void)
                        128,
                        28
                })
-       );
+       )
 
        ADD_ARG_CASE1(line_width, "Test cost of glLineWidth() calls",
                lineWidth,
@@ -278,7 +278,7 @@ void StateChangeCallTests::init (void)
                        0.5f,
                        10.0f
                })
-       );
+       )
 
        ADD_ARG_CASE1(cull_face, "Test cost of glCullFace() calls",
                cullFace,
@@ -288,7 +288,7 @@ void StateChangeCallTests::init (void)
                        GL_BACK,
                        GL_FRONT_AND_BACK
                })
-       );
+       )
 
        ADD_ARG_CASE1(front_face, "Test cost of glFrontFace() calls",
                frontFace,
@@ -297,7 +297,7 @@ void StateChangeCallTests::init (void)
                        GL_CCW,
                        GL_CW
                })
-       );
+       )
 
        ADD_ARG_CASE1(blend_equation, "Test cost of glBlendEquation() calls",
                blendEquation,
@@ -307,7 +307,7 @@ void StateChangeCallTests::init (void)
                        GL_FUNC_SUBTRACT,
                        GL_FUNC_REVERSE_SUBTRACT
                })
-       );
+       )
 
        ADD_ARG_CASE1(enable_vertex_attrib_array, "Test cost of glEnableVertexAttribArray() calls",
                enableVertexAttribArray,
@@ -322,7 +322,7 @@ void StateChangeCallTests::init (void)
                        6,
                        7,
                })
-       );
+       )
 
        ADD_ARG_CASE1(disable_vertex_attrib_array, "Test cost of glDisableVertexAttribArray() calls",
                disableVertexAttribArray,
@@ -337,7 +337,7 @@ void StateChangeCallTests::init (void)
                        6,
                        7,
                })
-       );
+       )
 
        ADD_ARG_CASE1(use_program, "Test cost of glUseProgram() calls. Note: Uses only program 0.",
                useProgram,
@@ -345,7 +345,7 @@ void StateChangeCallTests::init (void)
                ARG_LIST({
                        0,
                })
-       );
+       )
 
        ADD_ARG_CASE1(active_texture, "Test cost of glActiveTexture() calls",
                activeTexture,
@@ -360,7 +360,7 @@ void StateChangeCallTests::init (void)
                        GL_TEXTURE6,
                        GL_TEXTURE7
                })
-       );
+       )
 
        ADD_ARG_CASE2(depth_range, "Test cost of glDepthRangef() calls",
                depthRangef,
@@ -376,7 +376,7 @@ void StateChangeCallTests::init (void)
                        1.0f,
                        0.5f
                })
-       );
+       )
 
        ADD_ARG_CASE2(polygon_offset, "Test cost of glPolygonOffset() calls",
                polygonOffset,
@@ -394,7 +394,7 @@ void StateChangeCallTests::init (void)
                        0.5f,
                        1000.0f
                })
-       );
+       )
 
        ADD_ARG_CASE2(sample_coverage, "Test cost of glSampleCoverage() calls",
                sampleCoverage,
@@ -410,7 +410,7 @@ void StateChangeCallTests::init (void)
                        GL_TRUE,
                        GL_FALSE
                })
-       );
+       )
 
        ADD_ARG_CASE2(blend_func, "Test cost of glBlendFunc() calls",
                blendFunc,
@@ -448,7 +448,7 @@ void StateChangeCallTests::init (void)
                        GL_CONSTANT_ALPHA,
                        GL_ONE_MINUS_CONSTANT_ALPHA
                })
-       );
+       )
 
        ADD_ARG_CASE2(blend_equation_separate, "Test cost of glBlendEquationSeparate() calls",
                blendEquationSeparate,
@@ -464,7 +464,7 @@ void StateChangeCallTests::init (void)
                        GL_FUNC_SUBTRACT,
                        GL_FUNC_REVERSE_SUBTRACT
                })
-       );
+       )
 
        ADD_ARG_CASE2(stencil_mask_separate, "Test cost of glStencilMaskSeparate() calls",
                stencilMaskSeparate,
@@ -479,7 +479,7 @@ void StateChangeCallTests::init (void)
                        GL_TRUE,
                        GL_FALSE
                })
-       );
+       )
 
        ADD_ARG_CASE2(bind_buffer, "Test cost of glBindBuffer() calls. Note: Uses only buffer 0",
                bindBuffer,
@@ -492,7 +492,7 @@ void StateChangeCallTests::init (void)
                ARG_LIST({
                        0
                })
-       );
+       )
 
        ADD_ARG_CASE2(bind_texture, "Test cost of glBindTexture() calls. Note: Uses only texture 0",
                bindTexture,
@@ -505,7 +505,7 @@ void StateChangeCallTests::init (void)
                ARG_LIST({
                        0
                })
-       );
+       )
 
        ADD_ARG_CASE2(hint, "Test cost of glHint() calls",
                hint,
@@ -519,7 +519,7 @@ void StateChangeCallTests::init (void)
                        GL_NICEST,
                        GL_DONT_CARE
                })
-       );
+       )
 
        ADD_ARG_CASE3(stencil_func, "Test cost of glStencilFunc() calls",
                stencilFunc,
@@ -551,7 +551,7 @@ void StateChangeCallTests::init (void)
                        7,
                        0xFFFFFFFF
                })
-       );
+       )
 
        ADD_ARG_CASE3(stencil_op, "Test cost of glStencilOp() calls",
                stencilOp,
@@ -588,7 +588,7 @@ void StateChangeCallTests::init (void)
                        GL_INCR_WRAP,
                        GL_DECR_WRAP
                })
-       );
+       )
 
        ADD_ARG_CASE4(viewport, "Test cost of glViewport() calls",
                viewport,
@@ -620,7 +620,7 @@ void StateChangeCallTests::init (void)
                        100,
                        1145235
                })
-       );
+       )
 
        ADD_ARG_CASE4(scissor, "Test cost of glScissor() calls",
                scissor,
@@ -652,7 +652,7 @@ void StateChangeCallTests::init (void)
                        100,
                        1145235
                })
-       );
+       )
 
        ADD_ARG_CASE4(stencil_func_separate, "Test cost of glStencilFuncSeparate() calls",
                stencilFuncSeparate,
@@ -690,7 +690,7 @@ void StateChangeCallTests::init (void)
                        7,
                        0xFFFFFFFF
                })
-       );
+       )
 
        ADD_ARG_CASE4(stencil_op_separatae, "Test cost of glStencilOpSeparate() calls",
                stencilOpSeparate,
@@ -733,7 +733,7 @@ void StateChangeCallTests::init (void)
                        GL_INCR_WRAP,
                        GL_DECR_WRAP
                })
-       );
+       )
 
        ADD_ARG_CASE4(blend_func_separate, "Test cost of glBlendFuncSeparate() calls",
                blendFuncSeparate,
@@ -805,7 +805,7 @@ void StateChangeCallTests::init (void)
                        GL_CONSTANT_ALPHA,
                        GL_ONE_MINUS_CONSTANT_ALPHA
                })
-       );
+       )
 
        ADD_ARG_CASE4(color_mask, "Test cost of glColorMask() calls",
                colorMask,
@@ -829,7 +829,7 @@ void StateChangeCallTests::init (void)
                        GL_TRUE,
                        GL_FALSE
                })
-       );
+       )
 
        ADD_ARG_CASE4(clear_color, "Test cost of glClearColor() calls",
                clearColor,
@@ -861,7 +861,7 @@ void StateChangeCallTests::init (void)
                        0.5f,
                        0.33f
                })
-       );
+       )
 
        ADD_ARG_CASE6(vertex_attrib_pointer, "Test cost of glVertexAttribPointer() calls",
                vertexAttribPointer,
@@ -907,7 +907,7 @@ void StateChangeCallTests::init (void)
                        (void*)(deUintptr)(0x0FF),
                        (void*)(deUintptr)(0x0EF)
                })
-       );
+       )
 }
 
 } // Performance
index add6c02..3a3ddf5 100644 (file)
@@ -549,7 +549,7 @@ void TextureUploadTests::init (void)
 
                textureSizes[texSize].uploadCallGroup->addChild         (new TextureUploadCallCase              (m_context, caseName.c_str(), "", function, format, type, size));
                textureSizes[texSize].uploadAndDrawGroup->addChild      (new TextureUploadAndDrawCase   (m_context, caseName.c_str(), "", function, format, type, size));
-       })));
+       })))
 
        for (int i = 0; i < DE_LENGTH_OF_ARRAY(textureSizes); i++)
        {
index 5de5c71..e168c85 100644 (file)
@@ -32,7 +32,7 @@
 namespace tcu
 {
        class WaiverUtil;
-};
+}
 
 namespace deqp
 {
index 4f1d7a2..c4b7473 100644 (file)
@@ -735,7 +735,7 @@ void TextureFilteringTests::init (void)
                                                                                                                 wrapModes[wrapMode].mode,
                                                                                                                 formats[format].format,
                                                                                                                 sizes2D[size].width, sizes2D[size].height));
-               })))));
+               })))))
 
        // Cubemap cases.
        FOR_EACH(minFilter,             minFilterModes,
@@ -755,7 +755,7 @@ void TextureFilteringTests::init (void)
                                                                                                                         false,
                                                                                                                         formats[format].format,
                                                                                                                         sizesCube[size].width, sizesCube[size].height));
-               })))));
+               })))))
 }
 
 } // Accuracy
index eb81d41..039f92c 100644 (file)
@@ -715,12 +715,14 @@ public:
        }
 };
 
-#define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK)                                                                                               \
-       for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++)        \
-       {                                                                                                                                                                                       \
-               StateVerifier* verifier = (VERIFIERS)[_verifierNdx];                                                                    \
-               CODE_BLOCK;                                                                                                                                                             \
-       }
+#define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK)                                                                                                       \
+       do {                                                                                                                                                                                    \
+               for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++)        \
+               {                                                                                                                                                                                       \
+                       StateVerifier* verifier = (VERIFIERS)[_verifierNdx];                                                                    \
+                       CODE_BLOCK;                                                                                                                                                             \
+               }                                                                                                                                                                                       \
+       } while (0)
 
 } // anonymous
 
index d6d7152..ac05b22 100644 (file)
@@ -481,12 +481,14 @@ public:
 
 } // anonymous
 
-#define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK)                                                                                               \
-       for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++)        \
-       {                                                                                                                                                                                       \
-               BufferParamVerifier* verifier = (VERIFIERS)[_verifierNdx];                                                              \
-               CODE_BLOCK;                                                                                                                                                             \
-       }
+#define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK)                                                                                                       \
+       do {                                                                                                                                                                                    \
+               for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++)        \
+               {                                                                                                                                                                                       \
+                       BufferParamVerifier* verifier = (VERIFIERS)[_verifierNdx];                                                              \
+                       CODE_BLOCK;                                                                                                                                                             \
+               }                                                                                                                                                                                       \
+       } while (0)
 
 BufferObjectQueryTests::BufferObjectQueryTests (Context& context)
        : TestCaseGroup         (context, "buffer_object", "Buffer Object Query tests")
index 61e63ab..cc32545 100644 (file)
@@ -78,7 +78,7 @@ tcu::Vector<T1, S1> convertToTypeVec (const tcu::Vector<T2, S2>& v)
 class FloatLoader
 {
 public:
-       virtual                         ~FloatLoader    (void) {};
+       virtual                         ~FloatLoader    (void) {}
 
        // returns the value loaded
        virtual tcu::Vec4       load                    (glu::CallLogWrapper& gl, int index, const tcu::Vec4& v) const = 0;
index be01b15..e500942 100644 (file)
@@ -295,7 +295,7 @@ void generateBaseClearAndDepthCommands (const TestRenderTarget& target, vector<C
 
                                        RenderCommand renderCmd;
                                        renderCmd.params.visibleFace            = rr::FACETYPE_FRONT;
-                                       renderCmd.params.depth                          = depthValues[y1*numL1CellsX + x1];;
+                                       renderCmd.params.depth                          = depthValues[y1*numL1CellsX + x1];
                                        renderCmd.params.depthTestEnabled       = true;
                                        renderCmd.params.depthFunc                      = GL_ALWAYS;
                                        renderCmd.params.depthWriteMask         = true;
index c1e1a34..740cc18 100644 (file)
@@ -516,7 +516,7 @@ class StencilClearsTest : public FboRenderCase
 {
 public:
                                                StencilClearsTest               (Context& context, const FboConfig& config);
-       virtual                         ~StencilClearsTest              (void) {};
+       virtual                         ~StencilClearsTest              (void) {}
 
        void                            render                                  (sglr::Context& context, Surface& dst);
 };
@@ -607,7 +607,7 @@ class SharedColorbufferTest : public FboRenderCase
 {
 public:
                                                SharedColorbufferTest                   (Context& context, const FboConfig& config);
-       virtual                         ~SharedColorbufferTest                  (void) {};
+       virtual                         ~SharedColorbufferTest                  (void) {}
 
        void                            render                                                  (sglr::Context& context, Surface& dst);
 };
@@ -840,7 +840,7 @@ class SharedDepthStencilTest : public FboRenderCase
 {
 public:
                                        SharedDepthStencilTest          (Context& context, const FboConfig& config);
-       virtual                 ~SharedDepthStencilTest         (void) {};
+       virtual                 ~SharedDepthStencilTest         (void) {}
 
        static bool             isConfigSupported                       (const FboConfig& config);
        void                    render                                          (sglr::Context& context, Surface& dst);
index c1880ea..2322ce9 100644 (file)
@@ -204,7 +204,7 @@ static bool isRequiredFormat (deUint32 format, glu::RenderContext& renderContext
                case GL_R11F_G11F_B10F:
                case GL_RG32F:
                case GL_R32F:
-                       return glu::contextSupports(renderContext.getType(), glu::ApiType::es(3, 2));;
+                       return glu::contextSupports(renderContext.getType(), glu::ApiType::es(3, 2));
 
                default:
                        return false;
index 0ae190d..2fdefe1 100644 (file)
@@ -1236,12 +1236,14 @@ private:
        StateVerifier*  m_verifier;
 };
 
-#define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK)                                                                                               \
-       for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++)        \
-       {                                                                                                                                                                                       \
-               StateVerifier* verifier = (VERIFIERS)[_verifierNdx];                                                                    \
-               CODE_BLOCK;                                                                                                                                                             \
-       }
+#define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK)                                                                                                       \
+       do {                                                                                                                                                                                    \
+               for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++)        \
+               {                                                                                                                                                                                       \
+                       StateVerifier* verifier = (VERIFIERS)[_verifierNdx];                                                                    \
+                       CODE_BLOCK;                                                                                                                                                             \
+               }                                                                                                                                                                                       \
+       } while (0)
 
 } // anonymous
 
index 9bdfbfe..6a3661a 100644 (file)
@@ -254,12 +254,14 @@ private:
        StateVerifier*  m_verifier;
 };
 
-#define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK)                                                                                               \
-       for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++)        \
-       {                                                                                                                                                                                       \
-               StateVerifier* verifier = (VERIFIERS)[_verifierNdx];                                                                    \
-               CODE_BLOCK;                                                                                                                                                             \
-       }
+#define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK)                                                                                                       \
+       do {                                                                                                                                                                                    \
+               for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++)        \
+               {                                                                                                                                                                                       \
+                       StateVerifier* verifier = (VERIFIERS)[_verifierNdx];                                                                    \
+                       CODE_BLOCK;                                                                                                                                                             \
+               }                                                                                                                                                                                       \
+       } while (0)
 
 } // anonymous
 
index 16c11b4..14ce441 100644 (file)
@@ -2724,19 +2724,23 @@ static const char* getQueryTypeSuffix (QueryType type)
        }
 }
 
-#define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK)                                                                                               \
-       for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++)        \
-       {                                                                                                                                                                                       \
-               StateVerifier* verifier = (VERIFIERS)[_verifierNdx];                                                                    \
-               CODE_BLOCK;                                                                                                                                                             \
-       }
-
-#define FOR_EACH_QUERYTYPE(QUERYTYPES, CODE_BLOCK)                                                                                                     \
-       for (int _queryTypeNdx = 0; _queryTypeNdx < DE_LENGTH_OF_ARRAY(QUERYTYPES); _queryTypeNdx++)    \
-       {                                                                                                                                                                                               \
-               const QueryType queryType = (QUERYTYPES)[_queryTypeNdx];                                                                        \
-               CODE_BLOCK;                                                                                                                                                                     \
-       }
+#define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK)                                                                                                       \
+       do {                                                                                                                                                                                    \
+               for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++)        \
+               {                                                                                                                                                                                       \
+                       StateVerifier* verifier = (VERIFIERS)[_verifierNdx];                                                                    \
+                       CODE_BLOCK;                                                                                                                                                             \
+               }                                                                                                                                                                                       \
+       } while (0)
+
+#define FOR_EACH_QUERYTYPE(QUERYTYPES, CODE_BLOCK)                                                                                                             \
+       do {                                                                                                                                                                                            \
+               for (int _queryTypeNdx = 0; _queryTypeNdx < DE_LENGTH_OF_ARRAY(QUERYTYPES); _queryTypeNdx++)    \
+               {                                                                                                                                                                                               \
+                       const QueryType queryType = (QUERYTYPES)[_queryTypeNdx];                                                                        \
+                       CODE_BLOCK;                                                                                                                                                                     \
+               }                                                                                                                                                                                               \
+       } while (0)
 
 } // anonymous
 
index 59b33d0..3909173 100644 (file)
@@ -302,7 +302,7 @@ void BufferVAOInputAttacher::drawContainer (GLuint vao, Surface& dst)
        m_program.draw(vao, 1.0, false, &dst);
        log() << TestLog::Message << "// Drew an output image with VAO " << vao
                  << TestLog::EndMessage;
-};
+}
 
 class BufferTfAttacher : public Attacher
 {
index 3003ba5..2f1855d 100644 (file)
@@ -136,7 +136,7 @@ TestCase::IterateResult ClearColorCase::iterate (void)
                        a = (int)(deRandom_getUint32(&rnd) & 0xFF);
                        break;
 
-       };
+       }
 
        glClearColor(float(r)/255.0f, float(g)/255.0f, float(b)/255.0f, float(a)/255.0f);
        glClear(GL_COLOR_BUFFER_BIT);
index 832b237..52871b6 100644 (file)
@@ -95,7 +95,7 @@ void SamplerStateQueryTests::init (void)
                                                                                                                                         std::string() + states[stateNdx].name + getVerifierSuffix(verifier),
                                                                                                                                         states[stateNdx].desc,
                                                                                                                                         verifier,
-                                                                                                                                        states[stateNdx].tester)));
+                                                                                                                                        states[stateNdx].tester)))
        }
 }
 
index ff1e09b..37c7b47 100644 (file)
@@ -1124,7 +1124,7 @@ static ShaderLoopCase* createSpecialLoopCase (Context& context, const char* case
        // Create the case.
        ShaderEvalFunc evalFunc = getLoopEvalFunc(numIters);
        return new ShaderLoopCase(context, caseName, description, isVertexCase, evalFunc, vertexShaderSource.c_str(), fragmentShaderSource.c_str());
-};
+}
 
 // ShaderLoopTests.
 
index 039edf0..1f090e6 100644 (file)
@@ -156,44 +156,44 @@ inline Vector<T, Size> smoothStepScalarScalarVec (T s0, T s1, const Vector<T, Si
        return res;
 }
 
-inline float   addOne (float v)        { return v + 1.0f; };
-inline float   subOne (float v)        { return v - 1.0f; };
-inline int             addOne (int v)          { return v + 1; };
-inline int             subOne (int v)          { return v - 1; };
-inline deUint32        addOne (deUint32 v)     { return v + 1; };
-inline deUint32        subOne (deUint32 v)     { return v - 1; };
-
-template<int Size> inline Vector<float, Size>          addOne (const Vector<float, Size>& v)           { return v + 1.0f; };
-template<int Size> inline Vector<float, Size>          subOne (const Vector<float, Size>& v)           { return v - 1.0f; };
-template<int Size> inline Vector<int, Size>                    addOne (const Vector<int, Size>& v)                     { return v + 1; };
-template<int Size> inline Vector<int, Size>                    subOne (const Vector<int, Size>& v)                     { return v - 1; };
-template<int Size> inline Vector<deUint32, Size>       addOne (const Vector<deUint32, Size>& v)        { return v + 1U; };
-template<int Size> inline Vector<deUint32, Size>       subOne (const Vector<deUint32, Size>& v)        { return (v.asInt() - 1).asUint(); };
-
-template<typename T> inline T selection        (bool cond, T a, T b)   { return cond ? a : b; };
+inline float   addOne (float v)        { return v + 1.0f; }
+inline float   subOne (float v)        { return v - 1.0f; }
+inline int             addOne (int v)          { return v + 1; }
+inline int             subOne (int v)          { return v - 1; }
+inline deUint32        addOne (deUint32 v)     { return v + 1; }
+inline deUint32        subOne (deUint32 v)     { return v - 1; }
+
+template<int Size> inline Vector<float, Size>          addOne (const Vector<float, Size>& v)           { return v + 1.0f; }
+template<int Size> inline Vector<float, Size>          subOne (const Vector<float, Size>& v)           { return v - 1.0f; }
+template<int Size> inline Vector<int, Size>                    addOne (const Vector<int, Size>& v)                     { return v + 1; }
+template<int Size> inline Vector<int, Size>                    subOne (const Vector<int, Size>& v)                     { return v - 1; }
+template<int Size> inline Vector<deUint32, Size>       addOne (const Vector<deUint32, Size>& v)        { return v + 1U; }
+template<int Size> inline Vector<deUint32, Size>       subOne (const Vector<deUint32, Size>& v)        { return (v.asInt() - 1).asUint(); }
+
+template<typename T> inline T selection        (bool cond, T a, T b)   { return cond ? a : b; }
 
 // Vec-scalar and scalar-vec binary operators.
 
 // \note This one is done separately due to how the overloaded minus operator is implemented for vector-scalar operands.
-template<int Size>                             inline Vector<deUint32, Size>   subVecScalar                    (const Vector<deUint32, Size>& v, deUint32 s)   { return (v.asInt() - (int)s).asUint(); };
-
-template<typename T, int Size> inline Vector<T, Size>                  addVecScalar                    (const Vector<T, Size>& v, T s)                                 { return v + s; };
-template<typename T, int Size> inline Vector<T, Size>                  subVecScalar                    (const Vector<T, Size>& v, T s)                                 { return v - s; };
-template<typename T, int Size> inline Vector<T, Size>                  mulVecScalar                    (const Vector<T, Size>& v, T s)                                 { return v * s; };
-template<typename T, int Size> inline Vector<T, Size>                  divVecScalar                    (const Vector<T, Size>& v, T s)                                 { return v / s; };
-template<typename T, int Size> inline Vector<T, Size>                  modVecScalar                    (const Vector<T, Size>& v, T s)                                 { return mod(v, Vector<T, Size>(s)); };
-template<typename T, int Size> inline Vector<T, Size>                  bitwiseAndVecScalar             (const Vector<T, Size>& v, T s)                                 { return bitwiseAnd(v, Vector<T, Size>(s)); };
-template<typename T, int Size> inline Vector<T, Size>                  bitwiseOrVecScalar              (const Vector<T, Size>& v, T s)                                 { return bitwiseOr(v, Vector<T, Size>(s)); };
-template<typename T, int Size> inline Vector<T, Size>                  bitwiseXorVecScalar             (const Vector<T, Size>& v, T s)                                 { return bitwiseXor(v, Vector<T, Size>(s)); };
-
-template<typename T, int Size> inline Vector<T, Size>                  addScalarVec                    (T s, const Vector<T, Size>& v)                                 { return s + v; };
-template<typename T, int Size> inline Vector<T, Size>                  subScalarVec                    (T s, const Vector<T, Size>& v)                                 { return s - v; };
-template<typename T, int Size> inline Vector<T, Size>                  mulScalarVec                    (T s, const Vector<T, Size>& v)                                 { return s * v; };
-template<typename T, int Size> inline Vector<T, Size>                  divScalarVec                    (T s, const Vector<T, Size>& v)                                 { return s / v; };
-template<typename T, int Size> inline Vector<T, Size>                  modScalarVec                    (T s, const Vector<T, Size>& v)                                 { return mod(Vector<T, Size>(s), v); };
-template<typename T, int Size> inline Vector<T, Size>                  bitwiseAndScalarVec             (T s, const Vector<T, Size>& v)                                 { return bitwiseAnd(Vector<T, Size>(s), v); };
-template<typename T, int Size> inline Vector<T, Size>                  bitwiseOrScalarVec              (T s, const Vector<T, Size>& v)                                 { return bitwiseOr(Vector<T, Size>(s), v); };
-template<typename T, int Size> inline Vector<T, Size>                  bitwiseXorScalarVec             (T s, const Vector<T, Size>& v)                                 { return bitwiseXor(Vector<T, Size>(s), v); };
+template<int Size>                             inline Vector<deUint32, Size>   subVecScalar                    (const Vector<deUint32, Size>& v, deUint32 s)   { return (v.asInt() - (int)s).asUint(); }
+
+template<typename T, int Size> inline Vector<T, Size>                  addVecScalar                    (const Vector<T, Size>& v, T s)                                 { return v + s; }
+template<typename T, int Size> inline Vector<T, Size>                  subVecScalar                    (const Vector<T, Size>& v, T s)                                 { return v - s; }
+template<typename T, int Size> inline Vector<T, Size>                  mulVecScalar                    (const Vector<T, Size>& v, T s)                                 { return v * s; }
+template<typename T, int Size> inline Vector<T, Size>                  divVecScalar                    (const Vector<T, Size>& v, T s)                                 { return v / s; }
+template<typename T, int Size> inline Vector<T, Size>                  modVecScalar                    (const Vector<T, Size>& v, T s)                                 { return mod(v, Vector<T, Size>(s)); }
+template<typename T, int Size> inline Vector<T, Size>                  bitwiseAndVecScalar             (const Vector<T, Size>& v, T s)                                 { return bitwiseAnd(v, Vector<T, Size>(s)); }
+template<typename T, int Size> inline Vector<T, Size>                  bitwiseOrVecScalar              (const Vector<T, Size>& v, T s)                                 { return bitwiseOr(v, Vector<T, Size>(s)); }
+template<typename T, int Size> inline Vector<T, Size>                  bitwiseXorVecScalar             (const Vector<T, Size>& v, T s)                                 { return bitwiseXor(v, Vector<T, Size>(s)); }
+
+template<typename T, int Size> inline Vector<T, Size>                  addScalarVec                    (T s, const Vector<T, Size>& v)                                 { return s + v; }
+template<typename T, int Size> inline Vector<T, Size>                  subScalarVec                    (T s, const Vector<T, Size>& v)                                 { return s - v; }
+template<typename T, int Size> inline Vector<T, Size>                  mulScalarVec                    (T s, const Vector<T, Size>& v)                                 { return s * v; }
+template<typename T, int Size> inline Vector<T, Size>                  divScalarVec                    (T s, const Vector<T, Size>& v)                                 { return s / v; }
+template<typename T, int Size> inline Vector<T, Size>                  modScalarVec                    (T s, const Vector<T, Size>& v)                                 { return mod(Vector<T, Size>(s), v); }
+template<typename T, int Size> inline Vector<T, Size>                  bitwiseAndScalarVec             (T s, const Vector<T, Size>& v)                                 { return bitwiseAnd(Vector<T, Size>(s), v); }
+template<typename T, int Size> inline Vector<T, Size>                  bitwiseOrScalarVec              (T s, const Vector<T, Size>& v)                                 { return bitwiseOr(Vector<T, Size>(s), v); }
+template<typename T, int Size> inline Vector<T, Size>                  bitwiseXorScalarVec             (T s, const Vector<T, Size>& v)                                 { return bitwiseXor(Vector<T, Size>(s), v); }
 
 // Reference functions for specific sequence operations for the sequence operator tests.
 
@@ -1345,8 +1345,8 @@ DECLARE_BOOL_CWISE_COMPARE_FUNCS(notEqual)
        void eval_##GLSL_NAME##_bvec3   (ShaderEvalContext& c) { c.color.xyz()  = FUNC_NAME(greaterThan(c.in[0].swizzle(2, 0, 1), Vec3(0.0f))).asFloat(); }     \
        void eval_##GLSL_NAME##_bvec4   (ShaderEvalContext& c) { c.color.xyzw() = FUNC_NAME(greaterThan(c.in[0].swizzle(1, 2, 3, 0), Vec4(0.0f))).asFloat(); }
 
-DECLARE_UNARY_SCALAR_BVEC_FUNCS(any, boolAny);
-DECLARE_UNARY_SCALAR_BVEC_FUNCS(all, boolAll);
+DECLARE_UNARY_SCALAR_BVEC_FUNCS(any, boolAny)
+DECLARE_UNARY_SCALAR_BVEC_FUNCS(all, boolAll)
 
 void ShaderOperatorTests::init (void)
 {
index d9c613a..05a381b 100644 (file)
@@ -426,22 +426,22 @@ void StencilTests::init (void)
                        // \note Unused bits are set to 1, clear should mask them out
                        int mask = (1<<stencilBits)-1;
                        dst.push_back(StencilOp::clearStencil(targetStencil | ~mask));
-               });
+               })
 
        // Replace in different points
        STENCIL_CASE(stencil_fail_replace, "Set stencil on stencil fail",
                {
                        dst.push_back(StencilOp::quad(GL_NEVER, targetStencil, GL_ALWAYS, 0.0f, GL_REPLACE, GL_KEEP, GL_KEEP));
-               });
+               })
        STENCIL_CASE(depth_fail_replace, "Set stencil on depth fail",
                {
                        dst.push_back(StencilOp::clearDepth(0.0f));
                        dst.push_back(StencilOp::quad(GL_ALWAYS, targetStencil, GL_LESS, 0.5f, GL_KEEP, GL_REPLACE, GL_KEEP));
-               });
+               })
        STENCIL_CASE(depth_pass_replace, "Set stencil on depth pass",
                {
                        dst.push_back(StencilOp::quad(GL_ALWAYS, targetStencil, GL_LESS, 0.0f, GL_KEEP, GL_KEEP, GL_REPLACE));
-               });
+               })
 
        // Increment, decrement
        STENCIL_CASE(incr_stencil_fail, "Increment on stencil fail",
@@ -453,7 +453,7 @@ void StencilTests::init (void)
                        }
                        else
                                dst.push_back(StencilOp::clearStencil(targetStencil));
-               });
+               })
        STENCIL_CASE(decr_stencil_fail, "Decrement on stencil fail",
                {
                        int maxStencil = (1<<stencilBits)-1;
@@ -464,19 +464,19 @@ void StencilTests::init (void)
                        }
                        else
                                dst.push_back(StencilOp::clearStencil(targetStencil));
-               });
+               })
        STENCIL_CASE(incr_wrap_stencil_fail, "Increment (wrap) on stencil fail",
                {
                        int maxStencil = (1<<stencilBits)-1;
                        dst.push_back(StencilOp::clearStencil((targetStencil-1)&maxStencil));
                        dst.push_back(StencilOp::quad(GL_EQUAL, targetStencil, GL_ALWAYS, 0.0f, GL_INCR_WRAP, GL_KEEP, GL_KEEP));
-               });
+               })
        STENCIL_CASE(decr_wrap_stencil_fail, "Decrement (wrap) on stencil fail",
                {
                        int maxStencil = (1<<stencilBits)-1;
                        dst.push_back(StencilOp::clearStencil((targetStencil+1)&maxStencil));
                        dst.push_back(StencilOp::quad(GL_EQUAL, targetStencil, GL_ALWAYS, 0.0f, GL_DECR_WRAP, GL_KEEP, GL_KEEP));
-               });
+               })
 
        // Zero, Invert
        STENCIL_CASE(zero_stencil_fail, "Zero on stencil fail",
@@ -484,13 +484,13 @@ void StencilTests::init (void)
                        dst.push_back(StencilOp::clearStencil(targetStencil));
                        dst.push_back(StencilOp::quad(GL_NOTEQUAL, targetStencil, GL_ALWAYS, 0.0f, GL_ZERO, GL_KEEP, GL_KEEP));
                        dst.push_back(StencilOp::quad(GL_EQUAL, targetStencil, GL_ALWAYS, 0.0f, GL_REPLACE, GL_KEEP, GL_KEEP));
-               });
+               })
        STENCIL_CASE(invert_stencil_fail, "Invert on stencil fail",
                {
                        int mask = (1<<stencilBits)-1;
                        dst.push_back(StencilOp::clearStencil((~targetStencil)&mask));
                        dst.push_back(StencilOp::quad(GL_EQUAL, targetStencil, GL_ALWAYS, 0.0f, GL_INVERT, GL_KEEP, GL_KEEP));
-               });
+               })
 
        // Comparison modes
        STENCIL_CASE(cmp_equal, "Equality comparison",
@@ -500,7 +500,7 @@ void StencilTests::init (void)
                        dst.push_back(StencilOp::clearStencil(inv));
                        dst.push_back(StencilOp::quad(GL_EQUAL, inv, GL_ALWAYS, 0.0f, GL_KEEP, GL_KEEP, GL_INVERT));
                        dst.push_back(StencilOp::quad(GL_EQUAL, inv, GL_ALWAYS, 0.0f, GL_KEEP, GL_KEEP, GL_INVERT));
-               });
+               })
        STENCIL_CASE(cmp_not_equal, "Equality comparison",
                {
                        int mask = (1<<stencilBits)-1;
@@ -508,7 +508,7 @@ void StencilTests::init (void)
                        dst.push_back(StencilOp::clearStencil(inv));
                        dst.push_back(StencilOp::quad(GL_NOTEQUAL, targetStencil, GL_ALWAYS, 0.0f, GL_KEEP, GL_KEEP, GL_INVERT));
                        dst.push_back(StencilOp::quad(GL_NOTEQUAL, targetStencil, GL_ALWAYS, 0.0f, GL_KEEP, GL_KEEP, GL_INVERT));
-               });
+               })
        STENCIL_CASE(cmp_less_than, "Less than comparison",
                {
                        int maxStencil = (1<<stencilBits)-1;
@@ -520,7 +520,7 @@ void StencilTests::init (void)
                        }
                        else
                                dst.push_back(StencilOp::clearStencil(targetStencil));
-               });
+               })
        STENCIL_CASE(cmp_less_or_equal, "Less or equal comparison",
                {
                        int maxStencil = (1<<stencilBits)-1;
@@ -532,7 +532,7 @@ void StencilTests::init (void)
                        }
                        else
                                dst.push_back(StencilOp::clearStencil(targetStencil));
-               });
+               })
        STENCIL_CASE(cmp_greater_than, "Greater than comparison",
                {
                        if (targetStencil > 0)
@@ -543,7 +543,7 @@ void StencilTests::init (void)
                        }
                        else
                                dst.push_back(StencilOp::clearStencil(targetStencil));
-               });
+               })
        STENCIL_CASE(cmp_greater_or_equal, "Greater or equal comparison",
                {
                        if (targetStencil > 0)
@@ -554,7 +554,7 @@ void StencilTests::init (void)
                        }
                        else
                                dst.push_back(StencilOp::clearStencil(targetStencil));
-               });
+               })
        STENCIL_CASE(cmp_mask_equal, "Equality comparison with mask",
                {
                        int valMask = (1<<stencilBits)-1;
@@ -563,7 +563,7 @@ void StencilTests::init (void)
                        StencilOp op = StencilOp::quad(GL_EQUAL, (~targetStencil | ~mask) & valMask, GL_ALWAYS, 0.0f, GL_KEEP, GL_KEEP, GL_INVERT);
                        op.stencilMask = mask;
                        dst.push_back(op);
-               });
+               })
 }
 
 } // Functional
index 475f835..085cb04 100644 (file)
@@ -127,7 +127,7 @@ void TextureStateQueryTests::init (void)
                                                                                                                                         states[stateNdx].desc,
                                                                                                                                         verifier,
                                                                                                                                         textureTargets[targetNdx].target,
-                                                                                                                                        states[stateNdx].tester)));
+                                                                                                                                        states[stateNdx].tester)))
                }
        }
 }
index 33e0334..28a9813 100644 (file)
@@ -432,7 +432,7 @@ void TextureWrapTests::init (void)
                                                                                                                         filteringModes[filter].mode, filteringModes[filter].mode,
                                                                                                                         rgba8Sizes[size].width, rgba8Sizes[size].height));
 
-                               }))));
+                               }))))
                }
        }
 
@@ -456,7 +456,7 @@ void TextureWrapTests::init (void)
                                                                                                                filteringModes[filter].mode, filteringModes[filter].mode,
                                                                                                                potFilenames));
 
-                       })));
+                       })))
 
                std::vector<std::string> npotFilenames;
                npotFilenames.push_back("data/etc1/photo_helsinki_113x89.pkm");
@@ -472,7 +472,7 @@ void TextureWrapTests::init (void)
                                                                                                                wrapModes[wrapT].mode,
                                                                                                                filteringModes[filter].mode, filteringModes[filter].mode,
                                                                                                                npotFilenames));
-                       })));
+                       })))
        }
 
        // ETC-2 (and EAC) cases.
@@ -523,7 +523,7 @@ void TextureWrapTests::init (void)
                                                                                                                          wrapModes[wrapT].mode,
                                                                                                                          filteringModes[filter].mode, filteringModes[filter].mode,
                                                                                                                          etc2Sizes[size].width, etc2Sizes[size].height));
-                               }))));
+                               }))))
                }
        }
 
@@ -568,7 +568,7 @@ void TextureWrapTests::init (void)
                                                                                                                                  wrapModes[wrapT].mode,
                                                                                                                                  filteringModes[filter].mode, filteringModes[filter].mode,
                                                                                                                                  formatSizes[size].width, formatSizes[size].height));
-                                       }))));
+                                       }))))
                        }
                }
        }
index b363e73..8e58b0e 100644 (file)
@@ -553,7 +553,7 @@ private:
        vector<const StructType*>       m_structTypes;
 };
 
-}; // anonymous
+} // anonymous
 
 static VarValue getSamplerFillValue (const VarValue& sampler)
 {
index 82578b1..5f07e61 100644 (file)
@@ -408,7 +408,7 @@ deUint8* VertexArrayObjectTest::createRandomBufferData (const BufferSpec& buffer
 
                                default:
                                        DE_ASSERT(false);
-                       };
+                       }
                }
 
                itr += stride;
@@ -992,7 +992,7 @@ deUint8* MultiVertexArrayObjectTest::createRandomBufferData (const BufferSpec& b
 
                                default:
                                        DE_ASSERT(false);
-                       };
+                       }
                }
 
                itr += stride;
@@ -1570,7 +1570,7 @@ void VertexArrayObjectTestGroup::init (void)
                spec.indexCount                 = 0;
 
                spec.vao.attributes[0].normalized       = GL_TRUE;
-               spec.state.attributes[0].normalized     = GL_FALSE;;
+               spec.state.attributes[0].normalized     = GL_FALSE;
                addChild(new VertexArrayObjectTest(m_context, spec, "diff_normalize", "diff_normalize"));
        }
        // DrawElements with buffer / Pointer
index e4a2b6d..9c04958 100644 (file)
@@ -1900,7 +1900,7 @@ void VertexTextureTests::init (void)
                                                                                                                           magFilterModes[magFilter].mode,
                                                                                                                           wrapModes[wrapMode].mode,
                                                                                                                           wrapModes[wrapMode].mode));
-               })));
+               })))
 
        FOR_EACH(wrapSMode,             wrapModes,
        FOR_EACH(wrapTMode,             wrapModes,
@@ -1913,7 +1913,7 @@ void VertexTextureTests::init (void)
                                                                                                                  GL_LINEAR,
                                                                                                                  wrapModes[wrapSMode].mode,
                                                                                                                  wrapModes[wrapTMode].mode));
-               }));
+               }))
 
        // Cube map cases.
 
@@ -1929,7 +1929,7 @@ void VertexTextureTests::init (void)
                                                                                                                                   magFilterModes[magFilter].mode,
                                                                                                                                   wrapModes[wrapMode].mode,
                                                                                                                                   wrapModes[wrapMode].mode));
-               })));
+               })))
 
        FOR_EACH(wrapSMode,             wrapModes,
        FOR_EACH(wrapTMode,             wrapModes,
@@ -1942,7 +1942,7 @@ void VertexTextureTests::init (void)
                                                                                                                          GL_LINEAR,
                                                                                                                          wrapModes[wrapSMode].mode,
                                                                                                                          wrapModes[wrapTMode].mode));
-               }));
+               }))
 
        // 2D array cases.
 
@@ -1958,7 +1958,7 @@ void VertexTextureTests::init (void)
                                                                                                                                                 magFilterModes[magFilter].mode,
                                                                                                                                                 wrapModes[wrapMode].mode,
                                                                                                                                                 wrapModes[wrapMode].mode));
-               })));
+               })))
 
        FOR_EACH(wrapSMode,             wrapModes,
        FOR_EACH(wrapTMode,             wrapModes,
@@ -1971,7 +1971,7 @@ void VertexTextureTests::init (void)
                                                                                                                                        GL_LINEAR,
                                                                                                                                        wrapModes[wrapSMode].mode,
                                                                                                                                        wrapModes[wrapTMode].mode));
-               }));
+               }))
 
        // 3D cases.
 
@@ -1988,7 +1988,7 @@ void VertexTextureTests::init (void)
                                                                                                                           wrapModes[wrapMode].mode,
                                                                                                                           wrapModes[wrapMode].mode,
                                                                                                                           wrapModes[wrapMode].mode));
-               })));
+               })))
 
        FOR_EACH(wrapSMode,             wrapModes,
        FOR_EACH(wrapTMode,             wrapModes,
@@ -2003,7 +2003,7 @@ void VertexTextureTests::init (void)
                                                                                                                  wrapModes[wrapSMode].mode,
                                                                                                                  wrapModes[wrapTMode].mode,
                                                                                                                  wrapModes[wrapRMode].mode));
-               })));
+               })))
 }
 
 } // Functional
index 793e30d..605a455 100644 (file)
@@ -5402,8 +5402,8 @@ private:
        void                                    logAndSetTestResult                             (void);
        void                                    logSamples                                              (void);
        void                                    drawMisc                                                (void);
-       int                                             findStabilizationSample                 (deUint64 (Result::*target), const char* description);
-       bool                                    checkSampleTemporalStability    (deUint64 (Result::*target), const char* description);
+       int                                             findStabilizationSample                 (deUint64 Result::*target, const char* description);
+       bool                                    checkSampleTemporalStability    (deUint64 Result::*target, const char* description);
 
        const DrawMethod                m_drawMethod;
        const TargetBuffer              m_targetBuffer;
@@ -6072,7 +6072,7 @@ struct ThresholdComparer
        }
 };
 
-int UploadWaitDrawCase::findStabilizationSample (deUint64 (UploadWaitDrawCase::Result::*target), const char* description)
+int UploadWaitDrawCase::findStabilizationSample (deUint64 UploadWaitDrawCase::Result::*target, const char* description)
 {
        std::vector<std::vector<deUint64> >     sampleObservations(m_numMaxSwaps+1);
        ThresholdComparer<deUint64>                     comparer;
@@ -6146,7 +6146,7 @@ int UploadWaitDrawCase::findStabilizationSample (deUint64 (UploadWaitDrawCase::R
        return 0;
 }
 
-bool UploadWaitDrawCase::checkSampleTemporalStability (deUint64 (UploadWaitDrawCase::Result::*target), const char* description)
+bool UploadWaitDrawCase::checkSampleTemporalStability (deUint64 UploadWaitDrawCase::Result::*target, const char* description)
 {
        // Try to find correlation with sample order and sample times
 
index 63aef98..3fb61e2 100644 (file)
@@ -101,7 +101,7 @@ class RenderData
 {
 public:
                                                                RenderData              (const ObjectData& object, const glu::RenderContext& renderCtx, TestLog& log);
-                                                               ~RenderData             (void) {};
+                                                               ~RenderData             (void) {}
 
        const glu::ShaderProgram        m_program;
        const glu::VertexArray          m_vao;
index 8c80cd7..21d2d28 100644 (file)
@@ -2115,7 +2115,7 @@ ShaderCompilerCase::IterateResult ShaderCompilerCase::iterate (void)
                                string  statNamePrefix  = isEntireRange ? "" : "LowestHalf";
                                float   rangeSizeRatio  = isEntireRange ? 1.0f : 0.5f;
 
-#define LOG_TIME(NAME, DESC, DATA) log << TestLog::Float(statNamePrefix + (NAME) + singular, singular + " of " + (DESC), "ms", QP_KEY_TAG_TIME, func(vectorLowestPercentage((DATA), rangeSizeRatio))/1000.0f);
+#define LOG_TIME(NAME, DESC, DATA) log << TestLog::Float(statNamePrefix + (NAME) + singular, singular + " of " + (DESC), "ms", QP_KEY_TAG_TIME, func(vectorLowestPercentage((DATA), rangeSizeRatio))/1000.0f)
 
                                log << TestLog::Message << (isEntireRange ? "For all measurements:" : "\nFor only the lowest 50% of the measurements:") << TestLog::EndMessage;
                                LOG_TIME("ShaderSourceSetTime",                 "shader source set time",                       sourceSetTimes);
@@ -2641,7 +2641,7 @@ InvalidShaderCompilerCase::IterateResult InvalidShaderCompilerCase::iterate (voi
                                string  statNamePrefix  = isEntireRange ? "" : "LowestHalf";
                                float   rangeSizeRatio  = isEntireRange ? 1.0f : 0.5f;
 
-#define LOG_TIME(NAME, DESC, DATA) log << TestLog::Float(statNamePrefix + (NAME) + singular, singular + " of " + (DESC), "ms", QP_KEY_TAG_TIME, func(vectorLowestPercentage((DATA), rangeSizeRatio))/1000.0f);
+#define LOG_TIME(NAME, DESC, DATA) log << TestLog::Float(statNamePrefix + (NAME) + singular, singular + " of " + (DESC), "ms", QP_KEY_TAG_TIME, func(vectorLowestPercentage((DATA), rangeSizeRatio))/1000.0f)
 
                                log << TestLog::Message << (isEntireRange ? "For all measurements:" : "\nFor only the lowest 50% of the measurements:") << TestLog::EndMessage;
                                LOG_TIME("ShaderSourceSetTime",                 "shader source set time",                       sourceSetTimes);
index 616f0dd..2565e89 100644 (file)
@@ -232,7 +232,7 @@ void StateChangeCallTests::init (void)
                        GL_RASTERIZER_DISCARD,
                        GL_PRIMITIVE_RESTART_FIXED_INDEX
                })
-       );
+       )
 
        ADD_ARG_CASE1(disable, "Test cost of glDisable() calls",
                disable,
@@ -250,7 +250,7 @@ void StateChangeCallTests::init (void)
                        GL_RASTERIZER_DISCARD,
                        GL_PRIMITIVE_RESTART_FIXED_INDEX
                })
-       );
+       )
 
        ADD_ARG_CASE1(depth_func, "Test cost of glDepthFunc() calls",
                depthFunc,
@@ -265,7 +265,7 @@ void StateChangeCallTests::init (void)
                        GL_GEQUAL,
                        GL_NOTEQUAL
                })
-       );
+       )
 
        ADD_ARG_CASE1(depth_mask, "Test cost of glDepthMask() calls",
                depthMask,
@@ -274,7 +274,7 @@ void StateChangeCallTests::init (void)
                        GL_TRUE,
                        GL_FALSE
                })
-       );
+       )
 
        ADD_ARG_CASE1(stencil_mask, "Test cost of glStencilMask() calls",
                stencilMask,
@@ -283,7 +283,7 @@ void StateChangeCallTests::init (void)
                        GL_TRUE,
                        GL_FALSE
                })
-       );
+       )
 
        ADD_ARG_CASE1(clear_depth, "Test cost of glClearDepth() calls",
                clearDepthf,
@@ -293,7 +293,7 @@ void StateChangeCallTests::init (void)
                        0.5f,
                        1.0f
                })
-       );
+       )
 
        ADD_ARG_CASE1(clear_stencil, "Test cost of glClearStencil() calls",
                clearStencil,
@@ -303,7 +303,7 @@ void StateChangeCallTests::init (void)
                        128,
                        28
                })
-       );
+       )
 
        ADD_ARG_CASE1(line_width, "Test cost of glLineWidth() calls",
                lineWidth,
@@ -313,7 +313,7 @@ void StateChangeCallTests::init (void)
                        0.5f,
                        10.0f
                })
-       );
+       )
 
        ADD_ARG_CASE1(cull_face, "Test cost of glCullFace() calls",
                cullFace,
@@ -323,7 +323,7 @@ void StateChangeCallTests::init (void)
                        GL_BACK,
                        GL_FRONT_AND_BACK
                })
-       );
+       )
 
        ADD_ARG_CASE1(front_face, "Test cost of glFrontFace() calls",
                frontFace,
@@ -332,7 +332,7 @@ void StateChangeCallTests::init (void)
                        GL_CCW,
                        GL_CW
                })
-       );
+       )
 
        ADD_ARG_CASE1(blend_equation, "Test cost of glBlendEquation() calls",
                blendEquation,
@@ -342,7 +342,7 @@ void StateChangeCallTests::init (void)
                        GL_FUNC_SUBTRACT,
                        GL_FUNC_REVERSE_SUBTRACT
                })
-       );
+       )
 
        ADD_ARG_CASE1(enable_vertex_attrib_array, "Test cost of glEnableVertexAttribArray() calls",
                enableVertexAttribArray,
@@ -357,7 +357,7 @@ void StateChangeCallTests::init (void)
                        6,
                        7,
                })
-       );
+       )
 
        ADD_ARG_CASE1(disable_vertex_attrib_array, "Test cost of glDisableVertexAttribArray() calls",
                disableVertexAttribArray,
@@ -372,7 +372,7 @@ void StateChangeCallTests::init (void)
                        6,
                        7,
                })
-       );
+       )
 
        ADD_ARG_CASE1(use_program, "Test cost of glUseProgram() calls. Note: Uses only program 0.",
                useProgram,
@@ -380,7 +380,7 @@ void StateChangeCallTests::init (void)
                ARG_LIST({
                        0,
                })
-       );
+       )
 
        ADD_ARG_CASE1(active_texture, "Test cost of glActiveTexture() calls",
                activeTexture,
@@ -395,7 +395,7 @@ void StateChangeCallTests::init (void)
                        GL_TEXTURE6,
                        GL_TEXTURE7
                })
-       );
+       )
 
        ADD_ARG_CASE2(depth_range, "Test cost of glDepthRangef() calls",
                depthRangef,
@@ -411,7 +411,7 @@ void StateChangeCallTests::init (void)
                        1.0f,
                        0.5f
                })
-       );
+       )
 
        ADD_ARG_CASE2(polygon_offset, "Test cost of glPolygonOffset() calls",
                polygonOffset,
@@ -429,7 +429,7 @@ void StateChangeCallTests::init (void)
                        0.5f,
                        1000.0f
                })
-       );
+       )
 
        ADD_ARG_CASE2(sample_coverage, "Test cost of glSampleCoverage() calls",
                sampleCoverage,
@@ -445,7 +445,7 @@ void StateChangeCallTests::init (void)
                        GL_TRUE,
                        GL_FALSE
                })
-       );
+       )
 
        ADD_ARG_CASE2(blend_func, "Test cost of glBlendFunc() calls",
                blendFunc,
@@ -483,7 +483,7 @@ void StateChangeCallTests::init (void)
                        GL_CONSTANT_ALPHA,
                        GL_ONE_MINUS_CONSTANT_ALPHA
                })
-       );
+       )
 
        ADD_ARG_CASE2(blend_equation_separate, "Test cost of glBlendEquationSeparate() calls",
                blendEquationSeparate,
@@ -499,7 +499,7 @@ void StateChangeCallTests::init (void)
                        GL_FUNC_SUBTRACT,
                        GL_FUNC_REVERSE_SUBTRACT
                })
-       );
+       )
 
        ADD_ARG_CASE2(stencil_mask_separate, "Test cost of glStencilMaskSeparate() calls",
                stencilMaskSeparate,
@@ -514,7 +514,7 @@ void StateChangeCallTests::init (void)
                        GL_TRUE,
                        GL_FALSE
                })
-       );
+       )
 
        ADD_ARG_CASE2(bind_buffer, "Test cost of glBindBuffer() calls. Note: Uses only buffer 0",
                bindBuffer,
@@ -527,7 +527,7 @@ void StateChangeCallTests::init (void)
                ARG_LIST({
                        0
                })
-       );
+       )
 
        ADD_ARG_CASE2(bind_texture, "Test cost of glBindTexture() calls. Note: Uses only texture 0",
                bindTexture,
@@ -540,7 +540,7 @@ void StateChangeCallTests::init (void)
                ARG_LIST({
                        0
                })
-       );
+       )
 
        ADD_ARG_CASE2(bind_sampler, "Test cost of glBindSampler() calls. Note: Uses only sampler 0",
                bindSampler,
@@ -559,7 +559,7 @@ void StateChangeCallTests::init (void)
                ARG_LIST({
                        0
                })
-       );
+       )
 
        ADD_ARG_CASE1(bind_vertex_array, "Test cost of glBindVertexArray() calls. Note: Uses only VAO 0",
                bindVertexArray,
@@ -567,7 +567,7 @@ void StateChangeCallTests::init (void)
                ARG_LIST({
                        0
                })
-       );
+       )
 
        ADD_ARG_CASE2(hint, "Test cost of glHint() calls",
                hint,
@@ -581,7 +581,7 @@ void StateChangeCallTests::init (void)
                        GL_NICEST,
                        GL_DONT_CARE
                })
-       );
+       )
 
        ADD_ARG_CASE3(stencil_func, "Test cost of glStencilFunc() calls",
                stencilFunc,
@@ -613,7 +613,7 @@ void StateChangeCallTests::init (void)
                        7,
                        0xFFFFFFFF
                })
-       );
+       )
 
        ADD_ARG_CASE3(stencil_op, "Test cost of glStencilOp() calls",
                stencilOp,
@@ -650,7 +650,7 @@ void StateChangeCallTests::init (void)
                        GL_INCR_WRAP,
                        GL_DECR_WRAP
                })
-       );
+       )
 
        ADD_ARG_CASE4(viewport, "Test cost of glViewport() calls",
                viewport,
@@ -682,7 +682,7 @@ void StateChangeCallTests::init (void)
                        100,
                        1145235
                })
-       );
+       )
 
        ADD_ARG_CASE4(scissor, "Test cost of glScissor() calls",
                scissor,
@@ -714,7 +714,7 @@ void StateChangeCallTests::init (void)
                        100,
                        1145235
                })
-       );
+       )
 
        ADD_ARG_CASE4(stencil_func_separate, "Test cost of glStencilFuncSeparate() calls",
                stencilFuncSeparate,
@@ -752,7 +752,7 @@ void StateChangeCallTests::init (void)
                        7,
                        0xFFFFFFFF
                })
-       );
+       )
 
        ADD_ARG_CASE4(stencil_op_separatae, "Test cost of glStencilOpSeparate() calls",
                stencilOpSeparate,
@@ -795,7 +795,7 @@ void StateChangeCallTests::init (void)
                        GL_INCR_WRAP,
                        GL_DECR_WRAP
                })
-       );
+       )
 
        ADD_ARG_CASE4(blend_func_separate, "Test cost of glBlendFuncSeparate() calls",
                blendFuncSeparate,
@@ -867,7 +867,7 @@ void StateChangeCallTests::init (void)
                        GL_CONSTANT_ALPHA,
                        GL_ONE_MINUS_CONSTANT_ALPHA
                })
-       );
+       )
 
        ADD_ARG_CASE4(color_mask, "Test cost of glColorMask() calls",
                colorMask,
@@ -891,7 +891,7 @@ void StateChangeCallTests::init (void)
                        GL_TRUE,
                        GL_FALSE
                })
-       );
+       )
 
        ADD_ARG_CASE4(clear_color, "Test cost of glClearColor() calls",
                clearColor,
@@ -923,7 +923,7 @@ void StateChangeCallTests::init (void)
                        0.5f,
                        0.33f
                })
-       );
+       )
 
        ADD_ARG_CASE6(vertex_attrib_pointer, "Test cost of glVertexAttribPointer() calls",
                vertexAttribPointer,
@@ -969,7 +969,7 @@ void StateChangeCallTests::init (void)
                        (void*)(deUintptr)(0x0FF),
                        (void*)(deUintptr)(0x0EF)
                })
-       );
+       )
 
        ADD_ARG_CASE2(vertex_attrib_divisor, "Test cost of glVertexAttribDivisor() calls",
                vertexAttribDivisor,
@@ -994,7 +994,7 @@ void StateChangeCallTests::init (void)
                        127,
                        256
                })
-       );
+       )
 
        ADD_ARG_CASE3(bind_buffer_base, "Test cost of glBindBufferBase() calls. Note: uses only buffer 0.",
                bindBufferBase,
@@ -1013,7 +1013,7 @@ void StateChangeCallTests::init (void)
                ARG_LIST({
                        0
                })
-       );
+       )
 
        ADD_ARG_CASE5(bind_buffer_range, "Test cost of glBindBufferRange() calls. Note: uses only buffer 0.",
                bindBufferRange,
@@ -1040,7 +1040,7 @@ void StateChangeCallTests::init (void)
                ARG_LIST({
                        0
                })
-       );
+       )
 }
 
 } // Performance
index 12fd987..ae52dae 100644 (file)
@@ -32,7 +32,7 @@
 namespace tcu
 {
        class WaiverUtil;
-};
+}
 
 namespace deqp
 {
index 57bd0b4..0add880 100644 (file)
@@ -124,13 +124,15 @@ void BooleanStateQueryTests::init (void)
                QUERY_FLOAT
        };
 
-#define FOR_EACH_VERIFIER(VERIFIERS, X) \
-       for (int verifierNdx = 0; verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); ++verifierNdx)   \
-       {                                                                                                                                                                               \
-               const char* verifierSuffix = getVerifierSuffix((VERIFIERS)[verifierNdx]);                       \
-               const QueryType verifier = (VERIFIERS)[verifierNdx];                                                            \
-               this->addChild(X);                                                                                                                                      \
-       }
+#define FOR_EACH_VERIFIER(VERIFIERS, X)                                                                                                                        \
+       do {                                                                                                                                                                            \
+               for (int verifierNdx = 0; verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); ++verifierNdx)   \
+               {                                                                                                                                                                               \
+                       const char* verifierSuffix = getVerifierSuffix((VERIFIERS)[verifierNdx]);                       \
+                       const QueryType verifier = (VERIFIERS)[verifierNdx];                                                            \
+                       this->addChild(X);                                                                                                                                      \
+               }                                                                                                                                                                               \
+       } while (0)
 
        struct StateBoolean
        {
index 330ce96..b08de10 100644 (file)
@@ -264,9 +264,9 @@ public:
        bool                    nextCell                                (void);
        IVec2                   getOrigin                               (void) const;
 
-       const IVec2&    getCellSize                             (void) const { return m_cellSize; };
+       const IVec2&    getCellSize                             (void) const { return m_cellSize; }
        IVec4                   getUsedAreaBoundingBox  (void) const;
-       int                             getCellCount                    (void) const { return m_cellCount; };
+       int                             getCellCount                    (void) const { return m_cellCount; }
 
 private:
        static IVec2    getRandomOffset                 (deUint32 seed, IVec2 targetSize, IVec2 cellSize, IVec2 grid, int cellCount);
@@ -1210,7 +1210,7 @@ void renderTexture (glu::RenderContext&           renderContext,
                                if (!intThresholdCompare(log, cell.name.c_str(), cell.description.c_str(), cell.reference.getAccess(), resultAccess, threshold.toIVec().cast<deUint32>(), tcu::COMPARE_LOG_ON_ERROR))
                                        results.fail("Image comparison of " + cell.description + " failed.");
                                else
-                                       log << TestLog::Message << "Image comparison of " << cell.description << " passed." << TestLog::EndMessage;;
+                                       log << TestLog::Message << "Image comparison of " << cell.description << " passed." << TestLog::EndMessage;
                        }
                }
        }
index 0a1d4cc..2d71c9b 100644 (file)
@@ -737,7 +737,7 @@ FragmentShader::FragmentShader (int drawBufferNdx, const DrawBufferInfo& info)
 
                default:
                        DE_ASSERT(false);
-       };
+       }
 }
 
 void FragmentShader::shadeFragments (rr::FragmentPacket* packets, const int numPackets, const rr::FragmentShadingContext& context) const
@@ -799,7 +799,7 @@ void FragmentShader::shadeFragments (rr::FragmentPacket* packets, const int numP
 
                                default:
                                        DE_ASSERT(DE_FALSE);
-                       };
+                       }
                }
        }
 }
@@ -925,7 +925,7 @@ glu::FragmentSource genFragmentSource (const BlendState& preCommonBlendState, co
 
                        default:
                                DE_ASSERT(DE_FALSE);
-               };
+               }
 
                stream << " o_drawBuffer" <<  drawBufferNdx << ";\n";
        }
@@ -974,7 +974,7 @@ glu::FragmentSource genFragmentSource (const BlendState& preCommonBlendState, co
 
                        default:
                                DE_ASSERT(DE_FALSE);
-               };
+               }
        }
 
        stream << "}";
index fb1e7b3..f4720b1 100644 (file)
@@ -209,13 +209,15 @@ void FramebufferDefaultStateQueryTests::init (void)
                QUERY_FRAMEBUFFER_INTEGER,
        };
 
-#define FOR_EACH_VERIFIER(X) \
-       for (int verifierNdx = 0; verifierNdx < DE_LENGTH_OF_ARRAY(verifiers); ++verifierNdx)   \
-       {                                                                                                                                                                               \
-               const char* verifierSuffix = getVerifierSuffix(verifiers[verifierNdx]);                         \
-               const QueryType verifier = verifiers[verifierNdx];                                                              \
-               this->addChild(X);                                                                                                                                      \
-       }
+#define FOR_EACH_VERIFIER(X)                                                                                                                                   \
+       do {                                                                                                                                                                            \
+               for (int verifierNdx = 0; verifierNdx < DE_LENGTH_OF_ARRAY(verifiers); ++verifierNdx)   \
+               {                                                                                                                                                                               \
+                       const char* verifierSuffix = getVerifierSuffix(verifiers[verifierNdx]);                         \
+                       const QueryType verifier = verifiers[verifierNdx];                                                                      \
+                       this->addChild(X);                                                                                                                                      \
+               }                                                                                                                                                                               \
+       } while (0)
 
        FOR_EACH_VERIFIER(new FramebufferDimensionTest                          (m_context, verifier, FramebufferDimensionTest::DIMENSION_WIDTH,        (std::string("framebuffer_default_width_") + verifierSuffix).c_str(),                                   "Test FRAMEBUFFER_DEFAULT_WIDTH"));
        FOR_EACH_VERIFIER(new FramebufferDimensionTest                          (m_context, verifier, FramebufferDimensionTest::DIMENSION_HEIGHT,       (std::string("framebuffer_default_height_") + verifierSuffix).c_str(),                                  "Test FRAMEBUFFER_DEFAULT_HEIGHT"));
index 1cdc854..208c204 100644 (file)
@@ -3549,7 +3549,7 @@ bool LayeredRenderCase::verifyLayerContent (const tcu::Surface& layer, int layer
                default:
                        DE_ASSERT(DE_FALSE);
                        return false;
-       };
+       }
 }
 
 bool LayeredRenderCase::verifyImageSingleColoredRow (const tcu::Surface& layer, float rowWidthRatio, const tcu::Vec4& barColor, bool logging)
index bb8a2b2..f887123 100644 (file)
@@ -1098,7 +1098,7 @@ void delete_framebuffers (NegativeTestContext& ctx)
 }
 
 void delete_renderbuffers (NegativeTestContext& ctx)
-{;
+{
        ctx.beginSection("GL_INVALID_VALUE is generated if n is negative.");
        ctx.glDeleteRenderbuffers(-1, 0);
        ctx.expectError(GL_INVALID_VALUE);
index eb56fa0..1735db2 100644 (file)
@@ -97,8 +97,8 @@ public:
        bool                                            matchesFilter                                   (const glu::VariableDeclaration& variable) const;
        bool                                            matchesFilter                                   (const glu::InterfaceBlock& block) const;
 
-       deUint32                                        getShaderTypeBits                               (void) const { return m_shaderTypeBits; };
-       deUint32                                        getStorageBits                                  (void) const { return m_storageBits;    };
+       deUint32                                        getShaderTypeBits                               (void) const { return m_shaderTypeBits; }
+       deUint32                                        getStorageBits                                  (void) const { return m_storageBits;    }
 private:
        deUint32                                        m_shaderTypeBits;
        deUint32                                        m_storageBits;
index 2362420..f1c20f4 100644 (file)
@@ -1757,7 +1757,7 @@ static glw::GLenum getGLInterfaceEnumValue (ProgramInterface interface)
                default:
                        DE_ASSERT(false);
                        return 0;
-       };
+       }
 }
 
 static bool isInterfaceBlockInterfaceName (const ProgramInterfaceDefinition::Program* program, ProgramInterface interface, const std::string& blockInterfaceName)
index 70f9185..04d8843 100644 (file)
@@ -391,13 +391,15 @@ void ProgramPipelineStateQueryTests::init (void)
                QUERY_PIPELINE_INTEGER,
        };
 
-#define FOR_EACH_VERIFIER(X) \
-       for (int verifierNdx = 0; verifierNdx < DE_LENGTH_OF_ARRAY(verifiers); ++verifierNdx)   \
-       {                                                                                                                                                                               \
-               const char* verifierSuffix = getVerifierSuffix(verifiers[verifierNdx]);                         \
-               const QueryType verifier = verifiers[verifierNdx];                                                                      \
-               this->addChild(X);                                                                                                                                      \
-       }
+#define FOR_EACH_VERIFIER(X)                                                                                                                                   \
+       do {                                                                                                                                                                            \
+               for (int verifierNdx = 0; verifierNdx < DE_LENGTH_OF_ARRAY(verifiers); ++verifierNdx)   \
+               {                                                                                                                                                                               \
+                       const char* verifierSuffix = getVerifierSuffix(verifiers[verifierNdx]);                         \
+                       const QueryType verifier = verifiers[verifierNdx];                                                                      \
+                       this->addChild(X);                                                                                                                                      \
+               }                                                                                                                                                                               \
+       } while (0)
 
        FOR_EACH_VERIFIER(new ActiveProgramCase(m_context, verifier, (std::string("active_program_") + verifierSuffix).c_str(), "Test ACTIVE_PROGRAM"));
        FOR_EACH_VERIFIER(new PipelineProgramCase(m_context, verifier, (std::string("vertex_shader_") + verifierSuffix).c_str(), "Test VERTEX_SHADER", GL_VERTEX_SHADER));
index 5127fc2..8031246 100644 (file)
@@ -824,21 +824,25 @@ void ProgramStateQueryTests::init (void)
                QUERY_PROGRAM_INTEGER_VEC3,
        };
 
-#define FOR_EACH_INT_VERIFIER(X) \
-       for (int verifierNdx = 0; verifierNdx < DE_LENGTH_OF_ARRAY(intVerifiers); ++verifierNdx)        \
-       {                                                                                                                                                                                       \
-               const char* verifierSuffix = getVerifierSuffix(intVerifiers[verifierNdx]);                              \
-               const QueryType verifier = intVerifiers[verifierNdx];                                                                   \
-               this->addChild(X);                                                                                                                                              \
-       }
-
-#define FOR_EACH_VEC_VERIFIER(X) \
-       for (int verifierNdx = 0; verifierNdx < DE_LENGTH_OF_ARRAY(intVec3Verifiers); ++verifierNdx)    \
-       {                                                                                                                                                                                               \
-               const char* verifierSuffix = getVerifierSuffix(intVec3Verifiers[verifierNdx]);                          \
-               const QueryType verifier = intVec3Verifiers[verifierNdx];                                                                       \
-               this->addChild(X);                                                                                                                                                      \
-       }
+#define FOR_EACH_INT_VERIFIER(X)                                                                                                                                       \
+       do {                                                                                                                                                                                    \
+               for (int verifierNdx = 0; verifierNdx < DE_LENGTH_OF_ARRAY(intVerifiers); ++verifierNdx)        \
+               {                                                                                                                                                                                       \
+                       const char* verifierSuffix = getVerifierSuffix(intVerifiers[verifierNdx]);                              \
+                       const QueryType verifier = intVerifiers[verifierNdx];                                                                   \
+                       this->addChild(X);                                                                                                                                              \
+               }                                                                                                                                                                                       \
+       } while (0)
+
+#define FOR_EACH_VEC_VERIFIER(X)                                                                                                                                               \
+       do {                                                                                                                                                                                            \
+               for (int verifierNdx = 0; verifierNdx < DE_LENGTH_OF_ARRAY(intVec3Verifiers); ++verifierNdx)    \
+               {                                                                                                                                                                                               \
+                       const char* verifierSuffix = getVerifierSuffix(intVec3Verifiers[verifierNdx]);                          \
+                       const QueryType verifier = intVec3Verifiers[verifierNdx];                                                                       \
+                       this->addChild(X);                                                                                                                                                      \
+               }                                                                                                                                                                                               \
+       } while (0)
 
        FOR_EACH_INT_VERIFIER(new ProgramSeparableCase                          (m_context, verifier, (std::string("program_separable_") + verifierSuffix).c_str(),                             "Test PROGRAM_SEPARABLE"));
        FOR_EACH_VEC_VERIFIER(new ComputeWorkGroupSizeCase                      (m_context, verifier, (std::string("compute_work_group_size_") + verifierSuffix).c_str(),               "Test COMPUTE_WORK_GROUP_SIZE"));
index 19fd1c0..776afd1 100644 (file)
@@ -504,7 +504,7 @@ private:
        vector<const StructType*>       m_structTypes;
 };
 
-}; // anonymous
+} // anonymous
 
 static VarValue getSamplerFillValue (const VarValue& sampler)
 {
index 849e24f..4060c61 100644 (file)
@@ -200,7 +200,7 @@ struct TestGroupConfig
                , description           (groupDescription)
                , internalFormat        (groupInternalFormat) {}
 
-       ~TestGroupConfig                (void) {};
+       ~TestGroupConfig                (void) {}
 
        const char*                                     name;
        const char*                                     description;
index 7342793..aee1e0f 100644 (file)
@@ -181,7 +181,7 @@ void SamplerStateQueryTests::init (void)
                                                                                                                                                   std::string() + states[stateNdx].name + verifierSuffix,
                                                                                                                                                   states[stateNdx].desc,
                                                                                                                                                   verifier,
-                                                                                                                                                  states[stateNdx].tester));
+                                                                                                                                                  states[stateNdx].tester))
                        }
                        else if (isIsVectorQuery(states[stateNdx].tester))
                        {
@@ -190,7 +190,7 @@ void SamplerStateQueryTests::init (void)
                                                                                                                                                  std::string() + states[stateNdx].name + verifierSuffix,
                                                                                                                                                  states[stateNdx].desc,
                                                                                                                                                  verifier,
-                                                                                                                                                 states[stateNdx].tester));
+                                                                                                                                                 states[stateNdx].tester))
                        }
                        else
                        {
@@ -199,7 +199,7 @@ void SamplerStateQueryTests::init (void)
                                                                                                                                                  std::string() + states[stateNdx].name + verifierSuffix,
                                                                                                                                                  states[stateNdx].desc,
                                                                                                                                                  verifier,
-                                                                                                                                                 states[stateNdx].tester));
+                                                                                                                                                 states[stateNdx].tester))
                        }
                }
        }
index 0beeeec..90a3436 100644 (file)
@@ -577,7 +577,7 @@ class TextureFormatTestCase : public FramebufferFetchTestCase
 {
 public:
                                                TextureFormatTestCase           (Context& context, const char* name, const char* desc, deUint32 format);
-                                               ~TextureFormatTestCase          (void) {};
+                                               ~TextureFormatTestCase          (void) {}
 
        IterateResult           iterate                                         (void);
 
@@ -804,7 +804,7 @@ class LastFragDataTestCase : public FramebufferFetchTestCase
 {
 public:
                                                LastFragDataTestCase                    (Context& context, const char* name, const char* desc, deUint32 format);
-                                               ~LastFragDataTestCase                   (void) {};
+                                               ~LastFragDataTestCase                   (void) {}
 
        IterateResult           iterate                                                 (void);
 
index 75160cf..93092d9 100644 (file)
@@ -3639,7 +3639,7 @@ private:
 
                                Program                 (Winding w, const SharedPtr<const ShaderProgram>& prog) : winding(w), program(prog) {}
 
-               string  description             (void) const { return string() + "winding mode " + getWindingShaderName(winding); };
+               string  description             (void) const { return string() + "winding mode " + getWindingShaderName(winding); }
        };
 
        static const int                        RENDER_SIZE = 16;
@@ -3978,7 +3978,7 @@ private:
 
                                Program                 (Winding w, bool point, const SharedPtr<const ShaderProgram>& prog) : winding(w), usePointMode(point), program(prog) {}
 
-               string  description             (void) const { return string() + "winding mode " + getWindingShaderName(winding) + ", " + (usePointMode ? "" : "don't ") + "use point mode"; };
+               string  description             (void) const { return string() + "winding mode " + getWindingShaderName(winding) + ", " + (usePointMode ? "" : "don't ") + "use point mode"; }
        };
 
        static vector<float>            generatePatchTessLevels (int numPatches, int constantOuterLevelIndex, float constantOuterLevel);
index a67e92c..e382d56 100644 (file)
@@ -1614,7 +1614,7 @@ void TextureBorderClampRangeClampCase::init (void)
        }
        else if (isFixed)
        {
-               const bool              isSigned        = m_channelClass == tcu::TEXTURECHANNELCLASS_SIGNED_FIXED_POINT;;
+               const bool              isSigned        = m_channelClass == tcu::TEXTURECHANNELCLASS_SIGNED_FIXED_POINT;
                const tcu::Vec4 lookupBias      = (isSigned) ? (tcu::Vec4(0.5f))    : (tcu::Vec4(0.25f)); // scale & bias to [0.25, 0.5] range to make out-of-range values visible
                const tcu::Vec4 lookupScale     = (isSigned) ? (tcu::Vec4(0.25f))   : (tcu::Vec4(0.5f));
 
index 13284ee..bbf3eeb 100644 (file)
@@ -1651,13 +1651,16 @@ void TextureLevelStateQueryTests::init (void)
                QUERY_TEXTURE_LEVEL_FLOAT,
        };
 
-#define FOR_EACH_VERIFIER(X) \
-       for (int verifierNdx = 0; verifierNdx < DE_LENGTH_OF_ARRAY(verifiers); ++verifierNdx)   \
-       {                                                                                                                                                                               \
-               const std::string verifierSuffix = getVerifierSuffix(verifiers[verifierNdx]);           \
-               const QueryType verifier = verifiers[verifierNdx];                                                                      \
-               targetGroup->addChild(X);                                                                                                                       \
-       }
+#define FOR_EACH_VERIFIER(X)                                                                                                                                   \
+       do {                                                                                                                                                                            \
+               for (int verifierNdx = 0; verifierNdx < DE_LENGTH_OF_ARRAY(verifiers); ++verifierNdx)   \
+               {                                                                                                                                                                               \
+                       const std::string verifierSuffix = getVerifierSuffix(verifiers[verifierNdx]);           \
+                       const QueryType verifier = verifiers[verifierNdx];                                                                      \
+                       targetGroup->addChild(X);                                                                                                                       \
+               }                                                                                                                                                                               \
+       } while (0)
+
        static const struct
        {
                const char*     name;
index 3fe64b7..809b2f9 100644 (file)
@@ -230,7 +230,7 @@ void TextureStateQueryTests::init (void)
                                                                                                                                           states[stateNdx].desc,
                                                                                                                                           verifier,
                                                                                                                                           textureTargets[targetNdx].target,
-                                                                                                                                          states[stateNdx].tester));
+                                                                                                                                          states[stateNdx].tester))
                        }
                        else if (isIsVectorQuery(states[stateNdx].tester))
                        {
@@ -240,7 +240,7 @@ void TextureStateQueryTests::init (void)
                                                                                                                                        states[stateNdx].desc,
                                                                                                                                        verifier,
                                                                                                                                        textureTargets[targetNdx].target,
-                                                                                                                                       states[stateNdx].tester));
+                                                                                                                                       states[stateNdx].tester))
                        }
                        else
                        {
@@ -250,7 +250,7 @@ void TextureStateQueryTests::init (void)
                                                                                                                                          states[stateNdx].desc,
                                                                                                                                          verifier,
                                                                                                                                          textureTargets[targetNdx].target,
-                                                                                                                                         states[stateNdx].tester));
+                                                                                                                                         states[stateNdx].tester))
                        }
                }
        }
index a42c418..4bf2726 100644 (file)
@@ -32,7 +32,7 @@
 namespace tcu
 {
        class WaiverUtil;
-};
+}
 
 namespace deqp
 {
index 2641396..3a1349a 100644 (file)
@@ -32,7 +32,7 @@
 namespace tcu
 {
     class WaiverUtil;
-};
+}
 
 namespace deqp
 {
index 124b39b..385ecba 100644 (file)
@@ -2276,10 +2276,10 @@ ExprP<TRET> NAME (const ExprP<T0>& arg0, const ExprP<T1>& arg1,                 \
        return app<CLASS>(arg0, arg1, arg2, arg3);                                                      \
 }
 
-DEFINE_DERIVED_FLOAT1(Sqrt,            sqrt,           x,              constant(1.0f) / app<InverseSqrt>(x));
-DEFINE_DERIVED_FLOAT2(Pow,             pow,            x,      y,      exp2(y * log2(x)));
-DEFINE_DERIVED_FLOAT1(Radians, radians,        d,              (constant(DE_PI) / constant(180.0f)) * d);
-DEFINE_DERIVED_FLOAT1(Degrees, degrees,        r,              (constant(180.0f) / constant(DE_PI)) * r);
+DEFINE_DERIVED_FLOAT1(Sqrt,            sqrt,           x,              constant(1.0f) / app<InverseSqrt>(x))
+DEFINE_DERIVED_FLOAT2(Pow,             pow,            x,      y,      exp2(y * log2(x)))
+DEFINE_DERIVED_FLOAT1(Radians, radians,        d,              (constant(DE_PI) / constant(180.0f)) * d)
+DEFINE_DERIVED_FLOAT1(Degrees, degrees,        r,              (constant(180.0f) / constant(DE_PI)) * r)
 
 class TrigFunc : public CFloatFunc1
 {
@@ -2399,7 +2399,7 @@ protected:
 
 ExprP<float> cos (const ExprP<float>& x) { return app<Cos>(x); }
 
-DEFINE_DERIVED_FLOAT1(Tan, tan, x, sin(x) * (constant(1.0f) / cos(x)));
+DEFINE_DERIVED_FLOAT1(Tan, tan, x, sin(x) * (constant(1.0f) / cos(x)))
 
 class ASin : public CFloatFunc1
 {
@@ -2521,17 +2521,17 @@ protected:
        // Codomain could be [-pi, pi], but that would probably be too strict.
 };
 
-DEFINE_DERIVED_FLOAT1(Sinh, sinh, x, (exp(x) - exp(-x)) / constant(2.0f));
-DEFINE_DERIVED_FLOAT1(Cosh, cosh, x, (exp(x) + exp(-x)) / constant(2.0f));
-DEFINE_DERIVED_FLOAT1(Tanh, tanh, x, sinh(x) / cosh(x));
+DEFINE_DERIVED_FLOAT1(Sinh, sinh, x, (exp(x) - exp(-x)) / constant(2.0f))
+DEFINE_DERIVED_FLOAT1(Cosh, cosh, x, (exp(x) + exp(-x)) / constant(2.0f))
+DEFINE_DERIVED_FLOAT1(Tanh, tanh, x, sinh(x) / cosh(x))
 
 // These are not defined as derived forms in the GLSL ES spec, but
 // that gives us a reasonable precision.
-DEFINE_DERIVED_FLOAT1(ASinh, asinh, x, log(x + sqrt(x * x + constant(1.0f))));
+DEFINE_DERIVED_FLOAT1(ASinh, asinh, x, log(x + sqrt(x * x + constant(1.0f))))
 DEFINE_DERIVED_FLOAT1(ACosh, acosh, x, log(x + sqrt(alternatives((x + constant(1.0f)) * (x - constant(1.0f)),
-                                                                                                                                (x*x - constant(1.0f))))));
+                                                                                                                                (x*x - constant(1.0f))))))
 DEFINE_DERIVED_FLOAT1(ATanh, atanh, x, constant(0.5f) * log((constant(1.0f) + x) /
-                                                                                                                       (constant(1.0f) - x)));
+                                                                                                                       (constant(1.0f) - x)))
 
 template <typename T>
 class GetComponent : public PrimitiveFunc<Signature<typename T::Element, T, int> >
@@ -3150,7 +3150,7 @@ struct ApplyReflect
 
                return i - alternatives((n * dotNI) * constant(2.0f),
                                                                n * (dotNI * constant(2.0f)));
-       };
+       }
 };
 
 template<typename Ret, typename Arg0, typename Arg1>
@@ -3163,7 +3163,7 @@ struct ApplyReflect<1, Ret, Arg0, Arg1>
                return i - alternatives(alternatives((n * (n*i)) * constant(2.0f),
                                                                                        n * ((n*i) * constant(2.0f))),
                                                                                        (n * n) * (i * constant(2.0f)));
-       };
+       }
 };
 
 template <int Size>
@@ -3299,7 +3299,7 @@ public:
        Ceil (void) : PreciseFunc1("ceil", deCeil) {}
 };
 
-DEFINE_DERIVED_FLOAT1(Fract, fract, x, x - app<Floor>(x));
+DEFINE_DERIVED_FLOAT1(Fract, fract, x, x - app<Floor>(x))
 
 class PreciseFunc2 : public CFloatFunc2
 {
@@ -3309,7 +3309,7 @@ protected:
        double  precision               (const EvalContext&, double, double, double) const { return 0.0; }
 };
 
-DEFINE_DERIVED_FLOAT2(Mod, mod, x, y, x - y * app<Floor>(x / y));
+DEFINE_DERIVED_FLOAT2(Mod, mod, x, y, x - y * app<Floor>(x / y))
 
 class Modf : public PrimitiveFunc<Signature<float, float, float> >
 {
@@ -3456,7 +3456,7 @@ ExprP<float> clamp(const ExprP<float>& x, const ExprP<float>& minVal, const Expr
 }
 
 DEFINE_DERIVED_FLOAT3(Mix, mix, x, y, a, alternatives((x * (constant(1.0f) - a)) + y * a,
-                                                                                                         x + (y - x) * a));
+                                                                                                         x + (y - x) * a))
 
 static double step (double edge, double x)
 {
@@ -4985,7 +4985,7 @@ struct InputLess<InTuple<In> >
                if (inputLess(in1.d, in2.d))
                        return true;
                return false;
-       };
+       }
 };
 
 template<typename In>
index a026d49..f2e3fb0 100644 (file)
@@ -596,7 +596,7 @@ float GLValue::toFloat (void) const
                        DE_ASSERT(false);
                        return 0.0f;
                        break;
-       };
+       }
 }
 
 GLValue GLValue::getMaxValue (DrawTestSpec::InputType type)
@@ -652,16 +652,16 @@ template<> struct GLValueTypeTraits<GLValue::Half>         { static const DrawTestSpec:
 template<typename T>
 inline T extractGLValue (const GLValue& v);
 
-template<> GLValue::Float      inline extractGLValue<GLValue::Float>           (const GLValue& v) { return v.fl; };
-template<> GLValue::Double     inline extractGLValue<GLValue::Double>          (const GLValue& v) { return v.d; };
-template<> GLValue::Byte       inline extractGLValue<GLValue::Byte>            (const GLValue& v) { return v.b; };
-template<> GLValue::Ubyte      inline extractGLValue<GLValue::Ubyte>           (const GLValue& v) { return v.ub; };
-template<> GLValue::Ushort     inline extractGLValue<GLValue::Ushort>          (const GLValue& v) { return v.us; };
-template<> GLValue::Short      inline extractGLValue<GLValue::Short>           (const GLValue& v) { return v.s; };
-template<> GLValue::Fixed      inline extractGLValue<GLValue::Fixed>           (const GLValue& v) { return v.fi; };
-template<> GLValue::Int                inline extractGLValue<GLValue::Int>                     (const GLValue& v) { return v.i; };
-template<> GLValue::Uint       inline extractGLValue<GLValue::Uint>            (const GLValue& v) { return v.ui; };
-template<> GLValue::Half       inline extractGLValue<GLValue::Half>            (const GLValue& v) { return v.h; };
+template<> GLValue::Float      inline extractGLValue<GLValue::Float>           (const GLValue& v) { return v.fl; }
+template<> GLValue::Double     inline extractGLValue<GLValue::Double>          (const GLValue& v) { return v.d; }
+template<> GLValue::Byte       inline extractGLValue<GLValue::Byte>            (const GLValue& v) { return v.b; }
+template<> GLValue::Ubyte      inline extractGLValue<GLValue::Ubyte>           (const GLValue& v) { return v.ub; }
+template<> GLValue::Ushort     inline extractGLValue<GLValue::Ushort>          (const GLValue& v) { return v.us; }
+template<> GLValue::Short      inline extractGLValue<GLValue::Short>           (const GLValue& v) { return v.s; }
+template<> GLValue::Fixed      inline extractGLValue<GLValue::Fixed>           (const GLValue& v) { return v.fi; }
+template<> GLValue::Int                inline extractGLValue<GLValue::Int>                     (const GLValue& v) { return v.i; }
+template<> GLValue::Uint       inline extractGLValue<GLValue::Uint>            (const GLValue& v) { return v.ui; }
+template<> GLValue::Half       inline extractGLValue<GLValue::Half>            (const GLValue& v) { return v.h; }
 
 template<class T>
 inline T getRandom (deRandom& rnd, T min, T max);
index 856b991..a850a87 100644 (file)
@@ -706,7 +706,7 @@ ImageFormat TestBase::getDefaultFormat (GLenum attPoint, GLenum bufType) const
                throw tcu::NotSupportedError("Unsupported attachment kind for attachment point",
                                                                         "", __FILE__, __LINE__);
        return *it;
-};
+}
 
 Image* makeImage (GLenum bufType, ImageFormat format,
                                  GLsizei width, GLsizei height, FboBuilder& builder)
index 6affa68..ca48fdb 100644 (file)
@@ -196,7 +196,7 @@ namespace config
 
 struct Config
 {
-       virtual                                         ~Config                 (void) {};
+       virtual                                         ~Config                 (void) {}
 };
 
 struct Image : public Config
index fb34551..80bd689 100644 (file)
@@ -1112,7 +1112,7 @@ void AttachmentTest::testDeletedNames (void)
                                 "Attachment name returned by query even after detachment.");
        errors.check(!elemType.exists(elementId),
                                 "Deleted attached object name still usable after detachment.");
-};
+}
 
 class InputAttachmentTest : public TestBase
 {
@@ -1299,7 +1299,7 @@ IterateResult OutputAttachmentTest::iterate (void)
                        "Result of container modification on original attachment before deletion.",
                        refSurface);
        return STOP;
-};
+}
 
 struct LifeTestSpec
 {
index 1e3f685..46464b7 100644 (file)
@@ -118,7 +118,7 @@ private:
                {
                        array.elementType       = DE_NULL;
                        array.size                      = 0;
-               };
+               }
        } m_data;
 };
 
index a9f6471..5956d21 100644 (file)
@@ -1301,7 +1301,7 @@ float GLValue::toFloat (void) const
                        DE_ASSERT(false);
                        return 0.0f;
                        break;
-       };
+       }
 }
 
 class RandomArrayGenerator