From 21cea3e2425f9d41ac6b7090f9598646c9e90e48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abel=20Garc=C3=ADa=20Dorta?= Date: Wed, 12 May 2021 18:34:19 +0100 Subject: [PATCH] i915g: add HW atomic counters as unsupported Closes: #4772 Fixes: 2a06423c009 ("gallium: add CAPs to support HW atomic counters. (v3)") Reviewed-by: Alyssa Rosenzweig Part-of: (cherry picked from commit f88dd7ed4d2d2cac9816bc386064d08e5c4c06e7) --- .pick_status.json | 2 +- src/gallium/drivers/i915/i915_screen.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index e700dbcabf3..f77dabeed72 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -364,7 +364,7 @@ "description": "i915g: add HW atomic counters as unsupported", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "2a06423c0094749126afced82c400380221fadac" }, diff --git a/src/gallium/drivers/i915/i915_screen.c b/src/gallium/drivers/i915/i915_screen.c index b24cad39940..a500d6be40c 100644 --- a/src/gallium/drivers/i915/i915_screen.c +++ b/src/gallium/drivers/i915/i915_screen.c @@ -181,6 +181,8 @@ i915_get_shader_param(struct pipe_screen *screen, case PIPE_SHADER_CAP_LOWER_IF_THRESHOLD: case PIPE_SHADER_CAP_PREFERRED_IR: case PIPE_SHADER_CAP_TGSI_SKIP_MERGE_REGISTERS: + case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS: + case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS: return 0; case PIPE_SHADER_CAP_MAX_UNROLL_ITERATIONS_HINT: return 32;