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

anv/image: Remove the offset parameter from image_view_init

Browse Source 
The only place we were using this was in meta_blit2d which always creates a
new image anyway so we can just use the image offset.

Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
This commit is contained in:
Jason Ekstrand
2016-03-31 09:32:05 -07:00
parent f9a2570a06
commit b377c1d08e
6 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/intel/vulkan/anv_image.c
View File

@@ -464,7 +464,6 @@ anv_image_view_init(struct anv_image_view *iview,
struct anv_device *device, struct anv_device *device,
const VkImageViewCreateInfo* pCreateInfo, const VkImageViewCreateInfo* pCreateInfo,
struct anv_cmd_buffer *cmd_buffer, struct anv_cmd_buffer *cmd_buffer,
uint32_t offset,
VkImageUsageFlags usage_mask) VkImageUsageFlags usage_mask)
{ {
ANV_FROM_HANDLE(anv_image, image, pCreateInfo->image); ANV_FROM_HANDLE(anv_image, image, pCreateInfo->image);
@@ -495,7 +494,7 @@ anv_image_view_init(struct anv_image_view *iview,
iview->image = image; iview->image = image;
iview->bo = image->bo; iview->bo = image->bo;
iview->offset = image->offset + surface->offset + offset; iview->offset = image->offset + surface->offset;
iview->aspect_mask = pCreateInfo->subresourceRange.aspectMask; iview->aspect_mask = pCreateInfo->subresourceRange.aspectMask;
iview->vk_format = pCreateInfo->format; iview->vk_format = pCreateInfo->format;
@@ -614,7 +613,7 @@ anv_CreateImageView(VkDevice _device,
if (view == NULL) if (view == NULL)
return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY); return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
anv_image_view_init(view, device, pCreateInfo, NULL, 0, ~0); anv_image_view_init(view, device, pCreateInfo, NULL, ~0);
*pView = anv_image_view_to_handle(view); *pView = anv_image_view_to_handle(view);

4
src/intel/vulkan/anv_meta_blit.c
View File

@@ -384,7 +384,7 @@ void anv_CmdBlitImage(
.layerCount = 1 .layerCount = 1
}, },
}, },
cmd_buffer, 0, VK_IMAGE_USAGE_SAMPLED_BIT); cmd_buffer, VK_IMAGE_USAGE_SAMPLED_BIT);
const VkOffset3D dest_offset = { const VkOffset3D dest_offset = {
.x = pRegions[r].dstOffsets[0].x, .x = pRegions[r].dstOffsets[0].x,
@@ -434,7 +434,7 @@ void anv_CmdBlitImage(
.layerCount = 1 .layerCount = 1
}, },
}, },
cmd_buffer, 0, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); cmd_buffer, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT);
meta_emit_blit(cmd_buffer, meta_emit_blit(cmd_buffer,
src_image, &src_iview, src_image, &src_iview,

4
src/intel/vulkan/anv_meta_blit2d.c
View File

@@ -131,7 +131,7 @@ create_iview(struct anv_cmd_buffer *cmd_buffer,
* creating a dummy memory object etc. so there's really no point. * creating a dummy memory object etc. so there's really no point.
*/ */
anv_image_from_handle(*img)->bo = surf->bo; anv_image_from_handle(*img)->bo = surf->bo;
anv_image_from_handle(*img)->offset = surf->base_offset; anv_image_from_handle(*img)->offset = surf->base_offset + offset;
anv_image_view_init(iview, cmd_buffer->device, anv_image_view_init(iview, cmd_buffer->device,
&(VkImageViewCreateInfo) { &(VkImageViewCreateInfo) {
@@ -146,7 +146,7 @@ create_iview(struct anv_cmd_buffer *cmd_buffer,
.baseArrayLayer = 0, .baseArrayLayer = 0,
.layerCount = 1 .layerCount = 1
}, },
}, cmd_buffer, offset, usage); }, cmd_buffer, usage);
} }
struct blit2d_src_temps { struct blit2d_src_temps {

2
src/intel/vulkan/anv_meta_clear.c
View File

@@ -813,7 +813,7 @@ anv_cmd_clear_image(struct anv_cmd_buffer *cmd_buffer,
.layerCount = 1 .layerCount = 1
}, },
}, },
cmd_buffer, 0, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); cmd_buffer, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT);
VkFramebuffer fb; VkFramebuffer fb;
anv_CreateFramebuffer(device_h, anv_CreateFramebuffer(device_h,

4
src/intel/vulkan/anv_meta_resolve.c
View File

@@ -758,7 +758,7 @@ void anv_CmdResolveImage(
.layerCount = 1, .layerCount = 1,
}, },
}, },
cmd_buffer, 0, VK_IMAGE_USAGE_SAMPLED_BIT); cmd_buffer, VK_IMAGE_USAGE_SAMPLED_BIT);
struct anv_image_view dest_iview; struct anv_image_view dest_iview;
anv_image_view_init(&dest_iview, cmd_buffer->device, anv_image_view_init(&dest_iview, cmd_buffer->device,
@@ -775,7 +775,7 @@ void anv_CmdResolveImage(
.layerCount = 1, .layerCount = 1,
}, },
}, },
cmd_buffer, 0, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); cmd_buffer, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT);
VkFramebuffer fb_h; VkFramebuffer fb_h;
anv_CreateFramebuffer(device_h, anv_CreateFramebuffer(device_h,

1
src/intel/vulkan/anv_private.h
View File

@@ -1667,7 +1667,6 @@ void anv_image_view_init(struct anv_image_view *view,
struct anv_device *device, struct anv_device *device,
const VkImageViewCreateInfo* pCreateInfo, const VkImageViewCreateInfo* pCreateInfo,
struct anv_cmd_buffer *cmd_buffer, struct anv_cmd_buffer *cmd_buffer,
uint32_t offset,
VkImageUsageFlags usage_mask); VkImageUsageFlags usage_mask);
struct anv_buffer_view { struct anv_buffer_view {