diff options
| author | Chris Forbes <chrisf@ijw.co.nz> | 2012-12-21 21:33:37 +1300 |
|---|---|---|
| committer | Chris Forbes <chrisf@ijw.co.nz> | 2013-03-02 11:33:54 +1300 |
| commit | ffb53b4f0384fc811372644ce35471c0711eef9e (patch) | |
| tree | a9600d8e15d97f25a90cec15db64dce44e3f3e86 /src/glsl/glsl_types.h | |
| parent | 16af0aca09029e647e4b7ae53ed94b089531c080 (diff) | |
| download | external_mesa3d-ffb53b4f0384fc811372644ce35471c0711eef9e.zip external_mesa3d-ffb53b4f0384fc811372644ce35471c0711eef9e.tar.gz external_mesa3d-ffb53b4f0384fc811372644ce35471c0711eef9e.tar.bz2 | |
glsl: add support for ARB_texture_multisample
V2: - emit `sample` parameter properly for multisample texelFetch()
- fix spurious whitespace change
- introduce a new opcode ir_txf_ms rather than overloading the
existing ir_txf further. This makes doing the right thing in
the driver somewhat simpler.
V3: - fix weird whitespace
V4: - don't forget to include the new opcode in tex_opcode_strs[]
(thanks Kenneth for spotting this)
Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
[V2] Reviewed-by: Eric Anholt <eric@anholt.net>
[V2] Reviewed-by: Paul Berry <stereotype441@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/glsl/glsl_types.h')
| -rw-r--r-- | src/glsl/glsl_types.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h index 8cfd8dd..7930426 100644 --- a/src/glsl/glsl_types.h +++ b/src/glsl/glsl_types.h @@ -67,7 +67,8 @@ enum glsl_sampler_dim { GLSL_SAMPLER_DIM_CUBE, GLSL_SAMPLER_DIM_RECT, GLSL_SAMPLER_DIM_BUF, - GLSL_SAMPLER_DIM_EXTERNAL + GLSL_SAMPLER_DIM_EXTERNAL, + GLSL_SAMPLER_DIM_MS }; enum glsl_interface_packing { @@ -561,6 +562,7 @@ private: static const glsl_type builtin_EXT_texture_buffer_object_types[]; static const glsl_type builtin_OES_EGL_image_external_types[]; static const glsl_type builtin_ARB_texture_cube_map_array_types[]; + static const glsl_type builtin_ARB_texture_multisample_types[]; /*@}*/ /** @@ -586,6 +588,7 @@ private: static void generate_OES_texture_3D_types(glsl_symbol_table *, bool); static void generate_OES_EGL_image_external_types(glsl_symbol_table *, bool); static void generate_ARB_texture_cube_map_array_types(glsl_symbol_table *, bool); + static void generate_ARB_texture_multisample_types(glsl_symbol_table *, bool); /*@}*/ /** |