aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChad Versace <chad.versace@linux.intel.com>2012-11-30 15:20:24 -0800
committerChad Versace <chad.versace@linux.intel.com>2012-11-30 18:46:16 -0800
commitdb1247ab44db2670d6a2b111b1b960934b3e8f14 (patch)
treeec58b0aa5f6e6bd91532f8f3f882fa4b46383718
parentf7819ceb685e6ba6d297944397f971f693e8735b (diff)
util/gl: Add piglit-shader.[ch] into libpiglitutil_gles3
Eventually. gles3 support will be added shader_runner, and shader_runner requires piglit-shader.[ch]. Signed-off-by: Chad Versace <chad.versace@linux.intel.com> Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
-rw-r--r--tests/util/CMakeLists.gles3.txt2
-rw-r--r--tests/util/piglit-shader-gles2.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/util/CMakeLists.gles3.txt b/tests/util/CMakeLists.gles3.txt
index d9b78c6b..c6567b3e 100644
--- a/tests/util/CMakeLists.gles3.txt
+++ b/tests/util/CMakeLists.gles3.txt
@@ -1,5 +1,7 @@
list(APPEND UTIL_GL_SOURCES
minmax-test.c
+ piglit-shader.c
+ piglit-shader-gles2.c # Compatible with gles3.
piglit-util-gles.c
piglit-util-gles3-enum.c
)
diff --git a/tests/util/piglit-shader-gles2.c b/tests/util/piglit-shader-gles2.c
index c6e6dfb0..09ed61fa 100644
--- a/tests/util/piglit-shader-gles2.c
+++ b/tests/util/piglit-shader-gles2.c
@@ -21,10 +21,6 @@
* DEALINGS IN THE SOFTWARE.
*/
-#ifndef PIGLIT_USE_OPENGL_ES2
-# error PIGLIT_USE_OPENGL_ES2 is undefined
-#endif
-
#include "piglit-util-gl-common.h"
void piglit_require_GLSL(void) {}