vk/0.132: Rename VkDynamic*State types
sed -i -e 's/VkDynamicVpState/VkDynamicViewportState/g' \ -e 's/VkDynamicRsState/VkDynamicRasterState/g' \ -e 's/VkDynamicCbState/VkDynamicColorBlendState/g' \ -e 's/VkDynamicDsState/VkDynamicDepthStencilState/g' \ $(git ls-files include/vulkan src/vulkan)
This commit is contained in:
parent
ffb51fd112
commit
435ccf4056
|
@ -103,10 +103,10 @@ VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkSampler, VkNonDispatchable)
|
||||||
VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkDescriptorPool, VkNonDispatchable)
|
VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkDescriptorPool, VkNonDispatchable)
|
||||||
VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkDescriptorSet, VkNonDispatchable)
|
VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkDescriptorSet, VkNonDispatchable)
|
||||||
VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkDynamicStateObject, VkNonDispatchable)
|
VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkDynamicStateObject, VkNonDispatchable)
|
||||||
VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkDynamicVpState, VkDynamicStateObject)
|
VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkDynamicViewportState, VkDynamicStateObject)
|
||||||
VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkDynamicRsState, VkDynamicStateObject)
|
VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkDynamicRasterState, VkDynamicStateObject)
|
||||||
VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkDynamicCbState, VkDynamicStateObject)
|
VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkDynamicColorBlendState, VkDynamicStateObject)
|
||||||
VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkDynamicDsState, VkDynamicStateObject)
|
VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkDynamicDepthStencilState, VkDynamicStateObject)
|
||||||
VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkFramebuffer, VkNonDispatchable)
|
VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkFramebuffer, VkNonDispatchable)
|
||||||
VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkRenderPass, VkNonDispatchable)
|
VK_DEFINE_NONDISP_SUBCLASS_HANDLE(VkRenderPass, VkNonDispatchable)
|
||||||
|
|
||||||
|
@ -1772,7 +1772,7 @@ typedef struct {
|
||||||
uint32_t viewportAndScissorCount;
|
uint32_t viewportAndScissorCount;
|
||||||
const VkViewport* pViewports;
|
const VkViewport* pViewports;
|
||||||
const VkRect2D* pScissors;
|
const VkRect2D* pScissors;
|
||||||
} VkDynamicVpStateCreateInfo;
|
} VkDynamicViewportStateCreateInfo;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
VkStructureType sType;
|
VkStructureType sType;
|
||||||
|
@ -1781,13 +1781,13 @@ typedef struct {
|
||||||
float depthBiasClamp;
|
float depthBiasClamp;
|
||||||
float slopeScaledDepthBias;
|
float slopeScaledDepthBias;
|
||||||
float lineWidth;
|
float lineWidth;
|
||||||
} VkDynamicRsStateCreateInfo;
|
} VkDynamicRasterStateCreateInfo;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
VkStructureType sType;
|
VkStructureType sType;
|
||||||
const void* pNext;
|
const void* pNext;
|
||||||
float blendConst[4];
|
float blendConst[4];
|
||||||
} VkDynamicCbStateCreateInfo;
|
} VkDynamicColorBlendStateCreateInfo;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
VkStructureType sType;
|
VkStructureType sType;
|
||||||
|
@ -1798,7 +1798,7 @@ typedef struct {
|
||||||
uint32_t stencilWriteMask;
|
uint32_t stencilWriteMask;
|
||||||
uint32_t stencilFrontRef;
|
uint32_t stencilFrontRef;
|
||||||
uint32_t stencilBackRef;
|
uint32_t stencilBackRef;
|
||||||
} VkDynamicDsStateCreateInfo;
|
} VkDynamicDepthStencilStateCreateInfo;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
VkColorAttachmentView view;
|
VkColorAttachmentView view;
|
||||||
|
@ -2044,10 +2044,10 @@ typedef VkResult (VKAPI *PFN_vkCreateDescriptorPool)(VkDevice device, VkDescript
|
||||||
typedef VkResult (VKAPI *PFN_vkResetDescriptorPool)(VkDevice device, VkDescriptorPool descriptorPool);
|
typedef VkResult (VKAPI *PFN_vkResetDescriptorPool)(VkDevice device, VkDescriptorPool descriptorPool);
|
||||||
typedef VkResult (VKAPI *PFN_vkAllocDescriptorSets)(VkDevice device, VkDescriptorPool descriptorPool, VkDescriptorSetUsage setUsage, uint32_t count, const VkDescriptorSetLayout* pSetLayouts, VkDescriptorSet* pDescriptorSets, uint32_t* pCount);
|
typedef VkResult (VKAPI *PFN_vkAllocDescriptorSets)(VkDevice device, VkDescriptorPool descriptorPool, VkDescriptorSetUsage setUsage, uint32_t count, const VkDescriptorSetLayout* pSetLayouts, VkDescriptorSet* pDescriptorSets, uint32_t* pCount);
|
||||||
typedef VkResult (VKAPI *PFN_vkUpdateDescriptorSets)(VkDevice device, uint32_t writeCount, const VkWriteDescriptorSet* pDescriptorWrites, uint32_t copyCount, const VkCopyDescriptorSet* pDescriptorCopies);
|
typedef VkResult (VKAPI *PFN_vkUpdateDescriptorSets)(VkDevice device, uint32_t writeCount, const VkWriteDescriptorSet* pDescriptorWrites, uint32_t copyCount, const VkCopyDescriptorSet* pDescriptorCopies);
|
||||||
typedef VkResult (VKAPI *PFN_vkCreateDynamicViewportState)(VkDevice device, const VkDynamicVpStateCreateInfo* pCreateInfo, VkDynamicVpState* pState);
|
typedef VkResult (VKAPI *PFN_vkCreateDynamicViewportState)(VkDevice device, const VkDynamicViewportStateCreateInfo* pCreateInfo, VkDynamicViewportState* pState);
|
||||||
typedef VkResult (VKAPI *PFN_vkCreateDynamicRasterState)(VkDevice device, const VkDynamicRsStateCreateInfo* pCreateInfo, VkDynamicRsState* pState);
|
typedef VkResult (VKAPI *PFN_vkCreateDynamicRasterState)(VkDevice device, const VkDynamicRasterStateCreateInfo* pCreateInfo, VkDynamicRasterState* pState);
|
||||||
typedef VkResult (VKAPI *PFN_vkCreateDynamicColorBlendState)(VkDevice device, const VkDynamicCbStateCreateInfo* pCreateInfo, VkDynamicCbState* pState);
|
typedef VkResult (VKAPI *PFN_vkCreateDynamicColorBlendState)(VkDevice device, const VkDynamicColorBlendStateCreateInfo* pCreateInfo, VkDynamicColorBlendState* pState);
|
||||||
typedef VkResult (VKAPI *PFN_vkCreateDynamicDepthStencilState)(VkDevice device, const VkDynamicDsStateCreateInfo* pCreateInfo, VkDynamicDsState* pState);
|
typedef VkResult (VKAPI *PFN_vkCreateDynamicDepthStencilState)(VkDevice device, const VkDynamicDepthStencilStateCreateInfo* pCreateInfo, VkDynamicDepthStencilState* pState);
|
||||||
typedef VkResult (VKAPI *PFN_vkCreateFramebuffer)(VkDevice device, const VkFramebufferCreateInfo* pCreateInfo, VkFramebuffer* pFramebuffer);
|
typedef VkResult (VKAPI *PFN_vkCreateFramebuffer)(VkDevice device, const VkFramebufferCreateInfo* pCreateInfo, VkFramebuffer* pFramebuffer);
|
||||||
typedef VkResult (VKAPI *PFN_vkCreateRenderPass)(VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, VkRenderPass* pRenderPass);
|
typedef VkResult (VKAPI *PFN_vkCreateRenderPass)(VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, VkRenderPass* pRenderPass);
|
||||||
typedef VkResult (VKAPI *PFN_vkGetRenderAreaGranularity)(VkDevice device, VkRenderPass renderPass, VkExtent2D* pGranularity);
|
typedef VkResult (VKAPI *PFN_vkGetRenderAreaGranularity)(VkDevice device, VkRenderPass renderPass, VkExtent2D* pGranularity);
|
||||||
|
@ -2445,23 +2445,23 @@ VkResult VKAPI vkUpdateDescriptorSets(
|
||||||
|
|
||||||
VkResult VKAPI vkCreateDynamicViewportState(
|
VkResult VKAPI vkCreateDynamicViewportState(
|
||||||
VkDevice device,
|
VkDevice device,
|
||||||
const VkDynamicVpStateCreateInfo* pCreateInfo,
|
const VkDynamicViewportStateCreateInfo* pCreateInfo,
|
||||||
VkDynamicVpState* pState);
|
VkDynamicViewportState* pState);
|
||||||
|
|
||||||
VkResult VKAPI vkCreateDynamicRasterState(
|
VkResult VKAPI vkCreateDynamicRasterState(
|
||||||
VkDevice device,
|
VkDevice device,
|
||||||
const VkDynamicRsStateCreateInfo* pCreateInfo,
|
const VkDynamicRasterStateCreateInfo* pCreateInfo,
|
||||||
VkDynamicRsState* pState);
|
VkDynamicRasterState* pState);
|
||||||
|
|
||||||
VkResult VKAPI vkCreateDynamicColorBlendState(
|
VkResult VKAPI vkCreateDynamicColorBlendState(
|
||||||
VkDevice device,
|
VkDevice device,
|
||||||
const VkDynamicCbStateCreateInfo* pCreateInfo,
|
const VkDynamicColorBlendStateCreateInfo* pCreateInfo,
|
||||||
VkDynamicCbState* pState);
|
VkDynamicColorBlendState* pState);
|
||||||
|
|
||||||
VkResult VKAPI vkCreateDynamicDepthStencilState(
|
VkResult VKAPI vkCreateDynamicDepthStencilState(
|
||||||
VkDevice device,
|
VkDevice device,
|
||||||
const VkDynamicDsStateCreateInfo* pCreateInfo,
|
const VkDynamicDepthStencilStateCreateInfo* pCreateInfo,
|
||||||
VkDynamicDsState* pState);
|
VkDynamicDepthStencilState* pState);
|
||||||
|
|
||||||
VkResult VKAPI vkCreateFramebuffer(
|
VkResult VKAPI vkCreateFramebuffer(
|
||||||
VkDevice device,
|
VkDevice device,
|
||||||
|
|
|
@ -2064,8 +2064,8 @@ anv_dynamic_vp_state_destroy(struct anv_device *device,
|
||||||
|
|
||||||
VkResult anv_CreateDynamicViewportState(
|
VkResult anv_CreateDynamicViewportState(
|
||||||
VkDevice _device,
|
VkDevice _device,
|
||||||
const VkDynamicVpStateCreateInfo* pCreateInfo,
|
const VkDynamicViewportStateCreateInfo* pCreateInfo,
|
||||||
VkDynamicVpState* pState)
|
VkDynamicViewportState* pState)
|
||||||
{
|
{
|
||||||
ANV_FROM_HANDLE(anv_device, device, _device);
|
ANV_FROM_HANDLE(anv_device, device, _device);
|
||||||
struct anv_dynamic_vp_state *state;
|
struct anv_dynamic_vp_state *state;
|
||||||
|
@ -2151,8 +2151,8 @@ VkResult anv_CreateDynamicViewportState(
|
||||||
|
|
||||||
VkResult anv_CreateDynamicRasterState(
|
VkResult anv_CreateDynamicRasterState(
|
||||||
VkDevice _device,
|
VkDevice _device,
|
||||||
const VkDynamicRsStateCreateInfo* pCreateInfo,
|
const VkDynamicRasterStateCreateInfo* pCreateInfo,
|
||||||
VkDynamicRsState* pState)
|
VkDynamicRasterState* pState)
|
||||||
{
|
{
|
||||||
ANV_FROM_HANDLE(anv_device, device, _device);
|
ANV_FROM_HANDLE(anv_device, device, _device);
|
||||||
struct anv_dynamic_rs_state *state;
|
struct anv_dynamic_rs_state *state;
|
||||||
|
@ -2191,8 +2191,8 @@ VkResult anv_CreateDynamicRasterState(
|
||||||
|
|
||||||
VkResult anv_CreateDynamicColorBlendState(
|
VkResult anv_CreateDynamicColorBlendState(
|
||||||
VkDevice _device,
|
VkDevice _device,
|
||||||
const VkDynamicCbStateCreateInfo* pCreateInfo,
|
const VkDynamicColorBlendStateCreateInfo* pCreateInfo,
|
||||||
VkDynamicCbState* pState)
|
VkDynamicColorBlendState* pState)
|
||||||
{
|
{
|
||||||
ANV_FROM_HANDLE(anv_device, device, _device);
|
ANV_FROM_HANDLE(anv_device, device, _device);
|
||||||
struct anv_dynamic_cb_state *state;
|
struct anv_dynamic_cb_state *state;
|
||||||
|
@ -2220,8 +2220,8 @@ VkResult anv_CreateDynamicColorBlendState(
|
||||||
|
|
||||||
VkResult anv_CreateDynamicDepthStencilState(
|
VkResult anv_CreateDynamicDepthStencilState(
|
||||||
VkDevice _device,
|
VkDevice _device,
|
||||||
const VkDynamicDsStateCreateInfo* pCreateInfo,
|
const VkDynamicDepthStencilStateCreateInfo* pCreateInfo,
|
||||||
VkDynamicDsState* pState)
|
VkDynamicDepthStencilState* pState)
|
||||||
{
|
{
|
||||||
ANV_FROM_HANDLE(anv_device, device, _device);
|
ANV_FROM_HANDLE(anv_device, device, _device);
|
||||||
struct anv_dynamic_ds_state *state;
|
struct anv_dynamic_ds_state *state;
|
||||||
|
@ -3715,7 +3715,7 @@ VkResult anv_CreateFramebuffer(
|
||||||
framebuffer->layers = pCreateInfo->layers;
|
framebuffer->layers = pCreateInfo->layers;
|
||||||
|
|
||||||
anv_CreateDynamicViewportState(anv_device_to_handle(device),
|
anv_CreateDynamicViewportState(anv_device_to_handle(device),
|
||||||
&(VkDynamicVpStateCreateInfo) {
|
&(VkDynamicViewportStateCreateInfo) {
|
||||||
.sType = VK_STRUCTURE_TYPE_DYNAMIC_VP_STATE_CREATE_INFO,
|
.sType = VK_STRUCTURE_TYPE_DYNAMIC_VP_STATE_CREATE_INFO,
|
||||||
.viewportAndScissorCount = 1,
|
.viewportAndScissorCount = 1,
|
||||||
.pViewports = (VkViewport[]) {
|
.pViewports = (VkViewport[]) {
|
||||||
|
|
|
@ -149,7 +149,7 @@ struct anv_saved_state {
|
||||||
struct anv_vertex_binding old_vertex_bindings[NUM_VB_USED];
|
struct anv_vertex_binding old_vertex_bindings[NUM_VB_USED];
|
||||||
struct anv_descriptor_set *old_descriptor_set0;
|
struct anv_descriptor_set *old_descriptor_set0;
|
||||||
struct anv_pipeline *old_pipeline;
|
struct anv_pipeline *old_pipeline;
|
||||||
VkDynamicCbState cb_state;
|
VkDynamicColorBlendState cb_state;
|
||||||
};
|
};
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -1339,19 +1339,19 @@ anv_device_init_meta(struct anv_device *device)
|
||||||
anv_device_init_meta_blit_state(device);
|
anv_device_init_meta_blit_state(device);
|
||||||
|
|
||||||
anv_CreateDynamicRasterState(anv_device_to_handle(device),
|
anv_CreateDynamicRasterState(anv_device_to_handle(device),
|
||||||
&(VkDynamicRsStateCreateInfo) {
|
&(VkDynamicRasterStateCreateInfo) {
|
||||||
.sType = VK_STRUCTURE_TYPE_DYNAMIC_RS_STATE_CREATE_INFO,
|
.sType = VK_STRUCTURE_TYPE_DYNAMIC_RS_STATE_CREATE_INFO,
|
||||||
},
|
},
|
||||||
&device->meta_state.shared.rs_state);
|
&device->meta_state.shared.rs_state);
|
||||||
|
|
||||||
anv_CreateDynamicColorBlendState(anv_device_to_handle(device),
|
anv_CreateDynamicColorBlendState(anv_device_to_handle(device),
|
||||||
&(VkDynamicCbStateCreateInfo) {
|
&(VkDynamicColorBlendStateCreateInfo) {
|
||||||
.sType = VK_STRUCTURE_TYPE_DYNAMIC_CB_STATE_CREATE_INFO
|
.sType = VK_STRUCTURE_TYPE_DYNAMIC_CB_STATE_CREATE_INFO
|
||||||
},
|
},
|
||||||
&device->meta_state.shared.cb_state);
|
&device->meta_state.shared.cb_state);
|
||||||
|
|
||||||
anv_CreateDynamicDepthStencilState(anv_device_to_handle(device),
|
anv_CreateDynamicDepthStencilState(anv_device_to_handle(device),
|
||||||
&(VkDynamicDsStateCreateInfo) {
|
&(VkDynamicDepthStencilStateCreateInfo) {
|
||||||
.sType = VK_STRUCTURE_TYPE_DYNAMIC_DS_STATE_CREATE_INFO
|
.sType = VK_STRUCTURE_TYPE_DYNAMIC_DS_STATE_CREATE_INFO
|
||||||
},
|
},
|
||||||
&device->meta_state.shared.ds_state);
|
&device->meta_state.shared.ds_state);
|
||||||
|
|
|
@ -367,9 +367,9 @@ struct anv_meta_state {
|
||||||
} blit;
|
} blit;
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
VkDynamicRsState rs_state;
|
VkDynamicRasterState rs_state;
|
||||||
VkDynamicCbState cb_state;
|
VkDynamicColorBlendState cb_state;
|
||||||
VkDynamicDsState ds_state;
|
VkDynamicDepthStencilState ds_state;
|
||||||
} shared;
|
} shared;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -918,7 +918,7 @@ struct anv_framebuffer {
|
||||||
uint32_t layers;
|
uint32_t layers;
|
||||||
|
|
||||||
/* Viewport for clears */
|
/* Viewport for clears */
|
||||||
VkDynamicVpState vp_state;
|
VkDynamicViewportState vp_state;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct anv_render_pass_layer {
|
struct anv_render_pass_layer {
|
||||||
|
@ -970,10 +970,10 @@ ANV_DEFINE_CASTS(anv_instance, VkInstance)
|
||||||
ANV_DEFINE_CASTS(anv_queue, VkQueue)
|
ANV_DEFINE_CASTS(anv_queue, VkQueue)
|
||||||
ANV_DEFINE_CASTS(anv_device, VkDevice)
|
ANV_DEFINE_CASTS(anv_device, VkDevice)
|
||||||
ANV_DEFINE_CASTS(anv_device_memory, VkDeviceMemory)
|
ANV_DEFINE_CASTS(anv_device_memory, VkDeviceMemory)
|
||||||
ANV_DEFINE_CASTS(anv_dynamic_vp_state, VkDynamicVpState)
|
ANV_DEFINE_CASTS(anv_dynamic_vp_state, VkDynamicViewportState)
|
||||||
ANV_DEFINE_CASTS(anv_dynamic_rs_state, VkDynamicRsState)
|
ANV_DEFINE_CASTS(anv_dynamic_rs_state, VkDynamicRasterState)
|
||||||
ANV_DEFINE_CASTS(anv_dynamic_ds_state, VkDynamicDsState)
|
ANV_DEFINE_CASTS(anv_dynamic_ds_state, VkDynamicDepthStencilState)
|
||||||
ANV_DEFINE_CASTS(anv_dynamic_cb_state, VkDynamicCbState)
|
ANV_DEFINE_CASTS(anv_dynamic_cb_state, VkDynamicColorBlendState)
|
||||||
ANV_DEFINE_CASTS(anv_descriptor_set_layout, VkDescriptorSetLayout)
|
ANV_DEFINE_CASTS(anv_descriptor_set_layout, VkDescriptorSetLayout)
|
||||||
ANV_DEFINE_CASTS(anv_descriptor_set, VkDescriptorSet)
|
ANV_DEFINE_CASTS(anv_descriptor_set, VkDescriptorSet)
|
||||||
ANV_DEFINE_CASTS(anv_pipeline_layout, VkPipelineLayout)
|
ANV_DEFINE_CASTS(anv_pipeline_layout, VkPipelineLayout)
|
||||||
|
|
Loading…
Reference in New Issue