AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set the type of ir_texture properly; infer it from the sampler type.

Browse Source
This commit is contained in:
Kenneth Graunke
2010-06-03 15:07:34 -07:00
parent dd5b4a544b
commit 56d3f6ad78
5 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ir_reader.cpp
+3 -2
View File
@@ -934,11 +934,12 @@ read_texture(_mesa_glsl_parse_state *st, s_list *list)
// Read sampler (must be a deref)
s_expression *sampler_expr = (s_expression *) tag->next;
tex->sampler = read_dereference(st, sampler_expr);
if (tex->sampler == NULL) {
ir_dereference *sampler = read_dereference(st, sampler_expr);
if (sampler == NULL) {
ir_read_error(st, NULL, "when reading sampler in (%s ...)", tag->value());
return NULL;
}
tex->set_sampler(sampler);
// Read coordinate (any rvalue)
s_expression *coordinate_expr = (s_expression *) sampler_expr->next;