mirror of
https://github.com/brl/mutter.git
synced 2025-05-04 15:39:38 +00:00
2008-06-23 Robert Bragg <bob@o-hand.com>
* clutter/eglx/clutter-stage-egl.c: Makes sure the eglx backend passes the EGL_OPENGL_ES2_BIT surface attrib when using GLES2.0 under cogl
This commit is contained in:
parent
6ba7710224
commit
030ac047d1
@ -1,3 +1,9 @@
|
|||||||
|
2008-06-23 Robert Bragg <bob@o-hand.com>
|
||||||
|
|
||||||
|
* clutter/eglx/clutter-stage-egl.c: Makes sure the eglx backend
|
||||||
|
passes the EGL_OPENGL_ES2_BIT surface attrib when using
|
||||||
|
GLES2.0 under cogl
|
||||||
|
|
||||||
2008-06-23 Chris Lord <chris@openedhand.com>
|
2008-06-23 Chris Lord <chris@openedhand.com>
|
||||||
|
|
||||||
* clutter/x11/clutter-event-x11.c: (convert_xdevicekey_to_xkey),
|
* clutter/x11/clutter-event-x11.c: (convert_xdevicekey_to_xkey),
|
||||||
|
@ -100,6 +100,13 @@ clutter_stage_egl_realize (ClutterActor *actor)
|
|||||||
EGL_RED_SIZE, 5,
|
EGL_RED_SIZE, 5,
|
||||||
EGL_GREEN_SIZE, 6,
|
EGL_GREEN_SIZE, 6,
|
||||||
EGL_BLUE_SIZE, 5,
|
EGL_BLUE_SIZE, 5,
|
||||||
|
|
||||||
|
#ifdef HAVE_COGL_GLES2
|
||||||
|
EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
|
||||||
|
#else /* HAVE_COGL_GLES2 */
|
||||||
|
EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
|
||||||
|
#endif /* HAVE_COGL_GLES2 */
|
||||||
|
|
||||||
EGL_NONE
|
EGL_NONE
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -216,12 +223,21 @@ clutter_stage_egl_realize (ClutterActor *actor)
|
|||||||
|
|
||||||
if (G_UNLIKELY (backend_egl->egl_context == None))
|
if (G_UNLIKELY (backend_egl->egl_context == None))
|
||||||
{
|
{
|
||||||
|
static const EGLint attribs[3]
|
||||||
|
= { EGL_CONTEXT_CLIENT_VERSION,
|
||||||
|
#ifdef HAVE_COGL_GLES2
|
||||||
|
2,
|
||||||
|
#else /* HAVE_COGL_GLES2 */
|
||||||
|
1,
|
||||||
|
#endif
|
||||||
|
EGL_NONE };
|
||||||
|
|
||||||
CLUTTER_NOTE (GL, "Creating EGL Context");
|
CLUTTER_NOTE (GL, "Creating EGL Context");
|
||||||
|
|
||||||
backend_egl->egl_context = eglCreateContext (backend_egl->edpy,
|
backend_egl->egl_context = eglCreateContext (backend_egl->edpy,
|
||||||
configs[0],
|
configs[0],
|
||||||
EGL_NO_CONTEXT,
|
EGL_NO_CONTEXT,
|
||||||
NULL);
|
attribs);
|
||||||
|
|
||||||
if (backend_egl->egl_context == EGL_NO_CONTEXT)
|
if (backend_egl->egl_context == EGL_NO_CONTEXT)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user