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/uniform_query.cpp | |
| 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/uniform_query.cpp')
| -rw-r--r-- | src/mesa/main/uniform_query.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp index 5989364..7e630e6 100644 --- a/src/mesa/main/uniform_query.cpp +++ b/src/mesa/main/uniform_query.cpp @@ -993,9 +993,7 @@ _mesa_uniform_matrix(struct gl_context *ctx, struct gl_shader_program *shProg, * * Returns the uniform index into UniformStorage (also the * glGetActiveUniformsiv uniform index), and stores the referenced - * array offset in *offset, or GL_INVALID_INDEX (-1). Those two - * return values can be encoded into a uniform location for - * glUniform* using _mesa_uniform_merge_location_offset(index, offset). + * array offset in *offset, or GL_INVALID_INDEX (-1). */ extern "C" unsigned _mesa_get_uniform_location(struct gl_context *ctx, |