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

egl_dri2: Drop the use of _egl[SG]etConfigKey. 

_EGLConfig can be directly dereferenced now.
This commit is contained in:
Chia-I Wu 2010-10-22 15:03:11 +08:00
parent aa86c7657c
commit b67f7295b7
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/egl/drivers/dri2/egl_dri2.c
View File

@ -248,21 +248,20 @@ dri2_add_config(_EGLDisplay *disp, const __DRIconfig *dri_config, int id,
if (double_buffer) if (double_buffer)
return NULL; return NULL;
if (depth > 0 && depth != _eglGetConfigKey(&base, EGL_BUFFER_SIZE)) if (depth > 0 && depth != base.BufferSize)
return NULL; return NULL;
_eglSetConfigKey(&base, EGL_NATIVE_RENDERABLE, EGL_TRUE); base.NativeRenderable = EGL_TRUE;
_eglSetConfigKey(&base, EGL_SURFACE_TYPE, surface_type); base.SurfaceType = surface_type;
if (surface_type & (EGL_PIXMAP_BIT | EGL_PBUFFER_BIT)) { if (surface_type & (EGL_PIXMAP_BIT | EGL_PBUFFER_BIT)) {
_eglSetConfigKey(&base, EGL_BIND_TO_TEXTURE_RGB, bind_to_texture_rgb); base.BindToTextureRGB = bind_to_texture_rgb;
if (_eglGetConfigKey(&base, EGL_ALPHA_SIZE) > 0) if (base.AlphaSize > 0)
_eglSetConfigKey(&base, base.BindToTextureRGBA = bind_to_texture_rgba;
EGL_BIND_TO_TEXTURE_RGBA, bind_to_texture_rgba);
} }
_eglSetConfigKey(&base, EGL_RENDERABLE_TYPE, disp->ClientAPIsMask); base.RenderableType = disp->ClientAPIsMask;
_eglSetConfigKey(&base, EGL_CONFORMANT, disp->ClientAPIsMask); base.Conformant = disp->ClientAPIsMask;
if (!_eglValidateConfig(&base, EGL_FALSE)) { if (!_eglValidateConfig(&base, EGL_FALSE)) {
_eglLog(_EGL_DEBUG, "DRI2: failed to validate config %d", id); _eglLog(_EGL_DEBUG, "DRI2: failed to validate config %d", id);
@ -1251,8 +1250,7 @@ dri2_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type,
if (type == EGL_PBUFFER_BIT) { if (type == EGL_PBUFFER_BIT) {
dri2_surf->drawable = xcb_generate_id(dri2_dpy->conn); dri2_surf->drawable = xcb_generate_id(dri2_dpy->conn);
s = xcb_setup_roots_iterator(xcb_get_setup(dri2_dpy->conn)); s = xcb_setup_roots_iterator(xcb_get_setup(dri2_dpy->conn));
xcb_create_pixmap(dri2_dpy->conn, xcb_create_pixmap(dri2_dpy->conn, conf->BufferSize,
_eglGetConfigKey(conf, EGL_BUFFER_SIZE),
dri2_surf->drawable, s.data->root, dri2_surf->drawable, s.data->root,
dri2_surf->base.Width, dri2_surf->base.Height); dri2_surf->base.Width, dri2_surf->base.Height);
} else { } else {