mirror of https://github.com/xemu-project/xemu.git
Add Linux support.
Added OpenGL support by providing Linux gloffscreen alternatives. Added Xbox as valid KVM target to enable acceleration. Both changes were pulled from JayFoxRox's branch.
This commit is contained in:
Govert Versluis
parent
9c534afa34
commit
a94574577b
|
|
@ -138,6 +138,12 @@ endif
|
|||
obj-gl-y += gl/gloffscreen_common.o
|
||||
obj-gl-$(CONFIG_WIN32) += gl/gloffscreen_wgl.o
|
||||
obj-gl-$(CONFIG_DARWIN) += gl/gloffscreen_cgl.o
|
||||
# GLX / EGL selector
|
||||
ifeq (1,1)
|
||||
obj-gl-$(CONFIG_LINUX) += gl/gloffscreen_glx.o
|
||||
else
|
||||
obj-gl-$(CONFIG_LINUX) += gl/gloffscreen_egl.o
|
||||
endif
|
||||
obj-$(CONFIG_OPENGL) += $(obj-gl-y)
|
||||
|
||||
main.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
|
||||
|
|
|
|||
|
|
@ -2589,14 +2589,26 @@ EOF
|
|||
int main(void) { return GL_VERSION != 0; }
|
||||
EOF
|
||||
else
|
||||
opengl_libs="-lGL -lX11"
|
||||
cat > $TMPC << EOF
|
||||
#include <X11/Xlib.h>
|
||||
#include <GL/gl.h>
|
||||
# change this to "if false; then" you want EGL instead of GLX
|
||||
# also requires a change in Makefile.target, look for "obj-gl"
|
||||
if true; then
|
||||
opengl_libs="-lGLEW -lGLU -lGL -lX11"
|
||||
cat > $TMPC << EOF
|
||||
#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
|
||||
else
|
||||
opengl_libs="-lGLEW -lGLU -lGL -lEGL"
|
||||
cat > $TMPC << EOF
|
||||
#include <GL/glew.h>
|
||||
#include <GL/glu.h>
|
||||
#include <EGL/egl.h>
|
||||
int main(void) { return GL_VERSION != 0; }
|
||||
EOF
|
||||
fi
|
||||
fi
|
||||
if compile_prog "" "$opengl_libs" ; then
|
||||
opengl=yes
|
||||
|
|
@ -4366,7 +4378,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 +4387,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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -0,0 +1,179 @@
|
|||
/*
|
||||
* Offscreen OpenGL abstraction layer - EGL 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 <EGL/egl.h>
|
||||
#include <GL/glut.h>
|
||||
|
||||
#include "gloffscreen.h"
|
||||
|
||||
struct _GloContext {
|
||||
EGLSurface egl_surface;
|
||||
EGLContext egl_context;
|
||||
};
|
||||
|
||||
static EGLDisplay egl_display;
|
||||
|
||||
static const char* eglGetErrorString(void)
|
||||
{
|
||||
EGLint err = eglGetError();
|
||||
if (err == EGL_SUCCESS ) { return ""; }
|
||||
if (err == EGL_NOT_INITIALIZED ) { return "EGL_NOT_INITIALIZED"; }
|
||||
if (err == EGL_BAD_ACCESS ) { return "EGL_BAD_ACCESS"; }
|
||||
if (err == EGL_BAD_ALLOC ) { return "EGL_BAD_ALLOC"; }
|
||||
if (err == EGL_BAD_ATTRIBUTE ) { return "EGL_BAD_ATTRIBUTE"; }
|
||||
if (err == EGL_BAD_CONTEXT ) { return "EGL_BAD_CONTEXT"; }
|
||||
if (err == EGL_BAD_CONFIG ) { return "EGL_BAD_CONFIG"; }
|
||||
if (err == EGL_BAD_CURRENT_SURFACE) { return "EGL_BAD_CURRENT_SURFACE"; }
|
||||
if (err == EGL_BAD_DISPLAY ) { return "EGL_BAD_DISPLAY"; }
|
||||
if (err == EGL_BAD_SURFACE ) { return "EGL_BAD_SURFACE"; }
|
||||
if (err == EGL_BAD_MATCH ) { return "EGL_BAD_MATCH"; }
|
||||
if (err == EGL_BAD_PARAMETER ) { return "EGL_BAD_PARAMETER"; }
|
||||
if (err == EGL_BAD_NATIVE_PIXMAP ) { return "EGL_BAD_NATIVE_PIXMAP"; }
|
||||
if (err == EGL_BAD_NATIVE_WINDOW ) { return "EGL_BAD_NATIVE_WINDOW"; }
|
||||
if (err == EGL_CONTEXT_LOST ) { return "EGL_CONTEXT_LOST"; }
|
||||
return "<Unknown EGL Error>";
|
||||
}
|
||||
|
||||
/* Create an OpenGL context for a certain pixel format. formatflags are from
|
||||
* the GLO_ constants */
|
||||
GloContext *glo_context_create(int formatFlags)
|
||||
{
|
||||
EGLint err;
|
||||
|
||||
static bool initialized = false;
|
||||
|
||||
if (!initialized) {
|
||||
EGLint major, minor;
|
||||
egl_display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
|
||||
if (egl_display == EGL_NO_DISPLAY) { return NULL; }
|
||||
err = eglInitialize(egl_display, &major, &minor);
|
||||
eglBindAPI(EGL_OPENGL_API); // Necessary once to make sure all EGL calls are done properly here
|
||||
printf("gloffscreen: EGL version = %d.%d\n", major, minor);
|
||||
printf("gloffscreen: EGL_VENDOR = %s\n", eglQueryString(egl_display, EGL_VENDOR));
|
||||
if (err != EGL_TRUE) { return NULL; }
|
||||
} 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);
|
||||
|
||||
EGLint attr[] = {
|
||||
EGL_SURFACE_TYPE, EGL_PBUFFER_BIT,
|
||||
EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
|
||||
EGL_RED_SIZE, rgbaBits[0],
|
||||
EGL_GREEN_SIZE, rgbaBits[1],
|
||||
EGL_BLUE_SIZE, rgbaBits[2],
|
||||
EGL_ALPHA_SIZE, rgbaBits[3],
|
||||
EGL_DEPTH_SIZE, glo_flags_get_depth_bits(formatFlags),
|
||||
EGL_STENCIL_SIZE, glo_flags_get_stencil_bits(formatFlags),
|
||||
EGL_NONE
|
||||
};
|
||||
EGLConfig config;
|
||||
EGLint num_config;
|
||||
err = eglChooseConfig(egl_display, attr, &config, 1, &num_config);
|
||||
if (err != EGL_TRUE) { return NULL; }
|
||||
if (num_config != 1) { return NULL; }
|
||||
|
||||
#if 1
|
||||
/* Tiny surface because apitrace doesn't handle no surface yet */
|
||||
EGLint surface_attr[] = {
|
||||
EGL_WIDTH,16,
|
||||
EGL_HEIGHT,16,
|
||||
EGL_LARGEST_PBUFFER, EGL_TRUE,
|
||||
EGL_NONE
|
||||
};
|
||||
|
||||
context->egl_surface = eglCreatePbufferSurface(egl_display, config, surface_attr);
|
||||
if (context->egl_surface == EGL_NO_SURFACE) { return NULL; }
|
||||
#else
|
||||
context->egl_surface = EGL_NO_SURFACE;
|
||||
#endif
|
||||
|
||||
EGLint ctxattr[] = {
|
||||
EGL_NONE
|
||||
};
|
||||
context->egl_context = eglCreateContext(egl_display, config, EGL_NO_CONTEXT, ctxattr);
|
||||
if (context->egl_context == EGL_NO_CONTEXT) return NULL;
|
||||
glo_set_current(context);
|
||||
|
||||
if (!initialized) {
|
||||
/*TODO: Enable once glew supports EGL.. */
|
||||
#if 0
|
||||
/* Initialize glew */
|
||||
if (GLEW_OK != glewInit()) {
|
||||
/* GLEW failed! */
|
||||
printf("Glew init failed.");
|
||||
exit(1);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
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 eglGetProcAddress((const char*)extProc);
|
||||
}
|
||||
|
||||
/* Set current context */
|
||||
void glo_set_current(GloContext *context)
|
||||
{
|
||||
eglBindAPI(EGL_OPENGL_API);
|
||||
if (context == NULL) {
|
||||
eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
|
||||
} else {
|
||||
eglMakeCurrent(egl_display, context->egl_surface, context->egl_surface, context->egl_context);
|
||||
}
|
||||
}
|
||||
|
||||
/* Destroy a previously created OpenGL context */
|
||||
void glo_context_destroy(GloContext *context)
|
||||
{
|
||||
if (!context) { return; }
|
||||
glo_set_current(NULL);
|
||||
eglDestroyContext(egl_display, context->egl_context);
|
||||
if (context->egl_surface == EGL_NO_SURFACE) { return; }
|
||||
eglDestroySurface(egl_display, context->egl_surface);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -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);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue