Mesa (gallium-mesa-7.4): mesa: update fragResults array in arb_output_attrib_string()

Alan Hourihane alanh at kemper.freedesktop.org
Fri Mar 6 11:55:50 UTC 2009


Module: Mesa
Branch: gallium-mesa-7.4
Commit: a43c30ef417a01aeca101f18ec8312a8990cf184
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a43c30ef417a01aeca101f18ec8312a8990cf184

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Feb 27 13:49:58 2009 -0700

mesa: update fragResults array in arb_output_attrib_string()

Plus add some comments.

(cherry picked from master, commit a070937c00828ef0c0d618df7cc4845b0a21bbf3)

---

 src/mesa/shader/prog_print.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/mesa/shader/prog_print.c b/src/mesa/shader/prog_print.c
index 0ec13a4..b67a87f 100644
--- a/src/mesa/shader/prog_print.c
+++ b/src/mesa/shader/prog_print.c
@@ -85,6 +85,9 @@ file_string(enum register_file f, gl_prog_print_mode mode)
 static const char *
 arb_input_attrib_string(GLint index, GLenum progType)
 {
+   /*
+    * These strings should match the VERT_ATTRIB_x and FRAG_ATTRIB_x tokens.
+    */
    const char *vertAttribs[] = {
       "vertex.position",
       "vertex.weight",
@@ -159,6 +162,9 @@ arb_input_attrib_string(GLint index, GLenum progType)
 static const char *
 arb_output_attrib_string(GLint index, GLenum progType)
 {
+   /*
+    * These strings should match the VERT_RESULT_x and FRAG_RESULT_x tokens.
+    */
    const char *vertResults[] = {
       "result.position",
       "result.color.primary",
@@ -183,7 +189,12 @@ arb_output_attrib_string(GLint index, GLenum progType)
    };
    const char *fragResults[] = {
       "result.color",
-      "result.depth"
+      "result.color(half)",
+      "result.depth",
+      "result.color[0]",
+      "result.color[1]",
+      "result.color[2]",
+      "result.color[3]"
    };
 
    if (progType == GL_VERTEX_PROGRAM_ARB) {




More information about the mesa-commit mailing list