From 725948c6c9c4ec09795a105b5167b3f9f16146ab Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Wed, 18 Jan 2023 10:13:55 -0800 Subject: [PATCH] microsoft/compiler: Fix atomic image umax Part-of: --- src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt | 2 -- src/microsoft/compiler/nir_to_dxil.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt b/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt index f59cc4c..0b77ab7 100644 --- a/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt +++ b/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt @@ -47,8 +47,6 @@ spec@arb_sample_shading@arb_sample_shading-builtin-gl-sample-mask-mrt-alpha-to-c spec@arb_seamless_cube_map@arb_seamless_cubemap,Fail spec@arb_shader_atomic_counters@semantics,Fail spec@arb_shader_atomic_counters@semantics@Tessellation control shader atomic built-in semantics,Fail -spec@arb_shader_image_load_store@semantics,Fail -spec@arb_shader_image_load_store@semantics@imageAtomicMax/Vertex shader/r32ui/image1D test,Fail spec@arb_shader_image_size@builtin,Crash spec@arb_texture_buffer_object@texture-buffer-size-clamp,Crash spec@arb_texture_buffer_object@texture-buffer-size-clamp@r8ui_texture_buffer_size_via_sampler,Fail diff --git a/src/microsoft/compiler/nir_to_dxil.c b/src/microsoft/compiler/nir_to_dxil.c index b2f2ebc..2f912e4 100644 --- a/src/microsoft/compiler/nir_to_dxil.c +++ b/src/microsoft/compiler/nir_to_dxil.c @@ -4556,7 +4556,7 @@ emit_intrinsic(struct ntd_context *ctx, nir_intrinsic_instr *intr) return emit_image_atomic(ctx, intr, DXIL_ATOMIC_IMAX, nir_type_int); case nir_intrinsic_image_deref_atomic_umax: case nir_intrinsic_image_atomic_umax: - return emit_image_atomic(ctx, intr, DXIL_ATOMIC_IMAX, nir_type_uint); + return emit_image_atomic(ctx, intr, DXIL_ATOMIC_UMAX, nir_type_uint); case nir_intrinsic_image_deref_atomic_and: case nir_intrinsic_image_atomic_and: return emit_image_atomic(ctx, intr, DXIL_ATOMIC_AND, nir_type_uint); -- 2.7.4