projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 6c5347e)
Use de::min instead of std::min
authorMikael Tuomisalo <mikael.tuomisalo@siru.fi>
Mon, 9 Apr 2018 18:50:26 +0000 (11:50 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 9 Apr 2018 18:50:26 +0000 (11:50 -0700)
am: 1d08d3f4fe

Change-Id: I2fe6933d6123432679d00448599a74c9e6e4d134

modules/gles2/functional/es2fTextureSizeTests.cpp patch | blob | history
modules/gles3/functional/es3fTextureSizeTests.cpp patch | blob | history

diff --git a/modules/gles2/functional/es2fTextureSizeTests.cpp b/modules/gles2/functional/es2fTextureSizeTests.cpp
index f7627b9..dbf2776 100644 (file)
--- a/modules/gles2/functional/es2fTextureSizeTests.cpp
+++ b/modules/gles2/functional/es2fTextureSizeTests.cpp
@@ -124,7 +124,7 @@ Texture2DSizeCase::IterateResult Texture2DSizeCase::iterate (void)
        tcu::Surface                    referenceFrame  (viewport.width, viewport.height);
        const tcu::IVec4                texBits                 = tcu::getTextureFormatBitDepth(glu::mapGLTransferFormat(m_format, m_dataType));
        const tcu::PixelFormat& rtFmt                   = m_renderCtx.getRenderTarget().getPixelFormat();
-       const tcu::PixelFormat  thresholdFormat(std::min(texBits[0], rtFmt.redBits), std::min(texBits[1], rtFmt.greenBits), std::min(texBits[2], rtFmt.blueBits), std::min(texBits[3], rtFmt.alphaBits));
+       const tcu::PixelFormat  thresholdFormat(de::min(texBits[0], rtFmt.redBits), de::min(texBits[1], rtFmt.greenBits), de::min(texBits[2], rtFmt.blueBits), de::min(texBits[3], rtFmt.alphaBits));
        tcu::RGBA                               threshold               = thresholdFormat.getColorThreshold() + tcu::RGBA(7,7,7,7);
        deUint32                                wrapS                   = GL_CLAMP_TO_EDGE;
        deUint32                                wrapT                   = GL_CLAMP_TO_EDGE;
@@ -270,7 +270,7 @@ bool TextureCubeSizeCase::testFace (tcu::CubeFace face)
        tcu::Surface                    referenceFrame  (viewport.width, viewport.height);
        const tcu::IVec4                texBits                 = tcu::getTextureFormatBitDepth(glu::mapGLTransferFormat(m_format, m_dataType));
        const tcu::PixelFormat& rtFmt                   = m_renderCtx.getRenderTarget().getPixelFormat();
-       const tcu::PixelFormat  thresholdFormat(std::min(texBits[0], rtFmt.redBits), std::min(texBits[1], rtFmt.greenBits), std::min(texBits[2], rtFmt.blueBits), std::min(texBits[3], rtFmt.alphaBits));
+       const tcu::PixelFormat  thresholdFormat(de::min(texBits[0], rtFmt.redBits), de::min(texBits[1], rtFmt.greenBits), de::min(texBits[2], rtFmt.blueBits), de::min(texBits[3], rtFmt.alphaBits));
        tcu::RGBA                               threshold               = thresholdFormat.getColorThreshold() + tcu::RGBA(7,7,7,7);
        deUint32                                wrapS                   = GL_CLAMP_TO_EDGE;
        deUint32                                wrapT                   = GL_CLAMP_TO_EDGE;
diff --git a/modules/gles3/functional/es3fTextureSizeTests.cpp b/modules/gles3/functional/es3fTextureSizeTests.cpp
index 6eeed5a..4e09fb5 100644 (file)
--- a/modules/gles3/functional/es3fTextureSizeTests.cpp
+++ b/modules/gles3/functional/es3fTextureSizeTests.cpp
@@ -125,7 +125,7 @@ Texture2DSizeCase::IterateResult Texture2DSizeCase::iterate (void)
        tcu::Surface                    referenceFrame  (viewport.width, viewport.height);
        const tcu::IVec4                texBits                 = tcu::getTextureFormatBitDepth(glu::mapGLTransferFormat(m_format, m_dataType));
        const tcu::PixelFormat& rtFmt                   = m_renderCtx.getRenderTarget().getPixelFormat();
-       const tcu::PixelFormat  thresholdFormat(std::min(texBits[0], rtFmt.redBits), std::min(texBits[1], rtFmt.greenBits), std::min(texBits[2], rtFmt.blueBits), std::min(texBits[3], rtFmt.alphaBits));
+       const tcu::PixelFormat  thresholdFormat(de::min(texBits[0], rtFmt.redBits), de::min(texBits[1], rtFmt.greenBits), de::min(texBits[2], rtFmt.blueBits), de::min(texBits[3], rtFmt.alphaBits));
        tcu::RGBA                               threshold               = thresholdFormat.getColorThreshold() + tcu::RGBA(7,7,7,7);
        deUint32                                wrapS                   = GL_CLAMP_TO_EDGE;
        deUint32                                wrapT                   = GL_CLAMP_TO_EDGE;
@@ -271,7 +271,7 @@ bool TextureCubeSizeCase::testFace (tcu::CubeFace face)
        tcu::Surface                    referenceFrame  (viewport.width, viewport.height);
        const tcu::IVec4                texBits                 = tcu::getTextureFormatBitDepth(glu::mapGLTransferFormat(m_format, m_dataType));
        const tcu::PixelFormat& rtFmt                   = m_renderCtx.getRenderTarget().getPixelFormat();
-       const tcu::PixelFormat  thresholdFormat(std::min(texBits[0], rtFmt.redBits), std::min(texBits[1], rtFmt.greenBits), std::min(texBits[2], rtFmt.blueBits), std::min(texBits[3], rtFmt.alphaBits));
+       const tcu::PixelFormat  thresholdFormat(de::min(texBits[0], rtFmt.redBits), de::min(texBits[1], rtFmt.greenBits), de::min(texBits[2], rtFmt.blueBits), de::min(texBits[3], rtFmt.alphaBits));
        tcu::RGBA                               threshold               = thresholdFormat.getColorThreshold() + tcu::RGBA(7,7,7,7);
        deUint32                                wrapS                   = GL_CLAMP_TO_EDGE;
        deUint32                                wrapT                   = GL_CLAMP_TO_EDGE;
Domain: Graphics System / GL;