diff options
author | Jordan Justen <[email protected]> | 2017-10-30 11:16:48 -0700 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2017-12-08 16:44:35 +1100 |
commit | 7cf1037d5af015912e84cd52a992be80f4f6092c (patch) | |
tree | dc79550f7215fd2840aa791bdd90a2e4c71d727e /src/compiler/glsl/link_uniform_initializers.cpp | |
parent | ebd9e789c40190862b28bbde8852c0b8b09df5ba (diff) |
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 <[email protected]>
Signed-off-by: Jordan Justen <[email protected]> (v1)
Reviewed-by: Tapani Pälli <[email protected]>
Diffstat (limited to 'src/compiler/glsl/link_uniform_initializers.cpp')
-rw-r--r-- | src/compiler/glsl/link_uniform_initializers.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/compiler/glsl/link_uniform_initializers.cpp b/src/compiler/glsl/link_uniform_initializers.cpp index be3715cc1a3..97796e721bf 100644 --- a/src/compiler/glsl/link_uniform_initializers.cpp +++ b/src/compiler/glsl/link_uniform_initializers.cpp @@ -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); } |