diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2014-08-01 18:53:09 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2014-08-07 16:17:55 -0700 |
| commit | 89d92fc00e52ac0f9d5bb1edf81660ab93816f1b (patch) | |
| tree | df72d67968744389efe9cb6a54f026cc0f037cac /src/mesa/main/uniforms.c | |
| parent | 1c759e32d8782bae11148896231500727faa883a (diff) | |
| download | external_mesa3d-89d92fc00e52ac0f9d5bb1edf81660ab93816f1b.zip external_mesa3d-89d92fc00e52ac0f9d5bb1edf81660ab93816f1b.tar.gz external_mesa3d-89d92fc00e52ac0f9d5bb1edf81660ab93816f1b.tar.bz2 | |
mesa: Fold _mesa_uniform_merge_location_offset into its only caller
Also delete the comment before that function. Everything in that
comment was either stale, wrong, or captured elsewhere.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/main/uniforms.c')
| -rw-r--r-- | src/mesa/main/uniforms.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c index b6512fe..0d0cbf5 100644 --- a/src/mesa/main/uniforms.c +++ b/src/mesa/main/uniforms.c @@ -932,7 +932,8 @@ _mesa_GetUniformLocation(GLuint programObj, const GLcharARB *name) shProg->UniformStorage[index].atomic_buffer_index != -1) return -1; - return _mesa_uniform_merge_location_offset(shProg, index, offset); + /* location in remap table + array element offset */ + return shProg->UniformStorage[index].remap_location + offset; } GLuint GLAPIENTRY |