wined3d: Standardize pshader_hw_texkill.

Use shader_arb_get_dst_param instead of get_register_name to find the register name. Even though this adds support for modifiers(which aren't allowed by native), this shouldn't hurt. If an app passes in an incorrect shader it should be caught in the frontend.

wined3d: Standardize pshader_hw_texkill.
601030cf · Stefan Dösinger · Alexandre Julliard · 5cfbfbc8 · 601030cf
Commit 601030cf authored May 07, 2009 by Stefan Dösinger Committed by Alexandre Julliard May 11, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

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

No files found.
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -1016,13 +1016,11 @@ static void pshader_hw_texkill(const struct wined3d_shader_instruction *ins)
    const struct wined3d_shader_dst_param *dst = &ins->dst[0];
    SHADER_BUFFER *buffer = ins->ctx->buffer;
    char reg_dest[40];
-    BOOL is_color;

    /* No swizzles are allowed in d3d's texkill. PS 1.x ignores the 4th component as documented,
     * but >= 2.0 honors it(undocumented, but tested by the d3d9 testsuit)
     */
-    shader_arb_get_register_name(ins->ctx->shader, dst->reg.type,
-            dst->reg.idx, !!dst->reg.rel_addr, reg_dest, &is_color);
+    shader_arb_get_dst_param(ins, dst, reg_dest);

    if (ins->ctx->reg_maps->shader_version.major >= 2)
    {
@@ -1032,8 +1030,7 @@ static void pshader_hw_texkill(const struct wined3d_shader_instruction *ins)
        /* ARB fp doesn't like swizzles on the parameter of the KIL instruction. To mask the 4th component,
         * copy the register into our general purpose TMP variable, overwrite .w and pass TMP to KIL
         */
-        shader_addline(buffer, "MOV TMP, %s;\n", reg_dest);
-        shader_addline(buffer, "MOV TMP.w, one.w;\n");
+        shader_addline(buffer, "SWZ TMP, %s, x, y, z, 1;\n", reg_dest);
        shader_addline(buffer, "KIL TMP;\n");
    }
 }