ui: use libexpoxy

libepoxy does the opengl extension handling for us.

It also is helpful for trouble-shooting as it prints nice error messages
instead of silently failing or segfaulting in case we do something
wrong, like using gl commands not supported by the current context.

Signed-off-by: Gerd Hoffmann <[email protected]>
Reviewed-by: Max Reitz <[email protected]>

diff --git a/configure b/configure
index b70742962513eb5ca4c48e796591a80b2446410b..ac3729673ff43cf0ae6d9534041ca12ce43e8891 100755 (executable)
--- a/configure
+++ b/configure
@@ -3166,14 +3166,14 @@ else
 fi
 
 if test "$opengl" != "no" ; then
-  opengl_pkgs="gl glesv2"
+  opengl_pkgs="gl glesv2 epoxy"
   if $pkg_config $opengl_pkgs x11 && test "$have_glx" = "yes"; then
     opengl_cflags="$($pkg_config --cflags $opengl_pkgs) $x11_cflags"
     opengl_libs="$($pkg_config --libs $opengl_pkgs) $x11_libs"
     opengl=yes
   else
     if test "$opengl" = "yes" ; then
-      feature_not_found "opengl" "Install GL devel (e.g. MESA)"
+      feature_not_found "opengl" "Please install opengl (mesa) devel pkgs: $opengl_pkgs"
     fi
     opengl_cflags=""
     opengl_libs=""

diff --git a/include/ui/console.h b/include/ui/console.h
index e8b3a9ea8d8d44593d92c894d4eabefe9e506d95..383dec24ffaadf04fb6acb5313484060ffa79349 100644 (file)
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -10,8 +10,7 @@
 #include "qapi/error.h"
 
 #ifdef CONFIG_OPENGL
-# include <GLES2/gl2.h>
-# include <GLES2/gl2ext.h>
+# include <epoxy/gl.h>
 #endif
 
 /* keyboard/mouse support */

diff --git a/include/ui/shader.h b/include/ui/shader.h
index 1ff926c9e126c3070015786dd71994a74bfbf82c..992cde6a8056db65e954ad2bdd0ce3ddbda94fe9 100644 (file)
--- a/include/ui/shader.h
+++ b/include/ui/shader.h
@@ -1,7 +1,4 @@
-#ifdef CONFIG_OPENGL
-# include <GLES2/gl2.h>
-# include <GLES2/gl2ext.h>
-#endif
+#include <epoxy/gl.h>
 
 void qemu_gl_run_texture_blit(GLint texture_blit_prog);