r300g: don't use pipe_context::winsys
This commit is contained in:
@@ -231,7 +231,6 @@ void* r300_texture_transfer_map(struct pipe_context *ctx,
|
|||||||
struct pipe_transfer *transfer)
|
struct pipe_transfer *transfer)
|
||||||
{
|
{
|
||||||
struct r300_context *r300 = r300_context(ctx);
|
struct r300_context *r300 = r300_context(ctx);
|
||||||
struct radeon_winsys *rws = (struct radeon_winsys *)ctx->winsys;
|
|
||||||
struct r300_transfer *r300transfer = r300_transfer(transfer);
|
struct r300_transfer *r300transfer = r300_transfer(transfer);
|
||||||
struct r300_resource *tex = r300_resource(transfer->resource);
|
struct r300_resource *tex = r300_resource(transfer->resource);
|
||||||
char *map;
|
char *map;
|
||||||
@@ -240,13 +239,11 @@ void* r300_texture_transfer_map(struct pipe_context *ctx,
|
|||||||
if (r300transfer->linear_texture) {
|
if (r300transfer->linear_texture) {
|
||||||
/* The detiled texture is of the same size as the region being mapped
|
/* The detiled texture is of the same size as the region being mapped
|
||||||
* (no offset needed). */
|
* (no offset needed). */
|
||||||
return rws->buffer_map(r300transfer->linear_texture->buf,
|
return r300->rws->buffer_map(r300transfer->linear_texture->buf,
|
||||||
r300->cs,
|
r300->cs, transfer->usage);
|
||||||
transfer->usage);
|
|
||||||
} else {
|
} else {
|
||||||
/* Tiling is disabled. */
|
/* Tiling is disabled. */
|
||||||
map = rws->buffer_map(tex->buf, r300->cs,
|
map = r300->rws->buffer_map(tex->buf, r300->cs, transfer->usage);
|
||||||
transfer->usage);
|
|
||||||
|
|
||||||
if (!map) {
|
if (!map) {
|
||||||
return NULL;
|
return NULL;
|
||||||
|
Reference in New Issue
Block a user