Andrew Wesie : wined3d: Use PBO for read-only staging textures.

[Alexandre Julliard]

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

Author: Andrew Wesie <awesie at gmail.com>
Date:   Sun Sep 30 12:01:59 2018 -0500

wined3d: Use PBO for read-only staging textures.

Signed-off-by: Andrew Wesie <awesie at gmail.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/texture.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 9589e49..282c428 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -46,11 +46,15 @@ struct wined3d_rect_f
 
 static BOOL wined3d_texture_use_pbo(const struct wined3d_texture *texture, const struct wined3d_gl_info *gl_info)
 {
-    return !(texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU)
-            && texture->resource.usage & WINED3DUSAGE_DYNAMIC
-            && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT]
-            && !texture->resource.format->conv_byte_count
-            && !(texture->flags & (WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_COND_NP2_EMULATED));
+    if (!gl_info->supported[ARB_PIXEL_BUFFER_OBJECT]
+            || texture->resource.format->conv_byte_count
+            || (texture->flags & (WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_COND_NP2_EMULATED)))
+        return FALSE;
+
+    /* Use a PBO for dynamic textures and read-only staging textures. */
+    return (!(texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU)
+                && texture->resource.usage & WINED3DUSAGE_DYNAMIC)
+            || texture->resource.access == (WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP_R);
 }
 
 static BOOL wined3d_texture_use_immutable_storage(const struct wined3d_texture *texture,