Paul Gofman : wined3d: Merge _USER_MEMORY and _SYSMEM locations.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5b287bb0ca813eba988e6550453b7fc4501b4f1f
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=5b287bb0ca813eba988e65504...

Author: Paul Gofman <pgofman(a)codeweavers.com>
Date:   Tue Jun 16 16:38:46 2020 +0300

wined3d: Merge _USER_MEMORY and _SYSMEM locations.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49375
Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/wined3d/surface.c         |  3 +-
 dlls/wined3d/texture.c         | 72 ++++++++++++++----------------------------
 dlls/wined3d/utils.c           |  1 -
 dlls/wined3d/wined3d_private.h |  1 -
 4 files changed, 25 insertions(+), 52 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 652f6070b9..af2ab36d27 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -33,8 +33,7 @@
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);
 
-static const DWORD surface_simple_locations = WINED3D_LOCATION_SYSMEM
-        | WINED3D_LOCATION_USER_MEMORY | WINED3D_LOCATION_BUFFER;
+static const DWORD surface_simple_locations = WINED3D_LOCATION_SYSMEM | WINED3D_LOCATION_BUFFER;
 
 /* Works correctly only for <= 4 bpp formats. */
 static void get_color_masks(const struct wined3d_format *format, DWORD *masks)
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 84020f17c9..b1e08383f6 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -30,8 +30,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag);
 
 #define WINED3D_TEXTURE_DYNAMIC_MAP_THRESHOLD 50
 
-static const uint32_t wined3d_texture_sysmem_locations = WINED3D_LOCATION_SYSMEM
-        | WINED3D_LOCATION_USER_MEMORY | WINED3D_LOCATION_BUFFER;
+static const uint32_t wined3d_texture_sysmem_locations = WINED3D_LOCATION_SYSMEM | WINED3D_LOCATION_BUFFER;
 static const struct wined3d_texture_ops texture_gl_ops;
 
 struct wined3d_texture_idx
@@ -132,7 +131,6 @@ static DWORD wined3d_resource_access_from_location(DWORD location)
             return 0;
 
         case WINED3D_LOCATION_SYSMEM:
-        case WINED3D_LOCATION_USER_MEMORY:
             return WINED3D_RESOURCE_ACCESS_CPU;
 
         case WINED3D_LOCATION_BUFFER:
@@ -733,16 +731,18 @@ void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int su
         data->buffer_object = (uintptr_t)&sub_resource->bo;
         return;
     }
-    if (locations & WINED3D_LOCATION_USER_MEMORY)
-    {
-        data->addr = texture->user_memory;
-        data->buffer_object = 0;
-        return;
-    }
+
     if (locations & WINED3D_LOCATION_SYSMEM)
     {
-        data->addr = texture->resource.heap_memory;
-        data->addr += sub_resource->offset;
+        if (texture->user_memory)
+        {
+            data->addr = texture->user_memory;
+        }
+        else
+        {
+            data->addr = texture->resource.heap_memory;
+            data->addr += sub_resource->offset;
+        }
         data->buffer_object = 0;
         return;
     }
@@ -1741,7 +1741,6 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT
     unsigned int resource_size;
     const struct wined3d *d3d;
     unsigned int slice_pitch;
-    DWORD valid_location = 0;
     bool update_memory_only;
     bool create_dib = false;
 
@@ -1872,16 +1871,10 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT
         }
     }
 
-    if ((texture->user_memory = mem))
-    {
-        texture->resource.map_binding = WINED3D_LOCATION_USER_MEMORY;
-        valid_location = WINED3D_LOCATION_USER_MEMORY;
-    }
-    else
+    if (!(texture->user_memory = mem))
     {
         if (!wined3d_resource_prepare_sysmem(&texture->resource))
             ERR("Failed to allocate resource memory.\n");
-        valid_location = WINED3D_LOCATION_SYSMEM;
     }
 
     /* The format might be changed to a format that needs conversion.
@@ -1891,8 +1884,8 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT
     if (texture->resource.map_binding == WINED3D_LOCATION_BUFFER && !wined3d_texture_use_pbo(texture, gl_info))
         texture->resource.map_binding = WINED3D_LOCATION_SYSMEM;
 
-    wined3d_texture_validate_location(texture, 0, valid_location);
-    wined3d_texture_invalidate_location(texture, 0, ~valid_location);
+    wined3d_texture_validate_location(texture, 0, WINED3D_LOCATION_SYSMEM);
+    wined3d_texture_invalidate_location(texture, 0, ~WINED3D_LOCATION_SYSMEM);
 
     if (create_dib)
     {
@@ -3123,12 +3116,8 @@ static BOOL wined3d_texture_gl_prepare_location(struct wined3d_texture *texture,
     switch (location)
     {
         case WINED3D_LOCATION_SYSMEM:
-            return wined3d_resource_prepare_sysmem(&texture->resource);
-
-        case WINED3D_LOCATION_USER_MEMORY:
-            if (!texture->user_memory)
-                ERR("Preparing WINED3D_LOCATION_USER_MEMORY, but texture->user_memory is NULL.\n");
-            return TRUE;
+            return texture->user_memory ? TRUE
+                    : wined3d_resource_prepare_sysmem(&texture->resource);
 
         case WINED3D_LOCATION_BUFFER:
             wined3d_texture_prepare_buffer_object(texture, sub_resource_idx, context_gl->gl_info);
@@ -3176,7 +3165,6 @@ static BOOL wined3d_texture_gl_load_location(struct wined3d_texture *texture,
 
     switch (location)
     {
-        case WINED3D_LOCATION_USER_MEMORY:
         case WINED3D_LOCATION_SYSMEM:
         case WINED3D_LOCATION_BUFFER:
             return wined3d_texture_gl_load_sysmem(texture_gl, sub_resource_idx, context_gl, location);
@@ -4431,20 +4419,12 @@ static void wined3d_texture_no3d_download_data(struct wined3d_context *context,
 static BOOL wined3d_texture_no3d_prepare_location(struct wined3d_texture *texture,
         unsigned int sub_resource_idx, struct wined3d_context *context, unsigned int location)
 {
-    switch (location)
-    {
-        case WINED3D_LOCATION_SYSMEM:
-            return wined3d_resource_prepare_sysmem(&texture->resource);
-
-        case WINED3D_LOCATION_USER_MEMORY:
-            if (!texture->user_memory)
-                ERR("Preparing WINED3D_LOCATION_USER_MEMORY, but texture->user_memory is NULL.\n");
-            return TRUE;
+    if (location == WINED3D_LOCATION_SYSMEM)
+        return texture->user_memory ? TRUE
+                : wined3d_resource_prepare_sysmem(&texture->resource);
 
-        default:
-            FIXME("Unhandled location %s.\n", wined3d_debug_location(location));
-            return FALSE;
-    }
+    FIXME("Unhandled location %s.\n", wined3d_debug_location(location));
+    return FALSE;
 }
 
 static BOOL wined3d_texture_no3d_load_location(struct wined3d_texture *texture,
@@ -4453,7 +4433,7 @@ static BOOL wined3d_texture_no3d_load_location(struct wined3d_texture *texture,
     TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n",
             texture, sub_resource_idx, context, wined3d_debug_location(location));
 
-    if (location == WINED3D_LOCATION_USER_MEMORY || location == WINED3D_LOCATION_SYSMEM)
+    if (location == WINED3D_LOCATION_SYSMEM)
         return TRUE;
 
     ERR("Unhandled location %s.\n", wined3d_debug_location(location));
@@ -5078,12 +5058,8 @@ static BOOL wined3d_texture_vk_prepare_location(struct wined3d_texture *texture,
     switch (location)
     {
         case WINED3D_LOCATION_SYSMEM:
-            return wined3d_resource_prepare_sysmem(&texture->resource);
-
-        case WINED3D_LOCATION_USER_MEMORY:
-            if (!texture->user_memory)
-                ERR("Preparing WINED3D_LOCATION_USER_MEMORY, but texture->user_memory is NULL.\n");
-            return TRUE;
+            return texture->user_memory ? TRUE
+                    : wined3d_resource_prepare_sysmem(&texture->resource);
 
         case WINED3D_LOCATION_TEXTURE_RGB:
             return wined3d_texture_vk_prepare_texture(wined3d_texture_vk(texture), wined3d_context_vk(context));
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index d078c503df..2a3c04f435 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -6643,7 +6643,6 @@ const char *wined3d_debug_location(DWORD location)
 #define LOCATION_TO_STR(x) if (location & x) { debug_append(&buffer, #x, " | "); location &= ~x; }
     LOCATION_TO_STR(WINED3D_LOCATION_DISCARDED);
     LOCATION_TO_STR(WINED3D_LOCATION_SYSMEM);
-    LOCATION_TO_STR(WINED3D_LOCATION_USER_MEMORY);
     LOCATION_TO_STR(WINED3D_LOCATION_BUFFER);
     LOCATION_TO_STR(WINED3D_LOCATION_TEXTURE_RGB);
     LOCATION_TO_STR(WINED3D_LOCATION_TEXTURE_SRGB);
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 17acd4be4d..9556f8c0ab 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3988,7 +3988,6 @@ void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DEC
 
 #define WINED3D_LOCATION_DISCARDED      0x00000001
 #define WINED3D_LOCATION_SYSMEM         0x00000002
-#define WINED3D_LOCATION_USER_MEMORY    0x00000004
 #define WINED3D_LOCATION_BUFFER         0x00000008
 #define WINED3D_LOCATION_TEXTURE_RGB    0x00000010
 #define WINED3D_LOCATION_TEXTURE_SRGB   0x00000020