From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Mon, 25 Jan 2016 23:33:08 +0000 (-0800)
Subject: gen7/state: Apply min/mag filters individually for samplers
X-Git-Tag: upstream/17.1.0~11012^2~530
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6bbf3814dc937371c2918ea56b18d4c32000b951;p=platform%2Fupstream%2Fmesa.git

gen7/state: Apply min/mag filters individually for samplers

This fixes tests which apply different min and mag filters, and depend on
the min filter to be correct.
---

diff --git a/src/vulkan/gen7_state.c b/src/vulkan/gen7_state.c
index 55cff90..b3abe74 100644
--- a/src/vulkan/gen7_state.c
+++ b/src/vulkan/gen7_state.c
@@ -81,17 +81,16 @@ VkResult genX(CreateSampler)(
    if (!sampler)
       return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
 
-   uint32_t filter = vk_to_gen_tex_filter(pCreateInfo->magFilter,
-                                          pCreateInfo->anisotropyEnable);
-
    struct GEN7_SAMPLER_STATE sampler_state = {
       .SamplerDisable = false,
       .TextureBorderColorMode = DX10OGL,
       .LODPreClampEnable = OGL,
       .BaseMipLevel = 0.0,
       .MipModeFilter = vk_to_gen_mipmap_mode[pCreateInfo->mipmapMode],
-      .MagModeFilter = filter,
-      .MinModeFilter = filter,
+      .MagModeFilter = vk_to_gen_tex_filter(pCreateInfo->magFilter,
+                                            pCreateInfo->anisotropyEnable),
+      .MinModeFilter = vk_to_gen_tex_filter(pCreateInfo->minFilter,
+                                            pCreateInfo->anisotropyEnable),
       .TextureLODBias = pCreateInfo->mipLodBias * 256,
       .AnisotropicAlgorithm = EWAApproximation,
       .MinLOD = pCreateInfo->minLod,