diff options
| author | Emil Velikov <[email protected]> | 2016-08-25 00:42:56 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-10-14 12:45:54 +0100 |
| commit | d5342c6ff241419e287700e4c4e7c1043fd48ffc (patch) | |
| tree | 92fcda8144a2f63ea591a456951e92e2c4488bde | |
| parent | 38526bd4688a10385df1963458e8c6aded552653 (diff) | |
gbm: rename gbm_dri_device::{,loader_}extensions
To align with the name used in the EGL and GLX loaders.
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
| -rw-r--r-- | src/gbm/backends/dri/gbm_dri.c | 12 | ||||
| -rw-r--r-- | src/gbm/backends/dri/gbm_driint.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c index f863616ab08..e7c0e8941b5 100644 --- a/src/gbm/backends/dri/gbm_dri.c +++ b/src/gbm/backends/dri/gbm_dri.c @@ -439,19 +439,19 @@ dri_screen_create_dri2(struct gbm_dri_device *dri, char *driver_name) return ret; }; - dri->extensions = gbm_dri_screen_extensions; + dri->loader_extensions = gbm_dri_screen_extensions; if (dri->dri2 == NULL) return -1; if (dri->dri2->base.version >= 4) { dri->screen = dri->dri2->createNewScreen2(0, dri->base.base.fd, - dri->extensions, + dri->loader_extensions, dri->driver_extensions, &dri->driver_configs, dri); } else { dri->screen = dri->dri2->createNewScreen(0, dri->base.base.fd, - dri->extensions, + dri->loader_extensions, &dri->driver_configs, dri); } if (dri->screen == NULL) @@ -489,17 +489,17 @@ dri_screen_create_swrast(struct gbm_dri_device *dri) return ret; } - dri->extensions = gbm_dri_screen_extensions; + dri->loader_extensions = gbm_dri_screen_extensions; if (dri->swrast == NULL) return -1; if (dri->swrast->base.version >= 4) { - dri->screen = dri->swrast->createNewScreen2(0, dri->extensions, + dri->screen = dri->swrast->createNewScreen2(0, dri->loader_extensions, dri->driver_extensions, &dri->driver_configs, dri); } else { - dri->screen = dri->swrast->createNewScreen(0, dri->extensions, + dri->screen = dri->swrast->createNewScreen(0, dri->loader_extensions, &dri->driver_configs, dri); } if (dri->screen == NULL) diff --git a/src/gbm/backends/dri/gbm_driint.h b/src/gbm/backends/dri/gbm_driint.h index 9c550074847..1644facd9bd 100644 --- a/src/gbm/backends/dri/gbm_driint.h +++ b/src/gbm/backends/dri/gbm_driint.h @@ -58,7 +58,7 @@ struct gbm_dri_device { const __DRIdri2LoaderExtension *loader; const __DRIconfig **driver_configs; - const __DRIextension **extensions; + const __DRIextension **loader_extensions; const __DRIextension **driver_extensions; __DRIimage *(*lookup_image)(__DRIscreen *screen, void *image, void *data); |