diff options
| author | Jason Ekstrand <[email protected]> | 2015-06-23 18:05:25 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-06-23 18:05:25 -0700 |
| commit | a62edcce4eb4c800d972817a20ee874bf2a2c3ef (patch) | |
| tree | 46083a8762d45a6c595c7aaee2bb1cd0fc36eb62 /src/glsl/standalone_scaffolding.cpp | |
| parent | 9b9f973ca6d3cc1ec5be27857def00a83c032464 (diff) | |
| parent | 6844d6b7f8398a25eff511541b187afeb1199ce0 (diff) | |
Merge remote-tracking branch 'mesa-public/master' into vulkan
Diffstat (limited to 'src/glsl/standalone_scaffolding.cpp')
| -rw-r--r-- | src/glsl/standalone_scaffolding.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/standalone_scaffolding.cpp b/src/glsl/standalone_scaffolding.cpp index 6e1ecec3235..050e733d549 100644 --- a/src/glsl/standalone_scaffolding.cpp +++ b/src/glsl/standalone_scaffolding.cpp @@ -95,7 +95,7 @@ _mesa_clear_shader_program_data(struct gl_shader_program *shProg) { unsigned i; - shProg->NumUserUniformStorage = 0; + shProg->NumUniformStorage = 0; shProg->UniformStorage = NULL; shProg->NumUniformRemapTable = 0; shProg->UniformRemapTable = NULL; |