diff options
| author | Haitao Feng <haitao.feng@intel.com> | 2011-02-09 15:05:11 +0800 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2011-02-10 23:41:21 -0500 |
| commit | 3104e5cb4f8524e9852300aa1e112d7fe31545ca (patch) | |
| tree | 37d2bdbe707d8871f20b9e9fc097c687eb53e7c9 | |
| parent | 9f213f6a4af9d6b3663bd2fbd371fbec9f869c75 (diff) | |
egl_dri2: rename loader_extension to dri2_loader_extension
Signed-off-by: Haitao Feng <haitao.feng@intel.com>
| -rw-r--r-- | src/egl/drivers/dri2/egl_dri2.h | 2 | ||||
| -rw-r--r-- | src/egl/drivers/dri2/platform_wayland.c | 12 | ||||
| -rw-r--r-- | src/egl/drivers/dri2/platform_x11.c | 22 |
3 files changed, 18 insertions, 18 deletions
diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index ad262d21f0..6f5a69cf57 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -79,7 +79,7 @@ struct dri2_egl_display char *device_name; char *driver_name; - __DRIdri2LoaderExtension loader_extension; + __DRIdri2LoaderExtension dri2_loader_extension; const __DRIextension *extensions[3]; #ifdef HAVE_WAYLAND_PLATFORM struct wl_egl_display *wl_dpy; diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index 64f8b1bccc..859e99f7e7 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -627,14 +627,14 @@ dri2_initialize_wayland(_EGLDriver *drv, _EGLDisplay *disp) if (!dri2_load_driver(disp)) goto cleanup_driver_name; - dri2_dpy->loader_extension.base.name = __DRI_DRI2_LOADER; - dri2_dpy->loader_extension.base.version = 3; - dri2_dpy->loader_extension.getBuffers = dri2_get_buffers; - dri2_dpy->loader_extension.flushFrontBuffer = dri2_flush_front_buffer; - dri2_dpy->loader_extension.getBuffersWithFormat = + dri2_dpy->dri2_loader_extension.base.name = __DRI_DRI2_LOADER; + dri2_dpy->dri2_loader_extension.base.version = 3; + dri2_dpy->dri2_loader_extension.getBuffers = dri2_get_buffers; + dri2_dpy->dri2_loader_extension.flushFrontBuffer = dri2_flush_front_buffer; + dri2_dpy->dri2_loader_extension.getBuffersWithFormat = dri2_get_buffers_with_format; - dri2_dpy->extensions[0] = &dri2_dpy->loader_extension.base; + dri2_dpy->extensions[0] = &dri2_dpy->dri2_loader_extension.base; dri2_dpy->extensions[1] = &image_lookup_extension.base; dri2_dpy->extensions[2] = NULL; diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index e360266d80..4d72335552 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -742,21 +742,21 @@ dri2_initialize_x11(_EGLDriver *drv, _EGLDisplay *disp) } if (dri2_dpy->dri2_minor >= 1) { - dri2_dpy->loader_extension.base.name = __DRI_DRI2_LOADER; - dri2_dpy->loader_extension.base.version = 3; - dri2_dpy->loader_extension.getBuffers = dri2_get_buffers; - dri2_dpy->loader_extension.flushFrontBuffer = dri2_flush_front_buffer; - dri2_dpy->loader_extension.getBuffersWithFormat = + dri2_dpy->dri2_loader_extension.base.name = __DRI_DRI2_LOADER; + dri2_dpy->dri2_loader_extension.base.version = 3; + dri2_dpy->dri2_loader_extension.getBuffers = dri2_get_buffers; + dri2_dpy->dri2_loader_extension.flushFrontBuffer = dri2_flush_front_buffer; + dri2_dpy->dri2_loader_extension.getBuffersWithFormat = dri2_get_buffers_with_format; } else { - dri2_dpy->loader_extension.base.name = __DRI_DRI2_LOADER; - dri2_dpy->loader_extension.base.version = 2; - dri2_dpy->loader_extension.getBuffers = dri2_get_buffers; - dri2_dpy->loader_extension.flushFrontBuffer = dri2_flush_front_buffer; - dri2_dpy->loader_extension.getBuffersWithFormat = NULL; + dri2_dpy->dri2_loader_extension.base.name = __DRI_DRI2_LOADER; + dri2_dpy->dri2_loader_extension.base.version = 2; + dri2_dpy->dri2_loader_extension.getBuffers = dri2_get_buffers; + dri2_dpy->dri2_loader_extension.flushFrontBuffer = dri2_flush_front_buffer; + dri2_dpy->dri2_loader_extension.getBuffersWithFormat = NULL; } - dri2_dpy->extensions[0] = &dri2_dpy->loader_extension.base; + dri2_dpy->extensions[0] = &dri2_dpy->dri2_loader_extension.base; dri2_dpy->extensions[1] = &image_lookup_extension.base; dri2_dpy->extensions[2] = NULL; |