projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glsl: Add missing bool case in glsl_type::get_scalar_type
[mesa.git]
/
src
/
glsl
/
glsl_types.cpp
diff --git
a/src/glsl/glsl_types.cpp
b/src/glsl/glsl_types.cpp
index a783dcc3b9cebb4c10e9a1c0fbb52d7f72ac537c..419761a7d3b780251a0a0ea8082d7e308bd7a9ef 100644
(file)
--- a/
src/glsl/glsl_types.cpp
+++ b/
src/glsl/glsl_types.cpp
@@
-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)
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:
glsl_type::generate_130_types(state->symbols, true, skip_1d);
break;
case 140:
- case 150:
glsl_type::generate_140_types(state->symbols);
break;
glsl_type::generate_140_types(state->symbols);
break;
+ case 150:
+ glsl_type::generate_150_types(state->symbols);
+ break;
default:
assert(!"Unexpected language version");
break;
default:
assert(!"Unexpected language version");
break;
@@
-466,6
+476,8
@@
const glsl_type *glsl_type::get_scalar_type() const
return int_type;
case GLSL_TYPE_FLOAT:
return float_type;
return int_type;
case GLSL_TYPE_FLOAT:
return float_type;
+ case GLSL_TYPE_BOOL:
+ return bool_type;
default:
/* Handle everything else */
return type;
default:
/* Handle everything else */
return type;