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

egl: in _eglAddConfig() just save a pointer to the config; don't copy the config 

This allows subclassing by drivers.
This commit is contained in:
Brian Paul 2008-06-04 11:34:10 -06:00
parent 88f86c9d02
commit 97035cb19a
4 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/egl/main/eglconfig.c
View File

@ -78,8 +78,8 @@ _eglLookupConfig(_EGLDriver *drv, EGLDisplay dpy, EGLConfig config)
EGLint i;
_EGLDisplay *disp = _eglLookupDisplay(dpy);
for (i = 0; i < disp->NumConfigs; i++) {
if (disp->Configs[i].Handle == config) {
return disp->Configs + i;
if (disp->Configs[i]->Handle == config) {
return disp->Configs[i];
}
}
return NULL;
@ -88,23 +88,24 @@ _eglLookupConfig(_EGLDriver *drv, EGLDisplay dpy, EGLConfig config)
/**
* Add the given _EGLConfig to the given display.
* Note that we just save the ptr to the config (we don't copy the config).
*/
_EGLConfig *
_eglAddConfig(_EGLDisplay *display, const _EGLConfig *config)
_eglAddConfig(_EGLDisplay *display, _EGLConfig *config)
{
_EGLConfig *newConfigs;
_EGLConfig **newConfigs;
EGLint n;
n = display->NumConfigs;
newConfigs = (_EGLConfig *) realloc(display->Configs,
(n + 1) * sizeof(_EGLConfig));
/* realloc array of ptrs */
newConfigs = (_EGLConfig **) realloc(display->Configs,
(n + 1) * sizeof(_EGLConfig *));
if (newConfigs) {
display->Configs = newConfigs;
display->Configs[n] = *config; /* copy struct */
display->Configs[n].Handle = (EGLConfig) n;
display->Configs[n] = config;
display->NumConfigs++;
return display->Configs + n;
return config;
}
else {
return NULL;
@ -330,8 +331,8 @@ _eglChooseConfig(_EGLDriver *drv, EGLDisplay dpy, const EGLint *attrib_list,
/* make array of pointers to qualifying configs */
for (i = count = 0; i < disp->NumConfigs && count < config_size; i++) {
if (_eglConfigQualifies(disp->Configs + i, &criteria)) {
configList[count++] = disp->Configs + i;
if (_eglConfigQualifies(disp->Configs[i], &criteria)) {
configList[count++] = disp->Configs[i];
}
}
@ -389,7 +390,7 @@ _eglGetConfigs(_EGLDriver *drv, EGLDisplay dpy, EGLConfig *configs,
EGLint i;
*num_config = MIN2(disp->NumConfigs, config_size);
for (i = 0; i < *num_config; i++) {
configs[i] = disp->Configs[i].Handle;
configs[i] = disp->Configs[i]->Handle;
}
}
else {

2
src/egl/main/eglconfig.h
View File

@ -34,7 +34,7 @@ _eglLookupConfig(_EGLDriver *drv, EGLDisplay dpy, EGLConfig config);
extern _EGLConfig *
_eglAddConfig(_EGLDisplay *display, const _EGLConfig *config);
_eglAddConfig(_EGLDisplay *display, _EGLConfig *config);
extern EGLBoolean

18
src/egl/main/egldisplay.c
View File

@ -96,11 +96,25 @@ _eglGetCurrentDisplay(void)
}
/**
* Free all the data hanging of an _EGLDisplay object, but not
* the object itself.
*/
void
_eglCleanupDisplay(_EGLDisplay *disp)
{
/* XXX incomplete */
EGLint i;
for (i = 0; i < disp->NumConfigs; i++) {
free(disp->Configs[i]);
}
free(disp->Configs);
disp->Configs = NULL;
/* XXX incomplete */
free((void *) disp->DriverName);
/* driver deletes _EGLDisplay */
disp->DriverName = NULL;
/* driver deletes the _EGLDisplay object */
}

2
src/egl/main/egldisplay.h
View File

@ -21,7 +21,7 @@ struct _egl_display
_EGLScreen **Screens; /* array [NumScreens] */
EGLint NumConfigs;
_EGLConfig *Configs; /* array [NumConfigs] */
_EGLConfig **Configs; /* array [NumConfigs] of ptr to _EGLConfig */
#ifdef _EGL_PLATFORM_X
Display *Xdpy;