glsl: remove tabs from linker.{cpp,h}

[mesa.git] / src / compiler / glsl / ir.h

diff --git a/src/compiler/glsl/ir.h b/src/compiler/glsl/ir.h
index 68e774c03d1e065ba40baae637096e1a13dcec52..a3b1a50229fcdb389cbbe0729151739ac60688ce 100644 (file)
--- a/src/compiler/glsl/ir.h
+++ b/src/compiler/glsl/ir.h
@@ -831,6 +831,14 @@ public:
       unsigned from_ssbo_unsized_array:1; /**< unsized array buffer variable. */
 
       unsigned implicit_sized_array:1;
+
+      /**
+       * Whether this is a fragment shader output implicitly initialized with
+       * the previous contents of the specified render target at the
+       * framebuffer location corresponding to this shader invocation.
+       */
+      unsigned fb_fetch_output:1;
+
       /**
        * Emit a warning if this variable is accessed.
        */
@@ -1355,6 +1363,8 @@ public:
 
 #include "ir_expression_operation.h"
 
+extern const char *const ir_expression_operation_strings[ir_last_opcode + 1];
+
 class ir_expression : public ir_rvalue {
 public:
    ir_expression(int op, const struct glsl_type *type,
@@ -1421,17 +1431,6 @@ public:
              operation == ir_quadop_vector;
    }
 
-   /**
-    * Return a string representing this expression's operator.
-    */
-   const char *operator_string();
-
-   /**
-    * Return a string representing this expression's operator.
-    */
-   static const char *operator_string(ir_expression_operation);
-
-
    /**
     * Do a reverse-lookup to translate the given string into an operator.
     */