diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2016-12-07 14:45:14 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2016-12-07 14:45:14 +0000 |
| commit | 8dead45cb366bf5c08539bef2ccaa36b80eb1483 (patch) | |
| tree | 25bdc2041b9d00d0e2e1e46ece0f96b8aaca0527 /test/egl_and_glx_different_pointers.c | |
| parent | 0aa9d1bc831683bfe93980eb3cffa1f0c2f058fb (diff) | |
| download | libepoxy-8dead45cb366bf5c08539bef2ccaa36b80eb1483.tar.gz | |
Revert all changes since 8bbc0d40
Most of the changes that happened after commit 8bbc0d40 broke epoxy
pretty much irreparably because of the CMake build and the attempt at
making libepoxy a static library that can be copy-pasted into another
project without generating files.
Since all the commits are entangled, and are full of unrelated changes,
we cannot simply do a localized set of reverts; instead, we need to hit
the reset button.
From this point forward, we're going to improve libepoxy's build while
attempting to keep the existing build system working. This may mean
reinstating the CMake build system at a later date.
Diffstat (limited to 'test/egl_and_glx_different_pointers.c')
| -rw-r--r-- | test/egl_and_glx_different_pointers.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/test/egl_and_glx_different_pointers.c b/test/egl_and_glx_different_pointers.c index 009b82b..2a2ff3c 100644 --- a/test/egl_and_glx_different_pointers.c +++ b/test/egl_and_glx_different_pointers.c @@ -83,14 +83,12 @@ override_GLES2_glGetString(GLenum e) GLuint override_GL_glCreateShader(GLenum type) { - EPOXY_UNUSED(type); return GL_CREATESHADER_VALUE; } GLuint override_GLES2_glCreateShader(GLenum type) { - EPOXY_UNUSED(type); return GLES2_CREATESHADER_VALUE; } @@ -138,7 +136,7 @@ init_glx(Display **out_dpy, GLXContext *out_ctx, Drawable *out_draw) #ifdef USE_EGL static bool -make_egl_current_and_test(EGLDisplay dpy, EGLContext ctx) +make_egl_current_and_test(EGLDisplay *dpy, EGLContext ctx) { const char *string; GLuint shader; @@ -173,15 +171,15 @@ make_egl_current_and_test(EGLDisplay dpy, EGLContext ctx) } static void -init_egl(EGLDisplay *out_dpy, EGLContext *out_ctx) +init_egl(EGLDisplay **out_dpy, EGLContext *out_ctx) { - EGLDisplay dpy = get_egl_display_or_skip(); + EGLDisplay *dpy = get_egl_display_or_skip(); static const EGLint config_attribs[] = { EGL_SURFACE_TYPE, EGL_WINDOW_BIT, EGL_RED_SIZE, 1, EGL_GREEN_SIZE, 1, EGL_BLUE_SIZE, 1, - EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, + EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT, EGL_NONE }; static const EGLint context_attribs[] = { @@ -209,11 +207,12 @@ init_egl(EGLDisplay *out_dpy, EGLContext *out_ctx) } #endif /* USE_EGL */ -int main(void) +int +main(int argc, char **argv) { bool pass = true; #ifdef USE_EGL - EGLDisplay egl_dpy; + EGLDisplay *egl_dpy; EGLContext egl_ctx; #endif #ifdef USE_GLX |