nv30/shader: SSG, LIT only requires one source register

[mesa.git] / src / gallium / drivers / r600 / r600_texture.c

diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index 99cba964a32ddb2d43f754f3a0b3c9ae10eb7f26..4673d86fd02d71089d12f4cf42793cadfa843eef 100644 (file)
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -898,20 +898,20 @@ void* r600_texture_transfer_map(struct pipe_context *ctx,
 {
        struct r600_context *rctx = (struct r600_context *)ctx;
        struct r600_transfer *rtransfer = (struct r600_transfer*)transfer;
-       struct pb_buffer *buf;
+       struct radeon_winsys_cs_handle *buf;
        enum pipe_format format = transfer->resource->format;
        unsigned offset = 0;
        char *map;
 
        if (rtransfer->staging) {
-               buf = ((struct r600_resource *)rtransfer->staging)->buf;
+               buf = ((struct r600_resource *)rtransfer->staging)->cs_buf;
        } else {
                struct r600_resource_texture *rtex = (struct r600_resource_texture*)transfer->resource;
 
                if (rtex->flushed_depth_texture)
-                       buf = ((struct r600_resource *)rtex->flushed_depth_texture)->buf;
+                       buf = ((struct r600_resource *)rtex->flushed_depth_texture)->cs_buf;
                else
-                       buf = ((struct r600_resource *)transfer->resource)->buf;
+                       buf = ((struct r600_resource *)transfer->resource)->cs_buf;
 
                offset = rtransfer->offset +
                        transfer->box.y / util_format_get_blockheight(format) * transfer->stride +
@@ -930,17 +930,17 @@ void r600_texture_transfer_unmap(struct pipe_context *ctx,
 {
        struct r600_transfer *rtransfer = (struct r600_transfer*)transfer;
        struct r600_context *rctx = (struct r600_context*)ctx;
-       struct pb_buffer *buf;
+       struct radeon_winsys_cs_handle *buf;
 
        if (rtransfer->staging) {
-               buf = ((struct r600_resource *)rtransfer->staging)->buf;
+               buf = ((struct r600_resource *)rtransfer->staging)->cs_buf;
        } else {
                struct r600_resource_texture *rtex = (struct r600_resource_texture*)transfer->resource;
 
                if (rtex->flushed_depth_texture) {
-                       buf = ((struct r600_resource *)rtex->flushed_depth_texture)->buf;
+                       buf = ((struct r600_resource *)rtex->flushed_depth_texture)->cs_buf;
                } else {
-                       buf = ((struct r600_resource *)transfer->resource)->buf;
+                       buf = ((struct r600_resource *)transfer->resource)->cs_buf;
                }
        }
        rctx->ws->buffer_unmap(buf);