nir: Fix serialize/deserialize of void samplers/images
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net> Reviewed-by: Marek Olšák <marek.olsak@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6222>
This commit is contained in:
@@ -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_TYPE_VOID:
|
||||
return shadow ? samplerShadow_type : sampler_type;
|
||||
default:
|
||||
return error_type;
|
||||
}
|
||||
@@ -2656,8 +2658,8 @@ union packed_type {
|
||||
unsigned dimensionality:4;
|
||||
unsigned shadow:1;
|
||||
unsigned array:1;
|
||||
unsigned sampled_type:2;
|
||||
unsigned _pad:19;
|
||||
unsigned sampled_type:5;
|
||||
unsigned _pad:16;
|
||||
} sampler;
|
||||
struct {
|
||||
unsigned base_type:5;
|
||||
|
@@ -1442,7 +1442,7 @@ read_ssa_undef(read_ctx *ctx, union packed_instr header)
|
||||
union packed_tex_data {
|
||||
uint32_t u32;
|
||||
struct {
|
||||
enum glsl_sampler_dim sampler_dim:4;
|
||||
unsigned sampler_dim:4;
|
||||
unsigned dest_type:8;
|
||||
unsigned coord_components:3;
|
||||
unsigned is_array:1;
|
||||
|
Reference in New Issue
Block a user