glsl: call set_shader_inout_layout() earlier
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. Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
committed by
Timothy Arceri
parent
e74fe2a844
commit
4196af4ce7
@@ -1799,6 +1799,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;
|
||||
@@ -1806,9 +1809,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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user