radv: Only save the descriptor set if we have one.

[mesa.git] / src / mesa / drivers / dri / nouveau / nouveau_span.c

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_span.c b/src/mesa/drivers/dri/nouveau/nouveau_span.c
index 91a931161f00df90eec7ff63f547862b17dced31..77a150773d12ba16f06959fa027f215b8c4973dd 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_span.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_span.c
@@ -27,48 +27,34 @@
 #include "nouveau_driver.h"
 #include "nouveau_fbo.h"
 #include "nouveau_context.h"
-#include "nouveau_bo.h"
 
 #include "swrast/swrast.h"
+#include "swrast/s_context.h"
 
 
 
 static void
-renderbuffer_map_unmap(struct gl_renderbuffer *rb, GLboolean map)
+renderbuffer_map_unmap(struct gl_context *ctx, struct gl_renderbuffer *rb,
+                      GLboolean map)
 {
        struct nouveau_surface *s = &to_nouveau_renderbuffer(rb)->surface;
 
-       if (map) {
-               nouveau_bo_map(s->bo, NOUVEAU_BO_RDWR);
-       } else {
-               nouveau_bo_unmap(s->bo);
-       }
-}
-
-static void
-texture_unit_map_unmap(struct gl_context *ctx, struct gl_texture_unit *u, GLboolean map)
-{
-       if (!u->_ReallyEnabled)
-               return;
-
        if (map)
-               ctx->Driver.MapTexture(ctx, u->_Current);
-       else
-               ctx->Driver.UnmapTexture(ctx, u->_Current);
+               nouveau_bo_map(s->bo, NOUVEAU_BO_RDWR, context_client(ctx));
 }
 
 static void
-framebuffer_map_unmap(struct gl_framebuffer *fb, GLboolean map)
+framebuffer_map_unmap(struct gl_context *ctx, struct gl_framebuffer *fb, GLboolean map)
 {
        int i;
 
        for (i = 0; i < fb->_NumColorDrawBuffers; i++)
-               renderbuffer_map_unmap(fb->_ColorDrawBuffers[i], map);
+               renderbuffer_map_unmap(ctx, fb->_ColorDrawBuffers[i], map);
 
-       renderbuffer_map_unmap(fb->_ColorReadBuffer, map);
+       renderbuffer_map_unmap(ctx, fb->_ColorReadBuffer, map);
 
        if (fb->Attachment[BUFFER_DEPTH].Renderbuffer)
-               renderbuffer_map_unmap(fb->Attachment[BUFFER_DEPTH].Renderbuffer, map);
+               renderbuffer_map_unmap(ctx, fb->Attachment[BUFFER_DEPTH].Renderbuffer, map);
 }
 
 static void
@@ -76,13 +62,16 @@ span_map_unmap(struct gl_context *ctx, GLboolean map)
 {
        int i;
 
-       framebuffer_map_unmap(ctx->DrawBuffer, map);
+       framebuffer_map_unmap(ctx, ctx->DrawBuffer, map);
 
        if (ctx->ReadBuffer != ctx->DrawBuffer)
-               framebuffer_map_unmap(ctx->ReadBuffer, map);
+               framebuffer_map_unmap(ctx, ctx->ReadBuffer, map);
 
        for (i = 0; i < ctx->Const.MaxTextureUnits; i++)
-               texture_unit_map_unmap(ctx, &ctx->Texture.Unit[i], map);
+               if (map)
+                       _swrast_map_texture(ctx, ctx->Texture.Unit[i]._Current);
+               else
+                       _swrast_unmap_texture(ctx, ctx->Texture.Unit[i]._Current);
 }
 
 static void