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

vk/0.170.2: Update VkRenderPassBeginInfo

Browse Source 
Rename members:
    attachmentCount -> clearValueCount
    pAttachmentClearValues -> pClearValues
This commit is contained in:
Chad Versace
2015-10-04 09:26:25 -07:00
parent 3694518be5
commit 8cb2e27c62
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/vulkan/vulkan.h
View File

@@ -2020,8 +2020,8 @@ typedef struct {
VkRenderPass renderPass; VkRenderPass renderPass;
VkFramebuffer framebuffer; VkFramebuffer framebuffer;
VkRect2D renderArea; VkRect2D renderArea;
uint32_t attachmentCount; uint32_t clearValueCount;
const VkClearValue* pAttachmentClearValues; const VkClearValue* pClearValues;
} VkRenderPassBeginInfo; } VkRenderPassBeginInfo;
typedef struct { typedef struct {

11
src/vulkan/anv_meta.c
View File

@@ -428,6 +428,9 @@ anv_cmd_buffer_clear_attachments(struct anv_cmd_buffer *cmd_buffer,
if (pass->has_stencil_clear_attachment) if (pass->has_stencil_clear_attachment)
anv_finishme("stencil clear"); anv_finishme("stencil clear");
/* FINISHME: Rethink how we count clear attachments in light of
* 0.138.2 -> 0.170.2 diff.
*/
if (pass->num_color_clear_attachments == 0 && if (pass->num_color_clear_attachments == 0 &&
!pass->has_depth_clear_attachment) !pass->has_depth_clear_attachment)
return; return;
@@ -889,8 +892,8 @@ meta_emit_blit(struct anv_cmd_buffer *cmd_buffer,
.offset = { dest_offset.x, dest_offset.y }, .offset = { dest_offset.x, dest_offset.y },
.extent = { dest_extent.width, dest_extent.height }, .extent = { dest_extent.width, dest_extent.height },
}, },
.attachmentCount = 1, .clearValueCount = 0,
.pAttachmentClearValues = NULL, .pClearValues = NULL,
}, VK_RENDER_PASS_CONTENTS_INLINE); }, VK_RENDER_PASS_CONTENTS_INLINE);
VkPipeline pipeline; VkPipeline pipeline;
@@ -1621,8 +1624,8 @@ void anv_CmdClearColorImage(
}, },
.renderPass = pass, .renderPass = pass,
.framebuffer = fb, .framebuffer = fb,
.attachmentCount = 1, .clearValueCount = 1,
.pAttachmentClearValues = NULL, .pClearValues = NULL,
}, VK_RENDER_PASS_CONTENTS_INLINE); }, VK_RENDER_PASS_CONTENTS_INLINE);
struct clear_instance_data instance_data = { struct clear_instance_data instance_data = {

2
src/vulkan/gen7_cmd_buffer.c
View File

@@ -641,7 +641,7 @@ begin_render_pass(struct anv_cmd_buffer *cmd_buffer,
.DrawingRectangleOriginX = 0); .DrawingRectangleOriginX = 0);
anv_cmd_buffer_clear_attachments(cmd_buffer, pass, anv_cmd_buffer_clear_attachments(cmd_buffer, pass,
pRenderPassBegin->pAttachmentClearValues); pRenderPassBegin->pClearValues);
} }
void gen7_CmdBeginRenderPass( void gen7_CmdBeginRenderPass(

2
src/vulkan/gen8_cmd_buffer.c
View File

@@ -580,7 +580,7 @@ void gen8_CmdBeginRenderPass(
.DrawingRectangleOriginX = 0); .DrawingRectangleOriginX = 0);
anv_cmd_buffer_clear_attachments(cmd_buffer, pass, anv_cmd_buffer_clear_attachments(cmd_buffer, pass,
pRenderPassBegin->pAttachmentClearValues); pRenderPassBegin->pClearValues);
gen8_cmd_buffer_begin_subpass(cmd_buffer, pass->subpasses); gen8_cmd_buffer_begin_subpass(cmd_buffer, pass->subpasses);
} }