From: Józef Kucia <jkucia@codeweavers.com>
Subject: [PATCH v3 6/8] wined3d: Use ARB_get_texture_sub_image for surface data readback when available.
Message-Id: <1461145344-15122-6-git-send-email-jkucia@codeweavers.com>
Date: Wed, 20 Apr 2016 11:42:22 +0200
In-Reply-To: <1461145344-15122-1-git-send-email-jkucia@codeweavers.com>
References: <1461145344-15122-1-git-send-email-jkucia@codeweavers.com>

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
---
Version 3: Unmodified.
---
 dlls/wined3d/surface.c | 51 ++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 39 insertions(+), 12 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 1bb34ed..73eee6e 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -865,12 +865,14 @@ static void surface_download_data(struct wined3d_surface *surface, struct wined3
     struct wined3d_texture *texture = surface->container;
     const struct wined3d_format *format = texture->resource.format;
     struct wined3d_texture_sub_resource *sub_resource;
+    unsigned int width, height, sub_resource_size;
     unsigned int dst_row_pitch, dst_slice_pitch;
     unsigned int src_row_pitch, src_slice_pitch;
-    unsigned int sub_resource_size;
+    struct gl_texture *gl_texture = NULL;
     struct wined3d_bo_address data;
     BYTE *temporary_mem = NULL;
     void *mem;
+    BOOL srgb;
 
     /* Only support read back of converted P8 surfaces. */
     if (texture->flags & WINED3D_TEXTURE_CONVERTED && format->id != WINED3DFMT_P8_UINT)
@@ -881,8 +883,11 @@ static void surface_download_data(struct wined3d_surface *surface, struct wined3
 
     sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx);
     sub_resource_size = sub_resource->resource->size;
+    width = wined3d_texture_get_level_width(texture, surface->texture_level);
+    height = wined3d_texture_get_level_height(texture, surface->texture_level);
+    srgb = !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB);
 
-    if (surface->texture_target == GL_TEXTURE_2D_ARRAY)
+    if (surface->texture_target == GL_TEXTURE_2D_ARRAY && !gl_info->supported[ARB_GET_TEXTURE_SUB_IMAGE])
     {
         /* We don't expect to ever need to emulate NP2 textures when we have EXT_texture_array. */
         if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED)
@@ -901,7 +906,10 @@ static void surface_download_data(struct wined3d_surface *surface, struct wined3
         }
     }
 
-    wined3d_texture_bind_and_dirtify(texture, context, !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB));
+    if (gl_info->supported[ARB_GET_TEXTURE_SUB_IMAGE])
+        gl_texture = wined3d_texture_get_gl_texture(texture, srgb);
+    else
+        wined3d_texture_bind_and_dirtify(texture, context, srgb);
 
     wined3d_texture_get_memory(texture, sub_resource_idx, &data, dst_location);
 
@@ -941,20 +949,39 @@ static void surface_download_data(struct wined3d_surface *surface, struct wined3
 
     if (texture->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED)
     {
-        TRACE("Downloading compressed surface %p, level %u, format %#x, type %#x, data %p.\n",
-                surface, surface->texture_level, format->glFormat, format->glType, mem);
+        TRACE("Downloading compressed surface %p, level %u, layer %u, format %#x, type %#x, data %p.\n",
+                surface, surface->texture_level, surface->texture_layer, format->glFormat, format->glType, mem);
 
-        GL_EXTCALL(glGetCompressedTexImage(surface->texture_target, surface->texture_level, mem));
-        checkGLcall("glGetCompressedTexImage");
+        if (gl_info->supported[ARB_GET_TEXTURE_SUB_IMAGE])
+        {
+            GL_EXTCALL(glGetCompressedTextureSubImage(gl_texture->name, surface->texture_level,
+                        0, 0, surface->texture_layer, width, height, 1, sub_resource_size, mem));
+            checkGLcall("glGetCompressedTextureSubImage");
+        }
+        else
+        {
+            GL_EXTCALL(glGetCompressedTexImage(surface->texture_target, surface->texture_level, mem));
+            checkGLcall("glGetCompressedTexImage");
+        }
     }
     else
     {
-        TRACE("Downloading surface %p, level %u, format %#x, type %#x, data %p.\n",
-                surface, surface->texture_level, format->glFormat, format->glType, mem);
+        TRACE("Downloading surface %p, level %u, layer %u, format %#x, type %#x, data %p.\n",
+                surface, surface->texture_level, surface->texture_layer, format->glFormat, format->glType, mem);
 
-        gl_info->gl_ops.gl.p_glGetTexImage(surface->texture_target, surface->texture_level,
-                format->glFormat, format->glType, mem);
-        checkGLcall("glGetTexImage");
+        if (gl_info->supported[ARB_GET_TEXTURE_SUB_IMAGE])
+        {
+            GL_EXTCALL(glGetTextureSubImage(gl_texture->name, surface->texture_level,
+                        0, 0, surface->texture_layer, width, height, 1,
+                        format->glFormat, format->glType, sub_resource_size, mem));
+            checkGLcall("glGetTextureSubImage");
+        }
+        else
+        {
+            gl_info->gl_ops.gl.p_glGetTexImage(surface->texture_target, surface->texture_level,
+                    format->glFormat, format->glType, mem);
+            checkGLcall("glGetTexImage");
+        }
     }
 
     if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED)

-- 
2.4.10