[Piglit] [PATCH 3/4] util/gl: Add piglit-shader.[ch] into libpiglitutil_gles3
Chad Versace
chad.versace at linux.intel.com
Fri Nov 30 17:46:48 PST 2012
Eventually. gles3 support will be added shader_runner, and shader_runner
requires piglit-shader.[ch].
Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
---
tests/util/CMakeLists.gles3.txt | 2 ++
tests/util/piglit-shader-gles2.c | 4 ----
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/tests/util/CMakeLists.gles3.txt b/tests/util/CMakeLists.gles3.txt
index d9b78c6..c6567b3 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 c6e6dfb..09ed61f 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) {}
--
1.7.11.7
More information about the Piglit
mailing list