brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kms: Don't use egl_surface_width/height

Browse Source 
The egl_surface_width/height properties in CoglDisplayEGL were
accidentally being conditionally defined depending on KMS
support. They are not necessary because CoglDisplayKMS also already
stores the width/height and this was just copied over to the EGL
dipslay.

Reviewed-by: Robert Bragg <robert@linux.intel.com>
This commit is contained in:
Neil Roberts 2011-12-12 21:17:33 +00:00
parent 1e5494c2fb
commit a6b1f55546
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cogl/winsys/cogl-winsys-egl-kms.c
View File

@ -261,7 +261,6 @@ _cogl_winsys_egl_try_create_context (CoglDisplay *display,
CoglRenderer *renderer = display->renderer;
CoglRendererEGL *egl_renderer = renderer->winsys;
CoglDisplayEGL *egl_display = display->winsys;
CoglDisplayKMS *kms_display = egl_display->platform;
egl_display->egl_context = eglCreateContext (egl_renderer->edpy,
NULL,
@ -287,9 +286,6 @@ _cogl_winsys_egl_try_create_context (CoglDisplay *display,
return FALSE;
}
egl_display->egl_surface_width = kms_display->width;
egl_display->egl_surface_height = kms_display->height;
return TRUE;
}
@ -457,8 +453,8 @@ _cogl_winsys_onscreen_init (CoglOnscreen *onscreen,
_cogl_winsys_onscreen_swap_buffers (onscreen);
_cogl_framebuffer_winsys_update_size (framebuffer,
egl_display->egl_surface_width,
egl_display->egl_surface_height);
kms_display->width,
kms_display->height);
return TRUE;
}

3
cogl/winsys/cogl-winsys-egl-private.h
View File

@ -112,8 +112,7 @@ typedef struct _CoglDisplayEGL
EGLSurface dummy_surface;
#if defined (COGL_HAS_EGL_PLATFORM_POWERVR_NULL_SUPPORT) || \
defined (COGL_HAS_EGL_PLATFORM_GDL_SUPPORT) || \
defined (COGL_HAS_EGL_PLATFORM_ANDROID_SUPPORT) || \
defined (COGL_HAS_EGL_PLATFORM_KMS_SUPPORT)
defined (COGL_HAS_EGL_PLATFORM_ANDROID_SUPPORT)
int egl_surface_width;
int egl_surface_height;
gboolean have_onscreen;