system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

wined3d: Ignore invalid texture transform flags.

Browse source
This commit is contained in:
Matteo Bruni 2011-12-12 20:25:17 +01:00 committed by Alexandre Julliard
parent fdd4df446f
commit 68e0cd430f
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
dlls/wined3d/shader.c
View file

@ -1911,9 +1911,28 @@ void find_ps_compile_args(const struct wined3d_state *state,
for (i = 0; i < 4; ++i)
{
DWORD flags = state->texture_states[i][WINED3DTSS_TEXTURETRANSFORMFLAGS];
DWORD tex_transform = flags & ~WINED3DTTFF_PROJECTED;
DWORD count, tex_transform;
/* Filter some invalid flags */
count = flags & ~WINED3DTTFF_PROJECTED;
if (count > WINED3DTTFF_COUNT4)
{
WARN("The application set an invalid TEXTURETRANSFORMFLAGS value.\n");
flags = count = 0;
}
tex_transform = count;
if (flags & WINED3DTTFF_PROJECTED)
tex_transform |= WINED3D_PSARGS_PROJECTED;
{
enum wined3d_sampler_texture_type sampler_type = shader->reg_maps.sampler_type[i];
if ((sampler_type == WINED3DSTT_1D && tex_transform > WINED3DTTFF_COUNT1)
|| (sampler_type == WINED3DSTT_2D && tex_transform > WINED3DTTFF_COUNT2)
|| (sampler_type == WINED3DSTT_VOLUME && tex_transform > WINED3DTTFF_COUNT3))
tex_transform |= WINED3D_PSARGS_PROJECTED;
else
WARN("Application requested projected texture with unsuitable texture coordinates.\n");
}
args->tex_transform |= tex_transform << i * WINED3D_PSARGS_TEXTRANSFORM_SHIFT;
}
}