diff options
author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-08-10 23:24:54 +0100 |
---|---|---|
committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-12-14 15:53:21 +0000 |
commit | 18caea376dc7158a4e373857e816a64cdc982931 (patch) | |
tree | d858eef19b188f09448f574694156d8e9c188729 /tests/util/piglit-framework-gl/piglit_winsys_framework.c | |
parent | 490b2baa8ac1ba625af4f91b90bf7ef23c2c27d5 (diff) |
utils: add initial WAFFLE_WGL support
This will allow us to use waffle with its upcoming WGL support for
Windows. With that done, the final step to removing glut is to convert
piglit to use waffle for MacOS.
Current implementation does not have input handling/event loop, and as
such one needs to pass "-auto" when running individual tests, otherwise
the test will abort after being displayed for 8 seconds.
Waffle 1.5.0 is the first version that has WGL support.
TODO:
- Add input handling (event_loop).
v2: Updated the instructions in the README.
v3: Update against upstream Waffle (no API breakage)
v4: s/Sleep/fprintf()+getchar()/ in the event_loop. Suggested by Jose.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com> (v1)
Diffstat (limited to 'tests/util/piglit-framework-gl/piglit_winsys_framework.c')
-rw-r--r-- | tests/util/piglit-framework-gl/piglit_winsys_framework.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/util/piglit-framework-gl/piglit_winsys_framework.c b/tests/util/piglit-framework-gl/piglit_winsys_framework.c index 4c50f0c61..d9a40eba6 100644 --- a/tests/util/piglit-framework-gl/piglit_winsys_framework.c +++ b/tests/util/piglit-framework-gl/piglit_winsys_framework.c @@ -31,6 +31,7 @@ #include "piglit_gbm_framework.h" #include "piglit_gl_framework.h" +#include "piglit_wgl_framework.h" #include "piglit_winsys_framework.h" #include "piglit_wl_framework.h" #include "piglit_x11_framework.h" @@ -177,6 +178,12 @@ piglit_winsys_framework_factory(const struct piglit_gl_test_config *test_config) case WAFFLE_PLATFORM_WAYLAND: return piglit_wl_framework_create(test_config); #endif + +#ifdef PIGLIT_HAS_WGL + case WAFFLE_PLATFORM_WGL: + return piglit_wgl_framework_create(test_config); +#endif + default: assert(0); return NULL; |