Remove unused variables.

- Remove unused, irrelevant buffer from buffer upload perf baseline
  measurement test.
- Remove unused VAOs in VA binding query tests.
- Remove other misc variables.

Change-Id: Ie4ef3bf27905f7ef5c3e99c719be68f4d420c846

diff --git a/modules/gles3/functional/es3fRboStateQueryTests.cpp b/modules/gles3/functional/es3fRboStateQueryTests.cpp
index 371c834889eb143105ae20c8a18b02aef204b479..6da4d0c033adceb2594aed4efca8cc1ae64ccd8c 100644 (file)
--- a/modules/gles3/functional/es3fRboStateQueryTests.cpp
+++ b/modules/gles3/functional/es3fRboStateQueryTests.cpp
@@ -333,8 +333,6 @@ public:
 
        void test (void)
        {
 
        void test (void)
        {

-               de::Random rnd(0xabcdef);
-

                GLuint renderbufferID = 0;
                glGenRenderbuffers(1, &renderbufferID);
                glBindRenderbuffer(GL_RENDERBUFFER, renderbufferID);
                GLuint renderbufferID = 0;
                glGenRenderbuffers(1, &renderbufferID);
                glBindRenderbuffer(GL_RENDERBUFFER, renderbufferID);

diff --git a/modules/gles3/performance/es3pBufferDataUploadTests.cpp b/modules/gles3/performance/es3pBufferDataUploadTests.cpp
index 45bd25fb215dca6fa378ca588f917d7d555a4a75..556f22c3a7d0c280c3ea4d5c3c0756dece56257a 100644 (file)
--- a/modules/gles3/performance/es3pBufferDataUploadTests.cpp
+++ b/modules/gles3/performance/es3pBufferDataUploadTests.cpp
@@ -4359,7 +4359,6 @@ void ReferenceRenderTimeCase::runSample (SampleResult& sample)
        const int                               numVertices             = getLayeredGridNumVertices(sample.scene);
        const glu::Buffer               arrayBuffer             (m_context.getRenderContext());
        const glu::Buffer               indexBuffer             (m_context.getRenderContext());
        const int                               numVertices             = getLayeredGridNumVertices(sample.scene);
        const glu::Buffer               arrayBuffer             (m_context.getRenderContext());
        const glu::Buffer               indexBuffer             (m_context.getRenderContext());

-       const glu::Buffer               unrelatedBuffer (m_context.getRenderContext());

        std::vector<tcu::Vec4>  vertexData;
        std::vector<deUint32>   indexData;
        deUint64                                startTime;
        std::vector<tcu::Vec4>  vertexData;
        std::vector<deUint32>   indexData;
        deUint64                                startTime;

diff --git a/modules/gles31/functional/es31fShaderImageLoadStoreTests.cpp b/modules/gles31/functional/es31fShaderImageLoadStoreTests.cpp
index 47e2ea3c2587d17c8d75782141f3f9fb8df66a70..b5186787a1436f043cf2ccc63ae45260d4952855 100644 (file)
--- a/modules/gles31/functional/es31fShaderImageLoadStoreTests.cpp
+++ b/modules/gles31/functional/es31fShaderImageLoadStoreTests.cpp
@@ -2458,11 +2458,6 @@ AtomicCompSwapCase::IterateResult AtomicCompSwapCase::iterate (void)
                                                                                                                                                : m_caseType == ATOMIC_OPERATION_CASE_TYPE_RETURN_VALUES        ? *returnValueTextureBuf
                                                                                                                                                : (deUint32)-1;
 
                                                                                                                                                : m_caseType == ATOMIC_OPERATION_CASE_TYPE_RETURN_VALUES        ? *returnValueTextureBuf
                                                                                                                                                : (deUint32)-1;
 

-               // Actual size of the texture being checked.
-               const IVec3                                                                     textureToCheckSize      = imageSize * (m_caseType == ATOMIC_OPERATION_CASE_TYPE_END_RESULT      ? IVec3(1,                                                      1,                                                      1)
-                                                                                                                                                                        : m_imageType == TEXTURETYPE_CUBE                                              ? IVec3(NUM_INVOCATIONS_PER_PIXEL,      NUM_INVOCATIONS_PER_PIXEL,      1)
-                                                                                                                                                                        :                                                                                                                IVec3(NUM_INVOCATIONS_PER_PIXEL,      1,                                                      1));
-

                // The relevant region of the texture being checked (potentially
                // different from actual texture size for cube maps, because cube maps
                // may have unused pixels due to square size restriction).
                // The relevant region of the texture being checked (potentially
                // different from actual texture size for cube maps, because cube maps
                // may have unused pixels due to square size restriction).

diff --git a/modules/gles31/functional/es31fUniformLocationTests.cpp b/modules/gles31/functional/es31fUniformLocationTests.cpp
index fd6ff83075f85f33b717476018c68dc34a16e03d..9d7fc8bbabad8280a54ebac5c0471a0b9bf7b5ef 100644 (file)
--- a/modules/gles31/functional/es31fUniformLocationTests.cpp
+++ b/modules/gles31/functional/es31fUniformLocationTests.cpp
@@ -389,7 +389,6 @@ bool UniformLocationCase::verifyLocations (const glu::ShaderProgram& program, co
 
                for (glu::BasicTypeIterator subTypeIter = glu::BasicTypeIterator::begin(&uniformInfo.type); subTypeIter != glu::BasicTypeIterator::end(&uniformInfo.type); subTypeIter++, subTypeIndex++)
                {
 
                for (glu::BasicTypeIterator subTypeIter = glu::BasicTypeIterator::begin(&uniformInfo.type); subTypeIter != glu::BasicTypeIterator::end(&uniformInfo.type); subTypeIter++, subTypeIndex++)
                {

-                       const glu::VarType      type            = glu::getVarType(uniformInfo.type, subTypeIter.getPath());

                        const string            name            = getUniformName(uniformNdx, uniformInfo.type, subTypeIter.getPath());
                        const int                       gotLoc          = gl.getUniformLocation(programID, name.c_str());
                        const int                       expectLoc       = uniformInfo.location >= 0 ? uniformInfo.location+subTypeIndex : -1;
                        const string            name            = getUniformName(uniformNdx, uniformInfo.type, subTypeIter.getPath());
                        const int                       gotLoc          = gl.getUniformLocation(programID, name.c_str());
                        const int                       expectLoc       = uniformInfo.location >= 0 ? uniformInfo.location+subTypeIndex : -1;


@@ -985,7 +984,6 @@ void UniformLocationTests::init (void)
        // Min/Max location
        {
                tcu::TestCaseGroup* const       group           = new tcu::TestCaseGroup(m_testCtx, "min_max", "Maximum & minimum location");
        // Min/Max location
        {
                tcu::TestCaseGroup* const       group           = new tcu::TestCaseGroup(m_testCtx, "min_max", "Maximum & minimum location");

-               de::Random                                      rng                     (baseSeed + 0x1f01);

 
                addChild(group);
 
 
                addChild(group);
 

diff --git a/modules/gles31/functional/es31fVertexAttributeBindingStateQueryTests.cpp b/modules/gles31/functional/es31fVertexAttributeBindingStateQueryTests.cpp
index 45ae0c8506b7b2c0b87f9ff4996519259472ab4a..21d5bf36687e855d3b1b552fe715b70a63c0df33 100644 (file)
--- a/modules/gles31/functional/es31fVertexAttributeBindingStateQueryTests.cpp
+++ b/modules/gles31/functional/es31fVertexAttributeBindingStateQueryTests.cpp
@@ -578,7 +578,6 @@ MixedVertexBindingDivisorCase::MixedVertexBindingDivisorCase (Context& context,
 void MixedVertexBindingDivisorCase::test (tcu::ResultCollector& result)
 {
        glu::CallLogWrapper gl                                  (m_context.getRenderContext().getFunctions(), m_testCtx.getLog());
 void MixedVertexBindingDivisorCase::test (tcu::ResultCollector& result)
 {
        glu::CallLogWrapper gl                                  (m_context.getRenderContext().getFunctions(), m_testCtx.getLog());

-       glu::VertexArray        vao                                     (m_context.getRenderContext());

 
        gl.enableLogging(true);
 
 
        gl.enableLogging(true);
 


@@ -601,7 +600,6 @@ MixedVertexBindingOffsetCase::MixedVertexBindingOffsetCase (Context& context, co
 void MixedVertexBindingOffsetCase::test (tcu::ResultCollector& result)
 {
        glu::CallLogWrapper gl                                  (m_context.getRenderContext().getFunctions(), m_testCtx.getLog());
 void MixedVertexBindingOffsetCase::test (tcu::ResultCollector& result)
 {
        glu::CallLogWrapper gl                                  (m_context.getRenderContext().getFunctions(), m_testCtx.getLog());

-       glu::VertexArray        vao                                     (m_context.getRenderContext());

        glu::Buffer                     buffer                          (m_context.getRenderContext());
 
        gl.enableLogging(true);
        glu::Buffer                     buffer                          (m_context.getRenderContext());
 
        gl.enableLogging(true);


@@ -627,7 +625,6 @@ MixedVertexBindingStrideCase::MixedVertexBindingStrideCase (Context& context, co
 void MixedVertexBindingStrideCase::test (tcu::ResultCollector& result)
 {
        glu::CallLogWrapper gl                                  (m_context.getRenderContext().getFunctions(), m_testCtx.getLog());
 void MixedVertexBindingStrideCase::test (tcu::ResultCollector& result)
 {
        glu::CallLogWrapper gl                                  (m_context.getRenderContext().getFunctions(), m_testCtx.getLog());

-       glu::VertexArray        vao                                     (m_context.getRenderContext());

        glu::Buffer                     buffer                          (m_context.getRenderContext());
 
        gl.enableLogging(true);
        glu::Buffer                     buffer                          (m_context.getRenderContext());
 
        gl.enableLogging(true);


@@ -656,7 +653,6 @@ MixedVertexBindingBufferCase::MixedVertexBindingBufferCase (Context& context, co
 void MixedVertexBindingBufferCase::test (tcu::ResultCollector& result)
 {
        glu::CallLogWrapper gl                                  (m_context.getRenderContext().getFunctions(), m_testCtx.getLog());
 void MixedVertexBindingBufferCase::test (tcu::ResultCollector& result)
 {
        glu::CallLogWrapper gl                                  (m_context.getRenderContext().getFunctions(), m_testCtx.getLog());

-       glu::VertexArray        vao                                     (m_context.getRenderContext());

        glu::Buffer                     buffer                          (m_context.getRenderContext());
 
        gl.enableLogging(true);
        glu::Buffer                     buffer                          (m_context.getRenderContext());
 
        gl.enableLogging(true);