AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gbm: rename gbm_dri_device::{,loader_}extensions

Browse Source 
To align with the name used in the EGL and GLX loaders.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
This commit is contained in:
Emil Velikov
2016-08-25 00:42:56 +01:00
committed by Emil Velikov
parent 38526bd468
commit d5342c6ff2
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gbm/backends/dri/gbm_dri.c
View File

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

2
src/gbm/backends/dri/gbm_driint.h
View File

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