[cogl] kms: Don't use egl_surface_width/height
- From: Neil Roberts <nroberts src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl] kms: Don't use egl_surface_width/height
- Date: Wed, 14 Dec 2011 16:48:02 +0000 (UTC)
commit a6b1f55546434b3476f00db66a4b3cbe13b6dbf6
Author: Neil Roberts <neil linux intel com>
Date: Mon Dec 12 21:17:33 2011 +0000
kms: Don't use egl_surface_width/height
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>
cogl/winsys/cogl-winsys-egl-kms.c | 8 ++------
cogl/winsys/cogl-winsys-egl-private.h | 3 +--
2 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/winsys/cogl-winsys-egl-kms.c
index bb9233f..ec1d02b 100644
--- a/cogl/winsys/cogl-winsys-egl-kms.c
+++ b/cogl/winsys/cogl-winsys-egl-kms.c
@@ -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;
}
diff --git a/cogl/winsys/cogl-winsys-egl-private.h b/cogl/winsys/cogl-winsys-egl-private.h
index 9a0a643..98caabf 100644
--- a/cogl/winsys/cogl-winsys-egl-private.h
+++ b/cogl/winsys/cogl-winsys-egl-private.h
@@ -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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]