ShaderRenderCase: minor cleanup

diff --git a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.cpp b/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.cpp
index 82cb09d..f6684e3 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.cpp
+++ b/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.cpp
@@ -535,20 +535,12 @@ void ShaderRenderCaseInstance::useAttribute (deUint32 bindingLocation, BaseAttri
        m_enabledBaseAttributes.push_back(attribute);
 }
 
-void ShaderRenderCaseInstance::setupShaderData (void)
-{
-       // TODO!!!
-}
-
 void ShaderRenderCaseInstance::setup (void)
 {
-       // TODO!!
 }
 
 void ShaderRenderCaseInstance::setupUniforms (const tcu::Vec4& constCoords)
 {
-       // TODO!!
-       DE_UNREF(constCoords);
        m_uniformSetup.setup(*this, constCoords);
 }
 
@@ -1521,6 +1513,5 @@ bool ShaderRenderCaseInstance::compareImages (const tcu::Surface& resImage, cons
        return tcu::fuzzyCompare(m_context.getTestContext().getLog(), "ComparisonResult", "Image comparison result", refImage, resImage, errorThreshold, tcu::COMPARE_LOG_RESULT);
 }
 
-
 } // shaderrendercase
 } // vkt

diff --git a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.hpp b/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.hpp
index 99adfd7..93c3059 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.hpp
+++ b/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.hpp
@@ -201,7 +201,7 @@ public:
                                                                : vkt::TestCase(testCtx, name, description)
                                                                , m_isVertexCase(isVertexCase)
                                                                , m_evaluator(new ShaderEvaluator(evalFunc))
-                                                               , m_uniformSetup(uniformSetup)
+                                                               , m_uniformSetup(uniformSetup ? uniformSetup : new UniformSetup())
                                                                , m_attribFunc(attribFunc)
                                                        {}
 
@@ -408,7 +408,6 @@ public:
                                                                                                                                                                        deUint32 textureId);
 
 protected:
-       virtual void                                                                            setupShaderData                         (void);
        virtual void                                                                            setup                                           (void);
        virtual void                                                                            setupUniforms                           (const tcu::Vec4& constCoords);