From: Ander Conselvan de Oliveira <ander.conselvan.de.olive...@intel.com>
It actually contains a pointer to a gbm_dri_surface, so use a more
appropriate name.
---
src/egl/drivers/dri2/egl_dri2.h | 2 +-
src/egl/drivers/dri2/platform_drm.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h
index dfc5927..b8281e8 100644
--- a/src/egl/drivers/dri2/egl_dri2.h
+++ b/src/egl/drivers/dri2/egl_dri2.h
@@ -179,7 +179,7 @@ struct dri2_egl_surface
#endif
#ifdef HAVE_DRM_PLATFORM
- struct gbm_dri_surface *gbm_surf;
+ struct gbm_dri_surface *gbm_dri_surf;
#endif
#if defined(HAVE_WAYLAND_PLATFORM) || defined(HAVE_DRM_PLATFORM)
diff --git a/src/egl/drivers/dri2/platform_drm.c
b/src/egl/drivers/dri2/platform_drm.c
index a2b387d..a0f6ccb 100644
--- a/src/egl/drivers/dri2/platform_drm.c
+++ b/src/egl/drivers/dri2/platform_drm.c
@@ -111,7 +111,7 @@ dri2_create_surface(_EGLDriver *drv, _EGLDisplay *disp,
EGLint type,
if (!window)
return NULL;
surf = gbm_dri_surface((struct gbm_surface *) window);
- dri2_surf->gbm_surf = surf;
+ dri2_surf->gbm_dri_surf = surf;
dri2_surf->base.Width = surf->base.width;
dri2_surf->base.Height = surf->base.height;
surf->dri_private = dri2_surf;
@@ -123,7 +123,7 @@ dri2_create_surface(_EGLDriver *drv, _EGLDisplay *disp,
EGLint type,
dri2_surf->dri_drawable =
(*dri2_dpy->dri2->createNewDrawable) (dri2_dpy->dri_screen,
dri2_conf->dri_double_config,
- dri2_surf->gbm_surf);
+ dri2_surf->gbm_dri_surf);
if (dri2_surf->dri_drawable == NULL) {
_eglError(EGL_BAD_ALLOC, "dri2->createNewDrawable");
@@ -180,7 +180,7 @@ get_back_bo(struct dri2_egl_surface *dri2_surf)
{
struct dri2_egl_display *dri2_dpy =
dri2_egl_display(dri2_surf->base.Resource.Display);
- struct gbm_dri_surface *surf = dri2_surf->gbm_surf;
+ struct gbm_dri_surface *surf = dri2_surf->gbm_dri_surf;
int i;
if (dri2_surf->back == NULL) {
--
1.8.3.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
