OSDN Git Service

glsl: Fix 'control reaches end of non-void function' warning.
authorVinson Lee <vlee@freedesktop.org>
Tue, 17 Jan 2012 02:01:22 +0000 (18:01 -0800)
committerIan Romanick <ian.d.romanick@intel.com>
Tue, 24 Jan 2012 23:39:47 +0000 (15:39 -0800)
commit0b6003af71803db69a4911955026b93a552635e6
treea6599443db48c6bcd283d893d22e59859a2b5372
parentd8f66afa5d1cdb42677f5d170b99fa2ed9a1ef81
glsl: Fix 'control reaches end of non-void function' warning.

Fix this GCC warning on non-debug builds.
glsl_types.cpp: In member function 'gl_texture_index
glsl_type::sampler_index() const':
glsl_types.cpp:157: warning: control reaches end of non-void function

NOTE: This is a candidate for the 8.0 branch.

Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
(cherry picked from commit e9bcf4d56b8ae128204fb95693c6f81a6b724052)
src/glsl/glsl_types.cpp