gallium: remove PIPE_TRANSFER_NOOVERWRITE, use equivalent UNSYNCHRONIZED

diff --git a/src/gallium/auxiliary/util/u_inlines.h b/src/gallium/auxiliary/util/u_inlines.h
index 23658bc88708205497e5ac36355775909cc7f7d4..49b4531dbacbd862b7ef19c485b3b287443decfe 100644 (file)
--- 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 03a5f85884fceccb3d26f6f3cd61a7fbaccd8344..cee97e6520f62464ec1fbf1c6c8472a03c2fedef 100644 (file)
--- 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 da3cc237c7ba7e09c2867ea4df6a1077118eaa15..d5c366ffd4f0b13d4ea31ba3de8c3f557ec25c29 100644 (file)
--- 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)