Merge "Remove GLES3 interaction.basic_shader.20 from MNC mustpass."

diff --git a/modules/glshared/glsScissorTests.cpp b/modules/glshared/glsScissorTests.cpp
index a08d4d6..6462182 100644 (file)
--- a/modules/glshared/glsScissorTests.cpp
+++ b/modules/glshared/glsScissorTests.cpp
@@ -195,10 +195,10 @@ ScissorCase::IterateResult ScissorCase::iterate (void)
        const glw::Functions&           gl                              = m_renderCtx.getFunctions();
        TestLog&                                        log                             = m_testCtx.getLog();
        const tcu::PixelFormat          renderFormat    = m_renderCtx.getRenderTarget().getPixelFormat();
-       const tcu::Vec4                         threshold               = 0.02f * Vec4(1u << de::max(0, 8 - renderFormat.redBits),
-                                                                                                                          1u << de::max(0, 8 - renderFormat.greenBits),
-                                                                                                                          1u << de::max(0, 8 - renderFormat.blueBits),
-                                                                                                                          1u << de::max(0, 8 - renderFormat.alphaBits));
+       const tcu::Vec4                         threshold               = 0.02f * UVec4(1u << de::max(0, 8 - renderFormat.redBits),
+                                                                                                                               1u << de::max(0, 8 - renderFormat.greenBits),
+                                                                                                                               1u << de::max(0, 8 - renderFormat.blueBits),
+                                                                                                                               1u << de::max(0, 8 - renderFormat.alphaBits)).asFloat();
        const glu::ShaderProgram        shader                  (m_renderCtx, genShaders(glu::getContextTypeGLSLVersion(m_renderCtx.getType())));
 
        const RandomViewport            viewport                (m_renderCtx.getRenderTarget(), 256, 256, deStringHash(getName()));

diff --git a/modules/internal/ditTestPackage.cpp b/modules/internal/ditTestPackage.cpp
index e2be5cd..a290c70 100644 (file)
--- a/modules/internal/ditTestPackage.cpp
+++ b/modules/internal/ditTestPackage.cpp
@@ -78,8 +78,7 @@ public:
 };
 
 TestPackage::TestPackage (tcu::TestContext& testCtx)
-       : tcu::TestPackage      (testCtx, "dE-IT", "drawElements Internal Tests")
-       , m_archive                     (testCtx.getRootArchive(), "internal/")
+       : tcu::TestPackage(testCtx, "dE-IT", "drawElements Internal Tests")
 {
 }
 

diff --git a/modules/internal/ditTestPackage.hpp b/modules/internal/ditTestPackage.hpp
index c42a9ee..d04dfa3 100644 (file)
--- a/modules/internal/ditTestPackage.hpp
+++ b/modules/internal/ditTestPackage.hpp
@@ -25,7 +25,6 @@
 
 #include "tcuDefs.hpp"
 #include "tcuTestPackage.hpp"
-#include "tcuResource.hpp"
 
 namespace dit
 {
@@ -38,10 +37,6 @@ public:
 
        virtual void                                    init                                    (void);
        tcu::TestCaseExecutor*                  createExecutor                  (void) const;
-       tcu::Archive*                                   getArchive                              (void) { return &m_archive; }
-
-private:
-       tcu::ResourcePrefix                             m_archive;
 };
 
 } // dit