[Mesa-dev] [PATCH v3 10/14] glsl: call set_shader_inout_layout() earlier
Timothy Arceri
t_arceri at yahoo.com.au
Sat Nov 14 05:42:45 PST 2015
From: Timothy Arceri <timothy.arceri at collabora.com>
This will allow us to add error checking to this function
in a later patch, if we don't move it the error messages
will go missing.
---
src/glsl/glsl_parser_extras.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
index 3ed1168..1678d89 100644
--- a/src/glsl/glsl_parser_extras.cpp
+++ b/src/glsl/glsl_parser_extras.cpp
@@ -1795,6 +1795,9 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader,
if (shader->InfoLog)
ralloc_free(shader->InfoLog);
+ if (!state->error)
+ set_shader_inout_layout(shader, state);
+
shader->symbols = new(shader->ir) glsl_symbol_table;
shader->CompileStatus = !state->error;
shader->InfoLog = state->info_log;
@@ -1802,9 +1805,6 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader,
shader->IsES = state->es_shader;
shader->uses_builtin_functions = state->uses_builtin_functions;
- if (!state->error)
- set_shader_inout_layout(shader, state);
-
/* Retain any live IR, but trash the rest. */
reparent_ir(shader->ir, shader->ir);
--
2.4.3
More information about the mesa-dev
mailing list