OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vk/0.170.2: Rename VkTexAddress to VkTexAddressMode

Browse Source
This commit is contained in:
Jason Ekstrand
2015-10-05 20:15:06 -07:00
parent 39a19e88a3
commit f7c3519aaf
3 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/vulkan/vulkan.h
View File

@@ -688,16 +688,16 @@ typedef enum {
} VkTexMipmapMode;
typedef enum {
VK_TEX_ADDRESS_WRAP = 0,
VK_TEX_ADDRESS_MIRROR = 1,
VK_TEX_ADDRESS_CLAMP = 2,
VK_TEX_ADDRESS_MIRROR_ONCE = 3,
VK_TEX_ADDRESS_CLAMP_BORDER = 4,
VK_TEX_ADDRESS_BEGIN_RANGE = VK_TEX_ADDRESS_WRAP,
VK_TEX_ADDRESS_END_RANGE = VK_TEX_ADDRESS_CLAMP_BORDER,
VK_TEX_ADDRESS_NUM = (VK_TEX_ADDRESS_CLAMP_BORDER - VK_TEX_ADDRESS_WRAP + 1),
VK_TEX_ADDRESS_MODE_WRAP = 0,
VK_TEX_ADDRESS_MODE_MIRROR = 1,
VK_TEX_ADDRESS_MODE_CLAMP = 2,
VK_TEX_ADDRESS_MODE_MIRROR_ONCE = 3,
VK_TEX_ADDRESS_MODE_CLAMP_BORDER = 4,
VK_TEX_ADDRESS_BEGIN_RANGE = VK_TEX_ADDRESS_MODE_WRAP,
VK_TEX_ADDRESS_END_RANGE = VK_TEX_ADDRESS_MODE_CLAMP_BORDER,
VK_TEX_ADDRESS_NUM = (VK_TEX_ADDRESS_MODE_CLAMP_BORDER - VK_TEX_ADDRESS_MODE_WRAP + 1),
VK_TEX_ADDRESS_MAX_ENUM = 0x7FFFFFFF
} VkTexAddress;
} VkTexAddressMode;
typedef enum {
VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK = 0,
@@ -1717,9 +1717,9 @@ typedef struct {
VkTexFilter magFilter;
VkTexFilter minFilter;
VkTexMipmapMode mipMode;
VkTexAddress addressU;
VkTexAddress addressV;
VkTexAddress addressW;
VkTexAddressMode addressModeU;
VkTexAddressMode addressModeV;
VkTexAddressMode addressModeW;
float mipLodBias;
float maxAnisotropy;
VkBool32 compareEnable;

16
src/vulkan/gen7_state.c
View File

@@ -95,11 +95,11 @@ static const uint32_t vk_to_gen_mipmap_mode[] = {
};
static const uint32_t vk_to_gen_tex_address[] = {
[VK_TEX_ADDRESS_WRAP] = TCM_WRAP,
[VK_TEX_ADDRESS_MIRROR] = TCM_MIRROR,
[VK_TEX_ADDRESS_CLAMP] = TCM_CLAMP,
[VK_TEX_ADDRESS_MIRROR_ONCE] = TCM_MIRROR_ONCE,
[VK_TEX_ADDRESS_CLAMP_BORDER] = TCM_CLAMP_BORDER,
[VK_TEX_ADDRESS_MODE_WRAP] = TCM_WRAP,
[VK_TEX_ADDRESS_MODE_MIRROR] = TCM_MIRROR,
[VK_TEX_ADDRESS_MODE_CLAMP] = TCM_CLAMP,
[VK_TEX_ADDRESS_MODE_MIRROR_ONCE] = TCM_MIRROR_ONCE,
[VK_TEX_ADDRESS_MODE_CLAMP_BORDER] = TCM_CLAMP_BORDER,
};
static const uint32_t vk_to_gen_compare_op[] = {
@@ -169,9 +169,9 @@ VkResult gen7_CreateSampler(
.UAddressMagFilterRoundingEnable = 0,
.TrilinearFilterQuality = 0,
.NonnormalizedCoordinateEnable = 0,
.TCXAddressControlMode = vk_to_gen_tex_address[pCreateInfo->addressU],
.TCYAddressControlMode = vk_to_gen_tex_address[pCreateInfo->addressV],
.TCZAddressControlMode = vk_to_gen_tex_address[pCreateInfo->addressW],
.TCXAddressControlMode = vk_to_gen_tex_address[pCreateInfo->addressModeU],
.TCYAddressControlMode = vk_to_gen_tex_address[pCreateInfo->addressModeV],
.TCZAddressControlMode = vk_to_gen_tex_address[pCreateInfo->addressModeW],
};
GEN7_SAMPLER_STATE_pack(NULL, sampler->state, &sampler_state);

16
src/vulkan/gen8_state.c
View File

@@ -443,11 +443,11 @@ VkResult gen8_CreateSampler(
};
static const uint32_t vk_to_gen_tex_address[] = {
[VK_TEX_ADDRESS_WRAP] = TCM_WRAP,
[VK_TEX_ADDRESS_MIRROR] = TCM_MIRROR,
[VK_TEX_ADDRESS_CLAMP] = TCM_CLAMP,
[VK_TEX_ADDRESS_MIRROR_ONCE] = TCM_MIRROR_ONCE,
[VK_TEX_ADDRESS_CLAMP_BORDER] = TCM_CLAMP_BORDER,
[VK_TEX_ADDRESS_MODE_WRAP] = TCM_WRAP,
[VK_TEX_ADDRESS_MODE_MIRROR] = TCM_MIRROR,
[VK_TEX_ADDRESS_MODE_CLAMP] = TCM_CLAMP,
[VK_TEX_ADDRESS_MODE_MIRROR_ONCE] = TCM_MIRROR_ONCE,
[VK_TEX_ADDRESS_MODE_CLAMP_BORDER] = TCM_CLAMP_BORDER,
};
static const uint32_t vk_to_gen_compare_op[] = {
@@ -503,9 +503,9 @@ VkResult gen8_CreateSampler(
.UAddressMagFilterRoundingEnable = 0,
.TrilinearFilterQuality = 0,
.NonnormalizedCoordinateEnable = 0,
.TCXAddressControlMode = vk_to_gen_tex_address[pCreateInfo->addressU],
.TCYAddressControlMode = vk_to_gen_tex_address[pCreateInfo->addressV],
.TCZAddressControlMode = vk_to_gen_tex_address[pCreateInfo->addressW],
.TCXAddressControlMode = vk_to_gen_tex_address[pCreateInfo->addressModeU],
.TCYAddressControlMode = vk_to_gen_tex_address[pCreateInfo->addressModeV],
.TCZAddressControlMode = vk_to_gen_tex_address[pCreateInfo->addressModeW],
};
GEN8_SAMPLER_STATE_pack(NULL, sampler->state, &sampler_state);