main, glsl: Add UniformDataDefaults which stores uniform defaults
The ARB_get_program_binary extension requires that uniform values in a program be restored to their initial value just after linking. This patch saves off the initial values just after linking. When the program is restored by glProgramBinary, we can use this to copy the initial value of uniforms into UniformDataSlots. V2 (Timothy Arceri): - Store UniformDataDefaults only when serializing GLSL as this is what we want for both disk cache and ARB_get_program_binary. This saves us having to come back later and reset the Uniforms on program binary restores. Signed-off-by: Timothy Arceri <tarceri@itsqueeze.com> Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> (v1) Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
This commit is contained in:
committed by
Timothy Arceri
parent
ebd9e789c4
commit
7cf1037d5a
@@ -357,5 +357,7 @@ link_set_uniform_initializers(struct gl_shader_program *prog,
|
||||
}
|
||||
}
|
||||
|
||||
memcpy(prog->data->UniformDataDefaults, prog->data->UniformDataSlots,
|
||||
sizeof(union gl_constant_value) * prog->data->NumUniformDataSlots);
|
||||
ralloc_free(mem_ctx);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user