Remove sampleTextureMultiFace.

Change-Id: Id9a815599d2faa77dba72ef8ecc0caded03d2718

diff --git a/modules/gles3/accuracy/es3aTextureFilteringTests.cpp b/modules/gles3/accuracy/es3aTextureFilteringTests.cpp
index b2a0e18..8f44f53 100644 (file)
--- a/modules/gles3/accuracy/es3aTextureFilteringTests.cpp
+++ b/modules/gles3/accuracy/es3aTextureFilteringTests.cpp
@@ -484,8 +484,7 @@ static void renderFaces (
        int                                                     height,
        const tcu::Vec2&                        bottomLeft,
        const tcu::Vec2&                        topRight,
-       const tcu::Vec2&                        texCoordTopRightFactor,
-       bool                                            multiFace)
+       const tcu::Vec2&                        texCoordTopRightFactor)
 {
        DE_ASSERT(width == dstRef.getWidth() && height == dstRef.getHeight());
 
@@ -517,10 +516,7 @@ static void renderFaces (
 
                renderer.renderQuad(0, &texCoord[0], params);
 
-               if (multiFace)
-                       sampleTextureMultiFace(SurfaceAccess(dstRef, curX, curY, curW, curH), refTexture, &texCoord[0], params);
-               else
-                       sampleTexture(SurfaceAccess(dstRef, curX, curY, curW, curH), refTexture, &texCoord[0], params);
+               sampleTexture(SurfaceAccess(dstRef, curX, curY, curW, curH), refTexture, &texCoord[0], params);
        }
 
        GLU_EXPECT_NO_ERROR(gl.getError(), "Post render");
@@ -578,8 +574,7 @@ TextureCubeFilteringCase::IterateResult TextureCubeFilteringCase::iterate (void)
                                viewport.x, viewport.y, leftWidth, bottomHeight,
                                m_onlySampleFaceInterior ? tcu::Vec2(-0.81f, -0.81f) : tcu::Vec2(-0.975f, -0.975f),
                                m_onlySampleFaceInterior ? tcu::Vec2( 0.8f,  0.8f) : tcu::Vec2( 0.975f,  0.975f),
-                               !m_onlySampleFaceInterior ? tcu::Vec2(1.3f, 1.25f) : tcu::Vec2(1.0f, 1.0f),
-                               !m_onlySampleFaceInterior);
+                               !m_onlySampleFaceInterior ? tcu::Vec2(1.3f, 1.25f) : tcu::Vec2(1.0f, 1.0f));
 
        // Bottom right: Magnification
        renderFaces(gl,
@@ -588,8 +583,7 @@ TextureCubeFilteringCase::IterateResult TextureCubeFilteringCase::iterate (void)
                                m_renderer,
                                viewport.x+leftWidth, viewport.y, rightWidth, bottomHeight,
                                tcu::Vec2(0.5f, 0.65f), m_onlySampleFaceInterior ? tcu::Vec2(0.8f, 0.8f) : tcu::Vec2(0.975f, 0.975f),
-                               !m_onlySampleFaceInterior ? tcu::Vec2(1.1f, 1.06f) : tcu::Vec2(1.0f, 1.0f),
-                               !m_onlySampleFaceInterior);
+                               !m_onlySampleFaceInterior ? tcu::Vec2(1.1f, 1.06f) : tcu::Vec2(1.0f, 1.0f));
 
        if (m_textures.size() >= 2)
        {
@@ -611,8 +605,7 @@ TextureCubeFilteringCase::IterateResult TextureCubeFilteringCase::iterate (void)
                                viewport.x, viewport.y+bottomHeight, leftWidth, topHeight,
                                m_onlySampleFaceInterior ? tcu::Vec2(-0.81f, -0.81f) : tcu::Vec2(-0.975f, -0.975f),
                                m_onlySampleFaceInterior ? tcu::Vec2( 0.8f,  0.8f) : tcu::Vec2( 0.975f,  0.975f),
-                               !m_onlySampleFaceInterior ? tcu::Vec2(1.3f, 1.25f) : tcu::Vec2(1.0f, 1.0f),
-                               !m_onlySampleFaceInterior);
+                               !m_onlySampleFaceInterior ? tcu::Vec2(1.3f, 1.25f) : tcu::Vec2(1.0f, 1.0f));
 
        // Top right: Magnification
        renderFaces(gl,
@@ -621,8 +614,7 @@ TextureCubeFilteringCase::IterateResult TextureCubeFilteringCase::iterate (void)
                                m_renderer,
                                viewport.x+leftWidth, viewport.y+bottomHeight, rightWidth, topHeight,
                                tcu::Vec2(0.5f, -0.65f), m_onlySampleFaceInterior ? tcu::Vec2(0.8f, -0.8f) : tcu::Vec2(0.975f, -0.975f),
-                               !m_onlySampleFaceInterior ? tcu::Vec2(1.1f, 1.06f) : tcu::Vec2(1.0f, 1.0f),
-                               !m_onlySampleFaceInterior);
+                               !m_onlySampleFaceInterior ? tcu::Vec2(1.1f, 1.06f) : tcu::Vec2(1.0f, 1.0f));
 
        // Read result.
        glu::readPixels(m_renderCtx, viewport.x, viewport.y, renderedFrame.getAccess());

diff --git a/modules/glshared/glsTextureTestUtil.cpp b/modules/glshared/glsTextureTestUtil.cpp
index e0721e6..c87188f 100644 (file)
--- a/modules/glshared/glsTextureTestUtil.cpp
+++ b/modules/glshared/glsTextureTestUtil.cpp
@@ -692,12 +692,6 @@ void sampleTexture (const SurfaceAccess& dst, const tcu::TextureCubeView& src, c
        return sampleTexture(dst, view, sq, tq, rq, params);
 }
 
-// \todo [2013-07-17 pyry] Remove this!
-void sampleTextureMultiFace (const SurfaceAccess& dst, const tcu::TextureCubeView& src, const float* texCoord, const ReferenceParams& params)
-{
-       return sampleTexture(dst, src, texCoord, params);
-}
-
 static void sampleTextureNonProjected (const SurfaceAccess& dst, const tcu::Texture2DArrayView& src, const tcu::Vec4& sq, const tcu::Vec4& tq, const tcu::Vec4& rq, const ReferenceParams& params)
 {
        float           lodBias         = (params.flags & ReferenceParams::USE_BIAS) ? params.bias : 0.0f;
@@ -2110,7 +2104,7 @@ bool verifyTextureResult (tcu::TestContext&                                               testCtx,
 
        DE_ASSERT(getCompareMask(pixelFormat) == lookupPrec.colorMask);
 
-       sampleTextureMultiFace(SurfaceAccess(reference, pixelFormat), src, texCoord, sampleParams);
+       sampleTexture(SurfaceAccess(reference, pixelFormat), src, texCoord, sampleParams);
        numFailedPixels = computeTextureLookupDiff(result, reference.getAccess(), errorMask.getAccess(), src, texCoord, sampleParams, lookupPrec, lodPrec, testCtx.getWatchDog());
 
        if (numFailedPixels > 0)

diff --git a/modules/glshared/glsTextureTestUtil.hpp b/modules/glshared/glsTextureTestUtil.hpp
index f918985..29e27ee 100644 (file)
--- a/modules/glshared/glsTextureTestUtil.hpp
+++ b/modules/glshared/glsTextureTestUtil.hpp
@@ -360,7 +360,6 @@ void                        fetchTexture                            (const SurfaceAccess& dst, const tcu::ConstPixelBufferAcc
 
 void                   sampleTexture                           (const SurfaceAccess& dst, const tcu::Texture2DView&            src, const float* texCoord, const ReferenceParams& params);
 void                   sampleTexture                           (const SurfaceAccess& dst, const tcu::TextureCubeView&          src, const float* texCoord, const ReferenceParams& params);
-void                   sampleTextureMultiFace          (const SurfaceAccess& dst, const tcu::TextureCubeView&          src, const float* texCoord, const ReferenceParams& params);
 void                   sampleTexture                           (const SurfaceAccess& dst, const tcu::Texture2DArrayView&       src, const float* texCoord, const ReferenceParams& params);
 void                   sampleTexture                           (const SurfaceAccess& dst, const tcu::Texture3DView&            src, const float* texCoord, const ReferenceParams& params);
 void                   sampleTexture                           (const SurfaceAccess& dst, const tcu::TextureCubeArrayView&     src, const float* texCoord, const ReferenceParams& params);