commit 859dcb883effb4f57417666e3218b6d28645aeee
author Geoff Lang <geofflang@chromium.org> Mon May 25 15:12:54 2015 +0000
committer Geoff Lang <geofflang@chromium.org> Mon May 25 15:13:05 2015 +0000
tree df71ba2e25a7a6f80f7debbd756fb23307723d8e
parent db39e7f5dd38c5bdbff08c929288350e643eb0bc

Revert "Add table entries for almost all the remaining GL texture formats."

Missing include of <limits> for linux.

This reverts commit aa3a5fadebb2bad0be07eb2963a9d23f901c4c49.

Change-Id: Iafebfbc6154b4fe3a94e3f8b91b5ff496631c1f1
Reviewed-on: https://chromium-review.googlesource.com/273134
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/tests/gl_tests/BlendMinMaxTest.cpp

diff --git a/src/tests/gl_tests/BlendMinMaxTest.cpp b/src/tests/gl_tests/BlendMinMaxTest.cpp
index 79d9113..260f45a 100644
--- a/src/tests/gl_tests/BlendMinMaxTest.cpp
+++ b/src/tests/gl_tests/BlendMinMaxTest.cpp
@@ -36,7 +36,7 @@
         return blendMin ? std::min<GLubyte>(curAsUbyte, prevColor) : std::max<GLubyte>(curAsUbyte, prevColor);
     }
 
-    void runTest(GLenum colorFormat)
+    void runTest()
     {
         if (getClientVersion() < 3 && !extensionEnabled("GL_EXT_blend_minmax"))
         {
@@ -44,8 +44,6 @@
             return;
         }
 
-        SetUpFramebuffer(colorFormat);
-
         const size_t colorCount = 1024;
         Color colors[colorCount];
         for (size_t i = 0; i < colorCount; i++)
@@ -154,7 +152,8 @@
 
 TEST_P(BlendMinMaxTest, RGBA8)
 {
-    runTest(GL_RGBA8);
+    SetUpFramebuffer(GL_RGBA8);
+    runTest();
 }
 
 TEST_P(BlendMinMaxTest, RGBA32f)
@@ -165,7 +164,8 @@
         return;
     }
 
-    runTest(GL_RGBA32F);
+    SetUpFramebuffer(GL_RGBA32F);
+    runTest();
 }
 
 TEST_P(BlendMinMaxTest, RGBA16F)
@@ -176,7 +176,8 @@
         return;
     }
 
-    runTest(GL_RGBA16F);
+    SetUpFramebuffer(GL_RGBA16F);
+    runTest();
 }
 
 // Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.