wined3d: Read transform flags from the compile args in pshader_hw_texm3x2tex().

Instead of directly from the stateblock. Note that the GLSL backend doesn't take these flags into account at all. That's probably a bug in the GLSL backend, but needs tests.

wined3d: Read transform flags from the compile args in pshader_hw_texm3x2tex().
db156977 · Henri Verbeet · Alexandre Julliard · 8c36e4ce · db156977
Commit db156977 authored Oct 26, 2010 by Henri Verbeet Committed by Alexandre Julliard Oct 26, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

arb_program_shader.c dlls/wined3d/arb_program_shader.c +2 -3

No files found.
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -2090,8 +2090,7 @@ static void pshader_hw_texm3x2pad(const struct wined3d_shader_instruction *ins)
 static void pshader_hw_texm3x2tex(const struct wined3d_shader_instruction *ins)
 {
-    IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader;
+    struct shader_arb_ctx_priv *priv = ins->ctx->backend_data;
-    IWineD3DDeviceImpl *deviceImpl = (IWineD3DDeviceImpl *)shader->baseShader.device;
    DWORD flags;
    DWORD reg = ins->dst[0].reg.idx;
    struct wined3d_shader_buffer *buffer = ins->ctx->buffer;
@@ -2106,7 +2105,7 @@ static void pshader_hw_texm3x2tex(const struct wined3d_shader_instruction *ins)
    shader_arb_get_dst_param(ins, &ins->dst[0], dst_str);
    shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name);
    shader_addline(buffer, "DP3 %s.y, fragment.texcoord[%u], %s;\n", dst_reg, reg, src0_name);
-    flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->state.texture_states[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0;
+    flags = reg < MAX_TEXTURES ? priv->cur_ps_args->super.tex_transform >> reg * WINED3D_PSARGS_TEXTRANSFORM_SHIFT : 0;
    shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0, NULL, NULL);
 }