[Piglit] [PATCH 05/16] util/shader: Remove empty files piglit-shader-gl*.c

[Chad Versace]

These files are no longer used after moving all their functions to
piglit-shader.c.

Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
---
 tests/util/CMakeLists.gl.txt     |  3 ---
 tests/util/CMakeLists.gles2.txt  |  2 --
 tests/util/CMakeLists.gles3.txt  |  2 --
 tests/util/CMakeLists.txt        |  3 ++-
 tests/util/piglit-shader-gl.c    | 28 ----------------------------
 tests/util/piglit-shader-gles2.c | 24 ------------------------
 6 files changed, 2 insertions(+), 60 deletions(-)
 delete mode 100644 tests/util/piglit-shader-gl.c
 delete mode 100644 tests/util/piglit-shader-gles2.c

diff --git a/tests/util/CMakeLists.gl.txt b/tests/util/CMakeLists.gl.txt
index df32c9c..29e0d12 100644
--- a/tests/util/CMakeLists.gl.txt
+++ b/tests/util/CMakeLists.gl.txt
@@ -1,8 +1,6 @@
 set(UTIL_GL_SOURCES
 	${UTIL_GL_SOURCES}
 	piglit-matrix.c
-	piglit-shader.c
-	piglit-shader-gl.c
 	piglit-test-pattern.cpp
 	piglit-fbo.cpp
 	piglit-vbo.cpp
@@ -28,7 +26,6 @@ IF(PIGLIT_BUILD_GLX_TESTS)
 	add_definitions ( -DPIGLIT_USE_GLX )
 	piglit_add_library (piglitglxutil
 		    piglit-shader.c
-		    piglit-shader-gl.c
 		    piglit-util-gl-common.c
 		    piglit-glx-framework.c
 		    piglit-glx-util.c
diff --git a/tests/util/CMakeLists.gles2.txt b/tests/util/CMakeLists.gles2.txt
index 0faedb5..b3b6336 100644
--- a/tests/util/CMakeLists.gles2.txt
+++ b/tests/util/CMakeLists.gles2.txt
@@ -3,8 +3,6 @@ set(UTIL_GL_SOURCES
 	piglit-vbo.cpp
 	piglit-dispatch.c
 	piglit-dispatch-init.c
-	piglit-shader.c
-	piglit-shader-gles2.c
 	minmax-test.c
 	)
 
diff --git a/tests/util/CMakeLists.gles3.txt b/tests/util/CMakeLists.gles3.txt
index 50abd08..5043b48 100644
--- a/tests/util/CMakeLists.gles3.txt
+++ b/tests/util/CMakeLists.gles3.txt
@@ -2,8 +2,6 @@ list(APPEND UTIL_GL_SOURCES
 	minmax-test.c
 	piglit-dispatch.c
 	piglit-dispatch-init.c
-	piglit-shader.c
-	piglit-shader-gles2.c # Compatible with gles3.
 	piglit-vbo.cpp
 	)
 
diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
index c36bab5..9a39936 100644
--- a/tests/util/CMakeLists.txt
+++ b/tests/util/CMakeLists.txt
@@ -32,8 +32,9 @@ set(UTIL_GL_SOURCES
 	piglit-dispatch.c
 	piglit-dispatch-init.c
 	piglit-util-gl-common.c
-	piglit-framework-gl/piglit_gl_framework.c
 	piglit-framework-gl.c
+	piglit-framework-gl/piglit_gl_framework.c
+	piglit-shader.c
 	piglit_ktx.c
 	rgb9e5.c
 	r11g11b10f.c
diff --git a/tests/util/piglit-shader-gl.c b/tests/util/piglit-shader-gl.c
deleted file mode 100644
index 973f6d1..0000000
--- a/tests/util/piglit-shader-gl.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#if defined(_MSC_VER)
-#include <windows.h>
-#endif
-
-#include "piglit-util-gl-common.h"
diff --git a/tests/util/piglit-shader-gles2.c b/tests/util/piglit-shader-gles2.c
deleted file mode 100644
index be58598..0000000
--- a/tests/util/piglit-shader-gles2.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#include "piglit-util-gl-common.h"
-- 
2.0.0