fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-11 04:50:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glsl: Add sampler2DMS/sampler2DMSArray types to GLSL 1.50.

Browse source 
GLSL 1.50 includes support for the new sampler types introduced by
the ARB_texture_multisample extension.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
This commit is contained in:
Kenneth Graunke 2013-03-18 18:57:27 -07:00
parent f1ca2ed538
commit bcdda04349
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/glsl/glsl_types.cpp
View file

@ -291,6 +291,14 @@ glsl_type::generate_140_types(glsl_symbol_table *symtab)
}
void
glsl_type::generate_150_types(glsl_symbol_table *symtab)
{
generate_140_types(symtab);
generate_ARB_texture_multisample_types(symtab, false);
}
void
glsl_type::generate_ARB_texture_rectangle_types(glsl_symbol_table *symtab,
bool warn)
@ -385,9 +393,11 @@ _mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *state)
glsl_type::generate_130_types(state->symbols, true, skip_1d);
break;
case 140:
case 150:
glsl_type::generate_140_types(state->symbols);
break;
case 150:
glsl_type::generate_150_types(state->symbols);
break;
default:
assert(!"Unexpected language version");
break;

1
src/glsl/glsl_types.h
View file

@ -583,6 +583,7 @@ private:
static void generate_130_types(glsl_symbol_table *, bool add_deprecated,
bool skip_1d);
static void generate_140_types(glsl_symbol_table *);
static void generate_150_types(glsl_symbol_table *);
static void generate_ARB_texture_rectangle_types(glsl_symbol_table *, bool);
static void generate_EXT_texture_array_types(glsl_symbol_table *, bool);
static void generate_OES_texture_3D_types(glsl_symbol_table *, bool);