projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nir: Fix serialize/deserialize of void samplers/images
[mesa.git]
/
src
/
compiler
/
glsl_types.cpp
diff --git
a/src/compiler/glsl_types.cpp
b/src/compiler/glsl_types.cpp
index 051d8e8c38282ee8e95bae0f154672791a9088cf..e093034aa9f1c06edf67f3ea04509920df60e590 100644
(file)
--- a/
src/compiler/glsl_types.cpp
+++ b/
src/compiler/glsl_types.cpp
@@
-917,6
+917,8
@@
glsl_type::get_sampler_instance(enum glsl_sampler_dim dim,
case GLSL_SAMPLER_DIM_SUBPASS_MS:
return error_type;
}
case GLSL_SAMPLER_DIM_SUBPASS_MS:
return error_type;
}
+ case GLSL_TYPE_VOID:
+ return shadow ? samplerShadow_type : sampler_type;
default:
return error_type;
}
default:
return error_type;
}
@@
-2656,8
+2658,8
@@
union packed_type {
unsigned dimensionality:4;
unsigned shadow:1;
unsigned array:1;
unsigned dimensionality:4;
unsigned shadow:1;
unsigned array:1;
- unsigned sampled_type:
2
;
- unsigned _pad:1
9
;
+ unsigned sampled_type:
5
;
+ unsigned _pad:1
6
;
} sampler;
struct {
unsigned base_type:5;
} sampler;
struct {
unsigned base_type:5;