From f7918844eea4d2a2785ab492de9d78f0471ba58f Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 22 Jan 2021 11:23:35 -0800 Subject: [PATCH] swr: Don't report support for shader images. gallivm has images support, but this driver doesn't. Cc: mesa-stable (for the upcoming shader image leak fix) Acked-by: Jan Zielinski Part-of: (cherry picked from commit 9445c3d59ff25e61e94f3fa888dd2ac16126b4ce) --- .pick_status.json | 2 +- src/gallium/drivers/swr/swr_screen.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 32aa7952236..3e42f004469 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -445,7 +445,7 @@ "description": "swr: Don't report support for shader images.", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/swr/swr_screen.cpp b/src/gallium/drivers/swr/swr_screen.cpp index 8bc7a207901..f8eb5145ed6 100644 --- a/src/gallium/drivers/swr/swr_screen.cpp +++ b/src/gallium/drivers/swr/swr_screen.cpp @@ -349,8 +349,10 @@ swr_get_shader_param(struct pipe_screen *screen, shader != PIPE_SHADER_TESS_EVAL) return 0; - if (param == PIPE_SHADER_CAP_MAX_SHADER_BUFFERS) + if (param == PIPE_SHADER_CAP_MAX_SHADER_BUFFERS || + param == PIPE_SHADER_CAP_MAX_SHADER_IMAGES) { return 0; + } return gallivm_get_shader_param(param); }