AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vulkan-1.0.0: Get rid of MIPMAP_MODE_BASE

Browse Source
This commit is contained in:
Jason Ekstrand
2016-01-14 07:32:16 -08:00
parent 7b81637762
commit d877095e66
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/vulkan/vulkan.h
+4 -5
View File
@@ -682,12 +682,11 @@ typedef enum VkFilter {
} VkFilter;
typedef enum VkSamplerMipmapMode {
VK_SAMPLER_MIPMAP_MODE_BASE = 0,
VK_SAMPLER_MIPMAP_MODE_NEAREST = 1,
VK_SAMPLER_MIPMAP_MODE_LINEAR = 2,
VK_SAMPLER_MIPMAP_MODE_BEGIN_RANGE = VK_SAMPLER_MIPMAP_MODE_BASE,
VK_SAMPLER_MIPMAP_MODE_NEAREST = 0,
VK_SAMPLER_MIPMAP_MODE_LINEAR = 1,
VK_SAMPLER_MIPMAP_MODE_BEGIN_RANGE = VK_SAMPLER_MIPMAP_MODE_NEAREST,
VK_SAMPLER_MIPMAP_MODE_END_RANGE = VK_SAMPLER_MIPMAP_MODE_LINEAR,
VK_SAMPLER_MIPMAP_MODE_RANGE_SIZE = (VK_SAMPLER_MIPMAP_MODE_LINEAR - VK_SAMPLER_MIPMAP_MODE_BASE + 1),
VK_SAMPLER_MIPMAP_MODE_RANGE_SIZE = (VK_SAMPLER_MIPMAP_MODE_LINEAR - VK_SAMPLER_MIPMAP_MODE_NEAREST + 1),
VK_SAMPLER_MIPMAP_MODE_MAX_ENUM = 0x7FFFFFFF
} VkSamplerMipmapMode;
src/vulkan/genX_state_util.h
-1
View File
@@ -86,7 +86,6 @@ vk_to_gen_max_anisotropy(float ratio)
}
static const uint32_t vk_to_gen_mipmap_mode[] = {
[VK_SAMPLER_MIPMAP_MODE_BASE] = MIPFILTER_NONE,
[VK_SAMPLER_MIPMAP_MODE_NEAREST] = MIPFILTER_NEAREST,
[VK_SAMPLER_MIPMAP_MODE_LINEAR] = MIPFILTER_LINEAR
};