system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-10-15 18:58:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

gl-renderer: provide platform_base fallbacks and remove ifdefs

Browse source 
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Jonny Lamb 2015-03-24 13:12:05 +01:00 committed by Pekka Paalanen
parent 74eed31108
commit f1ec506048
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/gl-renderer.c
View file

@ -37,7 +37,6 @@
#include "gl-renderer.h"
#include "vertex-clipping.h"
#include <EGL/eglext.h>
#include "weston-egl-ext.h"
struct gl_shader {
@ -140,9 +139,7 @@ struct gl_renderer {
PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC swap_buffers_with_damage;
#endif
#ifdef EGL_EXT_platform_base
PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC create_platform_window;
#endif
int has_unpack_subimage;
@ -170,9 +167,7 @@ struct gl_renderer {
struct wl_signal destroy_signal;
};
#ifdef EGL_EXT_platform_base
static PFNEGLGETPLATFORMDISPLAYEXTPROC get_platform_display = NULL;
#endif
static inline struct gl_output_state *
get_output_state(struct weston_output *output)
@ -2006,19 +2001,18 @@ gl_renderer_output_create(struct weston_output *output,
if (go == NULL)
return -1;
#ifdef EGL_EXT_platform_base
if (gr->create_platform_window) {
go->egl_surface =
gr->create_platform_window(gr->egl_display,
egl_config,
window_for_platform,
NULL);
} else
#endif
} else {
go->egl_surface =
eglCreateWindowSurface(gr->egl_display,
egl_config,
window_for_legacy, NULL);
}
if (go->egl_surface == EGL_NO_SURFACE) {
weston_log("failed to create egl surface\n");
@ -2138,7 +2132,6 @@ gl_renderer_setup_egl_extensions(struct weston_compositor *ec)
"supported. Performance could be affected.\n");
#endif
#ifdef EGL_EXT_platform_base
extensions =
(const char *) eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
if (!extensions) {
@ -2151,7 +2144,6 @@ gl_renderer_setup_egl_extensions(struct weston_compositor *ec)
(void *) eglGetProcAddress("eglCreatePlatformWindowSurfaceEXT");
else
weston_log("warning: EGL_EXT_platform_base not supported.\n");
#endif
#ifdef EGL_MESA_configless_context
if (strstr(extensions, "EGL_MESA_configless_context"))
@ -2286,8 +2278,7 @@ gl_renderer_create(struct weston_compositor *ec, EGLenum platform,
gr->base.surface_copy_content = gl_renderer_surface_copy_content;
gr->egl_display = NULL;
#ifdef EGL_EXT_platform_base
/* the platform extension is supported */
/* extension_suffix is supported */
if (supports) {
if (!get_platform_display) {
get_platform_display = (void *) eglGetProcAddress(
@ -2304,7 +2295,6 @@ gl_renderer_create(struct weston_compositor *ec, EGLenum platform,
NULL);
}
}
#endif
if (!gr->egl_display) {
weston_log("warning: either no EGL_EXT_platform_base "

6
src/gl-renderer.h
View file

@ -35,12 +35,18 @@ typedef int EGLint;
typedef int EGLenum;
typedef void *EGLDisplay;
typedef void *EGLSurface;
typedef void *EGLConfig;
typedef intptr_t EGLNativeDisplayType;
typedef intptr_t EGLNativeWindowType;
#define EGL_DEFAULT_DISPLAY ((EGLNativeDisplayType)0)
#endif /* ENABLE_EGL */
#ifndef EGL_EXT_platform_base
typedef EGLDisplay (*PFNEGLGETPLATFORMDISPLAYEXTPROC) (EGLenum platform, void *native_display, const EGLint *attrib_list);
typedef EGLSurface (*PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC) (EGLDisplay dpy, EGLConfig config, void *native_window, const EGLint *attrib_list);
#endif
#ifndef EGL_PLATFORM_GBM_KHR
#define EGL_PLATFORM_GBM_KHR 0x31D7
#endif