apitrace & epoxy with EGL don't work nicely together, using glx works around this issue for now (disabled by default). Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>macos/master
Marc-André Lureau
9 years ago
committed by
Dave Airlie
parent
c49117ab45
commit
209557f455
@ -0,0 +1,38 @@ |
||||
/**************************************************************************
|
||||
* |
||||
* Copyright (C) 2016 Red Hat Inc. |
||||
* |
||||
* 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. |
||||
* |
||||
**************************************************************************/ |
||||
#ifndef VIRGL_GLX_H |
||||
#define VIRGL_GLX_H |
||||
|
||||
#include "vrend_renderer.h" |
||||
struct virgl_glx; |
||||
|
||||
struct virgl_glx *virgl_glx_init(void); |
||||
void virgl_glx_destroy(struct virgl_glx *ve); |
||||
|
||||
virgl_renderer_gl_context virgl_glx_create_context(struct virgl_glx *ve, struct virgl_gl_ctx_param *vparams); |
||||
void virgl_glx_destroy_context(struct virgl_glx *ve, virgl_renderer_gl_context virglctx); |
||||
int virgl_glx_make_context_current(struct virgl_glx *ve, virgl_renderer_gl_context virglctx); |
||||
virgl_renderer_gl_context virgl_glx_get_current_context(struct virgl_glx *ve); |
||||
|
||||
#endif |
||||
@ -0,0 +1,109 @@ |
||||
/**************************************************************************
|
||||
* |
||||
* Copyright (C) 2016 Red Hat Inc. |
||||
* |
||||
* 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. |
||||
* |
||||
**************************************************************************/ |
||||
|
||||
|
||||
#ifdef HAVE_CONFIG_H |
||||
#include "config.h" |
||||
#endif |
||||
|
||||
#include <epoxy/glx.h> |
||||
#include "virglrenderer.h" |
||||
#include "virgl_glx.h" |
||||
|
||||
struct virgl_glx { |
||||
Display *display; |
||||
GLXFBConfig* fbConfigs; |
||||
GLXPbuffer pbuffer; |
||||
}; |
||||
|
||||
struct virgl_glx *virgl_glx_init(void) |
||||
{ |
||||
struct virgl_glx *d; |
||||
|
||||
d = malloc(sizeof(struct virgl_glx)); |
||||
if (!d) |
||||
return NULL; |
||||
|
||||
d->display = XOpenDisplay(NULL); |
||||
|
||||
if (!d->display) { |
||||
free(d); |
||||
return NULL; |
||||
} |
||||
|
||||
int visualAttribs[] = { None }; |
||||
int numberOfFramebufferConfigurations = 0; |
||||
|
||||
d->fbConfigs = glXChooseFBConfig(d->display, DefaultScreen(d->display), |
||||
visualAttribs, &numberOfFramebufferConfigurations); |
||||
|
||||
int pbufferAttribs[] = { |
||||
GLX_PBUFFER_WIDTH, 32, |
||||
GLX_PBUFFER_HEIGHT, 32, |
||||
None |
||||
}; |
||||
d->pbuffer = glXCreatePbuffer(d->display, d->fbConfigs[0], pbufferAttribs); |
||||
|
||||
return d; |
||||
} |
||||
|
||||
void virgl_glx_destroy(struct virgl_glx *d) |
||||
{ |
||||
XFree(d->fbConfigs); |
||||
glXDestroyPbuffer(d->display,d->pbuffer); |
||||
XCloseDisplay(d->display); |
||||
free(d); |
||||
} |
||||
|
||||
virgl_renderer_gl_context virgl_glx_create_context(struct virgl_glx *d, struct virgl_gl_ctx_param *vparams) |
||||
{ |
||||
int context_attribs[] = { |
||||
GLX_CONTEXT_MAJOR_VERSION_ARB, vparams->major_ver, |
||||
GLX_CONTEXT_MINOR_VERSION_ARB, vparams->minor_ver, |
||||
None |
||||
}; |
||||
|
||||
GLXContext ctx = |
||||
glXCreateContextAttribsARB(d->display, d->fbConfigs[0], |
||||
vparams->shared ? glXGetCurrentContext() : NULL, |
||||
True, context_attribs); |
||||
return (virgl_renderer_gl_context)ctx; |
||||
} |
||||
|
||||
void virgl_glx_destroy_context(struct virgl_glx *d, virgl_renderer_gl_context virglctx) |
||||
{ |
||||
GLXContext ctx = (GLXContext)virglctx; |
||||
|
||||
glXDestroyContext(d->display,ctx); |
||||
} |
||||
|
||||
int virgl_glx_make_context_current(struct virgl_glx *d, virgl_renderer_gl_context virglctx) |
||||
{ |
||||
return glXMakeContextCurrent(d->display, d->pbuffer, d->pbuffer, virglctx); |
||||
} |
||||
|
||||
virgl_renderer_gl_context virgl_glx_get_current_context(struct virgl_glx *d) |
||||
{ |
||||
return glXGetCurrentContext(); |
||||
} |
||||
Loading…
Reference in new issue