st/nine: Remove errors on unsupported lock flags

Some applications seem to pass undefined flags...
And we shouldn't return an error.

Found investigating:
https://github.com/iXit/wine-nine-standalone/issues/100

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>

diff --git a/src/gallium/frontends/nine/buffer9.c b/src/gallium/frontends/nine/buffer9.c
index ed2f4ac..0cdc618 100644 (file)
--- a/src/gallium/frontends/nine/buffer9.c
+++ b/src/gallium/frontends/nine/buffer9.c
@@ -259,12 +259,6 @@ NineBuffer9_Lock( struct NineBuffer9 *This,
         OffsetToLock, SizeToLock, Flags);
 
     user_assert(ppbData, E_POINTER);
-    user_assert(!(Flags & ~(D3DLOCK_DISCARD |
-                            D3DLOCK_DONOTWAIT |
-                            D3DLOCK_NO_DIRTY_UPDATE |
-                            D3DLOCK_NOSYSLOCK |
-                            D3DLOCK_READONLY |
-                            D3DLOCK_NOOVERWRITE)), D3DERR_INVALIDCALL);
 
     if (SizeToLock == 0) {
         SizeToLock = This->size - OffsetToLock;

diff --git a/src/gallium/frontends/nine/surface9.c b/src/gallium/frontends/nine/surface9.c
index 52a3f24..28fb4ce 100644 (file)
--- a/src/gallium/frontends/nine/surface9.c
+++ b/src/gallium/frontends/nine/surface9.c
@@ -453,12 +453,6 @@ NineSurface9_LockRect( struct NineSurface9 *This,
                 (resource && (resource->flags & NINE_RESOURCE_FLAG_LOCKABLE)),
                 D3DERR_INVALIDCALL);
 #endif
-    user_assert(!(Flags & ~(D3DLOCK_DISCARD |
-                            D3DLOCK_DONOTWAIT |
-                            D3DLOCK_NO_DIRTY_UPDATE |
-                            D3DLOCK_NOOVERWRITE |
-                            D3DLOCK_NOSYSLOCK | /* ignored */
-                            D3DLOCK_READONLY)), D3DERR_INVALIDCALL);
     user_assert(!((Flags & D3DLOCK_DISCARD) && (Flags & D3DLOCK_READONLY)),
                 D3DERR_INVALIDCALL);