Józef Kucia : wined3d: Avoid guessing texture target if OpenGL 4.5 is available.

[Alexandre Julliard]

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

Author: Józef Kucia 
Date:   Fri Feb  9 13:03:20 2018 +0100

wined3d: Avoid guessing texture target if OpenGL 4.5 is available.

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

---

dlls/wined3d/context.c | 65 ++++++++++++++++++++++++++++++++++----------------
 dlls/wined3d/directx.c |  2 ++
 2 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index ccfe630..9a69921 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -289,39 +289,62 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G
             unsigned int i;

tex_type_str = NULL;
-            for (i = 0; i < ARRAY_SIZE(texture_type); ++i)
+            if (gl_info->gl_ops.ext.p_glGetTextureParameteriv)
             {
-                if (!gl_info->supported[texture_type[i].extension])
-                    continue;
+                GL_EXTCALL(glGetTextureParameteriv(name, GL_TEXTURE_TARGET, &tex_target));

-                gl_info->gl_ops.gl.p_glGetIntegerv(texture_type[i].binding, &old_texture);
-                while (gl_info->gl_ops.gl.p_glGetError());
-
-                gl_info->gl_ops.gl.p_glBindTexture(texture_type[i].target, name);
-                if (!gl_info->gl_ops.gl.p_glGetError())
+                for (i = 0; i < ARRAY_SIZE(texture_type); ++i)
                 {
-                    tex_target = texture_type[i].target;
-                    tex_type_str = texture_type[i].str;
-                    break;
+                    if (texture_type[i].target == tex_target)
+                    {
+                        tex_type_str = texture_type[i].str;
+                        break;
+                    }
                 }
-                gl_info->gl_ops.gl.p_glBindTexture(texture_type[i].target, old_texture);
+                if (i == ARRAY_SIZE(texture_type))
+                    tex_type_str = wine_dbg_sprintf("%#x", tex_target);
+
+                GL_EXTCALL(glGetTextureLevelParameteriv(name, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt));
+                GL_EXTCALL(glGetTextureLevelParameteriv(name, level, GL_TEXTURE_WIDTH, &width));
+                GL_EXTCALL(glGetTextureLevelParameteriv(name, level, GL_TEXTURE_HEIGHT, &height));
             }
-            if (!tex_type_str)
+            else
             {
-                FIXME("Cannot find type of texture %d.\n", name);
-                return;
-            }
+                for (i = 0; i < ARRAY_SIZE(texture_type); ++i)
+                {
+                    if (!gl_info->supported[texture_type[i].extension])
+                        continue;
+
+                    gl_info->gl_ops.gl.p_glGetIntegerv(texture_type[i].binding, &old_texture);
+                    while (gl_info->gl_ops.gl.p_glGetError());

-            gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt);
-            gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_WIDTH, &width);
-            gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_HEIGHT, &height);
+                    gl_info->gl_ops.gl.p_glBindTexture(texture_type[i].target, name);
+                    if (!gl_info->gl_ops.gl.p_glGetError())
+                    {
+                        tex_target = texture_type[i].target;
+                        tex_type_str = texture_type[i].str;
+                        break;
+                    }
+                    gl_info->gl_ops.gl.p_glBindTexture(texture_type[i].target, old_texture);
+                }
+                if (!tex_type_str)
+                {
+                    FIXME("Cannot find type of texture %d.\n", name);
+                    return;
+                }
+
+                gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt);
+                gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_WIDTH, &width);
+                gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_HEIGHT, &height);
+
+                gl_info->gl_ops.gl.p_glBindTexture(tex_target, old_texture);
+            }
         }

FIXME("    %s: %s texture %d, %dx%d, format %#x.\n", debug_fboattachment(attachment),
                 tex_type_str, name, width, height, fmt);

-        gl_info->gl_ops.gl.p_glBindTexture(tex_target, old_texture);
-        checkGLcall("Guess texture type");
+        checkGLcall("guess texture type");
     }
     else if (type == GL_NONE)
     {
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 000d0b7..1be6d2b 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -3270,6 +3270,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info)
     USE_GL_FUNC(glGetShaderiv)              /* OpenGL 2.0 */
     USE_GL_FUNC(glGetShaderSource)          /* OpenGL 2.0 */
     USE_GL_FUNC(glGetStringi)               /* OpenGL 3.0 */
+    USE_GL_FUNC(glGetTextureLevelParameteriv) /* OpenGL 4.5 */
+    USE_GL_FUNC(glGetTextureParameteriv)    /* OpenGL 4.5 */
     USE_GL_FUNC(glGetUniformfv)             /* OpenGL 2.0 */
     USE_GL_FUNC(glGetUniformiv)             /* OpenGL 2.0 */
     USE_GL_FUNC(glGetUniformLocation)       /* OpenGL 2.0 */