OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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 <kraxel@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Gerd Hoffmann 2015-05-11 12:24:43 +02:00
parent ce0274f730
commit dcf30025c3
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -3166,14 +3166,14 @@ else
fi fi
if test "$opengl" != "no" ; then 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 if $pkg_config $opengl_pkgs x11 && test "$have_glx" = "yes"; then
opengl_cflags="$($pkg_config --cflags $opengl_pkgs) $x11_cflags" opengl_cflags="$($pkg_config --cflags $opengl_pkgs) $x11_cflags"
opengl_libs="$($pkg_config --libs $opengl_pkgs) $x11_libs" opengl_libs="$($pkg_config --libs $opengl_pkgs) $x11_libs"
opengl=yes opengl=yes
else else
if test "$opengl" = "yes" ; then 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 fi
opengl_cflags="" opengl_cflags=""
opengl_libs="" opengl_libs=""

3
include/ui/console.h
View File

@ -10,8 +10,7 @@
#include "qapi/error.h" #include "qapi/error.h"
#ifdef CONFIG_OPENGL #ifdef CONFIG_OPENGL
# include <GLES2/gl2.h> # include <epoxy/gl.h>
# include <GLES2/gl2ext.h>
#endif #endif
/* keyboard/mouse support */ /* keyboard/mouse support */

5
include/ui/shader.h
View File

@ -1,7 +1,4 @@
#ifdef CONFIG_OPENGL #include <epoxy/gl.h>
# include <GLES2/gl2.h>
# include <GLES2/gl2ext.h>
#endif
void qemu_gl_run_texture_blit(GLint texture_blit_prog); void qemu_gl_run_texture_blit(GLint texture_blit_prog);