mirror of https://github.com/encounter/SDL.git
eglChooseConfig: only add EGL_DEPTH_SIZE if non 0
and fix static / shadowed variables warnings for dump configs
This commit is contained in:
parent
98a966d1c2
commit
cf05a5eb0c
|
@ -645,7 +645,8 @@ typedef struct {
|
||||||
char const* name;
|
char const* name;
|
||||||
} Attribute;
|
} Attribute;
|
||||||
|
|
||||||
Attribute attributes[] = {
|
static
|
||||||
|
Attribute all_attributes[] = {
|
||||||
ATTRIBUTE( EGL_BUFFER_SIZE ),
|
ATTRIBUTE( EGL_BUFFER_SIZE ),
|
||||||
ATTRIBUTE( EGL_ALPHA_SIZE ),
|
ATTRIBUTE( EGL_ALPHA_SIZE ),
|
||||||
ATTRIBUTE( EGL_BLUE_SIZE ),
|
ATTRIBUTE( EGL_BLUE_SIZE ),
|
||||||
|
@ -685,10 +686,10 @@ Attribute attributes[] = {
|
||||||
static void dumpconfig(_THIS, EGLConfig config)
|
static void dumpconfig(_THIS, EGLConfig config)
|
||||||
{
|
{
|
||||||
int attr;
|
int attr;
|
||||||
for (attr = 0 ; attr<sizeof(attributes)/sizeof(Attribute) ; attr++) {
|
for (attr = 0 ; attr<sizeof(all_attributes)/sizeof(Attribute) ; attr++) {
|
||||||
EGLint value;
|
EGLint value;
|
||||||
_this->egl_data->eglGetConfigAttrib(_this->egl_data->egl_display, config, attributes[attr].attribute, &value);
|
_this->egl_data->eglGetConfigAttrib(_this->egl_data->egl_display, config, all_attributes[attr].attribute, &value);
|
||||||
SDL_Log("\t%-32s: %10d (0x%08x)\n", attributes[attr].name, value, value);
|
SDL_Log("\t%-32s: %10d (0x%08x)\n", all_attributes[attr].name, value, value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -730,8 +731,10 @@ SDL_EGL_ChooseConfig(_THIS)
|
||||||
attribs[i++] = _this->gl_config.buffer_size;
|
attribs[i++] = _this->gl_config.buffer_size;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (_this->gl_config.depth_size) {
|
||||||
attribs[i++] = EGL_DEPTH_SIZE;
|
attribs[i++] = EGL_DEPTH_SIZE;
|
||||||
attribs[i++] = _this->gl_config.depth_size;
|
attribs[i++] = _this->gl_config.depth_size;
|
||||||
|
}
|
||||||
|
|
||||||
if (_this->gl_config.stencil_size) {
|
if (_this->gl_config.stencil_size) {
|
||||||
attribs[i++] = EGL_STENCIL_SIZE;
|
attribs[i++] = EGL_STENCIL_SIZE;
|
||||||
|
|
Loading…
Reference in New Issue