st/egl: Remove buffer from screen
authorJakob Bornecrantz <wallbraker@gmail.com>
Wed, 23 Sep 2009 03:22:13 +0000 (20:22 -0700)
committerJakob Bornecrantz <wallbraker@gmail.com>
Sun, 27 Sep 2009 20:19:48 +0000 (13:19 -0700)
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.

src/gallium/state_trackers/egl/egl_surface.c
src/gallium/state_trackers/egl/egl_tracker.h

index 69e2d6b7081eb28f8b0a338ca72f654a2ff3291f..542ac56121ccd91fa356afe7b7364d7ffe0a01db 100644 (file)
@@ -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;
 }
 
index dd4730f95795a607cff30bdc7ee532ea4c84485c..f280748d6525617e33d7f5825a57d964f00b9f86 100644 (file)
@@ -94,7 +94,6 @@ struct drm_screen
         * pipe
         */
 
-       struct pipe_buffer *buffer;
        struct pipe_texture *tex;
        struct pipe_surface *surface;