summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2012-01-02 00:02:34 +0100
committerMarek Olšák <[email protected]>2012-01-05 18:29:11 +0100
commit7cd1c62b6be88072e3d937b67c499592490927f1 (patch)
tree0a5a8e12e69c1787d90fcd01db0f57897d0152d1 /src/gallium/auxiliary
parent5968e4068cdcb0551f1c519f236560bb44ea659e (diff)
gallium: remove deprecated PIPE_TRANSFER_DISCARD
PIPE_TRANSFER_DISCARD_RANGE is defined the same.
Diffstat (limited to 'src/gallium/auxiliary')
-rw-r--r--src/gallium/auxiliary/vl/vl_compositor.c6
-rw-r--r--src/gallium/auxiliary/vl/vl_idct.c2
-rw-r--r--src/gallium/auxiliary/vl/vl_mpeg12_decoder.c2
-rw-r--r--src/gallium/auxiliary/vl/vl_vertex_buffers.c8
-rw-r--r--src/gallium/auxiliary/vl/vl_zscan.c4
5 files changed, 11 insertions, 11 deletions
diff --git a/src/gallium/auxiliary/vl/vl_compositor.c b/src/gallium/auxiliary/vl/vl_compositor.c
index f20941b4400..3631145b3b5 100644
--- a/src/gallium/auxiliary/vl/vl_compositor.c
+++ b/src/gallium/auxiliary/vl/vl_compositor.c
@@ -502,14 +502,14 @@ gen_vertex_data(struct vl_compositor *c, struct u_rect *dirty)
assert(c);
vb = pipe_buffer_map(c->pipe, c->vertex_buf.buffer,
- PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD | PIPE_TRANSFER_DONTBLOCK,
+ PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE | PIPE_TRANSFER_DONTBLOCK,
&buf_transfer);
if (!vb) {
// If buffer is still locked from last draw create a new one
create_vertex_buffer(c);
vb = pipe_buffer_map(c->pipe, c->vertex_buf.buffer,
- PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
+ PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE,
&buf_transfer);
}
@@ -635,7 +635,7 @@ vl_compositor_set_csc_matrix(struct vl_compositor *c, const float matrix[16])
memcpy
(
pipe_buffer_map(c->pipe, c->csc_matrix,
- PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
+ PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE,
&buf_transfer),
matrix,
sizeof(csc_matrix)
diff --git a/src/gallium/auxiliary/vl/vl_idct.c b/src/gallium/auxiliary/vl/vl_idct.c
index 325551aad0d..1486c00e7f0 100644
--- a/src/gallium/auxiliary/vl/vl_idct.c
+++ b/src/gallium/auxiliary/vl/vl_idct.c
@@ -715,7 +715,7 @@ vl_idct_upload_matrix(struct pipe_context *pipe, float scale)
buf_transfer = pipe->get_transfer
(
pipe, matrix,
- 0, PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
+ 0, PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE,
&rect
);
if (!buf_transfer)
diff --git a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
index 1426eb86fe2..1a3a2a4bb22 100644
--- a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
+++ b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
@@ -598,7 +598,7 @@ vl_mpeg12_begin_frame(struct pipe_video_decoder *decoder)
buf->tex_transfer = dec->base.context->get_transfer
(
dec->base.context, tex,
- 0, PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
+ 0, PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE,
&rect
);
diff --git a/src/gallium/auxiliary/vl/vl_vertex_buffers.c b/src/gallium/auxiliary/vl/vl_vertex_buffers.c
index e2665a5cfde..96765fc3433 100644
--- a/src/gallium/auxiliary/vl/vl_vertex_buffers.c
+++ b/src/gallium/auxiliary/vl/vl_vertex_buffers.c
@@ -65,7 +65,7 @@ vl_vb_upload_quads(struct pipe_context *pipe)
(
pipe,
quad.buffer,
- PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
+ PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE,
&buf_transfer
);
@@ -109,7 +109,7 @@ vl_vb_upload_pos(struct pipe_context *pipe, unsigned width, unsigned height)
(
pipe,
pos.buffer,
- PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
+ PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE,
&buf_transfer
);
@@ -298,7 +298,7 @@ vl_vb_map(struct vl_vertex_buffer *buffer, struct pipe_context *pipe)
(
pipe,
buffer->ycbcr[i].resource,
- PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
+ PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE,
&buffer->ycbcr[i].transfer
);
}
@@ -308,7 +308,7 @@ vl_vb_map(struct vl_vertex_buffer *buffer, struct pipe_context *pipe)
(
pipe,
buffer->mv[i].resource,
- PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
+ PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE,
&buffer->mv[i].transfer
);
}
diff --git a/src/gallium/auxiliary/vl/vl_zscan.c b/src/gallium/auxiliary/vl/vl_zscan.c
index 600e4152412..730074c0c57 100644
--- a/src/gallium/auxiliary/vl/vl_zscan.c
+++ b/src/gallium/auxiliary/vl/vl_zscan.c
@@ -382,7 +382,7 @@ vl_zscan_layout(struct pipe_context *pipe, const int layout[64], unsigned blocks
buf_transfer = pipe->get_transfer
(
pipe, res,
- 0, PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
+ 0, PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE,
&rect
);
if (!buf_transfer)
@@ -561,7 +561,7 @@ vl_zscan_upload_quant(struct vl_zscan *zscan, struct vl_zscan_buffer *buffer,
buf_transfer = pipe->get_transfer
(
pipe, buffer->quant->texture,
- 0, PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
+ 0, PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE,
&rect
);
if (!buf_transfer)