SQUASHME: Enable samplerAnisotropy and PR cleanup

Author: abaire

hw/xbox/nv2a/pgraph/vk/instance.c

@@ -547,6 +547,7 @@ static bool create_logical_device(PGRAPHState *pg, Error **errp)
         F(occlusionQueryPrecise, true),
         F(fillModeNonSolid, true),
         F(wideLines, false),
+        F(samplerAnisotropy, false),
         #undef F
         // clang-format on
     };

hw/xbox/nv2a/pgraph/vk/renderer.h

@@ -206,6 +206,7 @@ typedef struct TextureKey {
     uint32_t filter;
     uint32_t address;
     uint32_t border_color;
+    uint32_t max_anisotropy;
 } TextureKey;
 
 typedef struct TextureBinding {

hw/xbox/nv2a/pgraph/vk/texture.c

@@ -1101,13 +1101,9 @@ static void create_texture(PGRAPHState *pg, int texture_idx)
         pgraph_reg_r(pg, NV_PGRAPH_BORDERCOLOR0 + texture_idx * 4);
     bool is_indexed = (state.color_format ==
             NV097_SET_TEXTURE_FORMAT_COLOR_SZ_I8_A8R8G8B8);
-    uint32_t xbox_max_anisotropy =
+    uint32_t max_anisotropy =
         1 << (GET_MASK(pgraph_reg_r(pg, NV_PGRAPH_TEXCTL0_0 + texture_idx*4),
                        NV_PGRAPH_TEXCTL0_0_MAX_ANISOTROPY));
-    uint32_t max_anisotropy =
-        xbox_max_anisotropy <= r->device_props.limits.maxSamplerAnisotropy ?
-            xbox_max_anisotropy :
-            r->device_props.limits.maxSamplerAnisotropy;
 
     TextureKey key;
     memset(&key, 0, sizeof(key));
@@ -1127,6 +1123,7 @@ static void create_texture(PGRAPHState *pg, int texture_idx)
     key.filter = filter;
     key.address = address;
     key.border_color = border_color_pack32;
+    key.max_anisotropy = max_anisotropy;
 
     bool possibly_dirty = false;
     bool possibly_dirty_checked = false;
@@ -1350,6 +1347,8 @@ static void create_texture(PGRAPHState *pg, int texture_idx)
     } else if (lod_bias < -r->device_props.limits.maxSamplerLodBias) {
         lod_bias = -r->device_props.limits.maxSamplerLodBias;
     }
+    uint32_t sampler_max_anisotropy =
+        MIN(r->device_props.limits.maxSamplerAnisotropy, max_anisotropy);
 
     VkSamplerCreateInfo sampler_create_info = {
         .sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO,
@@ -1361,8 +1360,9 @@ static void create_texture(PGRAPHState *pg, int texture_idx)
             GET_MASK(address, NV_PGRAPH_TEXADDRESS0_ADDRV)),
         .addressModeW = (state.dimensionality > 2) ? lookup_texture_address_mode(
             GET_MASK(address, NV_PGRAPH_TEXADDRESS0_ADDRP)) : 0,
-        .anisotropyEnable = max_anisotropy > 1,
-        .maxAnisotropy = max_anisotropy,
+        .anisotropyEnable = r->enabled_physical_device_features.wideLines &&
+                            sampler_max_anisotropy > 1,
+        .maxAnisotropy = sampler_max_anisotropy,
         .borderColor = vk_border_color,
         .compareEnable = VK_FALSE,
         .compareOp = VK_COMPARE_OP_ALWAYS,