Commit 6e4cb28d authored by Chad Versace's avatar Chad Versace

gles2_shader_runner: Re-enable build of executable

Apply fixes to gles2_shader_runner.c to get it to build.
Then enable build in CMake files.
Signed-off-by: default avatarChad Versace <chad.versace@intel.com>
parent 095dc2c0
......@@ -3,6 +3,7 @@ add_subdirectory (bugs)
add_subdirectory (fbo)
add_subdirectory (general)
add_subdirectory (glean)
add_subdirectory (gles2)
add_subdirectory (glx)
add_subdirectory (glslparsertest)
add_subdirectory (asmparsertest)
......@@ -12,11 +13,6 @@ add_subdirectory (spec)
IF(OPENGL_egl_LIBRARY)
add_subdirectory (egl)
# Temporarily disable building GLES2 targets.
#IF(OPENGL_gles2_LIBRARY)
# add_subdirectory (gles2)
# add_subdirectory (gles2parsertest)
#ENDIF(OPENGL_gles2_LIBRARY)
ENDIF(OPENGL_egl_LIBRARY)
IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
......
#add_definitions(-DSOURCE_DIR="${piglit_SOURCE_DIR}/")
include_directories(
${OPENGL_INCLUDE_PATH}
${piglit_SOURCE_DIR}/tests/util/
)
link_libraries(
${OPENGL_gles2_LIBRARY}
${OPENGL_egl_LIBRARY}
glut_egl
piglitutil_gles2
)
add_executable(gles2_shader_runner
gles2_shader_runner.c
)
# vim: ft=cmake:
# -------------------------------------------
# Temporarily disable building GLES2 targets.
# -------------------------------------------
#add_definitions ( -DSOURCE_DIR="${piglit_SOURCE_DIR}/" )
#
#include_directories(
# ${OPENGL_INCLUDE_PATH}
# ${piglit_SOURCE_DIR}/tests/util/
# ${piglit_SOURCE_DIR}/tests/util/glut_egl
#)
#
#link_libraries (
# ${OPENGL_gles2_LIBRARY}
# ${OPENGL_egl_LIBRARY}
# piglitglutegl_x11
# piglitegl_gles2util
#)
#
#add_executable (gles2_shader_runner gles2_shader_runner.c ../util/shader-load.c)
#target_link_libraries(gles2_shader_runner X11)
piglit_include_target_api()
......@@ -28,8 +28,12 @@
*/
#include "piglit-gles2-util.h"
#include "piglit-egl-gles2-framework.h"
#define _GNU_SOURCE
#include <ctype.h>
#include <string.h>
#include "piglit-util.h"
#include "piglit-framework.h"
int piglit_window_mode = GLUT_RGB | GLUT_DEPTH;
int piglit_width = 250, piglit_height = 250;
......
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