From d4f0c6a30c66c3b70343df32dfbb711ed00268b2 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Thu, 24 Nov 2022 10:24:15 +0100 Subject: [PATCH] d3d12: fix max-array-layers We used to need this, because we incorrectly multiplied the cube array sizes by 6. Now that this has been fixed, we can actually support the OpenGL 4.1 limit for this. Fixes: 7118b2136e9 ("d3d12: Don't multiply cube array sizes by 6") Reviewed-by: Jesse Natalie Part-of: (cherry picked from commit acc0039aecec661e55e2dd90554a1d08a39d677c) --- .pick_status.json | 2 +- src/gallium/drivers/d3d12/d3d12_screen.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index d1d5580fb2d..227b381b07d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -427,7 +427,7 @@ "description": "d3d12: fix max-array-layers", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "7118b2136e9c7412108b668e7be4723830bbb7ec" }, diff --git a/src/gallium/drivers/d3d12/d3d12_screen.cpp b/src/gallium/drivers/d3d12/d3d12_screen.cpp index c3f47b4e8ba..1cbe1fbdd5e 100644 --- a/src/gallium/drivers/d3d12/d3d12_screen.cpp +++ b/src/gallium/drivers/d3d12/d3d12_screen.cpp @@ -175,8 +175,7 @@ d3d12_get_param(struct pipe_screen *pscreen, enum pipe_cap param) return 1; case PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS: - /* Divide by 6 because this also applies to cubemaps */ - return D3D12_REQ_TEXTURE2D_ARRAY_AXIS_DIMENSION / 6; + return D3D12_REQ_TEXTURE2D_ARRAY_AXIS_DIMENSION; case PIPE_CAP_DEPTH_CLIP_DISABLE: return 1;