Note that WINED3DSIO_TEXDP3TEX, WINED3DSIO_TEXM3x3VSPEC, WINED3DSIO_TEXM3x3SPEC are already handled in the 2 else if branches below, they should probably be removed somewhere.
@@ -295,8 +295,15 @@ HRESULT shader_get_registers_used( if (WINED3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) == 1 && (WINED3DSIO_TEX == curOpcode->opcode || WINED3DSIO_TEXBEM == curOpcode->opcode ||
WINED3DSIO_TEXBEML == curOpcode->opcode ||
WINED3DSIO_TEXDP3TEX == curOpcode->opcode || WINED3DSIO_TEXM3x2TEX == curOpcode->opcode ||
WINED3DSIO_TEXM3x3TEX == curOpcode->opcode)) {
WINED3DSIO_TEXM3x3SPEC == curOpcode->opcode ||
WINED3DSIO_TEXM3x3TEX == curOpcode->opcode ||
WINED3DSIO_TEXM3x3VSPEC == curOpcode->opcode ||
... } else if (WINED3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) == 1 && (WINED3DSIO_TEXM3x3SPEC == curOpcode->opcode || WINED3DSIO_TEXM3x3VSPEC == curOpcode->opcode)) {
On 28/12/06, Christoph Bumiller e0425955@stud3.tuwien.ac.at wrote:
Note that WINED3DSIO_TEXDP3TEX, WINED3DSIO_TEXM3x3VSPEC, WINED3DSIO_TEXM3x3SPEC are already handled in the 2 else if branches below, they should probably be removed somewhere.
Oops, you're right. Those two branches can be removed now that we can lookup the actual sampler type.