summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2016-03-30 13:51:21 -0700
committerJason Ekstrand <jason.ekstrand@intel.com>2016-04-08 15:57:47 -0700
commit28eb02e345c5642d49037759b5b0eee8d71e7feb (patch)
treee28e9a08df720ee218dc7d7cb084aa31949a870f /src
parent00e70868ee81f964bbdb33b40938eec7e4bef1f3 (diff)
anv/blit2d: Rename the descriptor set and pipeline layouts
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Diffstat (limited to 'src')
-rw-r--r--src/intel/vulkan/anv_meta_blit2d.c20
-rw-r--r--src/intel/vulkan/anv_private.h4
2 files changed, 12 insertions, 12 deletions
diff --git a/src/intel/vulkan/anv_meta_blit2d.c b/src/intel/vulkan/anv_meta_blit2d.c
index 3dc0c66d1cc..878ae3f096e 100644
--- a/src/intel/vulkan/anv_meta_blit2d.c
+++ b/src/intel/vulkan/anv_meta_blit2d.c
@@ -168,7 +168,7 @@ blit2d_bind_src(struct anv_cmd_buffer *cmd_buffer,
.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO,
.descriptorPool = tmp->desc_pool,
.descriptorSetCount = 1,
- .pSetLayouts = &device->meta_state.blit2d.ds_layout
+ .pSetLayouts = &device->meta_state.blit2d.image_ds_layout
}, &tmp->set);
anv_UpdateDescriptorSets(vk_device,
@@ -193,7 +193,7 @@ blit2d_bind_src(struct anv_cmd_buffer *cmd_buffer,
anv_CmdBindDescriptorSets(anv_cmd_buffer_to_handle(cmd_buffer),
VK_PIPELINE_BIND_POINT_GRAPHICS,
- device->meta_state.blit2d.pipeline_layout, 0, 1,
+ device->meta_state.blit2d.image_p_layout, 0, 1,
&tmp->set, 0, NULL);
}
@@ -473,15 +473,15 @@ anv_device_finish_meta_blit2d_state(struct anv_device *device)
&device->meta_state.alloc);
}
- if (device->meta_state.blit2d.pipeline_layout) {
+ if (device->meta_state.blit2d.image_p_layout) {
anv_DestroyPipelineLayout(anv_device_to_handle(device),
- device->meta_state.blit2d.pipeline_layout,
+ device->meta_state.blit2d.image_p_layout,
&device->meta_state.alloc);
}
- if (device->meta_state.blit2d.ds_layout) {
+ if (device->meta_state.blit2d.image_ds_layout) {
anv_DestroyDescriptorSetLayout(anv_device_to_handle(device),
- device->meta_state.blit2d.ds_layout,
+ device->meta_state.blit2d.image_ds_layout,
&device->meta_state.alloc);
}
}
@@ -539,7 +539,7 @@ anv_device_init_meta_blit2d_state(struct anv_device *device)
.pImmutableSamplers = NULL
},
}
- }, &device->meta_state.alloc, &device->meta_state.blit2d.ds_layout);
+ }, &device->meta_state.alloc, &device->meta_state.blit2d.image_ds_layout);
if (result != VK_SUCCESS)
goto fail;
@@ -547,9 +547,9 @@ anv_device_init_meta_blit2d_state(struct anv_device *device)
&(VkPipelineLayoutCreateInfo) {
.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO,
.setLayoutCount = 1,
- .pSetLayouts = &device->meta_state.blit2d.ds_layout,
+ .pSetLayouts = &device->meta_state.blit2d.image_ds_layout,
},
- &device->meta_state.alloc, &device->meta_state.blit2d.pipeline_layout);
+ &device->meta_state.alloc, &device->meta_state.blit2d.image_p_layout);
if (result != VK_SUCCESS)
goto fail;
@@ -678,7 +678,7 @@ anv_device_init_meta_blit2d_state(struct anv_device *device)
},
},
.flags = 0,
- .layout = device->meta_state.blit2d.pipeline_layout,
+ .layout = device->meta_state.blit2d.image_p_layout,
.renderPass = device->meta_state.blit2d.render_pass,
.subpass = 0,
};
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index 48ebff456e3..9e3978a4691 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -612,8 +612,8 @@ struct anv_meta_state {
/** Pipeline that copies from a 2D image. */
VkPipeline pipeline_2d_src;
- VkPipelineLayout pipeline_layout;
- VkDescriptorSetLayout ds_layout;
+ VkPipelineLayout image_p_layout;
+ VkDescriptorSetLayout image_ds_layout;
} blit2d;
struct {