diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2010-04-30 15:27:13 +0200 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2010-04-30 15:27:13 +0200 |
| commit | 7662e3519bef3802024da3050b886068281e02b1 (patch) | |
| tree | bc5bf675e67febffaf9e4d1fadd139e8c253ae32 /src/gallium/auxiliary/util/u_tile.c | |
| parent | 9a966b93c03aecac8eb72e6133aa9a2f2c7673f3 (diff) | |
| parent | 7c769bef052fc1936d7ab33e291bb4646dc5b0d1 (diff) | |
Merge commit 'origin/master' into gallium-msaa
Diffstat (limited to 'src/gallium/auxiliary/util/u_tile.c')
| -rw-r--r-- | src/gallium/auxiliary/util/u_tile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/util/u_tile.c b/src/gallium/auxiliary/util/u_tile.c index fe327c302b..f7aa1403d0 100644 --- a/src/gallium/auxiliary/util/u_tile.c +++ b/src/gallium/auxiliary/util/u_tile.c @@ -544,7 +544,7 @@ pipe_put_tile_z(struct pipe_context *pipe, case PIPE_FORMAT_Z24_UNORM_S8_USCALED: { uint *pDest = (uint *) (map + y * pt->stride + x*4); - //assert((pt->usage & PIPE_TRANSFER_READ_WRITE) == PIPE_TRANSFER_READ_WRITE); + /*assert((pt->usage & PIPE_TRANSFER_READ_WRITE) == PIPE_TRANSFER_READ_WRITE);*/ for (i = 0; i < h; i++) { for (j = 0; j < w; j++) { /* convert 32-bit Z to 24-bit Z, preserve stencil */ @@ -571,7 +571,7 @@ pipe_put_tile_z(struct pipe_context *pipe, case PIPE_FORMAT_S8_USCALED_Z24_UNORM: { uint *pDest = (uint *) (map + y * pt->stride + x*4); - //assert((pt->usage & PIPE_TRANSFER_READ_WRITE) == PIPE_TRANSFER_READ_WRITE); + /*assert((pt->usage & PIPE_TRANSFER_READ_WRITE) == PIPE_TRANSFER_READ_WRITE);*/ for (i = 0; i < h; i++) { for (j = 0; j < w; j++) { /* convert 32-bit Z to 24-bit Z, preserve stencil */ |