Demos (master): es[12]_info.c: Don't include GLES1/2 headers

Kristian Høgsberg krh at kemper.freedesktop.org
Tue Apr 17 16:58:01 UTC 2012


Module: Demos
Branch: master
Commit: 30b7d7991aa02ae80efe9f3b1e7f28ffc469a5d5
URL:    http://cgit.freedesktop.org/mesa/demos/commit/?id=30b7d7991aa02ae80efe9f3b1e7f28ffc469a5d5

Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Tue Apr 17 12:54:45 2012 -0400

es[12]_info.c: Don't include GLES1/2 headers

es1_info.c is compiled as es2_info as well, in which case we can't rely
on GLES1 headers being available.

---

 src/egl/opengles1/es1_info.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/egl/opengles1/es1_info.c b/src/egl/opengles1/es1_info.c
index e33597f..a97e9da 100644
--- a/src/egl/opengles1/es1_info.c
+++ b/src/egl/opengles1/es1_info.c
@@ -18,8 +18,6 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
-#include <GLES/gl.h>
-#include <GLES/glext.h>
 #include <EGL/egl.h>
 
 
@@ -92,6 +90,12 @@ info(EGLDisplay egl_dpy)
    s = eglQueryString(egl_dpy, EGL_CLIENT_APIS);
    printf("EGL_CLIENT_APIS = %s\n", s);
 
+const char *glGetString (int name);
+
+#define GL_RENDERER                       0x1F01
+#define GL_VERSION                        0x1F02
+#define GL_EXTENSIONS                     0x1F03
+
    printf("GL_VERSION: %s\n", (char *) glGetString(GL_VERSION));
    printf("GL_RENDERER: %s\n", (char *) glGetString(GL_RENDERER));
    printf("GL_EXTENSIONS:\n");




More information about the mesa-commit mailing list