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

vk/0.210.0: Don't allow chaining of description structs

Browse Source
This commit is contained in:
Jason Ekstrand
2015-11-30 17:54:51 -08:00
parent 17486b8664
commit 1ab9f843bc
3 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/vulkan/vulkan.h
View File

@@ -1927,8 +1927,6 @@ typedef struct VkFramebufferCreateInfo {
} VkFramebufferCreateInfo; } VkFramebufferCreateInfo;
typedef struct VkAttachmentDescription { typedef struct VkAttachmentDescription {
VkStructureType sType;
const void* pNext;
VkAttachmentDescriptionFlags flags; VkAttachmentDescriptionFlags flags;
VkFormat format; VkFormat format;
uint32_t samples; uint32_t samples;
@@ -1946,8 +1944,6 @@ typedef struct VkAttachmentReference {
} VkAttachmentReference; } VkAttachmentReference;
typedef struct VkSubpassDescription { typedef struct VkSubpassDescription {
VkStructureType sType;
const void* pNext;
VkSubpassDescriptionFlags flags; VkSubpassDescriptionFlags flags;
VkPipelineBindPoint pipelineBindPoint; VkPipelineBindPoint pipelineBindPoint;
uint32_t inputCount; uint32_t inputCount;
@@ -1961,8 +1957,6 @@ typedef struct VkSubpassDescription {
} VkSubpassDescription; } VkSubpassDescription;
typedef struct VkSubpassDependency { typedef struct VkSubpassDependency {
VkStructureType sType;
const void* pNext;
uint32_t srcSubpass; uint32_t srcSubpass;
uint32_t destSubpass; uint32_t destSubpass;
VkPipelineStageFlags srcStageMask; VkPipelineStageFlags srcStageMask;

2
src/vulkan/anv_meta.c
View File

@@ -190,7 +190,6 @@ anv_device_init_meta_blit_state(struct anv_device *device)
.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO,
.attachmentCount = 1, .attachmentCount = 1,
.pAttachments = &(VkAttachmentDescription) { .pAttachments = &(VkAttachmentDescription) {
.sType = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION,
.format = VK_FORMAT_UNDEFINED, /* Our shaders don't care */ .format = VK_FORMAT_UNDEFINED, /* Our shaders don't care */
.loadOp = VK_ATTACHMENT_LOAD_OP_LOAD, .loadOp = VK_ATTACHMENT_LOAD_OP_LOAD,
.storeOp = VK_ATTACHMENT_STORE_OP_STORE, .storeOp = VK_ATTACHMENT_STORE_OP_STORE,
@@ -199,7 +198,6 @@ anv_device_init_meta_blit_state(struct anv_device *device)
}, },
.subpassCount = 1, .subpassCount = 1,
.pSubpasses = &(VkSubpassDescription) { .pSubpasses = &(VkSubpassDescription) {
.sType = VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION,
.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS, .pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS,
.inputCount = 0, .inputCount = 0,
.colorCount = 1, .colorCount = 1,

2
src/vulkan/anv_meta_clear.c
View File

@@ -728,7 +728,6 @@ void anv_CmdClearColorImage(
.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO,
.attachmentCount = 1, .attachmentCount = 1,
.pAttachments = &(VkAttachmentDescription) { .pAttachments = &(VkAttachmentDescription) {
.sType = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION,
.format = iview.format->vk_format, .format = iview.format->vk_format,
.loadOp = VK_ATTACHMENT_LOAD_OP_LOAD, .loadOp = VK_ATTACHMENT_LOAD_OP_LOAD,
.storeOp = VK_ATTACHMENT_STORE_OP_STORE, .storeOp = VK_ATTACHMENT_STORE_OP_STORE,
@@ -737,7 +736,6 @@ void anv_CmdClearColorImage(
}, },
.subpassCount = 1, .subpassCount = 1,
.pSubpasses = &(VkSubpassDescription) { .pSubpasses = &(VkSubpassDescription) {
.sType = VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION,
.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS, .pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS,
.inputCount = 0, .inputCount = 0,
.colorCount = 1, .colorCount = 1,