egl_dri2: rename loader_extension to dri2_loader_extension

Signed-off-by: Haitao Feng <haitao.feng@intel.com>
This commit is contained in:
Haitao Feng
2011-02-09 15:05:11 +08:00
committed by Kristian Høgsberg
parent 9f213f6a4a
commit 3104e5cb4f
3 changed files with 18 additions and 18 deletions

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;