diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-23 08:37:42 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-23 08:37:42 +0100 |
| commit | 6b7b7d9ce2264b35d19ecec6bf1f28894dbcada7 (patch) | |
| tree | e151dcf34c7fa60fcf9bde9963638f3c20a567f6 /mesalib/src/glsl/glsl_types.cpp | |
| parent | dc56d736fcd8ee767f76674981abbb506a1d69d5 (diff) | |
| parent | 45e3694d529b052f4122262c9bdff5476219b2b4 (diff) | |
| download | vcxsrv-6b7b7d9ce2264b35d19ecec6bf1f28894dbcada7.tar.gz vcxsrv-6b7b7d9ce2264b35d19ecec6bf1f28894dbcada7.tar.bz2 vcxsrv-6b7b7d9ce2264b35d19ecec6bf1f28894dbcada7.zip | |
Merge remote-tracking branch 'origin/released'
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; } } |