Merge pull request #3 from Grovespaz/xbox

Add Linux support.

Makefile.target

@@ -138,6 +138,7 @@ endif
 obj-gl-y += gl/gloffscreen_common.o 
 obj-gl-$(CONFIG_WIN32) += gl/gloffscreen_wgl.o
 obj-gl-$(CONFIG_DARWIN) += gl/gloffscreen_cgl.o
+obj-gl-$(CONFIG_LINUX) += gl/gloffscreen_glx.o
 obj-$(CONFIG_OPENGL) += $(obj-gl-y)
 
 main.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)

configure

@@ -2589,13 +2589,13 @@ EOF
 int main(void) { return GL_VERSION != 0; }
 EOF
   else
-    opengl_libs="-lGL -lX11"
+    opengl_libs="-lGLEW -lGLU -lGL -lX11"
     cat > $TMPC << EOF
-#include <X11/Xlib.h>
-#include <GL/gl.h>
+#include <GL/glew.h>
+#include <GL/glu.h>
 #include <GL/glx.h>
-#include <GL/glut.h>
-int main(void) { glBegin(0); glXQueryVersion(0,0,0); return 0; }
+#include <X11/Xlib.h>
+int main(void) { glXGetClientString(XOpenDisplay(0), GL_VERSION); return 0; }
 EOF
   fi
   if compile_prog "" "$opengl_libs" ; then
@@ -4366,7 +4366,7 @@ case "$target_name" in
   *)
 esac
 case "$target_name" in
-  arm|i386|x86_64|ppcemb|ppc|ppc64|s390x)
+  arm|xbox|i386|x86_64|ppcemb|ppc|ppc64|s390x)
     # Make sure the target and host cpus are compatible
     if test "$kvm" = "yes" -a "$target_softmmu" = "yes" -a \
       \( "$target_name" = "$cpu" -o \
@@ -4375,7 +4375,9 @@ case "$target_name" in
       \( "$target_name" = "ppc"    -a "$cpu" = "ppc64" \) -o \
       \( "$target_name" = "ppcemb" -a "$cpu" = "ppc64" \) -o \
       \( "$target_name" = "x86_64" -a "$cpu" = "i386"   \) -o \
-      \( "$target_name" = "i386"   -a "$cpu" = "x86_64" \) \) ; then
+      \( "$target_name" = "i386"   -a "$cpu" = "x86_64" \) -o \
+      \( "$target_name" = "xbox"   -a "$cpu" = "i386"   \) -o \
+      \( "$target_name" = "xbox"   -a "$cpu" = "x86_64" \) \) ; then
       echo "CONFIG_KVM=y" >> $config_target_mak
       if test "$vhost_net" = "yes" ; then
         echo "CONFIG_VHOST_NET=y" >> $config_target_mak

gl/gloffscreen.h

@@ -70,6 +70,7 @@ extern void glo_set_current(GloContext *context);
 /* Check GL Extensions */
 extern GLboolean glo_check_extension(
     const GLubyte *extName, const GLubyte *extString);
+void* glo_get_extension_proc(const GLubyte *extProc);
 
 /* Create an OpenGL context for a certain
  * pixel format. formatflags are from the

gl/gloffscreen_glx.c

@@ -0,0 +1,144 @@
+/*
+ *  Offscreen OpenGL abstraction layer - GLX (X11) specific
+ *
+ *  Copyright (c) 2013 Wayo
+ *  Copyright (c) 2014 JayFoxRox
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "qemu-common.h"
+
+#include <GL/glew.h>
+#include <GL/glx.h>
+#include <GL/glut.h>
+#include <X11/Xlib.h>
+
+#include "gloffscreen.h"
+
+struct _GloContext {
+    GLXDrawable     glx_drawable;
+    GLXContext      glx_context;
+};
+
+static Display* x_display;
+
+
+/* Create an OpenGL context for a certain pixel format. formatflags are from 
+ * the GLO_ constants */
+GloContext *glo_context_create(int formatFlags)
+{
+
+    static bool initialized = false;
+
+    if (!initialized) {    
+        x_display = XOpenDisplay(0);     
+	      printf("gloffscreen: GLX_VERSION = %s\n", glXGetClientString(x_display, GLX_VERSION));
+	      printf("gloffscreen: GLX_VENDOR = %s\n", glXGetClientString(x_display, GLX_VENDOR));
+    } else {
+        printf("gloffscreen already inited\n");
+        exit(EXIT_FAILURE);
+    }
+    GloContext *context = (GloContext *)g_malloc0(sizeof(GloContext));
+
+    int rgbaBits[4];
+    glo_flags_get_rgba_bits(formatFlags, rgbaBits);
+
+    int fb_attribute_list[] = {
+        GLX_RENDER_TYPE, GLX_RGBA_BIT,
+        GLX_RED_SIZE, rgbaBits[0],
+        GLX_GREEN_SIZE, rgbaBits[1],
+        GLX_BLUE_SIZE, rgbaBits[2],
+        GLX_ALPHA_SIZE, rgbaBits[3],
+        GLX_DEPTH_SIZE, glo_flags_get_depth_bits(formatFlags),
+        GLX_STENCIL_SIZE, glo_flags_get_stencil_bits(formatFlags),
+        GLX_DRAWABLE_TYPE, GLX_PBUFFER_BIT,
+        None
+    };
+
+    int nelements;
+    GLXFBConfig* configs = glXChooseFBConfig(x_display, DefaultScreen(x_display), fb_attribute_list, &nelements);
+    if (configs == NULL) { return NULL; }
+    if (nelements == 0) { return NULL; }
+
+#if 1
+    /* Tiny surface because apitrace doesn't handle no surface yet */
+    int surface_attribute_list[] = {
+        GLX_PBUFFER_WIDTH,16,
+        GLX_PBUFFER_HEIGHT,16,
+        GLX_LARGEST_PBUFFER, True,
+        None
+    };
+    context->glx_drawable = glXCreatePbuffer(x_display, configs[0], surface_attribute_list);
+    if (context->glx_drawable == None) { return NULL; }
+#else
+    context->glx_drawable = None;
+#endif
+
+    /* Create GLX context */
+    context->glx_context = glXCreateNewContext(x_display, configs[0], GLX_RGBA_TYPE, NULL, True);
+    if (context->glx_context == NULL) return NULL;
+    glo_set_current(context);
+
+    if (!initialized) {
+        /* Initialize glew */
+        if (GLEW_OK != glewInit()) {
+            /* GLEW failed! */
+            printf("Glew init failed.");
+            exit(1);
+        }
+    }
+
+    initialized = true;
+    return context;
+}
+
+/* Check if an extension is available. */
+GLboolean glo_check_extension(const GLubyte *extName,
+    const GLubyte *extString)
+{
+    return gluCheckExtension(extName, extString);
+}
+
+void* glo_get_extension_proc(const GLubyte *extProc)
+{
+    return glXGetProcAddress(extProc); 
+}
+
+/* Set current context */
+void glo_set_current(GloContext *context)
+{
+    if (context == NULL) {
+        glXMakeCurrent(x_display, None, NULL);
+    } else {
+        glXMakeCurrent(x_display, context->glx_drawable, context->glx_context);
+    }
+}
+
+/* Destroy a previously created OpenGL context */
+void glo_context_destroy(GloContext *context)
+{
+    if (!context) { return; }
+    glo_set_current(NULL);
+   	glXDestroyContext(x_display, context->glx_context);
+}
+