gles2: add minmax testcase

Add minmax test based on values that can be queried as specified
in chapter 6.2 of the OpenGL ES 2.0.25 spec.

Small modification to tests/util/minmax-test.* so that functions
which use GLint64 and GLuint64 types aren't compiled when
building for OpenGL ES 2.

Signed-off-by: Tom Gall <tom.gall@linaro.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

3 files changed, 14 insertions, 4 deletions

diff --git a/tests/util/CMakeLists.gles2.txt b/tests/util/CMakeLists.gles2.txt
index 3df0f6bf..b0d5924a 100644
--- a/tests/util/CMakeLists.gles2.txt
+++ b/tests/util/CMakeLists.gles2.txt
@@ -4,6 +4,7 @@ set(UTIL_GL_SOURCES
 	piglit-shader-gles2.c
 	piglit-util-gl-enum.c
 	piglit-util-gles.c
+	minmax-test.c
 	)
 
 include_directories(
diff --git a/tests/util/minmax-test.c b/tests/util/minmax-test.c
index 9534b182..7eea9170 100644
--- a/tests/util/minmax-test.c
+++ b/tests/util/minmax-test.c
@@ -65,6 +65,7 @@ piglit_report_uint(const char *name, GLuint limit, GLuint val, bool pass)
 	printf("\n");
 }
 
+#if !defined(PIGLIT_USE_OPENGL_ES2)
 static void
 piglit_report_int64(const char *name, GLint64 limit, GLint64 val, bool pass)
 {
@@ -86,6 +87,7 @@ piglit_report_uint64(const char *name, GLuint64 limit, GLuint64 val, bool pass)
 	}
 	printf("\n");
 }
+#endif /* !PIGLIT_USE_OPENGL_ES2 */
 
 static void
 piglit_report_float(const char *name, GLfloat limit, GLfloat val, bool pass)
@@ -125,6 +127,7 @@ piglit_test_uint(GLenum token, GLuint limit, bool max)
 			   (!max && val >= limit));
 }
 
+#if !defined(PIGLIT_USE_OPENGL_ES2)
 static void
 piglit_test_int64(GLenum token, GLint64 limit, bool max)
 {
@@ -163,6 +166,7 @@ piglit_test_uint64(GLenum token, GLuint64 limit, bool max)
 			     (max && val <= limit) ||
 			     (!max && val >= limit));
 }
+#endif /* !PIGLIT_USE_OPENGL_ES2 */
 
 void piglit_test_min_int(GLenum token, GLint min)
 {
@@ -184,6 +188,7 @@ void piglit_test_max_uint(GLenum token, GLuint max)
 	piglit_test_uint(token, max, true);
 }
 
+#if !defined(PIGLIT_USE_OPENGL_ES2)
 void piglit_test_min_int64(GLenum token, GLint64 min)
 {
 	piglit_test_int64(token, min, false);
@@ -203,6 +208,7 @@ void piglit_test_max_uint64(GLenum token, GLuint64 max)
 {
 	piglit_test_uint64(token, max, true);
 }
+#endif /* !PIGLIT_USE_OPENGL_ES2 */
 
 static void
 piglit_test_float(GLenum token, GLfloat limit, bool max)
diff --git a/tests/util/minmax-test.h b/tests/util/minmax-test.h
index a2611479..1206716a 100644
--- a/tests/util/minmax-test.h
+++ b/tests/util/minmax-test.h
@@ -27,15 +27,18 @@ void piglit_test_min_int(GLenum token, GLint val);
 void piglit_test_max_int(GLenum token, GLint val);
 void piglit_test_min_uint(GLenum token, GLuint val);
 void piglit_test_max_uint(GLenum token, GLuint val);
-void piglit_test_min_int64(GLenum token, GLint64 min);
-void piglit_test_max_int64(GLenum token, GLint64 min);
-void piglit_test_min_uint64(GLenum token, GLuint64 min);
-void piglit_test_max_uint64(GLenum token, GLuint64 min);
 void piglit_test_min_float(GLenum token, GLfloat val);
 void piglit_test_max_float(GLenum token, GLfloat val);
 void piglit_test_range_float(GLenum token, GLfloat low, GLfloat high);
 void piglit_test_min_viewport_dimensions();
 
+#if !defined(PIGLIT_USE_OPENGL_ES2)
+void piglit_test_min_int64(GLenum token, GLint64 min);
+void piglit_test_max_int64(GLenum token, GLint64 min);
+void piglit_test_min_uint64(GLenum token, GLuint64 min);
+void piglit_test_max_uint64(GLenum token, GLuint64 min);
+#endif /* !PIGLIT_USE_OPENGL_ES2 */
+
 #ifdef PIGLIT_USE_OPENGL
 void piglit_test_oq_bits(void);
 void piglit_test_tf_bits(GLenum target);