nv50: remove previous hack to manage tiled surfaces

diff --git a/src/gallium/drivers/nv50/nv50_context.h b/src/gallium/drivers/nv50/nv50_context.h
index c1ff6061e4dd9ed8ccb4fb1d0129acae58492f02..a1a6b2cb887c91b5ef9a53b590e4c8b957abff42 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_context.h
+++ b/src/gallium/drivers/nv50/nv50_context.h
@@ -91,7 +91,6 @@ nv50_miptree(struct pipe_texture *pt)
 
 struct nv50_surface {
        struct pipe_surface base;
-       struct pipe_buffer *untiled;
 };
 
 static INLINE struct nv50_surface *

diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c
index 5bf97d3a6bfcfe91a061a7a7df4faeddce070164..3f45a2fe18644b6af2eba5f784c3a1604fd53e87 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_surface.c
+++ b/src/gallium/drivers/nv50/nv50_surface.c
@@ -63,48 +63,17 @@ static void *
 nv50_surface_map(struct pipe_screen *screen, struct pipe_surface *ps,
                 unsigned flags )
 {
-       struct nouveau_winsys *nvws = nv50_screen(screen)->nvws;
        struct pipe_winsys *ws = screen->winsys;
-       struct nv50_surface *s = nv50_surface(ps);
-       struct nv50_surface m = *s;
-       void *map;
 
-       if (!s->untiled) {
-               s->untiled = ws->buffer_create(ws, 0, 0, ps->buffer->size);
-
-               m.base.buffer = s->untiled;
-               nvws->surface_copy(nvws, &m.base, 0, 0, &s->base, 0, 0,
-                                        ps->width, ps->height);
-       }
-
-       /* Map original tiled surface to disallow it being validated while
-        * untiled mirror is mapped.
-        */
-       ws->buffer_map(ws, ps->buffer, flags);
-
-       map = ws->buffer_map(ws, s->untiled, flags);
-       if (!map)
-               return NULL;
-
-       return map;
+       return ws->buffer_map(ws, ps->buffer, flags);
 }
 
 static void
 nv50_surface_unmap(struct pipe_screen *pscreen, struct pipe_surface *ps)
 {
-       struct nouveau_winsys *nvws = nv50_screen(pscreen)->nvws;
        struct pipe_winsys *ws = pscreen->winsys;
-       struct nv50_surface *s = nv50_surface(ps);
-       struct nv50_surface m = *s;
 
-       ws->buffer_unmap(ws, s->untiled);
        ws->buffer_unmap(ws, ps->buffer);
-
-       m.base.buffer = s->untiled;
-       nvws->surface_copy(nvws, &s->base, 0, 0, &m.base, 0, 0,
-                                ps->width, ps->height);
-
-       pipe_buffer_reference(pscreen, &s->untiled, NULL);
 }
 
 void