d3dx9: Shader assembler ps_2_x support.

dlls/d3dx9_36/asmshader.y

@@ -328,14 +328,12 @@ version_marker:       VER_VS10
                     | VER_PS20
                         {
                             TRACE("Pixel  shader 2.0\n");
-                            set_parse_status(&asm_ctx, PARSE_ERR);
-                            YYABORT;
+                            create_ps20_parser(&asm_ctx);
                         }
                     | VER_PS2X
                         {
                             TRACE("Pixel  shader 2.x\n");
-                            set_parse_status(&asm_ctx, PARSE_ERR);
-                            YYABORT;
+                            create_ps2x_parser(&asm_ctx);
                         }
                     | VER_PS30
                         {

dlls/d3dx9_36/d3dx9_36_private.h

@@ -314,6 +314,8 @@ extern struct asm_parser asm_ctx;
 void create_vs20_parser(struct asm_parser *ret);
 void create_vs2x_parser(struct asm_parser *ret);
 void create_vs30_parser(struct asm_parser *ret);
+void create_ps20_parser(struct asm_parser *ret);
+void create_ps2x_parser(struct asm_parser *ret);
 void create_ps30_parser(struct asm_parser *ret);
 
 struct bwriter_shader *parse_asm_shader(char **messages);
@@ -380,6 +382,10 @@ struct bc_writer {
     DWORD                         oFog_mask;
     DWORD                         oPts_regnum;
     DWORD                         oPts_mask;
+
+    /* Pixel shader specific members */
+    DWORD                         t_regnum[8];
+    DWORD                         v_regnum[2];
 };
 
 /* Debug utility routines */

dlls/d3dx9_36/tests/asm.c

@@ -1015,6 +1015,15 @@ static void ps_2_x_test(void) {
             {0xffff0201, 0x01000026, 0xf0e40000, 0x01000060, 0xb0ff1000,
              0x00000027, 0x0000ffff}
         },
+        {   /* shader 16 */
+            "ps_2_x\n"
+            "call l2047\n"
+            "ret\n"
+            "label l2047\n"
+            "ret\n",
+            {0xffff0201, 0x01000019, 0xa0e417ff, 0x0000001c, 0x0100001e, 0xa0e417ff,
+             0x0000001c, 0x0000ffff}
+        },
     };
 
     exec_tests("ps_2_x", tests, sizeof(tests) / sizeof(tests[0]));
@@ -1504,8 +1513,8 @@ START_TEST(asm)
     todo_wine ps_1_4_test();
     vs_2_0_test();
     vs_2_x_test();
-    todo_wine ps_2_0_test();
-    todo_wine ps_2_x_test();
+    ps_2_0_test();
+    ps_2_x_test();
     vs_3_0_test();
     ps_3_0_test();