Commit 32ee70e7 authored by Chad Versace's avatar Chad Versace

util: Split piglit-shader.c into GL and GLES2 versions

The GL version is identical to the original.
In the GLES2 version, each function is defined to be a no-op.

Note: This belongs to a series that adds GLES2 support to Piglit.
Signed-off-by: default avatarChad Versace <chad.versace@intel.com>
parent 4c16acce
......@@ -9,7 +9,7 @@ include_directories(
set (UTIL_SOURCES
fdo-bitmap.c
piglit-shader.c
piglit-shader-gl.c
piglit-util.c
piglit-shared-util.c
shader-load.c
......@@ -20,7 +20,7 @@ set (UTIL_SOURCES
IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
add_definitions ( -DUSE_GLX )
add_library (piglitglxutil
piglit-shader.c
piglit-shader-gl.c
piglit-util.c
piglit-shared-util.c
piglit-glx-framework.c
......
......@@ -21,6 +21,10 @@
* DEALINGS IN THE SOFTWARE.
*/
#ifndef USE_OPENGL
# error USE_OPENGL is undefined
#endif
#if defined(_MSC_VER)
#include <windows.h>
#endif
......
/*
* 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.
*/
#ifndef USE_OPENGL_ES2
# error USE_OPENGL_ES2 is undefined
#endif
#include "piglit-util.h"
void piglit_require_GLSL(void) {}
void piglit_require_vertex_shader(void) {}
void piglit_require_fragment_shader(void) {}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment