diff options
| author | Vinson Lee <[email protected]> | 2012-01-16 18:01:22 -0800 |
|---|---|---|
| committer | Vinson Lee <[email protected]> | 2012-01-20 23:53:59 -0800 |
| commit | e9bcf4d56b8ae128204fb95693c6f81a6b724052 (patch) | |
| tree | 0b9a2d970f573e41531615ee4c767acfccafafca | |
| parent | d6cd514edbeca0de38561f66189748078d0dc602 (diff) | |
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 <[email protected]>
Reviewed-by: Chad Versace <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/glsl/glsl_types.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp index d4385a644ca..1489aae6d89 100644 --- a/src/glsl/glsl_types.cpp +++ b/src/glsl/glsl_types.cpp @@ -147,12 +147,12 @@ glsl_type::sampler_index() const return TEXTURE_RECT_INDEX; case GLSL_SAMPLER_DIM_BUF: assert(!"FINISHME: Implement ARB_texture_buffer_object"); - break; + return TEXTURE_BUFFER_INDEX; case GLSL_SAMPLER_DIM_EXTERNAL: return TEXTURE_EXTERNAL_INDEX; default: assert(!"Should not get here."); - break; + return TEXTURE_BUFFER_INDEX; } } |