gl-renderer: move all EGL_PLATFORM_* defines here

Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
dev
Jonny Lamb 10 years ago committed by Pekka Paalanen
parent 445fb697a5
commit a3e6a4a87a
  1. 4
      src/compositor-drm.c
  2. 4
      src/compositor-wayland.c
  3. 4
      src/compositor-x11.c
  4. 12
      src/gl-renderer.h

@ -68,10 +68,6 @@
#define GBM_BO_USE_CURSOR GBM_BO_USE_CURSOR_64X64 #define GBM_BO_USE_CURSOR GBM_BO_USE_CURSOR_64X64
#endif #endif
#ifndef EGL_PLATFORM_GBM_KHR
#define EGL_PLATFORM_GBM_KHR 0x31D7
#endif
static int option_current_mode = 0; static int option_current_mode = 0;
enum output_config { enum output_config {

@ -47,10 +47,6 @@
#define WINDOW_TITLE "Weston Compositor" #define WINDOW_TITLE "Weston Compositor"
#ifndef EGL_PLATFORM_WAYLAND_KHR
#define EGL_PLATFORM_WAYLAND_KHR 0x31D8
#endif
struct wayland_compositor { struct wayland_compositor {
struct weston_compositor base; struct weston_compositor base;

@ -55,10 +55,6 @@
#define DEFAULT_AXIS_STEP_DISTANCE wl_fixed_from_int(10) #define DEFAULT_AXIS_STEP_DISTANCE wl_fixed_from_int(10)
#ifndef EGL_PLATFORM_X11_KHR
#define EGL_PLATFORM_X11_KHR 0x31D5
#endif
static int option_width; static int option_width;
static int option_height; static int option_height;
static int option_scale; static int option_scale;

@ -39,6 +39,18 @@ typedef intptr_t EGLNativeDisplayType;
typedef intptr_t EGLNativeWindowType; typedef intptr_t EGLNativeWindowType;
#define EGL_DEFAULT_DISPLAY ((EGLNativeDisplayType)0) #define EGL_DEFAULT_DISPLAY ((EGLNativeDisplayType)0)
#endif /* ENABLE_EGL */
#ifndef EGL_PLATFORM_GBM_KHR
#define EGL_PLATFORM_GBM_KHR 0x31D7
#endif
#ifndef EGL_PLATFORM_WAYLAND_KHR
#define EGL_PLATFORM_WAYLAND_KHR 0x31D8
#endif
#ifndef EGL_PLATFORM_X11_KHR
#define EGL_PLATFORM_X11_KHR 0x31D5
#endif #endif
enum gl_renderer_border_side { enum gl_renderer_border_side {

Loading…
Cancel
Save