From e0f21cf5f2ee3a06c497f32a4392d23e4bbcd573 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mika=20Isoj=C3=A4rvi?= Date: Tue, 17 Feb 2015 15:49:23 -0800 Subject: [PATCH] Fix norm and snorm clear values on read pixel tests. Test was assuming that we are always using unorm8 format and converting float to integer color value by multiplying by 255. Bug: 19409759 Change-Id: I7b36701e396363ec880bef7ef7aef12055c304fc --- modules/gles2/functional/es2fReadPixelsTests.cpp | 5 +---- modules/gles3/functional/es3fReadPixelsTests.cpp | 15 +++------------ 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/modules/gles2/functional/es2fReadPixelsTests.cpp b/modules/gles2/functional/es2fReadPixelsTests.cpp index c16630f..29fe9c1 100644 --- a/modules/gles2/functional/es2fReadPixelsTests.cpp +++ b/modules/gles2/functional/es2fReadPixelsTests.cpp @@ -194,10 +194,7 @@ TestCase::IterateResult ReadPixelsTest::iterate (void) GLU_CHECK_CALL(glClearColor(red, green, blue, alpha)); GLU_CHECK_CALL(glClear(GL_COLOR_BUFFER_BIT)); - // Clear reference - for (int x = 0; x < reference.getWidth(); x++) - for (int y = 0; y < reference.getHeight(); y++) - reference.getLevel(0).setPixel(tcu::Vec4(red, green, blue, alpha), x, y); + tcu::clear(reference.getLevel(0), tcu::Vec4(red, green, blue, alpha)); } render(reference); diff --git a/modules/gles3/functional/es3fReadPixelsTests.cpp b/modules/gles3/functional/es3fReadPixelsTests.cpp index 09e9877..f44ece8 100644 --- a/modules/gles3/functional/es3fReadPixelsTests.cpp +++ b/modules/gles3/functional/es3fReadPixelsTests.cpp @@ -255,10 +255,7 @@ void ReadPixelsTest::clearColor (tcu::Texture2D& reference, vector& pix GLU_CHECK_CALL(glClearBufferfv(GL_COLOR, 0, color)); - // Clear reference - for (int x = 0; x < reference.getWidth(); x++) - for (int y = 0; y < reference.getHeight(); y++) - reference.getLevel(0).setPixel(tcu::UVec4((deUint32)(255.0f * red), (deUint32)(255.0f * green), (deUint32)(255.0f * blue), (deUint32)(255 * alpha)), x, y); + tcu::clear(reference.getLevel(0), tcu::Vec4(red, green, blue, alpha)); } else if (m_format == GL_RGBA_INTEGER) { @@ -274,10 +271,7 @@ void ReadPixelsTest::clearColor (tcu::Texture2D& reference, vector& pix GLU_CHECK_CALL(glClearBufferiv(GL_COLOR, 0, color)); - // Clear reference - for (int x = 0; x < reference.getWidth(); x++) - for (int y = 0; y < reference.getHeight(); y++) - reference.getLevel(0).setPixel(tcu::IVec4(red, green, blue, alpha), x, y); + tcu::clear(reference.getLevel(0), tcu::IVec4(red, green, blue, alpha)); } else if (m_type == GL_UNSIGNED_INT) { @@ -291,10 +285,7 @@ void ReadPixelsTest::clearColor (tcu::Texture2D& reference, vector& pix GLU_CHECK_CALL(glClearBufferuiv(GL_COLOR, 0, color)); - // Clear reference - for (int x = 0; x < reference.getWidth(); x++) - for (int y = 0; y < reference.getHeight(); y++) - reference.getLevel(0).setPixel(tcu::UVec4(red, green, blue, alpha), x, y); + tcu::clear(reference.getLevel(0), tcu::UVec4(red, green, blue, alpha)); } else DE_ASSERT(false); -- 2.7.4