diff options
| author | Gwan-gyeong Mun <elongbug@gmail.com> | 2017-07-18 17:12:26 +0900 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2017-07-19 13:06:50 +0100 |
| commit | 3f6cc931eb4d16c4a003827148b97ef6d62ac242 (patch) | |
| tree | b1c1e8f11cb8cc180a98a07a97bdce82e7d2cfe3 | |
| parent | faada25f4727bc2b3088aa2a1b9efd2c562cfb28 (diff) | |
egl/dri2: remove unused buffer_count variable
It removes unused buffer_count variable from dri2_egl_surface.
And it polishes the assert of dri2_drm_get_buffers_with_format().
Signed-off-by: Mun Gwan-gyeong <elongbug@gmail.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
| -rw-r--r-- | src/egl/drivers/dri2/egl_dri2.h | 1 | ||||
| -rw-r--r-- | src/egl/drivers/dri2/platform_android.c | 5 | ||||
| -rw-r--r-- | src/egl/drivers/dri2/platform_drm.c | 3 | ||||
| -rw-r--r-- | src/egl/drivers/dri2/platform_x11.c | 1 |
4 files changed, 2 insertions, 8 deletions
diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index 0388b642cd..ccfefef61f 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -256,7 +256,6 @@ struct dri2_egl_surface _EGLSurface base; __DRIdrawable *dri_drawable; __DRIbuffer buffers[5]; - int buffer_count; bool have_fake_front; #ifdef HAVE_X11_PLATFORM diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index 13006fee87..300e2d9dbf 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -1003,16 +1003,13 @@ droid_get_buffers_with_format(__DRIdrawable * driDrawable, if (update_buffers(dri2_surf) < 0) return NULL; - dri2_surf->buffer_count = - droid_get_buffers_parse_attachments(dri2_surf, attachments, count); + *out_count = droid_get_buffers_parse_attachments(dri2_surf, attachments, count); if (width) *width = dri2_surf->base.Width; if (height) *height = dri2_surf->base.Height; - *out_count = dri2_surf->buffer_count; - return dri2_surf->buffers; } diff --git a/src/egl/drivers/dri2/platform_drm.c b/src/egl/drivers/dri2/platform_drm.c index d18c73cb33..d59009f3d2 100644 --- a/src/egl/drivers/dri2/platform_drm.c +++ b/src/egl/drivers/dri2/platform_drm.c @@ -323,10 +323,9 @@ dri2_drm_get_buffers_with_format(__DRIdrawable *driDrawable, struct dri2_egl_surface *dri2_surf = loaderPrivate; int i, j; - dri2_surf->buffer_count = 0; for (i = 0, j = 0; i < 2 * count; i += 2, j++) { assert(attachments[i] < __DRI_BUFFER_COUNT); - assert(dri2_surf->buffer_count < 5); + assert(j < ARRAY_SIZE(dri2_surf->buffers)); switch (attachments[i]) { case __DRI_BUFFER_BACK_LEFT: diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index c10cd84fce..b01f739010 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -445,7 +445,6 @@ dri2_x11_process_buffers(struct dri2_egl_surface *dri2_surf, dri2_egl_display(dri2_surf->base.Resource.Display); xcb_rectangle_t rectangle; - dri2_surf->buffer_count = count; dri2_surf->have_fake_front = false; /* This assumes the DRI2 buffer attachment tokens matches the |