Stefan Dösinger : wined3d: Don't load/ unload unsupported texture coordinate attribs.

[Alexandre Julliard]

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

Author: Stefan Dösinger 
Date:   Thu Sep  1 18:20:19 2011 +0200

wined3d: Don't load/unload unsupported texture coordinate attribs.

---

dlls/wined3d/directx.c         |    4 ++++
 dlls/wined3d/state.c           |    8 +++++++-
 dlls/wined3d/wined3d_private.h |    1 +
 3 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index ef66a47..b393c69 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2287,6 +2287,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
     gl_info->limits.blends = 1;
     gl_info->limits.buffers = 1;
     gl_info->limits.textures = 1;
+    gl_info->limits.texture_coords = 1;
     gl_info->limits.fragment_samplers = 1;
     gl_info->limits.vertex_samplers = 0;
     gl_info->limits.combined_samplers = gl_info->limits.fragment_samplers + gl_info->limits.vertex_samplers;
@@ -2465,6 +2466,9 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
         glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &gl_max);
         gl_info->limits.textures = min(MAX_TEXTURES, gl_max);
         TRACE_(d3d_caps)("Max textures: %d.\n", gl_info->limits.textures);
+        glGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, &gl_max);
+        gl_info->limits.texture_coords = min(MAX_TEXTURES, gl_max);
+        TRACE_(d3d_caps)("Max texture coords: %d.\n", gl_info->limits.texture_coords);

if (gl_info->supported[ARB_FRAGMENT_PROGRAM])
         {
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index c4e0513..31c62a4 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -3222,7 +3222,7 @@ static void unload_tex_coords(const struct wined3d_gl_info *gl_info)
 {
     unsigned int texture_idx;

-    for (texture_idx = 0; texture_idx < gl_info->limits.texture_stages; ++texture_idx)
+    for (texture_idx = 0; texture_idx < gl_info->limits.texture_coords; ++texture_idx)
     {
         GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + texture_idx));
         glDisableClientState(GL_TEXTURE_COORD_ARRAY);
@@ -3244,6 +3244,12 @@ static void load_tex_coords(const struct wined3d_context *context, const struct
         mapped_stage = device->texUnitMap[textureNo];
         if (mapped_stage == WINED3D_UNMAPPED_STAGE) continue;

+        if (mapped_stage >= gl_info->limits.texture_coords)
+        {
+            FIXME("Attempted to load unsupported texture coordinate %u\n", mapped_stage);
+            continue;
+        }
+
         if (coordIdx < MAX_TEXTURES && (si->use_map & (1 << (WINED3D_FFP_TEXCOORD0 + coordIdx))))
         {
             const struct wined3d_stream_info_element *e = &si->elements[WINED3D_FFP_TEXCOORD0 + coordIdx];
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 1fac908..0325333 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1446,6 +1446,7 @@ struct wined3d_gl_limits
     UINT lights;
     UINT textures;
     UINT texture_stages;
+    UINT texture_coords;
     UINT fragment_samplers;
     UINT vertex_samplers;
     UINT combined_samplers;