reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-29 06:30:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wined3d: Support WINED3D_TTFF_COUNT3 texture projection in the ARB backend.

Browse Source
This commit is contained in:
Matteo Bruni 2012-03-28 13:52:12 +02:00 committed by Alexandre Julliard
parent 439097c810
commit 7e3c7840e3
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/wined3d/arb_program_shader.c
View File

@ -1914,6 +1914,7 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins)
char reg_coord[40];
DWORD reg_sampler_code;
WORD myflags = 0;
BOOL swizzle_coord = FALSE;
/* All versions have a destination register */
shader_arb_get_dst_param(ins, dst, reg_dest);
@ -1948,18 +1949,18 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins)
if (reg_sampler_code < MAX_TEXTURES)
flags = priv->cur_ps_args->super.tex_transform >> reg_sampler_code * WINED3D_PSARGS_TEXTRANSFORM_SHIFT;
if (flags & WINED3D_PSARGS_PROJECTED)
{
myflags |= TEX_PROJ;
if ((flags & ~WINED3D_PSARGS_PROJECTED) == WINED3D_TTFF_COUNT3)
swizzle_coord = TRUE;
}
}
else if (shader_version < WINED3D_SHADER_VERSION(2,0))
{
enum wined3d_shader_src_modifier src_mod = ins->src[0].modifiers;
if (src_mod == WINED3DSPSM_DZ)
{
/* TXP cannot handle DZ natively, so move the z coordinate to .w. reg_coord is a read-only
* varying register, so we need a temp reg
*/
shader_addline(ins->ctx->buffer, "SWZ TA, %s, x, y, z, z;\n", reg_coord);
strcpy(reg_coord, "TA");
swizzle_coord = TRUE;
myflags |= TEX_PROJ;
} else if(src_mod == WINED3DSPSM_DW) {
myflags |= TEX_PROJ;
@ -1968,6 +1969,15 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins)
if (ins->flags & WINED3DSI_TEXLD_PROJECT) myflags |= TEX_PROJ;
if (ins->flags & WINED3DSI_TEXLD_BIAS) myflags |= TEX_BIAS;
}
if (swizzle_coord)
{
/* TXP cannot handle DZ natively, so move the z coordinate to .w.
* reg_coord is a read-only varying register, so we need a temp reg */
shader_addline(ins->ctx->buffer, "SWZ TA, %s, x, y, z, z;\n", reg_coord);
strcpy(reg_coord, "TA");
}
shader_hw_sample(ins, reg_sampler_code, reg_dest, reg_coord, myflags, NULL, NULL);
}