diff options
| author | Ian Romanick <[email protected]> | 2011-11-14 14:02:09 -0800 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2012-01-11 12:51:24 -0800 |
| commit | 32be81de39f7548e353afabf1215b0ea7c7b0916 (patch) | |
| tree | 654eb52334ab6494b9eb3eb836bf6d037b8b12c2 /src/glsl | |
| parent | 195ee502c3196607e3a74075aefade9770a08a67 (diff) | |
glsl: Add glsl_type::sampler_index
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/glsl_types.cpp | 29 | ||||
| -rw-r--r-- | src/glsl/glsl_types.h | 6 |
2 files changed, 35 insertions, 0 deletions
diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp index 8587da0a3a2..d4385a644ca 100644 --- a/src/glsl/glsl_types.cpp +++ b/src/glsl/glsl_types.cpp @@ -127,6 +127,35 @@ glsl_type::contains_sampler() const } } +gl_texture_index +glsl_type::sampler_index() const +{ + const glsl_type *const t = (this->is_array()) ? this->fields.array : this; + + assert(t->is_sampler()); + + switch (t->sampler_dimensionality) { + case GLSL_SAMPLER_DIM_1D: + return (t->sampler_array) ? TEXTURE_1D_ARRAY_INDEX : TEXTURE_1D_INDEX; + case GLSL_SAMPLER_DIM_2D: + return (t->sampler_array) ? TEXTURE_2D_ARRAY_INDEX : TEXTURE_2D_INDEX; + case GLSL_SAMPLER_DIM_3D: + return TEXTURE_3D_INDEX; + case GLSL_SAMPLER_DIM_CUBE: + return TEXTURE_CUBE_INDEX; + case GLSL_SAMPLER_DIM_RECT: + return TEXTURE_RECT_INDEX; + case GLSL_SAMPLER_DIM_BUF: + assert(!"FINISHME: Implement ARB_texture_buffer_object"); + break; + case GLSL_SAMPLER_DIM_EXTERNAL: + return TEXTURE_EXTERNAL_INDEX; + default: + assert(!"Should not get here."); + break; + } +} + void glsl_type::generate_100ES_types(glsl_symbol_table *symtab) { diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h index 4ac90118b86..2997c931149 100644 --- a/src/glsl/glsl_types.h +++ b/src/glsl/glsl_types.h @@ -28,6 +28,7 @@ #include <string.h> #include <assert.h> +#include "main/mtypes.h" /* for gl_texture_index, C++'s enum rules are broken */ #ifdef __cplusplus extern "C" { @@ -354,6 +355,11 @@ struct glsl_type { bool contains_sampler() const; /** + * Get the Mesa texture target index for a sampler type. + */ + gl_texture_index sampler_index() const; + + /** * Query whether or not a type is an array */ bool is_array() const |