From: Ben Widawsky Date: Mon, 25 Jan 2016 23:26:25 +0000 (-0800) Subject: gen8/state: Apply min/mag filters individually for samplers X-Git-Tag: upstream/17.1.0~11012^2~531 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9c69f4632d7ae36efb59f4e7002de28dac08a896;p=platform%2Fupstream%2Fmesa.git gen8/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/gen8_state.c b/src/vulkan/gen8_state.c index ce142e6..6e4c3ea 100644 --- a/src/vulkan/gen8_state.c +++ b/src/vulkan/gen8_state.c @@ -324,9 +324,6 @@ 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); - uint32_t border_color_offset = device->border_colors.offset + pCreateInfo->borderColor * 64; @@ -338,8 +335,8 @@ VkResult genX(CreateSampler)( .BaseMipLevel = 0.0, #endif .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 = anv_clamp_f(pCreateInfo->mipLodBias, -16, 15.996), .AnisotropicAlgorithm = EWAApproximation, .MinLOD = anv_clamp_f(pCreateInfo->minLod, 0, 14),