diff options
author | marha <marha@users.sourceforge.net> | 2012-01-23 08:33:10 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-01-23 08:33:10 +0100 |
commit | 45e3694d529b052f4122262c9bdff5476219b2b4 (patch) | |
tree | 173df8f3cea2330e782626e382a90668950d3e6f /mesalib/src/glsl/glsl_types.cpp | |
parent | a8ef69cc0c9e5281e6b745dd4a2be75f629eb8b8 (diff) | |
download | vcxsrv-45e3694d529b052f4122262c9bdff5476219b2b4.tar.gz vcxsrv-45e3694d529b052f4122262c9bdff5476219b2b4.tar.bz2 vcxsrv-45e3694d529b052f4122262c9bdff5476219b2b4.zip |
git update libX11 mesa libxcb xkeyboard-config 23 jan 2012
Diffstat (limited to 'mesalib/src/glsl/glsl_types.cpp')
-rw-r--r-- | mesalib/src/glsl/glsl_types.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/glsl/glsl_types.cpp b/mesalib/src/glsl/glsl_types.cpp index d4385a644..1489aae6d 100644 --- a/mesalib/src/glsl/glsl_types.cpp +++ b/mesalib/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; } } |