diff options
| author | Timothy Arceri <tarceri@itsqueeze.com> | 2018-01-20 14:04:55 +1100 |
|---|---|---|
| committer | Timothy Arceri <tarceri@itsqueeze.com> | 2018-01-23 18:05:13 +1100 |
| commit | e68150de263156a3f3d1b609b6506c5649967f61 (patch) | |
| tree | 9a23877c1c54f93ed900f923dd72f2cc7d267733 | |
| parent | 82adf53308c137ce0dc5f2d5da4e7cc40c5b808c (diff) | |
ac: fix image load store for GLSL_SAMPLER_DIM_3D
Fixes the following piglit tests:
arb_shader_image_load_store/layer/image3d/layered binding test
arb_shader_image_load_store/max-size/image3d max size test/2048x8x8x1
arb_shader_image_load_store/max-size/image3d max size test/8x2048x8x1
arb_shader_image_load_store/max-size/image3d max size test/8x8x2048x1
arb_shader_image_load_store/semantics/imageload/vertex shader/rgba32f/image3d test
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
| -rw-r--r-- | src/amd/common/ac_nir_to_llvm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c index 8ec361cf8db..9ba324a5132 100644 --- a/src/amd/common/ac_nir_to_llvm.c +++ b/src/amd/common/ac_nir_to_llvm.c @@ -3635,6 +3635,7 @@ static LLVMValueRef visit_image_load(struct ac_nir_context *ctx, } else { bool is_da = glsl_sampler_type_is_array(type) || glsl_get_sampler_dim(type) == GLSL_SAMPLER_DIM_CUBE || + glsl_get_sampler_dim(type) == GLSL_SAMPLER_DIM_3D || glsl_get_sampler_dim(type) == GLSL_SAMPLER_DIM_SUBPASS || glsl_get_sampler_dim(type) == GLSL_SAMPLER_DIM_SUBPASS_MS; LLVMValueRef da = is_da ? ctx->ac.i1true : ctx->ac.i1false; @@ -3693,7 +3694,8 @@ static void visit_image_store(struct ac_nir_context *ctx, params, 6, 0); } else { bool is_da = glsl_sampler_type_is_array(type) || - glsl_get_sampler_dim(type) == GLSL_SAMPLER_DIM_CUBE; + glsl_get_sampler_dim(type) == GLSL_SAMPLER_DIM_CUBE || + glsl_get_sampler_dim(type) == GLSL_SAMPLER_DIM_3D; LLVMValueRef da = is_da ? ctx->ac.i1true : ctx->ac.i1false; LLVMValueRef slc = ctx->ac.i1false; |