fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 05:08:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r600g: remove compute_global_transfer_* calls from texture_transfer_map/unmap

Browse source 
Textures can never have target==PIPE_BUFFER.
This commit is contained in:
Marek Olšák 2013-09-25 20:57:22 +02:00
parent ef6680d3ee
commit 4069d39465
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gallium/drivers/r600/r600_texture.c
View file

@ -25,7 +25,6 @@
* Corbin Simpson
*/
#include "r600_formats.h"
#include "evergreen_compute.h"
#include "r600d.h"
#include <errno.h>
@ -774,10 +773,6 @@ static void *r600_texture_transfer_map(struct pipe_context *ctx,
unsigned offset = 0;
char *map;
if ((texture->bind & PIPE_BIND_GLOBAL) && texture->target == PIPE_BUFFER) {
return r600_compute_global_transfer_map(ctx, texture, level, usage, box, ptransfer);
}
/* We cannot map a tiled texture directly because the data is
* in a different order, therefore we do detiling using a blit.
*
@ -917,10 +912,6 @@ static void r600_texture_transfer_unmap(struct pipe_context *ctx,
struct pipe_resource *texture = transfer->resource;
struct r600_texture *rtex = (struct r600_texture*)texture;
if ((transfer->resource->bind & PIPE_BIND_GLOBAL) && transfer->resource->target == PIPE_BUFFER) {
return r600_compute_global_transfer_unmap(ctx, transfer);
}
if (rtransfer->staging) {
buf = ((struct r600_resource *)rtransfer->staging)->cs_buf;
} else {