commit eef68a9094396ee85f73a94911f8919d232b9a08
author Chad Versace <chad.versace@linux.intel.com> Tue Jan 28 17:03:03 2014 -0800
committer Chad Versace <chad.versace@linux.intel.com> Mon Mar 17 15:39:23 2014 -0700
tree 1f349242fae19a69016a8defbd0035cc5f1367e2
parent 88b9e600a6c9ad191c4cb9ba981b5aa15bbe2b81

egl/dri2: Dispatch eglCreateImageKHR by display, not driver

Add dri2_egl_display_vtbl::create_image, set it for each platform, and
let egl_dri2 dispatch eglCreateImageKHR to that.

To remove ambiguity, rename egl_dri2.c:dri2_create_image() to
dri2_create_image_from_dri().

This prepares for the EGL platform extensions.

Signed-off-by: Chad Versace <chad.versace@linux.intel.com>

src/egl/drivers/dri2/egl_dri2.c

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 722131c..76dc773 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -1220,8 +1220,18 @@
    return EGL_TRUE;
 }
 
+static _EGLImage*
+dri2_create_image(_EGLDriver *drv, _EGLDisplay *dpy, _EGLContext *ctx,
+                  EGLenum target, EGLClientBuffer buffer,
+                  const EGLint *attr_list)
+{
+   struct dri2_egl_display *dri2_dpy = dri2_egl_display(dpy);
+   return dri2_dpy->vtbl->create_image(drv, dpy, ctx, target, buffer,
+                                       attr_list);
+}
+
 static _EGLImage *
-dri2_create_image(_EGLDisplay *disp, __DRIimage *dri_image)
+dri2_create_image_from_dri(_EGLDisplay *disp, __DRIimage *dri_image)
 {
    struct dri2_egl_image *dri2_img;
 
@@ -1265,7 +1275,7 @@
       dri2_dpy->image->createImageFromRenderbuffer(dri2_ctx->dri_context,
                                                    renderbuffer, NULL);
 
-   return dri2_create_image(disp, dri_image);
+   return dri2_create_image_from_dri(disp, dri_image);
 }
 
 #ifdef HAVE_DRM_PLATFORM
@@ -1311,7 +1321,7 @@
 					   pitch,
 					   NULL);
 
-   return dri2_create_image(disp, dri_image);
+   return dri2_create_image_from_dri(disp, dri_image);
 }
 #endif
 
@@ -1374,7 +1384,7 @@
       return NULL;
    }
 
-   return dri2_create_image(disp, dri_image);
+   return dri2_create_image_from_dri(disp, dri_image);
 }
 #endif
 
@@ -1744,7 +1754,7 @@
    if (!dri_image)
       return EGL_NO_IMAGE_KHR;
 
-   res = dri2_create_image(disp, dri_image);
+   res = dri2_create_image_from_dri(disp, dri_image);
    if (res)
       dri2_take_dma_buf_ownership(fds, num_fds);
 
@@ -2157,7 +2167,7 @@
    dri2_drv->base.API.PostSubBufferNV = dri2_post_sub_buffer;
    dri2_drv->base.API.CopyBuffers = dri2_copy_buffers,
    dri2_drv->base.API.QueryBufferAge = dri2_query_buffer_age;
-   dri2_drv->base.API.CreateImageKHR = dri2_create_image_khr;
+   dri2_drv->base.API.CreateImageKHR = dri2_create_image;
    dri2_drv->base.API.DestroyImageKHR = dri2_destroy_image_khr;
    dri2_drv->base.API.CreateWaylandBufferFromImageWL = dri2_create_wayland_buffer_from_image;
 #ifdef HAVE_DRM_PLATFORM