diff options
| author | Chad Versace <chad.versace@linux.intel.com> | 2012-09-14 00:38:10 +0300 |
|---|---|---|
| committer | Chad Versace <chad.versace@linux.intel.com> | 2012-10-09 19:08:31 -0700 |
| commit | 05c8d2e058af7c63043da9880bc8e88ed66353b1 (patch) | |
| tree | b5521792e0a7339250bac63376e7de7b0ffa025c /src | |
| parent | 4072eacd585d084d443a9643bb864160ea71494b (diff) | |
cmake,util: Switch GL tests to use new framework
- Stop building old framework sources, piglit-framework-{fbo,glut}.c.
- Stop building libglut_waffle.
- Wire up piglit_gl_test_run() to use the new framework.
Reviewed-and-tested-by: Jordan Justen <jordan.l.justen@intel.com>
Tested-by: Paul Berry <stereotype441@gmail.com>
Acked-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/piglit/glut_wrap.h | 7 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2cca584e..e69de29b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,3 +0,0 @@ -if(PIGLIT_USE_WAFFLE) - add_subdirectory(glut_waffle) -endif(PIGLIT_USE_WAFFLE) diff --git a/src/piglit/glut_wrap.h b/src/piglit/glut_wrap.h index 549059da..f4ef9116 100644 --- a/src/piglit/glut_wrap.h +++ b/src/piglit/glut_wrap.h @@ -27,9 +27,6 @@ /** * \file glut_wrap.h * \brief Convenience header that includes the actual GLUT headers. - * - * The actual GLUT headers are chosen according to the macro definitions - * PIGLIT_USE_GLUT and PIGLIT_USE_WAFFLE. */ #pragma once @@ -42,9 +39,7 @@ extern "C" { #include <windows.h> #endif -#if defined(PIGLIT_USE_WAFFLE) -# include <glut_waffle/glut_waffle.h> -#elif defined(PIGLIT_USE_GLUT) +#if defined(PIGLIT_USE_GLUT) # ifdef __APPLE__ # include <GLUT/glut.h> |