Henri Verbeet : wined3d: Don' t bother removing PBOs for formats with upload/ download conversion in texture2d_load_texture().

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Wed Mar 21 13:18:50 2018 +0330

wined3d: Don't bother removing PBOs for formats with upload/download conversion in texture2d_load_texture().

We don't use PBOs for those in the first place.

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/wined3d/surface.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 3760abb..8f4e1ee 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2087,7 +2087,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re
     /* Don't use PBOs for converted surfaces. During PBO conversion we look at
      * WINED3D_TEXTURE_CONVERTED but it isn't set (yet) in all cases it is
      * getting called. */
-    if ((format.conv_byte_count || conversion) && texture->sub_resources[sub_resource_idx].buffer_object)
+    if (conversion && sub_resource->buffer_object)
     {
         TRACE("Removing the pbo attached to texture %p, %u.\n", texture, sub_resource_idx);