Józef Kucia : wined3d: Handle 2D array textures in context_dump_fbo_attachment().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0f1729c5f47b162e083866e2047dd06f9b4b5286
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0f1729c5f47b162e083866e204...

Author: Józef Kucia 
Date:   Fri Apr 22 11:18:47 2016 +0200

wined3d: Handle 2D array textures in context_dump_fbo_attachment().

Signed-off-by: Józef Kucia 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/wined3d/context.c | 58 +++++++++++++++++++++++++++++++++-----------------
 1 file changed, 38 insertions(+), 20 deletions(-)

diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 6cda974..e741969 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -219,6 +219,20 @@ static void context_attach_surface_fbo(struct wined3d_context *context,
 static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, GLenum target,
         GLenum attachment)
 {
+    static const struct
+    {
+        GLenum target;
+        GLenum binding;
+        const char *str;
+        enum wined3d_gl_extension extension;
+    }
+    texture_type[] =
+    {
+        {GL_TEXTURE_2D,            GL_TEXTURE_BINDING_2D,            "2d",        WINED3D_GL_EXT_NONE},
+        {GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_BINDING_RECTANGLE_ARB, "rectangle", ARB_TEXTURE_RECTANGLE},
+        {GL_TEXTURE_2D_ARRAY,      GL_TEXTURE_BINDING_2D_ARRAY,      "2d-array",  EXT_TEXTURE_ARRAY},
+    };
+
     GLint type, name, samples, width, height, old_texture, level, face, fmt, tex_target;

gl_info->fbo_ops.glGetFramebufferAttachmentParameteriv(target, attachment,
@@ -262,29 +276,30 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G
         }
         else
         {
-            gl_info->gl_ops.gl.p_glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_texture);
-            while (gl_info->gl_ops.gl.p_glGetError());
+            unsigned int i;

-            glBindTexture(GL_TEXTURE_2D, name);
-            if (!gl_info->gl_ops.gl.p_glGetError())
-            {
-                tex_target = GL_TEXTURE_2D;
-                tex_type_str = "2d";
-            }
-            else
+            tex_type_str = NULL;
+            for (i = 0; i < sizeof(texture_type) / sizeof(*texture_type); ++i)
             {
-                glBindTexture(GL_TEXTURE_2D, old_texture);
-                gl_info->gl_ops.gl.p_glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &old_texture);
+                if (!gl_info->supported[texture_type[i].extension])
+                    continue;

-                glBindTexture(GL_TEXTURE_RECTANGLE_ARB, name);
-                if (gl_info->gl_ops.gl.p_glGetError())
+                gl_info->gl_ops.gl.p_glGetIntegerv(texture_type[i].binding, &old_texture);
+                while (gl_info->gl_ops.gl.p_glGetError());
+
+                glBindTexture(texture_type[i].target, name);
+                if (!gl_info->gl_ops.gl.p_glGetError())
                 {
-                    glBindTexture(GL_TEXTURE_RECTANGLE_ARB, old_texture);
-                    FIXME("Cannot find type of texture %d.\n", name);
-                    return;
+                    tex_target = texture_type[i].target;
+                    tex_type_str = texture_type[i].str;
+                    break;
                 }
-                tex_target = GL_TEXTURE_RECTANGLE_ARB;
-                tex_type_str = "rectangle";
+                glBindTexture(texture_type[i].target, old_texture);
+            }
+            if (!tex_type_str)
+            {
+                FIXME("Cannot find type of texture %d.\n", name);
+                return;
             }

glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt);
@@ -296,13 +311,16 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G
                 tex_type_str, name, width, height, fmt);

glBindTexture(tex_target, old_texture);
+        checkGLcall("Guess texture type");
     }
     else if (type == GL_NONE)
     {
-        FIXME("\t%s: NONE.\n", debug_fboattachment(attachment));
+        FIXME("    %s: NONE.\n", debug_fboattachment(attachment));
     }
     else
-        ERR("\t%s: Unknown attachment %#x.\n", debug_fboattachment(attachment), type);
+    {
+        ERR("    %s: Unknown attachment %#x.\n", debug_fboattachment(attachment), type);
+    }
 }

/* Context activation is done by the caller. */