mesa: rename, reorder FRAG_RESULT_x tokens

s/FRAG_RESULT_DEPR/FRAG_RESULT_DEPTH/
s/FRAG_RESULT_COLR/FRAG_RESULT/COLOR/
Remove FRAG_RESULT_COLH (NV half-precision) output since we never used it.
Next, we might merge the COLOR and DATA outputs (COLOR0, COLOR1, etc).

1 files changed, 5 insertions, 5 deletions

diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index d2535b6a2f..f825204915 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -466,23 +466,23 @@ st_translate_fragment_program(struct st_context *st,
       GLbitfield outputsWritten = stfp->Base.Base.OutputsWritten;
 
       /* if z is written, emit that first */
-      if (outputsWritten & (1 << FRAG_RESULT_DEPR)) {
+      if (outputsWritten & (1 << FRAG_RESULT_DEPTH)) {
          fs_output_semantic_name[fs_num_outputs] = TGSI_SEMANTIC_POSITION;
          fs_output_semantic_index[fs_num_outputs] = 0;
-         outputMapping[FRAG_RESULT_DEPR] = fs_num_outputs;
+         outputMapping[FRAG_RESULT_DEPTH] = fs_num_outputs;
          fs_num_outputs++;
-         outputsWritten &= ~(1 << FRAG_RESULT_DEPR);
+         outputsWritten &= ~(1 << FRAG_RESULT_DEPTH);
       }
 
       /* handle remaning outputs (color) */
       for (attr = 0; attr < FRAG_RESULT_MAX; attr++) {
          if (outputsWritten & (1 << attr)) {
             switch (attr) {
-            case FRAG_RESULT_DEPR:
+            case FRAG_RESULT_DEPTH:
                /* handled above */
                assert(0);
                break;
-            case FRAG_RESULT_COLR:
+            case FRAG_RESULT_COLOR:
                fs_output_semantic_name[fs_num_outputs] = TGSI_SEMANTIC_COLOR;
                fs_output_semantic_index[fs_num_outputs] = numColors;
                outputMapping[attr] = fs_num_outputs;