diff options
| author | Jason Ekstrand <[email protected]> | 2016-01-14 07:32:16 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-01-14 07:32:16 -0800 |
| commit | d877095e66e7d5be234ed5b20ad59c3a1d3539ec (patch) | |
| tree | e5d935b3db82303eb5c4b044c95c07ce2bdd0193 | |
| parent | 7b81637762268f94bdf0576ca83bb2e6896b3565 (diff) | |
vulkan-1.0.0: Get rid of MIPMAP_MODE_BASE
| -rw-r--r-- | include/vulkan/vulkan.h | 9 | ||||
| -rw-r--r-- | src/vulkan/genX_state_util.h | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index 5f75865c581..1d3ef3faafe 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -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; diff --git a/src/vulkan/genX_state_util.h b/src/vulkan/genX_state_util.h index f7a860e796b..215e9ba30eb 100644 --- a/src/vulkan/genX_state_util.h +++ b/src/vulkan/genX_state_util.h @@ -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 }; |