Finish up decls for packed fragment program outputs.

diff --git a/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c b/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c
index 5a1ec35..66b8db0 100644 (file)
--- a/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c
+++ b/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c
@@ -516,7 +516,10 @@ tgsi_mesa_compile_fp_program(
    const ubyte inputSemanticName[],\r
    const ubyte inputSemanticIndex[],\r
    const GLuint interpMode[],\r
+   GLuint numOutputs,\r
    const GLuint outputMapping[],\r
+   const ubyte outputSemanticName[],\r
+   const ubyte outputSemanticIndex[],\r
    struct tgsi_token *tokens,\r
    GLuint maxTokens )\r
 {\r
@@ -580,30 +583,31 @@ tgsi_mesa_compile_fp_program(
    /*\r
     * Declare output attributes.\r
     */\r
-   assert(\r
-      program->Base.OutputsWritten ==\r
-      (program->Base.OutputsWritten & ((1 << FRAG_RESULT_COLR) | (1 << FRAG_RESULT_DEPR))) );\r
-\r
-   fulldecl = make_output_decl(\r
-      0,\r
-      TGSI_SEMANTIC_POSITION, 0,  /* Z / Depth */\r
-      TGSI_WRITEMASK_Z );\r
-   ti += tgsi_build_full_declaration(\r
-      &fulldecl,\r
-      &tokens[ti],\r
-      header,\r
-      maxTokens - ti );\r
-\r
-   if( program->Base.OutputsWritten & (1 << FRAG_RESULT_COLR) ) {\r
-      fulldecl = make_output_decl(\r
-         1,\r
-         TGSI_SEMANTIC_COLOR, 0,\r
-         TGSI_WRITEMASK_XYZW );\r
-      ti += tgsi_build_full_declaration(\r
-         &fulldecl,\r
-         &tokens[ti],\r
-         header,\r
-         maxTokens - ti );\r
+   for (i = 0; i < numOutputs; i++) {\r
+      switch (outputSemanticName[i]) {\r
+      case TGSI_SEMANTIC_POSITION:\r
+         fulldecl = make_output_decl(i,\r
+                                     TGSI_SEMANTIC_POSITION, 0, /* Z / Depth */\r
+                                     TGSI_WRITEMASK_Z );\r
+         ti += tgsi_build_full_declaration(\r
+                                           &fulldecl,\r
+                                           &tokens[ti],\r
+                                           header,\r
+                                           maxTokens - ti );\r
+         break;\r
+      case TGSI_SEMANTIC_COLOR:\r
+         fulldecl = make_output_decl(i,\r
+                                     TGSI_SEMANTIC_COLOR, 0,\r
+                                     TGSI_WRITEMASK_XYZW );\r
+         ti += tgsi_build_full_declaration(\r
+                                           &fulldecl,\r
+                                           &tokens[ti],\r
+                                           header,\r
+                                           maxTokens - ti );\r
+         break;\r
+      default:\r
+         abort();\r
+      }\r
    }\r
 \r
    /*\r

diff --git a/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.h b/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.h
index cf85eb9..29e8053 100644 (file)
--- a/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.h
+++ b/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.h
@@ -15,7 +15,10 @@ tgsi_mesa_compile_fp_program(
    const ubyte inputSemanticName[],\r
    const ubyte inputSemanticIndex[],\r
    const GLuint interpMode[],\r
+   GLuint numOutputs,\r
    const GLuint outputMapping[],\r
+   const ubyte outputSemanticName[],\r
+   const ubyte outputSemanticIndex[],\r
    struct tgsi_token *tokens,\r
    GLuint maxTokens );\r
 \r

diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 0b14830..1c5af7b 100644 (file)
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -394,7 +394,10 @@ st_translate_fragment_program(struct st_context *st,
                                  fs.input_semantic_index,
                                  interpMode,
                                  /* outputs */
+                                 fs.num_outputs,
                                  outputMapping,
+                                 fs.output_semantic_name,
+                                 fs.output_semantic_index,
                                  /* tokenized result */
                                  tokensOut, maxTokens);