r600g: implement timestamp query and get_timestamp hook

[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 6460c4fa346c57e9694ee763bfa3764135c1a8a6..f4c30de1dd1e08f02fed23d389c1a1e235c41134 100644 (file)
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -98,8 +98,9 @@ static int r600_init_surface(struct r600_screen *rscreen,
                }
        }
 
-       surface->nsamples = 1;
+       surface->nsamples = ptex->nr_samples ? ptex->nr_samples : 1;
        surface->flags = 0;
+
        switch (array_mode) {
        case V_038000_ARRAY_1D_TILED_THIN1:
                surface->flags |= RADEON_SURF_SET(RADEON_SURF_MODE_1D, MODE);
@@ -516,7 +517,8 @@ struct pipe_transfer* r600_texture_get_transfer(struct pipe_context *ctx,
 
                r600_blit_uncompress_depth(ctx, rtex, staging_depth,
                                           level, level,
-                                          box->z, box->z + box->depth - 1);
+                                          box->z, box->z + box->depth - 1,
+                                          0, 0);
 
                trans->transfer.stride = staging_depth->pitch_in_bytes[level];
                trans->offset = r600_texture_get_offset(staging_depth, level, box->z);