Revert "glcpp: Rewrite line-continuation support to act globally."

[mesa.git] / src / glsl / hir_field_selection.cpp

diff --git a/src/glsl/hir_field_selection.cpp b/src/glsl/hir_field_selection.cpp
index db1e06932f4596f15bc0e1e2a37164ce562d8116..260b415a800af318f5a7e1a8fa04ae657eda376b 100644 (file)
--- a/src/glsl/hir_field_selection.cpp
+++ b/src/glsl/hir_field_selection.cpp
@@ -22,13 +22,12 @@
  */
 
 #include "ir.h"
-#include "main/imports.h"
-#include "symbol_table.h"
+#include "program/symbol_table.h"
 #include "glsl_parser_extras.h"
 #include "ast.h"
 #include "glsl_types.h"
 
-struct ir_rvalue *
+ir_rvalue *
 _mesa_ast_field_selection_to_hir(const ast_expression *expr,
                                 exec_list *instructions,
                                 struct _mesa_glsl_parse_state *state)
@@ -99,5 +98,5 @@ _mesa_ast_field_selection_to_hir(const ast_expression *expr,
                       expr->primary_expression.identifier);
    }
 
-   return result ? result : ir_call::get_error_instruction(ctx);
+   return result ? result : ir_rvalue::error_value(ctx);
 }