AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/nine: Have NOOVERWRITE win over DISCARD

Browse Source 
I held for a long time the belief DISCARD wins
over NOOVERWRITE, backed by experiments.

But probably both behaviours are ok.
For perf it is better to have NOOVERWRITE win.

Signed-off-by: Axel Davy <davyaxel0@gmail.com>
Acked-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10160>
This commit is contained in:
Axel Davy
2021-03-27 22:33:06 +01:00
committed by Marge Bot
parent 1797a6eb04
commit 805cedd207
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/frontends/nine/buffer9.c
+9 -2
View File
@@ -338,8 +338,15 @@ NineBuffer9_Lock( struct NineBuffer9 *This,
* Our tests: On win 7 nvidia, D3DLOCK_DONOTWAIT does return
* D3DERR_WASSTILLDRAWING if the resource is in use, except for DYNAMIC.
* Our tests: some apps do use both DISCARD and NOOVERWRITE at the same
* time. On windows it seems to return different pointer, thus indicating
* DISCARD is taken into account. */
* time. On windows it seems to return different pointer in some conditions,
* creation flags and drivers. However these tests indicate having
* NOOVERWRITE win is a valid behaviour (NVidia).
*/
/* Have NOOVERWRITE win over DISCARD. This is allowed (see above) and
* it prevents overconsuming buffers if apps do use both at the same time. */
if ((Flags & (D3DLOCK_DISCARD | D3DLOCK_NOOVERWRITE)) == (D3DLOCK_DISCARD | D3DLOCK_NOOVERWRITE))
Flags &= ~D3DLOCK_DISCARD;
if (Flags & D3DLOCK_DISCARD)
usage = PIPE_MAP_WRITE | PIPE_MAP_DISCARD_WHOLE_RESOURCE;