diff options
| author | Marek Olšák <[email protected]> | 2012-04-13 21:10:21 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-04-18 16:19:39 +0200 |
| commit | 5db9cedeafe98c5ac094fc32f7b4d275c273b867 (patch) | |
| tree | d288ab0c12b7c74723a1dcd250e172277b6a4290 /src | |
| parent | a8a478999c366cd08be2910ea83465d9b69181e8 (diff) | |
gallium: remove PIPE_TRANSFER_NOOVERWRITE, use equivalent UNSYNCHRONIZED
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/auxiliary/util/u_inlines.h | 2 | ||||
| -rw-r--r-- | src/gallium/include/pipe/p_defines.h | 1 | ||||
| -rw-r--r-- | src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/util/u_inlines.h b/src/gallium/auxiliary/util/u_inlines.h index 23658bc8870..49b4531dbac 100644 --- a/src/gallium/auxiliary/util/u_inlines.h +++ b/src/gallium/auxiliary/util/u_inlines.h @@ -370,7 +370,7 @@ pipe_buffer_write_nooverlap(struct pipe_context *pipe, buf, 0, (PIPE_TRANSFER_WRITE | - PIPE_TRANSFER_NOOVERWRITE), + PIPE_TRANSFER_UNSYNCHRONIZED), &box, data, 0, 0); diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 03a5f85884f..cee97e6520f 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -256,7 +256,6 @@ enum pipe_transfer_usage { * - WDDM's D3DDDICB_LOCKFLAGS.IgnoreSync flag. */ PIPE_TRANSFER_UNSYNCHRONIZED = (1 << 10), - PIPE_TRANSFER_NOOVERWRITE = (1 << 10), /* are these really the same?? */ /** * Written ranges will be notified later with diff --git a/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h b/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h index da3cc237c7b..d5c366ffd4f 100644 --- a/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h +++ b/src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h @@ -1501,7 +1501,7 @@ struct GalliumD3D10Device : public GalliumD3D10ScreenImpl<threadsafe> else if(map_type == D3D11_MAP_WRITE_DISCARD) usage = PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD; else if(map_type == D3D11_MAP_WRITE_NO_OVERWRITE) - usage = PIPE_TRANSFER_WRITE | PIPE_TRANSFER_NOOVERWRITE; + usage = PIPE_TRANSFER_WRITE | PIPE_TRANSFER_UNSYNCHRONIZED; else return E_INVALIDARG; if(map_type & D3D10_MAP_FLAG_DO_NOT_WAIT) |