diff options
| author | Jakob Bornecrantz <wallbraker@gmail.com> | 2009-09-22 20:22:13 -0700 |
|---|---|---|
| committer | Jakob Bornecrantz <wallbraker@gmail.com> | 2009-09-27 13:19:48 -0700 |
| commit | dd586078bef433d0830df0b60c768c617a8ae8cd (patch) | |
| tree | 671e75479763b36afd279556161bc2c2180e0587 | |
| parent | eea30906de37ea3b2f8a594c2b33b643d3dde987 (diff) | |
| download | external_mesa3d-dd586078bef433d0830df0b60c768c617a8ae8cd.zip external_mesa3d-dd586078bef433d0830df0b60c768c617a8ae8cd.tar.gz external_mesa3d-dd586078bef433d0830df0b60c768c617a8ae8cd.tar.bz2 | |
st/egl: Remove buffer from screen
It is no longer needed since the new drm api code,
and it incorrectly checked if the buffer where there
for testing completeness when it should have checked
the texture instead.
| -rw-r--r-- | src/gallium/state_trackers/egl/egl_surface.c | 7 | ||||
| -rw-r--r-- | src/gallium/state_trackers/egl/egl_tracker.h | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/gallium/state_trackers/egl/egl_surface.c b/src/gallium/state_trackers/egl/egl_surface.c index 69e2d6b..542ac56 100644 --- a/src/gallium/state_trackers/egl/egl_surface.c +++ b/src/gallium/state_trackers/egl/egl_surface.c @@ -152,7 +152,6 @@ drm_takedown_shown_screen(_EGLDisplay *dpy, struct drm_screen *screen) pipe_surface_reference(&screen->surface, NULL); pipe_texture_reference(&screen->tex, NULL); - pipe_buffer_reference(&screen->buffer, NULL); screen->shown = 0; } @@ -250,8 +249,8 @@ drm_show_screen_surface_mesa(_EGLDriver *drv, _EGLDisplay *dpy, drm_create_texture(dpy, scrn, mode->Width, mode->Height); - if (!scrn->buffer) - return EGL_FALSE; + if (!scrn->tex) + goto err_tex; ret = drmModeAddFB(dev->drmFD, scrn->front.width, scrn->front.height, @@ -325,8 +324,8 @@ err_fb: err_bo: pipe_surface_reference(&scrn->surface, NULL); pipe_texture_reference(&scrn->tex, NULL); - pipe_buffer_reference(&scrn->buffer, NULL); +err_tex: return EGL_FALSE; } diff --git a/src/gallium/state_trackers/egl/egl_tracker.h b/src/gallium/state_trackers/egl/egl_tracker.h index dd4730f..f280748 100644 --- a/src/gallium/state_trackers/egl/egl_tracker.h +++ b/src/gallium/state_trackers/egl/egl_tracker.h @@ -94,7 +94,6 @@ struct drm_screen * pipe */ - struct pipe_buffer *buffer; struct pipe_texture *tex; struct pipe_surface *surface; |