diff options
| author | Chia-I Wu <[email protected]> | 2010-10-22 15:03:11 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2010-10-22 16:26:25 +0800 |
| commit | b67f7295b77839a027502039e63213dce269034c (patch) | |
| tree | f8bb7aacc85746190bc7255d1d65c7097e409169 /src/egl/drivers | |
| parent | aa86c7657cdedb4b045c54afe0927f52aa0cd6bb (diff) | |
egl_dri2: Drop the use of _egl[SG]etConfigKey.
_EGLConfig can be directly dereferenced now.
Diffstat (limited to 'src/egl/drivers')
| -rw-r--r-- | src/egl/drivers/dri2/egl_dri2.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index d17a2ab88c2..aad1c254b76 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -248,21 +248,20 @@ dri2_add_config(_EGLDisplay *disp, const __DRIconfig *dri_config, int id, if (double_buffer) return NULL; - if (depth > 0 && depth != _eglGetConfigKey(&base, EGL_BUFFER_SIZE)) + if (depth > 0 && depth != base.BufferSize) 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)) { - _eglSetConfigKey(&base, EGL_BIND_TO_TEXTURE_RGB, bind_to_texture_rgb); - if (_eglGetConfigKey(&base, EGL_ALPHA_SIZE) > 0) - _eglSetConfigKey(&base, - EGL_BIND_TO_TEXTURE_RGBA, bind_to_texture_rgba); + base.BindToTextureRGB = bind_to_texture_rgb; + if (base.AlphaSize > 0) + base.BindToTextureRGBA = bind_to_texture_rgba; } - _eglSetConfigKey(&base, EGL_RENDERABLE_TYPE, disp->ClientAPIsMask); - _eglSetConfigKey(&base, EGL_CONFORMANT, disp->ClientAPIsMask); + base.RenderableType = disp->ClientAPIsMask; + base.Conformant = disp->ClientAPIsMask; if (!_eglValidateConfig(&base, EGL_FALSE)) { _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) { dri2_surf->drawable = xcb_generate_id(dri2_dpy->conn); s = xcb_setup_roots_iterator(xcb_get_setup(dri2_dpy->conn)); - xcb_create_pixmap(dri2_dpy->conn, - _eglGetConfigKey(conf, EGL_BUFFER_SIZE), + xcb_create_pixmap(dri2_dpy->conn, conf->BufferSize, dri2_surf->drawable, s.data->root, dri2_surf->base.Width, dri2_surf->base.Height); } else { |