[cogl/halfline/wip/render-node: 1/6] kms-winsys: drop support for old gbm versions
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/halfline/wip/render-node: 1/6] kms-winsys: drop support for old gbm versions
- Date: Thu, 27 Aug 2015 18:24:48 +0000 (UTC)
commit 4a10460648ae1c8de2ebdd061e15cd492565121b
Author: Ray Strode <rstrode redhat com>
Date: Wed Aug 26 11:30:04 2015 -0400
kms-winsys: drop support for old gbm versions
Right now cogl tries to accomodate older gbm versions that
have the function gbm_bo_get_pitch() instead of the more
recently named gbm_bo_get_stride().
This adds an ugly #ifdef in the code. Furthermore, we are
going to rely on newer gbm for dma-buf support anyway.
This commit drops the #ifdef.
cogl/winsys/cogl-winsys-egl-kms.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/winsys/cogl-winsys-egl-kms.c
index 6628927..c7ee4bc 100644
--- a/cogl/winsys/cogl-winsys-egl-kms.c
+++ b/cogl/winsys/cogl-winsys-egl-kms.c
@@ -910,13 +910,7 @@ _cogl_winsys_onscreen_swap_buffers_with_damage (CoglOnscreen *onscreen,
}
/* Now we need to set the CRTC to whatever is the front buffer */
kms_onscreen->next_bo = gbm_surface_lock_front_buffer (kms_onscreen->surface);
-
-#if (COGL_VERSION_ENCODE (COGL_GBM_MAJOR, COGL_GBM_MINOR, COGL_GBM_MICRO) >= \
- COGL_VERSION_ENCODE (8, 1, 0))
stride = gbm_bo_get_stride (kms_onscreen->next_bo);
-#else
- stride = gbm_bo_get_pitch (kms_onscreen->next_bo);
-#endif
handle = gbm_bo_get_handle (kms_onscreen->next_bo).u32;
if (drmModeAddFB (kms_renderer->fd,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]