Remove unused variables.

Change-Id: I234eb6375d7332bc82fc2d0a8b4e754b169f9290

diff --git a/framework/common/tcuEither.cpp b/framework/common/tcuEither.cpp
index 64b9737..c640ded 100644 (file)
--- a/framework/common/tcuEither.cpp
+++ b/framework/common/tcuEither.cpp
@@ -280,8 +280,7 @@ void Either_selfTest (void)
                Either<int, TestClassWithConstructor>           either          (intValue);
                const Either<int, TestClassWithConstructor>     otherEither     (testObject);
 
-
-               either = testObject;
+               either = otherEither;
 
                TCU_CHECK(!either.isFirst());
                TCU_CHECK(either.isSecond());

diff --git a/framework/common/tcuVectorUtil.hpp b/framework/common/tcuVectorUtil.hpp
index 00ca7ec..de17642 100644 (file)
--- a/framework/common/tcuVectorUtil.hpp
+++ b/framework/common/tcuVectorUtil.hpp
@@ -194,7 +194,6 @@ inline Vector<T, Size> reflect (const Vector<T, Size>& i, const Vector<T, Size>&
 template <typename T, int Size>
 inline Vector<T, Size> refract (const Vector<T, Size>& i, const Vector<T, Size>& n, T eta)
 {
-       Vector<T, Size> res;
        T cosAngle = dot(n, i);
        T k = T(1) - eta * eta * (T(1) - cosAngle * cosAngle);
        if (k < T(0))

diff --git a/framework/referencerenderer/rrFragmentOperations.cpp b/framework/referencerenderer/rrFragmentOperations.cpp
index 8113fbc..b8451e6 100644 (file)
--- a/framework/referencerenderer/rrFragmentOperations.cpp
+++ b/framework/referencerenderer/rrFragmentOperations.cpp
@@ -672,7 +672,6 @@ void FragmentProcessor::executeRGBA8ColorWrite (int fragNdxOffset, int numSample
                {
                        const int                       fragSampleNdx   = regSampleNdx % numSamplesPerFragment;
                        const Fragment&         frag                    = inputFragments[fragNdxOffset + regSampleNdx/numSamplesPerFragment];
-                       Vec4                            combinedColor;
                        deUint8*                        dstPtr                  = basePtr + fragSampleNdx*fragStride + frag.pixelCoord.x()*xStride + frag.pixelCoord.y()*yStride;
 
                        dstPtr[0] = tcu::floatToU8(m_sampleRegister[regSampleNdx].blendedRGB.x());

diff --git a/framework/referencerenderer/rrRasterizer.cpp b/framework/referencerenderer/rrRasterizer.cpp
index db222f6..53d3ecc 100644 (file)
--- a/framework/referencerenderer/rrRasterizer.cpp
+++ b/framework/referencerenderer/rrRasterizer.cpp
@@ -876,7 +876,6 @@ void SingleSampleLineRasterizer::init (const tcu::Vec4& v0, const tcu::Vec4& v1,
        // Bounding box \note: with wide lines, the line is actually moved as in the spec
        const deInt32                                   lineWidthPixels = (lineWidth > 1.0f) ? (deInt32)floor(lineWidth + 0.5f) : 1;
 
-       const tcu::IVec2                                minorDirection  = (isXMajor ? tcu::IVec2(0, 1) : tcu::IVec2(1, 0));
        const tcu::Vector<deInt64,2>    widthOffset             = (isXMajor ? tcu::Vector<deInt64,2>(0, -1) : tcu::Vector<deInt64,2>(-1, 0)) * (toSubpixelCoord(lineWidthPixels - 1) / 2);
 
        const deInt64                                   x0                              = toSubpixelCoord(v0.x()) + widthOffset.x();

diff --git a/modules/egl/teglImageTests.cpp b/modules/egl/teglImageTests.cpp
index 4cabdd3..b6ef160 100644 (file)
--- a/modules/egl/teglImageTests.cpp
+++ b/modules/egl/teglImageTests.cpp
@@ -373,7 +373,6 @@ public:
 
 private:
        UniquePtr<ImageSource>  m_source;
-       EGLint                                  m_target;
 };
 
 class ImageTargetGLES2 : public ImageTestCase

diff --git a/modules/egl/teglQuerySurfaceTests.cpp b/modules/egl/teglQuerySurfaceTests.cpp
index a31ca05..3db27f5 100644 (file)
--- a/modules/egl/teglQuerySurfaceTests.cpp
+++ b/modules/egl/teglQuerySurfaceTests.cpp
@@ -40,7 +40,6 @@
 #include "tcuCommandLine.hpp"
 
 #include "deUniquePtr.hpp"
-#include "deRandom.hpp"
 
 #include <string>
 #include <vector>
@@ -476,7 +475,6 @@ void SurfaceAttribCase::testAttributes (EGLDisplay display, EGLSurface surface,
        const Library&          egl             = m_eglTestCtx.getLibrary();
        tcu::TestLog&           log             = m_testCtx.getLog();
        const eglu::Version     version = eglu::getVersion(egl, display);
-       de::Random                      rnd             (deStringHash(m_name.c_str()) ^ 0xf215918f);
 
        if (version.getMajor() == 1 && version.getMinor() == 0)
        {

diff --git a/modules/egl/teglResizeTests.cpp b/modules/egl/teglResizeTests.cpp
index 81ba71b..4e829a6 100644 (file)
--- a/modules/egl/teglResizeTests.cpp
+++ b/modules/egl/teglResizeTests.cpp
@@ -349,8 +349,6 @@ IVec2 checkSurfaceSize (const Library&              egl,
 IterateResult ChangeSurfaceSizeCase::iterate (void)
 {
        const Library&                  egl                     = m_eglTestCtx.getLibrary();
-       Surface                                 oldSurface;
-       Surface                                 newSurface;
        ScopedCurrentContext    currentCtx      (egl, m_display, **m_surface, **m_surface, **m_context);
        IVec2                                   oldEglSize      = checkSurfaceSize(egl,
                                                                                                                   m_display,
@@ -454,7 +452,9 @@ IvVec2 ivVec2 (const IVec2& vec)
 
 Interval approximateInt (int i)
 {
-       return (Interval(i) + Interval(-1.0, 1.0)) & Interval(0.0, TCU_INFINITY);
+       const Interval margin(-1.0, 1.0); // The resolution may be rounded
+
+       return (Interval(i) + margin) & Interval(0.0, TCU_INFINITY);
 }
 
 IvVec2 UpdateResolutionCase::getNativePixelsPerInch    (void)
@@ -464,7 +464,6 @@ IvVec2 UpdateResolutionCase::getNativePixelsPerInch (void)
        const IVec2             bufSize         = eglu::getSurfaceSize(egl, m_display, **m_surface);
        const IVec2             winSize         = m_nativeWindow->getScreenSize();
        const IVec2             bufPp10km       = eglu::getSurfaceResolution(egl, m_display, **m_surface);
-       const Interval  margin          (-1.0, 1.0); // The resolution may be rounded
        const IvVec2    bufPpiI         = (IvVec2(approximateInt(bufPp10km.x()),
                                                                                  approximateInt(bufPp10km.y()))
                                                                   / Interval(inchPer10km));

diff --git a/modules/egl/teglTestPackage.cpp b/modules/egl/teglTestPackage.cpp
index 90fbe08..461c137 100644 (file)
--- a/modules/egl/teglTestPackage.cpp
+++ b/modules/egl/teglTestPackage.cpp
@@ -128,8 +128,7 @@ public:
 };
 
 TestCaseWrapper::TestCaseWrapper (EglTestContext& eglTestCtx)
-       : tcu::TestCaseWrapper  (eglTestCtx.getTestContext())
-       , m_eglTestCtx                  (eglTestCtx)
+       : tcu::TestCaseWrapper(eglTestCtx.getTestContext())
 {
 }
 

diff --git a/modules/egl/teglTestPackage.hpp b/modules/egl/teglTestPackage.hpp
index 8f0fd63..a6b1073 100644 (file)
--- a/modules/egl/teglTestPackage.hpp
+++ b/modules/egl/teglTestPackage.hpp
@@ -43,9 +43,6 @@ public:
        bool                                                    deinitTestCase                  (tcu::TestCase* testCase);
 
        tcu::TestNode::IterateResult    iterateTestCase                 (tcu::TestCase* testCase);
-
-private:
-       EglTestContext&                                 m_eglTestCtx;
 };
 
 class PackageContext

diff --git a/modules/gles2/accuracy/es2aVaryingInterpolationTests.cpp b/modules/gles2/accuracy/es2aVaryingInterpolationTests.cpp
index 6c808ea..6b0b40c 100644 (file)
--- a/modules/gles2/accuracy/es2aVaryingInterpolationTests.cpp
+++ b/modules/gles2/accuracy/es2aVaryingInterpolationTests.cpp
@@ -254,7 +254,6 @@ InterpolationCase::IterateResult InterpolationCase::iterate (void)
        // Frames.
        tcu::Surface    rendered                (viewportWidth, viewportHeight);
        tcu::Surface    reference               (viewportWidth, viewportHeight);
-       tcu::Surface    diffMask                (viewportWidth, viewportHeight);
 
        // Render with GL.
        glViewport(viewportX, viewportY, viewportWidth, viewportHeight);

diff --git a/modules/gles2/functional/es2fClippingTests.cpp b/modules/gles2/functional/es2fClippingTests.cpp
index 74afc01..7037d7a 100644 (file)
--- a/modules/gles2/functional/es2fClippingTests.cpp
+++ b/modules/gles2/functional/es2fClippingTests.cpp
@@ -121,7 +121,6 @@ void blitImageOnBlackSurface(const ConstPixelBufferAccess& src, const PixelBuffe
 {
        const int                       height  = src.getHeight();
        const int                       width   = src.getWidth();
-       const tcu::IVec4        black   = tcu::IVec4(0, 0, 0, 255);
 
        for (int y = 0; y < height; y++)
        for (int x = 0; x < width; x++)

diff --git a/modules/gles2/functional/es2fTextureCompletenessTests.cpp b/modules/gles2/functional/es2fTextureCompletenessTests.cpp
index a4c92db..d902481 100644 (file)
--- a/modules/gles2/functional/es2fTextureCompletenessTests.cpp
+++ b/modules/gles2/functional/es2fTextureCompletenessTests.cpp
@@ -537,9 +537,6 @@ Incomplete2DEmptyObjectCase::Incomplete2DEmptyObjectCase (tcu::TestContext& test
 
 void Incomplete2DEmptyObjectCase::createTexture (void)
 {
-       tcu::TextureFormat      fmt                     = glu::mapGLTransferFormat(GL_RGBA, GL_UNSIGNED_BYTE);
-       tcu::TextureLevel       levelData       (fmt);
-
        GLuint texture;
        glGenTextures   (1, &texture);
        glPixelStorei   (GL_UNPACK_ALIGNMENT, 1);
@@ -901,9 +898,6 @@ IncompleteCubeEmptyObjectCase::IncompleteCubeEmptyObjectCase (tcu::TestContext&
 
 void IncompleteCubeEmptyObjectCase::createTexture (void)
 {
-       tcu::TextureFormat              fmt                             = glu::mapGLTransferFormat(GL_RGBA, GL_UNSIGNED_BYTE);
-       tcu::TextureLevel               levelData               (fmt);
-
        GLuint texture;
        glGenTextures   (1, &texture);
        glPixelStorei   (GL_UNPACK_ALIGNMENT, 1);

diff --git a/modules/gles2/functional/es2fTextureMipmapTests.cpp b/modules/gles2/functional/es2fTextureMipmapTests.cpp
index e22ca8f..95c3619 100644 (file)
--- a/modules/gles2/functional/es2fTextureMipmapTests.cpp
+++ b/modules/gles2/functional/es2fTextureMipmapTests.cpp
@@ -816,7 +816,6 @@ Texture2DGenMipmapCase::IterateResult Texture2DGenMipmapCase::iterate (void)
        const deUint32                  wrapT                           = GL_CLAMP_TO_EDGE;
 
        const int                               numLevels                       = deLog2Floor32(de::max(m_width, m_height))+1;
-       const tcu::Sampler              sampler                         = glu::mapGLSampler(wrapS, wrapT, minFilter, magFilter);
 
        tcu::Texture2D                  resultTexture           (tcu::TextureFormat(tcu::TextureFormat::RGBA, tcu::TextureFormat::UNORM_INT8), m_texture->getRefTexture().getWidth(), m_texture->getRefTexture().getHeight());
 
@@ -955,7 +954,6 @@ TextureCubeGenMipmapCase::IterateResult TextureCubeGenMipmapCase::iterate (void)
        tcu::TextureCube                resultTexture           (tcu::TextureFormat(tcu::TextureFormat::RGBA, tcu::TextureFormat::UNORM_INT8), m_size);
 
        const int                               numLevels                       = deLog2Floor32(m_size)+1;
-       tcu::Sampler                    sampler                         = glu::mapGLSampler(wrapS, wrapT, minFilter, magFilter);
        vector<float>                   texCoord;
 
        // Initialize texture level 0 with colored grid.

diff --git a/modules/gles2/functional/es2fTextureSpecificationTests.cpp b/modules/gles2/functional/es2fTextureSpecificationTests.cpp
index 9e7d0dd..7a8705e 100644 (file)
--- a/modules/gles2/functional/es2fTextureSpecificationTests.cpp
+++ b/modules/gles2/functional/es2fTextureSpecificationTests.cpp
@@ -155,7 +155,6 @@ public:
                        const float                     y               = coord.y();
                        const float                     f0              = (x + y) * 0.5f;
                        const float                     f1              = 0.5f + (x - y) * 0.5f;
-                       const tcu::Vec4         fv              = Vec4(f0, f1, 1.0f-f0, 1.0f-f1);
 
                        rr::writeFragmentOutput(context, packetNdx, fragNdx, 0, tcu::Vec4(f0, f1, 1.0f-f0, 1.0f-f1));
                }

diff --git a/modules/gles3/accuracy/es3aVaryingInterpolationTests.cpp b/modules/gles3/accuracy/es3aVaryingInterpolationTests.cpp
index 1c7da06..c9fec57 100644 (file)
--- a/modules/gles3/accuracy/es3aVaryingInterpolationTests.cpp
+++ b/modules/gles3/accuracy/es3aVaryingInterpolationTests.cpp
@@ -261,7 +261,6 @@ InterpolationCase::IterateResult InterpolationCase::iterate (void)
        // Frames.
        tcu::Surface    rendered                (viewportWidth, viewportHeight);
        tcu::Surface    reference               (viewportWidth, viewportHeight);
-       tcu::Surface    diffMask                (viewportWidth, viewportHeight);
 
        // Render with GL.
        glViewport(viewportX, viewportY, viewportWidth, viewportHeight);

diff --git a/modules/gles3/functional/es3fClippingTests.cpp b/modules/gles3/functional/es3fClippingTests.cpp
index bc73012..9d8de92 100644 (file)
--- a/modules/gles3/functional/es3fClippingTests.cpp
+++ b/modules/gles3/functional/es3fClippingTests.cpp
@@ -124,7 +124,6 @@ void blitImageOnBlackSurface(const ConstPixelBufferAccess& src, const PixelBuffe
 {
        const int                       height  = src.getHeight();
        const int                       width   = src.getWidth();
-       const tcu::IVec4        black   = tcu::IVec4(0, 0, 0, 255);
 
        for (int y = 0; y < height; y++)
        for (int x = 0; x < width; x++)

diff --git a/modules/gles3/functional/es3fDrawTests.cpp b/modules/gles3/functional/es3fDrawTests.cpp
index bdf22dd..efd8b48 100644 (file)
--- a/modules/gles3/functional/es3fDrawTests.cpp
+++ b/modules/gles3/functional/es3fDrawTests.cpp
@@ -775,8 +775,6 @@ bool InstancedGridRenderTest::verifyImage (const tcu::Surface& image)
        // \note the green/yellow pattern is only for clarity. The test will only verify that all instances were drawn by looking for anything non-green/yellow.
        using tcu::TestLog;
 
-       const tcu::RGBA green           (0, 255, 0, 255);
-       const tcu::RGBA yellow          (255, 255, 0, 255);
        const int colorThreshold        = 20;
 
        tcu::Surface error                      (image.getWidth(), image.getHeight());

diff --git a/modules/gles3/functional/es3fTextureMipmapTests.cpp b/modules/gles3/functional/es3fTextureMipmapTests.cpp
index dd78b96..8c0c4a2 100644 (file)
--- a/modules/gles3/functional/es3fTextureMipmapTests.cpp
+++ b/modules/gles3/functional/es3fTextureMipmapTests.cpp
@@ -855,7 +855,6 @@ Texture2DGenMipmapCase::IterateResult Texture2DGenMipmapCase::iterate (void)
        const deUint32                  wrapT                           = GL_CLAMP_TO_EDGE;
 
        const int                               numLevels                       = deLog2Floor32(de::max(m_width, m_height))+1;
-       const tcu::Sampler              sampler                         = glu::mapGLSampler(wrapS, wrapT, minFilter, magFilter);
 
        tcu::Texture2D                  resultTexture           (tcu::TextureFormat(tcu::TextureFormat::RGBA, tcu::TextureFormat::UNORM_INT8), m_texture->getRefTexture().getWidth(), m_texture->getRefTexture().getHeight());
 

diff --git a/modules/gles3/functional/es3fTextureWrapTests.cpp b/modules/gles3/functional/es3fTextureWrapTests.cpp
index c20300d..8290cef 100644 (file)
--- a/modules/gles3/functional/es3fTextureWrapTests.cpp
+++ b/modules/gles3/functional/es3fTextureWrapTests.cpp
@@ -296,7 +296,6 @@ TextureWrapCase::IterateResult TextureWrapCase::iterate (void)
        TestLog&                                                log                                                             = m_testCtx.getLog();
        const RandomViewport                    viewport                                                (m_renderCtx.getRenderTarget(), VIEWPORT_WIDTH, VIEWPORT_HEIGHT, deStringHash(getName()) + m_caseNdx);
        tcu::Surface                                    renderedFrame                                   (viewport.width, viewport.height);
-       tcu::Surface                                    referenceFrame                                  (viewport.width, viewport.height);
        ReferenceParams                                 refParams                                               (TEXTURETYPE_2D);
        const tcu::TextureFormat                texFormat                                               = m_texture->getRefTexture().getFormat();
        vector<float>                                   texCoord;

diff --git a/modules/gles31/functional/es31fDrawTests.cpp b/modules/gles31/functional/es31fDrawTests.cpp
index 89d904a..0664137 100644 (file)
--- a/modules/gles31/functional/es31fDrawTests.cpp
+++ b/modules/gles31/functional/es31fDrawTests.cpp
@@ -109,8 +109,6 @@ static bool verifyImageYellowGreen (const tcu::Surface& image, tcu::TestLog& log
 {
        using tcu::TestLog;
 
-       const tcu::RGBA green           (0, 255, 0, 255);
-       const tcu::RGBA yellow          (255, 255, 0, 255);
        const int colorThreshold        = 20;
 
        tcu::Surface error                      (image.getWidth(), image.getHeight());

diff --git a/modules/gles31/functional/es31fGeometryShaderTests.cpp b/modules/gles31/functional/es31fGeometryShaderTests.cpp
index 6fdc859..e75eb28 100644 (file)
--- a/modules/gles31/functional/es31fGeometryShaderTests.cpp
+++ b/modules/gles31/functional/es31fGeometryShaderTests.cpp
@@ -3482,7 +3482,6 @@ bool LayeredRenderCase::verifyEmptyImage (const tcu::Surface& layer, bool loggin
 
 bool LayeredRenderCase::verifyProvokingVertexLayers (const tcu::Surface& layer0, const tcu::Surface& layer1)
 {
-       const tcu::Vec4 white                   = tcu::Vec4(1.0f, 1.0f, 1.0f, 1.0f);
        const bool              layer0Empty             = verifyEmptyImage(layer0, false);
        const bool              layer1Empty             = verifyEmptyImage(layer1, false);
        bool                    error                   = false;

diff --git a/modules/gles31/functional/es31fShaderImageLoadStoreTests.cpp b/modules/gles31/functional/es31fShaderImageLoadStoreTests.cpp
index f993654..47e2ea3 100644 (file)
--- a/modules/gles31/functional/es31fShaderImageLoadStoreTests.cpp
+++ b/modules/gles31/functional/es31fShaderImageLoadStoreTests.cpp
@@ -2942,7 +2942,6 @@ EarlyFragmentTestsCase::IterateResult EarlyFragmentTestsCase::iterate (void)
        const int                                               viewportHeight          = RENDER_SIZE;
        const int                                               viewportX                       = (m_renderTarget == RENDERTARGET_DEFAULT) ? (rnd.getInt(0, renderCtx.getRenderTarget().getWidth() - viewportWidth))    : (0);
        const int                                               viewportY                       = (m_renderTarget == RENDERTARGET_DEFAULT) ? (rnd.getInt(0, renderCtx.getRenderTarget().getHeight() - viewportHeight))  : (0);
-       const IVec3                                             imageSize                       = defaultImageSize(TEXTURETYPE_2D);
        const glu::Texture                              texture                         (renderCtx);
        de::MovePtr<glu::Framebuffer>   fbo;
        de::MovePtr<glu::Renderbuffer>  colorAttachment;

diff --git a/modules/gles31/functional/es31fTessellationTests.cpp b/modules/gles31/functional/es31fTessellationTests.cpp
index e373bda..3b3a413 100644 (file)
--- a/modules/gles31/functional/es31fTessellationTests.cpp
+++ b/modules/gles31/functional/es31fTessellationTests.cpp
@@ -1068,7 +1068,6 @@ static void drawTessCoordVisualization (tcu::Surface& dst, TessPrimitiveType pri
 {
        const int               imageWidth              = 256;
        const int               imageHeight             = 256;
-       const Vec2              imageSizeFloat  ((float)imageWidth, (float)imageHeight);
        dst.setSize(imageWidth, imageHeight);
 
        tcu::clear(dst.getAccess(), tcu::Vec4(0.0f, 0.0f, 0.0f, 1.0f));
@@ -1716,8 +1715,6 @@ CommonEdgeCase::IterateResult CommonEdgeCase::iterate (void)
        gridIndices.reserve(numIndices);
 
        {
-               Random constantSeedRnd(42);
-
                for (int i = 0; i < gridHeight+1; i++)
                for (int j = 0; j < gridWidth+1; j++)
                {

diff --git a/modules/gles31/functional/es31fTextureGatherTests.cpp b/modules/gles31/functional/es31fTextureGatherTests.cpp
index dcdc1b2..42316ac 100644 (file)
--- a/modules/gles31/functional/es31fTextureGatherTests.cpp
+++ b/modules/gles31/functional/es31fTextureGatherTests.cpp
@@ -1335,7 +1335,6 @@ TextureGatherCase::IterateResult TextureGatherCase::iterate (void)
        TestLog&                                                log                                                             = m_testCtx.getLog();
        const tcu::ScopedLogSection             iterationSection                                (log, "Iteration" + de::toString(m_currentIteration), "Iteration " + de::toString(m_currentIteration));
        const glu::RenderContext&               renderCtx                                               = m_context.getRenderContext();
-       const tcu::IVec2                                renderSize                                              = RENDER_SIZE;
        const glw::Functions&                   gl                                                              = renderCtx.getFunctions();
        const GatherArgs&                               gatherArgs                                              = getGatherArgs(m_currentIteration);
        const string                                    refZExpr                                                = "v_normalizedCoord.x";

diff --git a/modules/gles31/functional/es31fVertexAttributeBindingTests.cpp b/modules/gles31/functional/es31fVertexAttributeBindingTests.cpp
index 292b342..3136137 100644 (file)
--- a/modules/gles31/functional/es31fVertexAttributeBindingTests.cpp
+++ b/modules/gles31/functional/es31fVertexAttributeBindingTests.cpp
@@ -79,8 +79,6 @@ static bool verifyImageYellowGreen (const tcu::Surface& image, tcu::TestLog& log
 {
        using tcu::TestLog;
 
-       const tcu::RGBA green           (0, 255, 0, 255);
-       const tcu::RGBA yellow          (255, 255, 0, 255);
        const int colorThreshold        = 20;
 
        tcu::Surface error                      (image.getWidth(), image.getHeight());

diff --git a/modules/gles31/stress/es31sVertexAttributeBindingTests.cpp b/modules/gles31/stress/es31sVertexAttributeBindingTests.cpp
index 87cf343..5622297 100644 (file)
--- a/modules/gles31/stress/es31sVertexAttributeBindingTests.cpp
+++ b/modules/gles31/stress/es31sVertexAttributeBindingTests.cpp
@@ -73,8 +73,6 @@ static bool verifyImageYellowGreen (const tcu::Surface& image, tcu::TestLog& log
 {
        using tcu::TestLog;
 
-       const tcu::RGBA green           (0, 255, 0, 255);
-       const tcu::RGBA yellow          (255, 255, 0, 255);
        const int colorThreshold        = 20;
 
        tcu::Surface error                      (image.getWidth(), image.getHeight());

diff --git a/modules/glshared/glsRasterizationTestUtil.cpp b/modules/glshared/glsRasterizationTestUtil.cpp
index fd83f2b..f479d5e 100644 (file)
--- a/modules/glshared/glsRasterizationTestUtil.cpp
+++ b/modules/glshared/glsRasterizationTestUtil.cpp
@@ -1700,7 +1700,6 @@ CoverageType calculateTriangleCoverage (const tcu::Vec4& p0, const tcu::Vec4& p1
                        const int               nextEdgeNdx     = (edgeNdx+1) % 3;
                        const I64Vec2   startPos        ((startRounding&0x01)   ? (triangleSubPixelSpaceFloor[edgeNdx].x())             : (triangleSubPixelSpaceCeil[edgeNdx].x()),             (startRounding&0x02)    ? (triangleSubPixelSpaceFloor[edgeNdx].y())             : (triangleSubPixelSpaceCeil[edgeNdx].y()));
                        const I64Vec2   endPos          ((endRounding&0x01)             ? (triangleSubPixelSpaceFloor[nextEdgeNdx].x()) : (triangleSubPixelSpaceCeil[nextEdgeNdx].x()), (endRounding&0x02)              ? (triangleSubPixelSpaceFloor[nextEdgeNdx].y()) : (triangleSubPixelSpaceCeil[nextEdgeNdx].y()));
-                       const I64Vec2   edge            = endPos - startPos;
 
                        for (int pixelEdgeNdx = 0; pixelEdgeNdx < 4; ++pixelEdgeNdx)
                        {

diff --git a/modules/glshared/glsTextureBufferCase.cpp b/modules/glshared/glsTextureBufferCase.cpp
index fe76eac..a5d6bb3 100644 (file)
--- a/modules/glshared/glsTextureBufferCase.cpp
+++ b/modules/glshared/glsTextureBufferCase.cpp
@@ -266,8 +266,6 @@ public:
                {
                        rr::FragmentPacket&     packet          = packets[packetNdx];
 
-                       const tcu::IVec2        position        = packet.position;
-
                        const tcu::IVec2        position0       = packet.position + tcu::IVec2(0, 0);
                        const tcu::IVec2        position1       = packet.position + tcu::IVec2(1, 0);
                        const tcu::IVec2        position2       = packet.position + tcu::IVec2(0, 1);

diff --git a/modules/glshared/glsTextureTestUtil.cpp b/modules/glshared/glsTextureTestUtil.cpp
index ae6a470..e0b3055 100644 (file)
--- a/modules/glshared/glsTextureTestUtil.cpp
+++ b/modules/glshared/glsTextureTestUtil.cpp
@@ -937,7 +937,6 @@ void sampleTexture (const SurfaceAccess& dst, const tcu::TextureCubeArrayView& s
 void fetchTexture (const SurfaceAccess& dst, const tcu::ConstPixelBufferAccess& src, const float* texCoord, const tcu::Vec4& colorScale, const tcu::Vec4& colorBias)
 {
        const tcu::Vec4         sq                      = tcu::Vec4(texCoord[0], texCoord[1], texCoord[2], texCoord[3]);
-       const tcu::IVec2        dstSize         = tcu::IVec2(dst.getWidth(), dst.getHeight());
        const tcu::Vec3         triS[2]         = { sq.swizzle(0, 1, 2), sq.swizzle(3, 2, 1) };
 
        for (int y = 0; y < dst.getHeight(); y++)
@@ -1858,8 +1857,6 @@ int computeTextureLookupDiff (const tcu::ConstPixelBufferAccess&  result,
                                        const float             nxo             = wxo/dstW;
                                        const float             nyo             = wyo/dstH;
 
-                                       const tcu::Vec2 coordO          (projectedTriInterpolate(triS[triNdx], triW[triNdx], nxo, nyo),
-                                                                                                projectedTriInterpolate(triT[triNdx], triW[triNdx], nxo, nyo));
                                        const tcu::Vec2 coordDxo        = tcu::Vec2(triDerivateX(triS[triNdx], triW[triNdx], wxo, dstW, nyo),
                                                                                                                        triDerivateX(triT[triNdx], triW[triNdx], wxo, dstW, nyo)) * srcSize.asFloat();
                                        const tcu::Vec2 coordDyo        = tcu::Vec2(triDerivateY(triS[triNdx], triW[triNdx], wyo, dstH, nxo),
@@ -2237,9 +2234,6 @@ int computeTextureLookupDiff (const tcu::ConstPixelBufferAccess&  result,
                                                const float             nxo             = wxo/dstW;
                                                const float             nyo             = wyo/dstH;
 
-                                               const tcu::Vec3 coordO          (projectedTriInterpolate(triS[triNdx], triW[triNdx], nxo, nyo),
-                                                                                                        projectedTriInterpolate(triT[triNdx], triW[triNdx], nxo, nyo),
-                                                                                                        projectedTriInterpolate(triR[triNdx], triW[triNdx], nxo, nyo));
                                                const tcu::Vec3 coordDxo        = tcu::Vec3(triDerivateX(triS[triNdx], triW[triNdx], wxo, dstW, nyo),
                                                                                                                                triDerivateX(triT[triNdx], triW[triNdx], wxo, dstW, nyo),
                                                                                                                                triDerivateX(triR[triNdx], triW[triNdx], wxo, dstW, nyo)) * srcSize.asFloat();
@@ -2390,8 +2384,6 @@ int computeTextureLookupDiff (const tcu::ConstPixelBufferAccess&  result,
                                        const float             nxo             = wxo/dstW;
                                        const float             nyo             = wyo/dstH;
 
-                                       const tcu::Vec2 coordO          (projectedTriInterpolate(triS[triNdx], triW[triNdx], nxo, nyo),
-                                                                                                projectedTriInterpolate(triT[triNdx], triW[triNdx], nxo, nyo));
                                        const float     coordDxo                = triDerivateX(triS[triNdx], triW[triNdx], wxo, dstW, nyo) * srcSize;
                                        const float     coordDyo                = triDerivateY(triS[triNdx], triW[triNdx], wyo, dstH, nxo) * srcSize;
                                        const tcu::Vec2 lodO            = tcu::computeLodBoundsFromDerivates(coordDxo, coordDyo, lodPrec);
@@ -2501,9 +2493,6 @@ int computeTextureLookupDiff (const tcu::ConstPixelBufferAccess&  result,
                                        const float             nxo             = wxo/dstW;
                                        const float             nyo             = wyo/dstH;
 
-                                       const tcu::Vec3 coordO          (projectedTriInterpolate(triS[triNdx], triW[triNdx], nxo, nyo),
-                                                                                                projectedTriInterpolate(triT[triNdx], triW[triNdx], nxo, nyo),
-                                                                                                projectedTriInterpolate(triR[triNdx], triW[triNdx], nxo, nyo));
                                        const tcu::Vec2 coordDxo        = tcu::Vec2(triDerivateX(triS[triNdx], triW[triNdx], wxo, dstW, nyo),
                                                                                                                        triDerivateX(triT[triNdx], triW[triNdx], wxo, dstW, nyo)) * srcSize;
                                        const tcu::Vec2 coordDyo        = tcu::Vec2(triDerivateY(triS[triNdx], triW[triNdx], wyo, dstH, nxo),
@@ -2872,8 +2861,6 @@ int computeTextureCompareDiff (const tcu::ConstPixelBufferAccess& result,
                                        const float             nxo             = wxo/dstW;
                                        const float             nyo             = wyo/dstH;
 
-                                       const tcu::Vec2 coordO          (projectedTriInterpolate(triS[triNdx], triW[triNdx], nxo, nyo),
-                                                                                                projectedTriInterpolate(triT[triNdx], triW[triNdx], nxo, nyo));
                                        const tcu::Vec2 coordDxo        = tcu::Vec2(triDerivateX(triS[triNdx], triW[triNdx], wxo, dstW, nyo),
                                                                                                                        triDerivateX(triT[triNdx], triW[triNdx], wxo, dstW, nyo)) * srcSize.asFloat();
                                        const tcu::Vec2 coordDyo        = tcu::Vec2(triDerivateY(triS[triNdx], triW[triNdx], wyo, dstH, nxo),
@@ -3103,8 +3090,6 @@ int computeTextureCompareDiff (const tcu::ConstPixelBufferAccess& result,
                                        const float             nxo             = wxo/dstW;
                                        const float             nyo             = wyo/dstH;
 
-                                       const tcu::Vec2 coordO          (projectedTriInterpolate(triS[triNdx], triW[triNdx], nxo, nyo),
-                                                                                                projectedTriInterpolate(triT[triNdx], triW[triNdx], nxo, nyo));
                                        const tcu::Vec2 coordDxo        = tcu::Vec2(triDerivateX(triS[triNdx], triW[triNdx], wxo, dstW, nyo),
                                                                                                                        triDerivateX(triT[triNdx], triW[triNdx], wxo, dstW, nyo)) * srcSize.asFloat();
                                        const tcu::Vec2 coordDyo        = tcu::Vec2(triDerivateY(triS[triNdx], triW[triNdx], wyo, dstH, nxo),