Use TestLog, not TestContext, in gls::TextureTestUtil::TextureRenderer.

Change-Id: I7307b039777a2fe041e41379712e4f66d4a5e440

diff --git a/modules/gles2/accuracy/es2aTextureFilteringTests.cpp b/modules/gles2/accuracy/es2aTextureFilteringTests.cpp
index 2321491..03d7689 100644 (file)
--- a/modules/gles2/accuracy/es2aTextureFilteringTests.cpp
+++ b/modules/gles2/accuracy/es2aTextureFilteringTests.cpp
@@ -97,7 +97,7 @@ Texture2DFilteringCase::Texture2DFilteringCase (tcu::TestContext& testCtx, glu::
        , m_dataType            (dataType)
        , m_width                       (width)
        , m_height                      (height)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
 {
 }
 
@@ -114,7 +114,7 @@ Texture2DFilteringCase::Texture2DFilteringCase (tcu::TestContext& testCtx, glu::
        , m_width                       (0)
        , m_height                      (0)
        , m_filenames           (filenames)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
 {
 }
 
@@ -358,7 +358,7 @@ TextureCubeFilteringCase::TextureCubeFilteringCase (tcu::TestContext& testCtx, g
        , m_dataType                            (dataType)
        , m_width                                       (width)
        , m_height                                      (height)
-       , m_renderer                            (renderCtx, testCtx, glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
+       , m_renderer                            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
 {
 }
 
@@ -375,7 +375,7 @@ TextureCubeFilteringCase::TextureCubeFilteringCase (tcu::TestContext& testCtx, g
        , m_width                                       (0)
        , m_height                                      (0)
        , m_filenames                           (filenames)
-       , m_renderer                            (renderCtx, testCtx, glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
+       , m_renderer                            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
 {
 }
 

diff --git a/modules/gles2/accuracy/es2aTextureMipmapTests.cpp b/modules/gles2/accuracy/es2aTextureMipmapTests.cpp
index 6e47861..5387749 100644 (file)
--- a/modules/gles2/accuracy/es2aTextureMipmapTests.cpp
+++ b/modules/gles2/accuracy/es2aTextureMipmapTests.cpp
@@ -137,7 +137,7 @@ Texture2DMipmapCase::Texture2DMipmapCase (tcu::TestContext&                 testCtx,
        , m_width                       (width)
        , m_height                      (height)
        , m_texture                     (DE_NULL)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_100_ES,
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_100_ES,
                                                 renderCtxInfo.isFragmentHighPrecisionSupported() ? glu::PRECISION_HIGHP // Use highp if available.
                                                                                                                                                  : glu::PRECISION_MEDIUMP)
 {
@@ -434,7 +434,7 @@ TextureCubeMipmapCase::TextureCubeMipmapCase (tcu::TestContext&                     testCtx,
        , m_dataType            (dataType)
        , m_size                        (size)
        , m_texture                     (DE_NULL)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_100_ES,
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_100_ES,
                                                 renderCtxInfo.isFragmentHighPrecisionSupported() ? glu::PRECISION_HIGHP // Use highp if available.
                                                                                                                                                  : glu::PRECISION_MEDIUMP)
 {

diff --git a/modules/gles2/functional/es2fTextureCompletenessTests.cpp b/modules/gles2/functional/es2fTextureCompletenessTests.cpp
index a4c92db..0e67950 100644 (file)
--- a/modules/gles2/functional/es2fTextureCompletenessTests.cpp
+++ b/modules/gles2/functional/es2fTextureCompletenessTests.cpp
@@ -151,7 +151,7 @@ Tex2DCompletenessCase::IterateResult Tex2DCompletenessCase::iterate (void)
        int                                     viewportWidth   = de::min(64, m_renderCtx.getRenderTarget().getWidth());
        int                                     viewportHeight  = de::min(64, m_renderCtx.getRenderTarget().getHeight());
        TestLog&                        log                             = m_testCtx.getLog();
-       TextureRenderer         renderer                (m_renderCtx, m_testCtx, glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP);
+       TextureRenderer         renderer                (m_renderCtx, log, glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP);
        tcu::Surface            renderedFrame   (viewportWidth, viewportHeight);
        vector<float>           texCoord;
 
@@ -204,7 +204,7 @@ TexCubeCompletenessCase::IterateResult TexCubeCompletenessCase::iterate (void)
        int                                     viewportHeight  = de::min(64, m_renderCtx.getRenderTarget().getHeight());
        bool                            allFacesOk              = true;
        TestLog&                        log                             = m_testCtx.getLog();
-       TextureRenderer         renderer                (m_renderCtx, m_testCtx, glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP);
+       TextureRenderer         renderer                (m_renderCtx, log, glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP);
        tcu::Surface            renderedFrame   (viewportWidth, viewportHeight);
        vector<float>           texCoord;
 

diff --git a/modules/gles2/functional/es2fTextureFilteringTests.cpp b/modules/gles2/functional/es2fTextureFilteringTests.cpp
index 784faae..1e9d5c4 100644 (file)
--- a/modules/gles2/functional/es2fTextureFilteringTests.cpp
+++ b/modules/gles2/functional/es2fTextureFilteringTests.cpp
@@ -126,7 +126,7 @@ Texture2DFilteringCase::Texture2DFilteringCase (tcu::TestContext& testCtx, glu::
        , m_dataType            (dataType)
        , m_width                       (width)
        , m_height                      (height)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
        , m_caseNdx                     (0)
 {
 }
@@ -144,7 +144,7 @@ Texture2DFilteringCase::Texture2DFilteringCase (tcu::TestContext& testCtx, glu::
        , m_width                       (0)
        , m_height                      (0)
        , m_filenames           (filenames)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
        , m_caseNdx                     (0)
 {
 }
@@ -389,7 +389,7 @@ TextureCubeFilteringCase::TextureCubeFilteringCase (tcu::TestContext& testCtx, g
        , m_dataType                            (dataType)
        , m_width                                       (width)
        , m_height                                      (height)
-       , m_renderer                            (renderCtx, testCtx, glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
+       , m_renderer                            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
        , m_caseNdx                                     (0)
 {
 }
@@ -407,7 +407,7 @@ TextureCubeFilteringCase::TextureCubeFilteringCase (tcu::TestContext& testCtx, g
        , m_width                                       (0)
        , m_height                                      (0)
        , m_filenames                           (filenames)
-       , m_renderer                            (renderCtx, testCtx, glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
+       , m_renderer                            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
        , m_caseNdx                                     (0)
 {
 }

diff --git a/modules/gles2/functional/es2fTextureFormatTests.cpp b/modules/gles2/functional/es2fTextureFormatTests.cpp
index a3e422d..9b8f4b2 100644 (file)
--- a/modules/gles2/functional/es2fTextureFormatTests.cpp
+++ b/modules/gles2/functional/es2fTextureFormatTests.cpp
@@ -96,7 +96,7 @@ Texture2DFormatCase::Texture2DFormatCase (tcu::TestContext& testCtx, glu::Render
        , m_width               (width)
        , m_height              (height)
        , m_texture             (DE_NULL)
-       , m_renderer    (renderCtx, testCtx, glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
+       , m_renderer    (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
 {
 }
 
@@ -240,7 +240,7 @@ TextureCubeFormatCase::TextureCubeFormatCase (tcu::TestContext& testCtx, glu::Re
        , m_width               (width)
        , m_height              (height)
        , m_texture             (DE_NULL)
-       , m_renderer    (renderCtx, testCtx, glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
+       , m_renderer    (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
        , m_curFace             (0)
        , m_isOk                (false)
 {
@@ -420,7 +420,7 @@ Compressed2DFormatCase::Compressed2DFormatCase (tcu::TestContext& testCtx, glu::
        , m_renderCtxInfo       (renderCtxInfo)
        , m_filenames           (filenames)
        , m_texture                     (DE_NULL)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
 {
 }
 
@@ -525,7 +525,7 @@ CompressedCubeFormatCase::CompressedCubeFormatCase (tcu::TestContext& testCtx, g
        , m_renderCtxInfo       (renderCtxInfo)
        , m_filenames           (filenames)
        , m_texture                     (DE_NULL)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
        , m_curFace                     (0)
        , m_isOk                        (false)
 {

diff --git a/modules/gles2/functional/es2fTextureMipmapTests.cpp b/modules/gles2/functional/es2fTextureMipmapTests.cpp
index e22ca8f..d1de440 100644 (file)
--- a/modules/gles2/functional/es2fTextureMipmapTests.cpp
+++ b/modules/gles2/functional/es2fTextureMipmapTests.cpp
@@ -138,7 +138,7 @@ Texture2DMipmapCase::Texture2DMipmapCase (tcu::TestContext&                 testCtx,
        , m_width                       (width)
        , m_height                      (height)
        , m_texture                     (DE_NULL)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_100_ES,
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_100_ES,
                                                 renderCtxInfo.isFragmentHighPrecisionSupported() ? glu::PRECISION_HIGHP // Use highp if available.
                                                                                                                                                  : glu::PRECISION_MEDIUMP)
 {
@@ -488,7 +488,7 @@ TextureCubeMipmapCase::TextureCubeMipmapCase (tcu::TestContext&                     testCtx,
        , m_dataType            (dataType)
        , m_size                        (size)
        , m_texture                     (DE_NULL)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_100_ES,
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_100_ES,
                                                 renderCtxInfo.isFragmentHighPrecisionSupported() ? glu::PRECISION_HIGHP // Use highp if available.
                                                                                                                                                  : glu::PRECISION_MEDIUMP)
 {
@@ -783,7 +783,7 @@ Texture2DGenMipmapCase::Texture2DGenMipmapCase (tcu::TestContext& testCtx, glu::
        , m_width                       (width)
        , m_height                      (height)
        , m_texture                     (DE_NULL)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
 {
 }
 
@@ -917,7 +917,7 @@ TextureCubeGenMipmapCase::TextureCubeGenMipmapCase (tcu::TestContext& testCtx, g
        , m_hint                        (hint)
        , m_size                        (size)
        , m_texture                     (DE_NULL)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
 {
 }
 

diff --git a/modules/gles2/functional/es2fTextureSizeTests.cpp b/modules/gles2/functional/es2fTextureSizeTests.cpp
index 5fcd23f..7a88e71 100644 (file)
--- a/modules/gles2/functional/es2fTextureSizeTests.cpp
+++ b/modules/gles2/functional/es2fTextureSizeTests.cpp
@@ -82,7 +82,7 @@ Texture2DSizeCase::Texture2DSizeCase (tcu::TestContext& testCtx, glu::RenderCont
        , m_height              (height)
        , m_useMipmaps  (mipmaps)
        , m_texture             (DE_NULL)
-       , m_renderer    (renderCtx, testCtx, glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
+       , m_renderer    (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
 {
 }
 
@@ -202,7 +202,7 @@ TextureCubeSizeCase::TextureCubeSizeCase (tcu::TestContext& testCtx, glu::Render
        , m_height              (height)
        , m_useMipmaps  (mipmaps)
        , m_texture             (DE_NULL)
-       , m_renderer    (renderCtx, testCtx, glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
+       , m_renderer    (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
        , m_curFace             (0)
        , m_isOk                (false)
 {

diff --git a/modules/gles2/functional/es2fTextureWrapTests.cpp b/modules/gles2/functional/es2fTextureWrapTests.cpp
index f1a3b80..40ad350 100644 (file)
--- a/modules/gles2/functional/es2fTextureWrapTests.cpp
+++ b/modules/gles2/functional/es2fTextureWrapTests.cpp
@@ -99,7 +99,7 @@ TextureWrapCase::TextureWrapCase (tcu::TestContext& testCtx, glu::RenderContext&
        , m_width                       (width)
        , m_height                      (height)
        , m_texture                     (DE_NULL)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
 {
 }
 
@@ -117,7 +117,7 @@ TextureWrapCase::TextureWrapCase (tcu::TestContext& testCtx, glu::RenderContext&
        , m_height                      (0)
        , m_filenames           (filenames)
        , m_texture                     (DE_NULL)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_100_ES, glu::PRECISION_MEDIUMP)
 {
 }
 

diff --git a/modules/gles3/accuracy/es3aTextureFilteringTests.cpp b/modules/gles3/accuracy/es3aTextureFilteringTests.cpp
index 25fe515..b2a0e18 100644 (file)
--- a/modules/gles3/accuracy/es3aTextureFilteringTests.cpp
+++ b/modules/gles3/accuracy/es3aTextureFilteringTests.cpp
@@ -90,7 +90,7 @@ Texture2DFilteringCase::Texture2DFilteringCase (tcu::TestContext& testCtx, glu::
        , m_internalFormat      (internalFormat)
        , m_width                       (width)
        , m_height                      (height)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
 {
 }
 
@@ -106,7 +106,7 @@ Texture2DFilteringCase::Texture2DFilteringCase (tcu::TestContext& testCtx, glu::
        , m_width                       (0)
        , m_height                      (0)
        , m_filenames           (filenames)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_100_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_100_ES, glu::PRECISION_HIGHP)
 {
 }
 
@@ -346,7 +346,7 @@ TextureCubeFilteringCase::TextureCubeFilteringCase (tcu::TestContext& testCtx, g
        , m_internalFormat                      (internalFormat)
        , m_width                                       (width)
        , m_height                                      (height)
-       , m_renderer                            (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer                            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
 {
 }
 
@@ -363,7 +363,7 @@ TextureCubeFilteringCase::TextureCubeFilteringCase (tcu::TestContext& testCtx, g
        , m_width                                       (0)
        , m_height                                      (0)
        , m_filenames                           (filenames)
-       , m_renderer                            (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer                            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
 {
 }
 

diff --git a/modules/gles3/accuracy/es3aTextureMipmapTests.cpp b/modules/gles3/accuracy/es3aTextureMipmapTests.cpp
index 67a700c..630a57a 100644 (file)
--- a/modules/gles3/accuracy/es3aTextureMipmapTests.cpp
+++ b/modules/gles3/accuracy/es3aTextureMipmapTests.cpp
@@ -134,7 +134,7 @@ Texture2DMipmapCase::Texture2DMipmapCase (tcu::TestContext&                 testCtx,
        , m_width                       (width)
        , m_height                      (height)
        , m_texture                     (DE_NULL)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
 {
 }
 
@@ -427,7 +427,7 @@ TextureCubeMipmapCase::TextureCubeMipmapCase (tcu::TestContext&                     testCtx,
        , m_dataType            (dataType)
        , m_size                        (size)
        , m_texture                     (DE_NULL)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
 {
 }
 

diff --git a/modules/gles3/functional/es3fASTCDecompressionCases.cpp b/modules/gles3/functional/es3fASTCDecompressionCases.cpp
index 2aa9001..9611fab 100644 (file)
--- a/modules/gles3/functional/es3fASTCDecompressionCases.cpp
+++ b/modules/gles3/functional/es3fASTCDecompressionCases.cpp
@@ -1649,7 +1649,7 @@ ASTCRenderer2D::ASTCRenderer2D (Context&                  context,
                                                                CompressedTexFormat     format,
                                                                deUint32                        randomSeed)
        : m_context                     (context)
-       , m_renderer            (context.getRenderContext(), context.getTestContext(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (context.getRenderContext(), context.getTestContext().getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
        , m_format                      (format)
        , m_blockSize           (tcu::getBlockPixelSize(format).xy())
        , m_astcSupport         (ASTCSUPPORTLEVEL_NONE)

diff --git a/modules/gles3/functional/es3fTextureFilteringTests.cpp b/modules/gles3/functional/es3fTextureFilteringTests.cpp
index 498e8dc..5f6eaa6 100644 (file)
--- a/modules/gles3/functional/es3fTextureFilteringTests.cpp
+++ b/modules/gles3/functional/es3fTextureFilteringTests.cpp
@@ -127,7 +127,7 @@ Texture2DFilteringCase::Texture2DFilteringCase (tcu::TestContext& testCtx, glu::
        , m_internalFormat      (internalFormat)
        , m_width                       (width)
        , m_height                      (height)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
        , m_caseNdx                     (0)
 {
 }
@@ -144,7 +144,7 @@ Texture2DFilteringCase::Texture2DFilteringCase (tcu::TestContext& testCtx, glu::
        , m_width                       (0)
        , m_height                      (0)
        , m_filenames           (filenames)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
        , m_caseNdx                     (0)
 {
 }
@@ -405,7 +405,7 @@ TextureCubeFilteringCase::TextureCubeFilteringCase (tcu::TestContext& testCtx, g
        , m_internalFormat                      (internalFormat)
        , m_width                                       (width)
        , m_height                                      (height)
-       , m_renderer                            (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer                            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
        , m_caseNdx                                     (0)
 {
 }
@@ -423,7 +423,7 @@ TextureCubeFilteringCase::TextureCubeFilteringCase (tcu::TestContext& testCtx, g
        , m_width                                       (0)
        , m_height                                      (0)
        , m_filenames                           (filenames)
-       , m_renderer                            (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer                            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
        , m_caseNdx                                     (0)
 {
 }
@@ -718,7 +718,7 @@ Texture2DArrayFilteringCase::Texture2DArrayFilteringCase (Context& context, cons
        , m_numLayers           (numLayers)
        , m_gradientTex         (DE_NULL)
        , m_gridTex                     (DE_NULL)
-       , m_renderer            (m_context.getRenderContext(), context.getTestContext(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (context.getRenderContext(), context.getTestContext().getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
        , m_caseNdx                     (0)
 {
 }
@@ -983,7 +983,7 @@ Texture3DFilteringCase::Texture3DFilteringCase (Context& context, const char* na
        , m_depth                       (depth)
        , m_gradientTex         (DE_NULL)
        , m_gridTex                     (DE_NULL)
-       , m_renderer            (m_context.getRenderContext(), context.getTestContext(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (context.getRenderContext(), context.getTestContext().getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
        , m_caseNdx                     (0)
 {
 }

diff --git a/modules/gles3/functional/es3fTextureFormatTests.cpp b/modules/gles3/functional/es3fTextureFormatTests.cpp
index 2ae60cc..629fe84 100644 (file)
--- a/modules/gles3/functional/es3fTextureFormatTests.cpp
+++ b/modules/gles3/functional/es3fTextureFormatTests.cpp
@@ -96,7 +96,7 @@ Texture2DFormatCase::Texture2DFormatCase (tcu::TestContext& testCtx, glu::Render
        , m_width               (width)
        , m_height              (height)
        , m_texture             (DE_NULL)
-       , m_renderer    (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer    (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
 {
 }
 
@@ -108,7 +108,7 @@ Texture2DFormatCase::Texture2DFormatCase (tcu::TestContext& testCtx, glu::Render
        , m_width               (width)
        , m_height              (height)
        , m_texture             (DE_NULL)
-       , m_renderer    (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer    (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
 {
 }
 
@@ -257,7 +257,7 @@ TextureCubeFormatCase::TextureCubeFormatCase (tcu::TestContext& testCtx, glu::Re
        , m_width               (width)
        , m_height              (height)
        , m_texture             (DE_NULL)
-       , m_renderer    (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer    (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
        , m_curFace             (0)
        , m_isOk                (false)
 {
@@ -271,7 +271,7 @@ TextureCubeFormatCase::TextureCubeFormatCase (tcu::TestContext& testCtx, glu::Re
        , m_width               (width)
        , m_height              (height)
        , m_texture             (DE_NULL)
-       , m_renderer    (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer    (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
        , m_curFace             (0)
        , m_isOk                (false)
 {
@@ -453,7 +453,7 @@ Texture2DArrayFormatCase::Texture2DArrayFormatCase (tcu::TestContext& testCtx, g
        , m_height              (height)
        , m_numLayers   (numLayers)
        , m_texture             (DE_NULL)
-       , m_renderer    (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer    (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
        , m_curLayer    (0)
 {
 }
@@ -467,7 +467,7 @@ Texture2DArrayFormatCase::Texture2DArrayFormatCase (tcu::TestContext& testCtx, g
        , m_height              (height)
        , m_numLayers   (numLayers)
        , m_texture             (DE_NULL)
-       , m_renderer    (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer    (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
        , m_curLayer    (0)
 {
 }
@@ -605,7 +605,7 @@ Texture3DFormatCase::Texture3DFormatCase (tcu::TestContext& testCtx, glu::Render
        , m_height              (height)
        , m_depth               (depth)
        , m_texture             (DE_NULL)
-       , m_renderer    (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer    (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
        , m_curSlice    (0)
 {
 }
@@ -619,7 +619,7 @@ Texture3DFormatCase::Texture3DFormatCase (tcu::TestContext& testCtx, glu::Render
        , m_height              (height)
        , m_depth               (depth)
        , m_texture             (DE_NULL)
-       , m_renderer    (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer    (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
        , m_curSlice    (0)
 {
 }
@@ -770,7 +770,7 @@ Compressed2DFormatCase::Compressed2DFormatCase (tcu::TestContext&                   testCtx,
        , m_width                       (width)
        , m_height                      (height)
        , m_texture                     (DE_NULL)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
 {
 }
 
@@ -911,7 +911,7 @@ CompressedCubeFormatCase::CompressedCubeFormatCase (tcu::TestContext&                       testCtx,
        , m_width                       (width)
        , m_height                      (height)
        , m_texture                     (DE_NULL)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
        , m_curFace                     (0)
        , m_isOk                        (false)
 {
@@ -1048,7 +1048,7 @@ Texture2DFileCase::Texture2DFileCase (tcu::TestContext& testCtx, glu::RenderCont
        , m_renderCtxInfo       (renderCtxInfo)
        , m_filenames           (filenames)
        , m_texture                     (DE_NULL)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
 {
 }
 
@@ -1153,7 +1153,7 @@ TextureCubeFileCase::TextureCubeFileCase (tcu::TestContext& testCtx, glu::Render
        , m_renderCtxInfo       (renderCtxInfo)
        , m_filenames           (filenames)
        , m_texture                     (DE_NULL)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
        , m_curFace                     (0)
        , m_isOk                        (false)
 {

diff --git a/modules/gles3/functional/es3fTextureMipmapTests.cpp b/modules/gles3/functional/es3fTextureMipmapTests.cpp
index dd78b96..4afa6de 100644 (file)
--- a/modules/gles3/functional/es3fTextureMipmapTests.cpp
+++ b/modules/gles3/functional/es3fTextureMipmapTests.cpp
@@ -187,7 +187,7 @@ Texture2DMipmapCase::Texture2DMipmapCase (tcu::TestContext&                 testCtx,
        , m_width                       (width)
        , m_height                      (height)
        , m_texture                     (DE_NULL)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
 {
 }
 
@@ -532,7 +532,7 @@ TextureCubeMipmapCase::TextureCubeMipmapCase (tcu::TestContext&                     testCtx,
        , m_dataType            (dataType)
        , m_size                        (size)
        , m_texture                     (DE_NULL)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
 {
 }
 
@@ -822,7 +822,7 @@ Texture2DGenMipmapCase::Texture2DGenMipmapCase (tcu::TestContext& testCtx, glu::
        , m_width                       (width)
        , m_height                      (height)
        , m_texture                     (DE_NULL)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
 {
 }
 
@@ -955,7 +955,7 @@ TextureCubeGenMipmapCase::TextureCubeGenMipmapCase (tcu::TestContext& testCtx, g
        , m_hint                        (hint)
        , m_size                        (size)
        , m_texture                     (DE_NULL)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
 {
 }
 
@@ -1129,7 +1129,7 @@ Texture3DMipmapCase::Texture3DMipmapCase (Context& context, const char* name, co
        , m_height                      (height)
        , m_depth                       (depth)
        , m_texture                     (DE_NULL)
-       , m_renderer            (context.getRenderContext(), m_context.getTestContext(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (context.getRenderContext(), context.getTestContext().getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
 {
 }
 
@@ -1452,7 +1452,7 @@ Texture2DLodControlCase::Texture2DLodControlCase (Context& context, const char*
        , m_texHeight   (64)
        , m_minFilter   (minFilter)
        , m_texture             (DE_NULL)
-       , m_renderer    (context.getRenderContext(), m_context.getTestContext(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer    (context.getRenderContext(), context.getTestContext().getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
 {
 }
 
@@ -1752,7 +1752,7 @@ TextureCubeLodControlCase::TextureCubeLodControlCase (Context& context, const ch
        , m_texSize                     (64)
        , m_minFilter           (minFilter)
        , m_texture                     (DE_NULL)
-       , m_renderer            (context.getRenderContext(), context.getTestContext(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (context.getRenderContext(), context.getTestContext().getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
 {
 }
 
@@ -2071,7 +2071,7 @@ Texture3DLodControlCase::Texture3DLodControlCase (Context& context, const char*
        , m_texDepth            (32)
        , m_minFilter           (minFilter)
        , m_texture                     (DE_NULL)
-       , m_renderer            (context.getRenderContext(), m_context.getTestContext(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (context.getRenderContext(), context.getTestContext().getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
 {
 }
 

diff --git a/modules/gles3/functional/es3fTextureShadowTests.cpp b/modules/gles3/functional/es3fTextureShadowTests.cpp
index 3c4bc21..5feb04f 100644 (file)
--- a/modules/gles3/functional/es3fTextureShadowTests.cpp
+++ b/modules/gles3/functional/es3fTextureShadowTests.cpp
@@ -212,7 +212,7 @@ Texture2DShadowCase::Texture2DShadowCase (Context& context, const char* name, co
        , m_width                       (width)
        , m_height                      (height)
        , m_compareFunc         (compareFunc)
-       , m_renderer            (context.getRenderContext(), context.getTestContext(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (context.getRenderContext(), context.getTestContext().getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
        , m_caseNdx                     (0)
 {
 }
@@ -465,7 +465,7 @@ TextureCubeShadowCase::TextureCubeShadowCase (Context& context, const char* name
        , m_compareFunc         (compareFunc)
        , m_gradientTex         (DE_NULL)
        , m_gridTex                     (DE_NULL)
-       , m_renderer            (context.getRenderContext(), m_context.getTestContext(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (context.getRenderContext(), context.getTestContext().getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
        , m_caseNdx                     (0)
 {
 }
@@ -760,7 +760,7 @@ Texture2DArrayShadowCase::Texture2DArrayShadowCase (Context& context, const char
        , m_compareFunc         (compareFunc)
        , m_gradientTex         (DE_NULL)
        , m_gridTex                     (DE_NULL)
-       , m_renderer            (context.getRenderContext(), context.getTestContext(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (context.getRenderContext(), context.getTestContext().getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
        , m_caseNdx                     (0)
 {
 }

diff --git a/modules/gles3/functional/es3fTextureSizeTests.cpp b/modules/gles3/functional/es3fTextureSizeTests.cpp
index 13eac43..9fbbcc8 100644 (file)
--- a/modules/gles3/functional/es3fTextureSizeTests.cpp
+++ b/modules/gles3/functional/es3fTextureSizeTests.cpp
@@ -82,7 +82,7 @@ Texture2DSizeCase::Texture2DSizeCase (tcu::TestContext& testCtx, glu::RenderCont
        , m_height              (height)
        , m_useMipmaps  (mipmaps)
        , m_texture             (DE_NULL)
-       , m_renderer    (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_MEDIUMP)
+       , m_renderer    (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_MEDIUMP)
 {
 }
 
@@ -202,7 +202,7 @@ TextureCubeSizeCase::TextureCubeSizeCase (tcu::TestContext& testCtx, glu::Render
        , m_height              (height)
        , m_useMipmaps  (mipmaps)
        , m_texture             (DE_NULL)
-       , m_renderer    (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_MEDIUMP)
+       , m_renderer    (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_MEDIUMP)
        , m_curFace             (0)
        , m_isOk                (false)
 {

diff --git a/modules/gles3/functional/es3fTextureSwizzleTests.cpp b/modules/gles3/functional/es3fTextureSwizzleTests.cpp
index fb02ed9..9636619 100644 (file)
--- a/modules/gles3/functional/es3fTextureSwizzleTests.cpp
+++ b/modules/gles3/functional/es3fTextureSwizzleTests.cpp
@@ -109,7 +109,7 @@ Texture2DSwizzleCase::Texture2DSwizzleCase (Context& context, const char* name,
        , m_swizzleB            (swizzleB)
        , m_swizzleA            (swizzleA)
        , m_texture                     (DE_NULL)
-       , m_renderer            (context.getRenderContext(), context.getTestContext(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (context.getRenderContext(), context.getTestContext().getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_HIGHP)
 {
 }
 

diff --git a/modules/gles3/functional/es3fTextureWrapTests.cpp b/modules/gles3/functional/es3fTextureWrapTests.cpp
index c20300d..c274357 100644 (file)
--- a/modules/gles3/functional/es3fTextureWrapTests.cpp
+++ b/modules/gles3/functional/es3fTextureWrapTests.cpp
@@ -141,7 +141,7 @@ TextureWrapCase::TextureWrapCase (tcu::TestContext& testCtx, glu::RenderContext&
        , m_height                              (height)
        , m_caseNdx                             (0)
        , m_texture                             (DE_NULL)
-       , m_renderer                    (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_MEDIUMP)
+       , m_renderer                    (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_MEDIUMP)
 {
 }
 
@@ -161,7 +161,7 @@ TextureWrapCase::TextureWrapCase (tcu::TestContext& testCtx, glu::RenderContext&
        , m_filenames                   (filenames)
        , m_caseNdx                             (0)
        , m_texture                             (DE_NULL)
-       , m_renderer                    (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_MEDIUMP)
+       , m_renderer                    (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_MEDIUMP)
 {
 }
 
@@ -180,7 +180,7 @@ TextureWrapCase::TextureWrapCase (tcu::TestContext& testCtx, glu::RenderContext&
        , m_height                              (height)
        , m_caseNdx                             (0)
        , m_texture                             (DE_NULL)
-       , m_renderer                    (renderCtx, testCtx, glu::GLSL_VERSION_300_ES, glu::PRECISION_MEDIUMP)
+       , m_renderer                    (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_300_ES, glu::PRECISION_MEDIUMP)
 {
 }
 

diff --git a/modules/gles31/functional/es31fCopyImageTests.cpp b/modules/gles31/functional/es31fCopyImageTests.cpp
index 89c458d..b88329f 100644 (file)
--- a/modules/gles31/functional/es31fCopyImageTests.cpp
+++ b/modules/gles31/functional/es31fCopyImageTests.cpp
@@ -1603,13 +1603,13 @@ private:
        struct State
        {
                State (int                                      seed,
-                          tcu::TestContext&    testContext,
+                          tcu::TestLog&                log,
                           glu::RenderContext&  renderContext)
                        : rng                           (seed)
-                       , results                       (testContext.getLog())
+                       , results                       (log)
                        , srcImage                      (NULL)
                        , dstImage                      (NULL)
-                       , textureRenderer       (renderContext, testContext, glu::GLSL_VERSION_310_ES, glu::PRECISION_HIGHP)
+                       , textureRenderer       (renderContext, log, glu::GLSL_VERSION_310_ES, glu::PRECISION_HIGHP)
                {
                }
 
@@ -1691,7 +1691,7 @@ void CopyImageTest::init (void)
                                << m_srcImageInfo
                                << m_dstImageInfo;
 
-               m_state = new State(builder.get(), m_testCtx, m_context.getRenderContext());
+               m_state = new State(builder.get(), m_testCtx.getLog(), m_context.getRenderContext());
        }
 }
 

diff --git a/modules/gles31/functional/es31fTextureFilteringTests.cpp b/modules/gles31/functional/es31fTextureFilteringTests.cpp
index 67eadb1..e26b312 100644 (file)
--- a/modules/gles31/functional/es31fTextureFilteringTests.cpp
+++ b/modules/gles31/functional/es31fTextureFilteringTests.cpp
@@ -184,7 +184,7 @@ TextureCubeArrayFilteringCase::TextureCubeArrayFilteringCase (Context& context,
        , m_onlySampleFaceInterior      (onlySampleFaceInterior)
        , m_gradientTex                         (DE_NULL)
        , m_gridTex                                     (DE_NULL)
-       , m_renderer                            (m_context.getRenderContext(), context.getTestContext(), glu::GLSL_VERSION_310_ES, glu::PRECISION_HIGHP)
+       , m_renderer                            (context.getRenderContext(), context.getTestContext().getLog(), glu::GLSL_VERSION_310_ES, glu::PRECISION_HIGHP)
        , m_caseNdx                                     (0)
 {
 }

diff --git a/modules/gles31/functional/es31fTextureFormatTests.cpp b/modules/gles31/functional/es31fTextureFormatTests.cpp
index f6c9da8..ad35705 100644 (file)
--- a/modules/gles31/functional/es31fTextureFormatTests.cpp
+++ b/modules/gles31/functional/es31fTextureFormatTests.cpp
@@ -108,7 +108,7 @@ TextureCubeArrayFormatCase::TextureCubeArrayFormatCase (tcu::TestContext& testCt
        , m_size                        (size)
        , m_depth                       (depth)
        , m_texture                     (DE_NULL)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_310_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_310_ES, glu::PRECISION_HIGHP)
        , m_curLayerFace        (0)
 {
 }
@@ -122,7 +122,7 @@ TextureCubeArrayFormatCase::TextureCubeArrayFormatCase (tcu::TestContext& testCt
        , m_size                        (size)
        , m_depth                       (depth)
        , m_texture                     (DE_NULL)
-       , m_renderer            (renderCtx, testCtx, glu::GLSL_VERSION_310_ES, glu::PRECISION_HIGHP)
+       , m_renderer            (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_310_ES, glu::PRECISION_HIGHP)
        , m_curLayerFace        (0)
 {
 }
@@ -269,7 +269,7 @@ TextureBufferFormatCase::TextureBufferFormatCase (tcu::TestContext& testCtx, glu
        , m_format              (internalFormat)
        , m_width               (width)
        , m_texture             (DE_NULL)
-       , m_renderer    (renderCtx, testCtx, glu::GLSL_VERSION_310_ES, glu::PRECISION_HIGHP)
+       , m_renderer    (renderCtx, testCtx.getLog(), glu::GLSL_VERSION_310_ES, glu::PRECISION_HIGHP)
 {
 }
 

diff --git a/modules/glshared/glsTextureTestUtil.cpp b/modules/glshared/glsTextureTestUtil.cpp
index ae6a470..72544a9 100644 (file)
--- a/modules/glshared/glsTextureTestUtil.cpp
+++ b/modules/glshared/glsTextureTestUtil.cpp
@@ -1027,9 +1027,9 @@ RandomViewport::RandomViewport (const tcu::RenderTarget& renderTarget, int prefe
        y = rnd.getInt(0, renderTarget.getHeight()      - height);
 }
 
-ProgramLibrary::ProgramLibrary (const glu::RenderContext& context, tcu::TestContext& testCtx, glu::GLSLVersion glslVersion, glu::Precision texCoordPrecision)
+ProgramLibrary::ProgramLibrary (const glu::RenderContext& context, tcu::TestLog& log, glu::GLSLVersion glslVersion, glu::Precision texCoordPrecision)
        : m_context                             (context)
-       , m_testCtx                             (testCtx)
+       , m_log                                 (log)
        , m_glslVersion                 (glslVersion)
        , m_texCoordPrecision   (texCoordPrecision)
 {
@@ -1052,8 +1052,6 @@ void ProgramLibrary::clear (void)
 
 glu::ShaderProgram* ProgramLibrary::getProgram (Program program)
 {
-       TestLog& log = m_testCtx.getLog();
-
        if (m_programs.find(program) != m_programs.end())
                return m_programs[program]; // Return from cache.
 
@@ -1223,7 +1221,7 @@ glu::ShaderProgram* ProgramLibrary::getProgram (Program program)
        glu::ShaderProgram* progObj = new glu::ShaderProgram(m_context, glu::makeVtxFragSources(vertSrc, fragSrc));
        if (!progObj->isOk())
        {
-               log << *progObj;
+               m_log << *progObj;
                delete progObj;
                TCU_FAIL("Failed to compile shader program");
        }
@@ -1241,10 +1239,10 @@ glu::ShaderProgram* ProgramLibrary::getProgram (Program program)
        return progObj;
 }
 
-TextureRenderer::TextureRenderer (const glu::RenderContext& context, tcu::TestContext& testCtx, glu::GLSLVersion glslVersion, glu::Precision texCoordPrecision)
+TextureRenderer::TextureRenderer (const glu::RenderContext& context, tcu::TestLog& log, glu::GLSLVersion glslVersion, glu::Precision texCoordPrecision)
        : m_renderCtx           (context)
-       , m_testCtx                     (testCtx)
-       , m_programLibrary      (context, testCtx, glslVersion, texCoordPrecision)
+       , m_log                         (log)
+       , m_programLibrary      (context, log, glslVersion, texCoordPrecision)
 {
 }
 
@@ -1268,7 +1266,6 @@ void TextureRenderer::renderQuad (int texUnit, const float* texCoord, const Rend
        const glw::Functions&   gl                      = m_renderCtx.getFunctions();
        tcu::Vec4                               wCoord          = params.flags & RenderParams::PROJECTED ? params.w : tcu::Vec4(1.0f);
        bool                                    useBias         = !!(params.flags & RenderParams::USE_BIAS);
-       TestLog&                                log                     = m_testCtx.getLog();
        bool                                    logUniforms     = !!(params.flags & RenderParams::LOG_UNIFORMS);
 
        // Render quad with texture.
@@ -1398,7 +1395,7 @@ void TextureRenderer::renderQuad (int texUnit, const float* texCoord, const Rend
 
        // \todo [2012-09-26 pyry] Move to ProgramLibrary and log unique programs only(?)
        if (params.flags & RenderParams::LOG_PROGRAMS)
-               log << *program;
+               m_log << *program;
 
        GLU_EXPECT_NO_ERROR(gl.getError(), "Set vertex attributes");
 
@@ -1408,20 +1405,20 @@ void TextureRenderer::renderQuad (int texUnit, const float* texCoord, const Rend
 
        gl.uniform1i(gl.getUniformLocation(prog, "u_sampler"), texUnit);
        if (logUniforms)
-               log << TestLog::Message << "u_sampler = " << texUnit << TestLog::EndMessage;
+               m_log << TestLog::Message << "u_sampler = " << texUnit << TestLog::EndMessage;
 
        if (useBias)
        {
                gl.uniform1f(gl.getUniformLocation(prog, "u_bias"), params.bias);
                if (logUniforms)
-                       log << TestLog::Message << "u_bias = " << params.bias << TestLog::EndMessage;
+                       m_log << TestLog::Message << "u_bias = " << params.bias << TestLog::EndMessage;
        }
 
        if (params.samplerType == SAMPLERTYPE_SHADOW)
        {
                gl.uniform1f(gl.getUniformLocation(prog, "u_ref"), params.ref);
                if (logUniforms)
-                       log << TestLog::Message << "u_ref = " << params.ref << TestLog::EndMessage;
+                       m_log << TestLog::Message << "u_ref = " << params.ref << TestLog::EndMessage;
        }
 
        gl.uniform4fv(gl.getUniformLocation(prog, "u_colorScale"),      1, params.colorScale.getPtr());
@@ -1429,8 +1426,8 @@ void TextureRenderer::renderQuad (int texUnit, const float* texCoord, const Rend
 
        if (logUniforms)
        {
-               log << TestLog::Message << "u_colorScale = " << params.colorScale << TestLog::EndMessage;
-               log << TestLog::Message << "u_colorBias = " << params.colorBias << TestLog::EndMessage;
+               m_log << TestLog::Message << "u_colorScale = " << params.colorScale << TestLog::EndMessage;
+               m_log << TestLog::Message << "u_colorBias = " << params.colorBias << TestLog::EndMessage;
        }
 
        GLU_EXPECT_NO_ERROR(gl.getError(), "Set program state");

diff --git a/modules/glshared/glsTextureTestUtil.hpp b/modules/glshared/glsTextureTestUtil.hpp
index e1b01bc..f918985 100644 (file)
--- a/modules/glshared/glsTextureTestUtil.hpp
+++ b/modules/glshared/glsTextureTestUtil.hpp
@@ -189,7 +189,7 @@ enum Program
 class ProgramLibrary
 {
 public:
-                                                                                       ProgramLibrary                  (const glu::RenderContext& context, tcu::TestContext& testCtx, glu::GLSLVersion glslVersion, glu::Precision texCoordPrecision);
+                                                                                       ProgramLibrary                  (const glu::RenderContext& context, tcu::TestLog& log, glu::GLSLVersion glslVersion, glu::Precision texCoordPrecision);
                                                                                        ~ProgramLibrary                 (void);
 
        glu::ShaderProgram*                                             getProgram                              (Program program);
@@ -200,7 +200,7 @@ private:
        ProgramLibrary&                                                 operator=                               (const ProgramLibrary& other);
 
        const glu::RenderContext&                               m_context;
-       tcu::TestContext&                                               m_testCtx;
+       tcu::TestLog&                                                   m_log;
        glu::GLSLVersion                                                m_glslVersion;
        glu::Precision                                                  m_texCoordPrecision;
        std::map<Program, glu::ShaderProgram*>  m_programs;
@@ -209,7 +209,7 @@ private:
 class TextureRenderer
 {
 public:
-                                                               TextureRenderer                 (const glu::RenderContext& context, tcu::TestContext& testCtx, glu::GLSLVersion glslVersion, glu::Precision texCoordPrecision);
+                                                               TextureRenderer                 (const glu::RenderContext& context, tcu::TestLog& log, glu::GLSLVersion glslVersion, glu::Precision texCoordPrecision);
                                                                ~TextureRenderer                (void);
 
        void                                            clear                                   (void); //!< Frees allocated resources. Destructor will call clear() as well.
@@ -222,7 +222,7 @@ private:
        TextureRenderer&                        operator=                               (const TextureRenderer& other);
 
        const glu::RenderContext&       m_renderCtx;
-       tcu::TestContext&                       m_testCtx;
+       tcu::TestLog&                           m_log;
        ProgramLibrary                          m_programLibrary;
 };