diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ef66a47969a..b393c692988 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 c4e0513a077..31c62a4ecb9 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 1fac90800a9..032533324cb 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;