ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Stefan Dösinger 2011-09-01 18:20:19 +02:00 committed by Alexandre Julliard
parent c2cefe5584
commit efba48ccfb
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/wined3d/directx.c
View File

@ -2287,6 +2287,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
gl_info->limits.blends = 1; gl_info->limits.blends = 1;
gl_info->limits.buffers = 1; gl_info->limits.buffers = 1;
gl_info->limits.textures = 1; gl_info->limits.textures = 1;
gl_info->limits.texture_coords = 1;
gl_info->limits.fragment_samplers = 1; gl_info->limits.fragment_samplers = 1;
gl_info->limits.vertex_samplers = 0; gl_info->limits.vertex_samplers = 0;
gl_info->limits.combined_samplers = gl_info->limits.fragment_samplers + gl_info->limits.vertex_samplers; 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); glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &gl_max);
gl_info->limits.textures = min(MAX_TEXTURES, gl_max); gl_info->limits.textures = min(MAX_TEXTURES, gl_max);
TRACE_(d3d_caps)("Max textures: %d.\n", gl_info->limits.textures); 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]) if (gl_info->supported[ARB_FRAGMENT_PROGRAM])
{ {

8
dlls/wined3d/state.c
View File

@ -3222,7 +3222,7 @@ static void unload_tex_coords(const struct wined3d_gl_info *gl_info)
{ {
unsigned int texture_idx; 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)); GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + texture_idx));
glDisableClientState(GL_TEXTURE_COORD_ARRAY); 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]; mapped_stage = device->texUnitMap[textureNo];
if (mapped_stage == WINED3D_UNMAPPED_STAGE) continue; 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)))) 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]; const struct wined3d_stream_info_element *e = &si->elements[WINED3D_FFP_TEXCOORD0 + coordIdx];

1
dlls/wined3d/wined3d_private.h
View File

@ -1446,6 +1446,7 @@ struct wined3d_gl_limits
UINT lights; UINT lights;
UINT textures; UINT textures;
UINT texture_stages; UINT texture_stages;
UINT texture_coords;
UINT fragment_samplers; UINT fragment_samplers;
UINT vertex_samplers; UINT vertex_samplers;
UINT combined_samplers; UINT combined_samplers;