diff options
Diffstat (limited to 'src/gallium/drivers/r300')
| -rw-r--r-- | src/gallium/drivers/r300/r300_context.h | 5 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_emit.c | 18 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_flush.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_query.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_screen_buffer.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_texture.c | 10 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_transfer.c | 8 |
7 files changed, 21 insertions, 31 deletions
diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h index 8c8c7ce129f..d8638fc1764 100644 --- a/src/gallium/drivers/r300/r300_context.h +++ b/src/gallium/drivers/r300/r300_context.h @@ -295,8 +295,6 @@ struct r300_query { struct radeon_winsys_cs_handle *cs_buf; /* The size of the buffer. */ unsigned buffer_size; - /* The domain of the buffer. */ - enum radeon_bo_domain domain; /* Linked list members. */ struct r300_query* prev; @@ -310,8 +308,6 @@ struct r300_surface { struct pb_buffer *buf; struct radeon_winsys_cs_handle *cs_buf; - enum radeon_bo_domain domain; - uint32_t offset; /* COLOROFFSET or DEPTHOFFSET. */ uint32_t pitch; /* COLORPITCH or DEPTHPITCH. */ uint32_t pitch_zmask; /* ZMASK_PITCH */ @@ -395,7 +391,6 @@ struct r300_resource /* Winsys buffer backing this resource. */ struct pb_buffer *buf; struct radeon_winsys_cs_handle *cs_buf; - enum radeon_bo_domain domain; /* Constant buffers are in user memory. */ uint8_t *constant_buffer; diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c index 62dcbf6e0df..2fb448a433a 100644 --- a/src/gallium/drivers/r300/r300_emit.c +++ b/src/gallium/drivers/r300/r300_emit.c @@ -1189,15 +1189,15 @@ validate: for (i = 0; i < fb->nr_cbufs; i++) { tex = r300_resource(fb->cbufs[i]->texture); assert(tex && tex->buf && "cbuf is marked, but NULL!"); - r300->rws->cs_add_reloc(r300->cs, tex->cs_buf, 0, - r300_surface(fb->cbufs[i])->domain); + r300->rws->cs_add_reloc(r300->cs, tex->cs_buf, + RADEON_USAGE_READWRITE); } /* ...depth buffer... */ if (fb->zsbuf) { tex = r300_resource(fb->zsbuf->texture); assert(tex && tex->buf && "zsbuf is marked, but NULL!"); - r300->rws->cs_add_reloc(r300->cs, tex->cs_buf, 0, - r300_surface(fb->zsbuf)->domain); + r300->rws->cs_add_reloc(r300->cs, tex->cs_buf, + RADEON_USAGE_READWRITE); } } if (r300->textures_state.dirty) { @@ -1208,17 +1208,17 @@ validate: } tex = r300_resource(texstate->sampler_views[i]->base.texture); - r300->rws->cs_add_reloc(r300->cs, tex->cs_buf, tex->domain, 0); + r300->rws->cs_add_reloc(r300->cs, tex->cs_buf, RADEON_USAGE_READ); } } /* ...occlusion query buffer... */ if (r300->query_current) r300->rws->cs_add_reloc(r300->cs, r300->query_current->cs_buf, - 0, r300->query_current->domain); + RADEON_USAGE_WRITE); /* ...vertex buffer for SWTCL path... */ if (r300->vbo) r300->rws->cs_add_reloc(r300->cs, r300_resource(r300->vbo)->cs_buf, - r300_resource(r300->vbo)->domain, 0); + RADEON_USAGE_READ); /* ...vertex buffers for HWTCL path... */ if (do_validate_vertex_buffers && r300->vertex_arrays_dirty) { struct pipe_vertex_buffer *vbuf = r300->vbuf_mgr->real_vertex_buffer; @@ -1231,13 +1231,13 @@ validate: continue; r300->rws->cs_add_reloc(r300->cs, r300_resource(buf)->cs_buf, - r300_resource(buf)->domain, 0); + RADEON_USAGE_READ); } } /* ...and index buffer for HWTCL path. */ if (index_buffer) r300->rws->cs_add_reloc(r300->cs, r300_resource(index_buffer)->cs_buf, - r300_resource(index_buffer)->domain, 0); + RADEON_USAGE_READ); /* Now do the validation (flush is called inside cs_validate on failure). */ if (!r300->rws->cs_validate(r300->cs)) { diff --git a/src/gallium/drivers/r300/r300_flush.c b/src/gallium/drivers/r300/r300_flush.c index ad06ef416a1..8b710c1a5ee 100644 --- a/src/gallium/drivers/r300/r300_flush.c +++ b/src/gallium/drivers/r300/r300_flush.c @@ -76,11 +76,11 @@ void r300_flush(struct pipe_context *pipe, /* Create a fence, which is a dummy BO. */ *rfence = r300->rws->buffer_create(r300->rws, 1, 1, PIPE_BIND_CUSTOM, - RADEON_DOMAIN_GTT); + PIPE_USAGE_IMMUTABLE); /* Add the fence as a dummy relocation. */ r300->rws->cs_add_reloc(r300->cs, r300->rws->buffer_get_cs_handle(*rfence), - RADEON_DOMAIN_GTT, RADEON_DOMAIN_GTT); + RADEON_USAGE_READWRITE); } if (r300->dirty_hw) { diff --git a/src/gallium/drivers/r300/r300_query.c b/src/gallium/drivers/r300/r300_query.c index c0357f9d035..3177ce63b99 100644 --- a/src/gallium/drivers/r300/r300_query.c +++ b/src/gallium/drivers/r300/r300_query.c @@ -45,7 +45,6 @@ static struct pipe_query *r300_create_query(struct pipe_context *pipe, return NULL; q->type = query_type; - q->domain = RADEON_DOMAIN_GTT; q->buffer_size = 4096; if (r300screen->caps.family == CHIP_FAMILY_RV530) @@ -57,7 +56,7 @@ static struct pipe_query *r300_create_query(struct pipe_context *pipe, /* Open up the occlusion query buffer. */ q->buf = r300->rws->buffer_create(r300->rws, q->buffer_size, 4096, - PIPE_BIND_CUSTOM, q->domain); + PIPE_BIND_CUSTOM, PIPE_USAGE_STAGING); q->cs_buf = r300->rws->buffer_get_cs_handle(q->buf); return (struct pipe_query*)q; diff --git a/src/gallium/drivers/r300/r300_screen_buffer.c b/src/gallium/drivers/r300/r300_screen_buffer.c index a8392d2dc52..5424f260e97 100644 --- a/src/gallium/drivers/r300/r300_screen_buffer.c +++ b/src/gallium/drivers/r300/r300_screen_buffer.c @@ -187,7 +187,6 @@ struct pipe_resource *r300_buffer_create(struct pipe_screen *screen, pipe_reference_init(&rbuf->b.b.b.reference, 1); rbuf->b.b.b.screen = screen; rbuf->b.user_ptr = NULL; - rbuf->domain = RADEON_DOMAIN_GTT; rbuf->buf = NULL; rbuf->constant_buffer = NULL; @@ -200,7 +199,7 @@ struct pipe_resource *r300_buffer_create(struct pipe_screen *screen, rbuf->buf = r300screen->rws->buffer_create(r300screen->rws, rbuf->b.b.b.width0, alignment, - rbuf->b.b.b.bind, rbuf->domain); + rbuf->b.b.b.bind, rbuf->b.b.b.usage); if (!rbuf->buf) { util_slab_free(&r300screen->pool_buffers, rbuf); return NULL; @@ -234,7 +233,6 @@ struct pipe_resource *r300_user_buffer_create(struct pipe_screen *screen, rbuf->b.b.b.flags = 0; rbuf->b.b.vtbl = &r300_buffer_vtbl; rbuf->b.user_ptr = ptr; - rbuf->domain = RADEON_DOMAIN_GTT; rbuf->buf = NULL; rbuf->constant_buffer = NULL; return &rbuf->b.b.b; diff --git a/src/gallium/drivers/r300/r300_texture.c b/src/gallium/drivers/r300/r300_texture.c index 067ec072f67..11442864c71 100644 --- a/src/gallium/drivers/r300/r300_texture.c +++ b/src/gallium/drivers/r300/r300_texture.c @@ -897,9 +897,6 @@ r300_texture_create_object(struct r300_screen *rscreen, tex->tex.microtile = microtile; tex->tex.macrotile[0] = macrotile; tex->tex.stride_in_bytes_override = stride_in_bytes_override; - tex->domain = base->flags & R300_RESOURCE_FLAG_TRANSFER ? - RADEON_DOMAIN_GTT : - RADEON_DOMAIN_VRAM | RADEON_DOMAIN_GTT; tex->buf = buffer; if (!r300_resource_set_properties(&rscreen->screen, &tex->b.b.b, 0, base)) { @@ -912,7 +909,7 @@ r300_texture_create_object(struct r300_screen *rscreen, /* Create the backing buffer if needed. */ if (!tex->buf) { tex->buf = rws->buffer_create(rws, tex->tex.size_in_bytes, 2048, - base->bind, tex->domain); + base->bind, base->usage); if (!tex->buf) { FREE(tex); @@ -1023,11 +1020,6 @@ struct pipe_surface* r300_create_surface(struct pipe_context * ctx, surface->buf = tex->buf; surface->cs_buf = tex->cs_buf; - /* Prefer VRAM if there are multiple domains to choose from. */ - surface->domain = tex->domain; - if (surface->domain & RADEON_DOMAIN_VRAM) - surface->domain &= ~RADEON_DOMAIN_GTT; - surface->offset = r300_texture_get_offset(tex, level, surf_tmpl->u.tex.first_layer); r300_texture_setup_fb_state(surface); diff --git a/src/gallium/drivers/r300/r300_transfer.c b/src/gallium/drivers/r300/r300_transfer.c index 65964020adc..57d60a0e0fe 100644 --- a/src/gallium/drivers/r300/r300_transfer.c +++ b/src/gallium/drivers/r300/r300_transfer.c @@ -130,8 +130,14 @@ r300_texture_get_transfer(struct pipe_context *ctx, base.array_size = 1; base.last_level = 0; base.nr_samples = 0; - base.usage = PIPE_USAGE_DYNAMIC; + base.usage = PIPE_USAGE_STAGING; base.bind = 0; + if (usage & PIPE_TRANSFER_READ) { + base.bind |= PIPE_BIND_SAMPLER_VIEW; + } + if (usage & PIPE_TRANSFER_WRITE) { + base.bind |= PIPE_BIND_RENDER_TARGET; + } base.flags = R300_RESOURCE_FLAG_TRANSFER; /* For texture reading, the temporary (detiled) texture is used as |