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

radv: Remove unused args of radv_image_view_init.

Browse Source 
Signed-off-by: Bas Nieuwenhuizen <basni@google.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Bas Nieuwenhuizen
2017-06-25 22:25:47 +02:00
parent 789f480029
commit 78bef01da2
11 changed files with 23 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/amd/vulkan/radv_image.c
View File

@@ -837,9 +837,7 @@ radv_image_create(VkDevice _device,
void void
radv_image_view_init(struct radv_image_view *iview, radv_image_view_init(struct radv_image_view *iview,
struct radv_device *device, struct radv_device *device,
const VkImageViewCreateInfo* pCreateInfo, const VkImageViewCreateInfo* pCreateInfo)
struct radv_cmd_buffer *cmd_buffer,
VkImageUsageFlags usage_mask)
{ {
RADV_FROM_HANDLE(radv_image, image, pCreateInfo->image); RADV_FROM_HANDLE(radv_image, image, pCreateInfo->image);
const VkImageSubresourceRange *range = &pCreateInfo->subresourceRange; const VkImageSubresourceRange *range = &pCreateInfo->subresourceRange;
@@ -1013,7 +1011,7 @@ radv_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);
radv_image_view_init(view, device, pCreateInfo, NULL, ~0); radv_image_view_init(view, device, pCreateInfo);
*pView = radv_image_view_to_handle(view); *pView = radv_image_view_to_handle(view);

12
src/amd/vulkan/radv_meta_blit.c
View File

@@ -526,8 +526,7 @@ void radv_CmdBlitImage(
.baseArrayLayer = src_res->baseArrayLayer, .baseArrayLayer = src_res->baseArrayLayer,
.layerCount = 1 .layerCount = 1
}, },
}, });
cmd_buffer, VK_IMAGE_USAGE_SAMPLED_BIT);
unsigned dst_start, dst_end; unsigned dst_start, dst_end;
if (dest_image->type == VK_IMAGE_TYPE_3D) { if (dest_image->type == VK_IMAGE_TYPE_3D) {
@@ -575,12 +574,6 @@ void radv_CmdBlitImage(
dest_box.extent.height = abs(dst_y1 - dst_y0); dest_box.extent.height = abs(dst_y1 - dst_y0);
struct radv_image_view dest_iview; struct radv_image_view dest_iview;
unsigned usage;
if (dst_res->aspectMask == VK_IMAGE_ASPECT_COLOR_BIT)
usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
else
usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
const unsigned num_layers = dst_end - dst_start; const unsigned num_layers = dst_end - dst_start;
for (unsigned i = 0; i < num_layers; i++) { for (unsigned i = 0; i < num_layers; i++) {
const VkOffset3D dest_offset_0 = { const VkOffset3D dest_offset_0 = {
@@ -620,8 +613,7 @@ void radv_CmdBlitImage(
.baseArrayLayer = dest_array_slice, .baseArrayLayer = dest_array_slice,
.layerCount = 1 .layerCount = 1
}, },
}, });
cmd_buffer, usage);
meta_emit_blit(cmd_buffer, meta_emit_blit(cmd_buffer,
src_image, &src_iview, src_image, &src_iview,
src_offset_0, src_offset_1, src_offset_0, src_offset_1,

16
src/amd/vulkan/radv_meta_blit2d.c
View File

@@ -53,7 +53,6 @@ enum blit2d_src_type {
static void static void
create_iview(struct radv_cmd_buffer *cmd_buffer, create_iview(struct radv_cmd_buffer *cmd_buffer,
struct radv_meta_blit2d_surf *surf, struct radv_meta_blit2d_surf *surf,
VkImageUsageFlags usage,
struct radv_image_view *iview, VkFormat depth_format) struct radv_image_view *iview, VkFormat depth_format)
{ {
VkFormat format; VkFormat format;
@@ -76,7 +75,7 @@ create_iview(struct radv_cmd_buffer *cmd_buffer,
.baseArrayLayer = surf->layer, .baseArrayLayer = surf->layer,
.layerCount = 1 .layerCount = 1
}, },
}, cmd_buffer, usage); });
} }
static void static void
@@ -139,8 +138,7 @@ blit2d_bind_src(struct radv_cmd_buffer *cmd_buffer,
VK_SHADER_STAGE_FRAGMENT_BIT, 16, 4, VK_SHADER_STAGE_FRAGMENT_BIT, 16, 4,
&src_buf->pitch); &src_buf->pitch);
} else { } else {
create_iview(cmd_buffer, src_img, VK_IMAGE_USAGE_SAMPLED_BIT, &tmp->iview, create_iview(cmd_buffer, src_img, &tmp->iview, depth_format);
depth_format);
radv_meta_push_descriptor_set(cmd_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, radv_meta_push_descriptor_set(cmd_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS,
device->meta_state.blit2d.p_layouts[src_type], device->meta_state.blit2d.p_layouts[src_type],
@@ -179,15 +177,7 @@ blit2d_bind_dst(struct radv_cmd_buffer *cmd_buffer,
VkFormat depth_format, VkFormat depth_format,
struct blit2d_dst_temps *tmp) struct blit2d_dst_temps *tmp)
{ {
VkImageUsageFlagBits bits; create_iview(cmd_buffer, dst, &tmp->iview, depth_format);
if (dst->aspect_mask == VK_IMAGE_ASPECT_COLOR_BIT)
bits = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
else
bits = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
create_iview(cmd_buffer, dst, bits,
&tmp->iview, depth_format);
radv_CreateFramebuffer(radv_device_to_handle(cmd_buffer->device), radv_CreateFramebuffer(radv_device_to_handle(cmd_buffer->device),
&(VkFramebufferCreateInfo) { &(VkFramebufferCreateInfo) {

13
src/amd/vulkan/radv_meta_bufimage.c
View File

@@ -859,7 +859,6 @@ radv_meta_end_cleari(struct radv_cmd_buffer *cmd_buffer,
static void static void
create_iview(struct radv_cmd_buffer *cmd_buffer, create_iview(struct radv_cmd_buffer *cmd_buffer,
struct radv_meta_blit2d_surf *surf, struct radv_meta_blit2d_surf *surf,
VkImageUsageFlags usage,
struct radv_image_view *iview) struct radv_image_view *iview)
{ {
@@ -876,7 +875,7 @@ create_iview(struct radv_cmd_buffer *cmd_buffer,
.baseArrayLayer = surf->layer, .baseArrayLayer = surf->layer,
.layerCount = 1 .layerCount = 1
}, },
}, cmd_buffer, usage); });
} }
static void static void
@@ -962,7 +961,7 @@ radv_meta_image_to_buffer(struct radv_cmd_buffer *cmd_buffer,
struct radv_device *device = cmd_buffer->device; struct radv_device *device = cmd_buffer->device;
struct itob_temps temps; struct itob_temps temps;
create_iview(cmd_buffer, src, VK_IMAGE_USAGE_SAMPLED_BIT, &temps.src_iview); create_iview(cmd_buffer, src, &temps.src_iview);
create_bview(cmd_buffer, dst->buffer, dst->offset, dst->format, &temps.dst_bview); create_bview(cmd_buffer, dst->buffer, dst->offset, dst->format, &temps.dst_bview);
itob_bind_descriptors(cmd_buffer, &temps); itob_bind_descriptors(cmd_buffer, &temps);
@@ -1048,7 +1047,7 @@ radv_meta_buffer_to_image_cs(struct radv_cmd_buffer *cmd_buffer,
struct btoi_temps temps; struct btoi_temps temps;
create_bview(cmd_buffer, src->buffer, src->offset, src->format, &temps.src_bview); create_bview(cmd_buffer, src->buffer, src->offset, src->format, &temps.src_bview);
create_iview(cmd_buffer, dst, VK_IMAGE_USAGE_STORAGE_BIT, &temps.dst_iview); create_iview(cmd_buffer, dst, &temps.dst_iview);
btoi_bind_descriptors(cmd_buffer, &temps); btoi_bind_descriptors(cmd_buffer, &temps);
btoi_bind_pipeline(cmd_buffer); btoi_bind_pipeline(cmd_buffer);
@@ -1138,8 +1137,8 @@ radv_meta_image_to_image_cs(struct radv_cmd_buffer *cmd_buffer,
struct radv_device *device = cmd_buffer->device; struct radv_device *device = cmd_buffer->device;
struct itoi_temps temps; struct itoi_temps temps;
create_iview(cmd_buffer, src, VK_IMAGE_USAGE_SAMPLED_BIT, &temps.src_iview); create_iview(cmd_buffer, src, &temps.src_iview);
create_iview(cmd_buffer, dst, VK_IMAGE_USAGE_STORAGE_BIT, &temps.dst_iview); create_iview(cmd_buffer, dst, &temps.dst_iview);
itoi_bind_descriptors(cmd_buffer, &temps); itoi_bind_descriptors(cmd_buffer, &temps);
@@ -1210,7 +1209,7 @@ radv_meta_clear_image_cs(struct radv_cmd_buffer *cmd_buffer,
struct radv_device *device = cmd_buffer->device; struct radv_device *device = cmd_buffer->device;
struct radv_image_view dst_iview; struct radv_image_view dst_iview;
create_iview(cmd_buffer, dst, VK_IMAGE_USAGE_STORAGE_BIT, &dst_iview); create_iview(cmd_buffer, dst, &dst_iview);
cleari_bind_descriptors(cmd_buffer, &dst_iview); cleari_bind_descriptors(cmd_buffer, &dst_iview);
cleari_bind_pipeline(cmd_buffer); cleari_bind_pipeline(cmd_buffer);

3
src/amd/vulkan/radv_meta_clear.c
View File

@@ -1094,8 +1094,7 @@ radv_clear_image_layer(struct radv_cmd_buffer *cmd_buffer,
.baseArrayLayer = range->baseArrayLayer + layer, .baseArrayLayer = range->baseArrayLayer + layer,
.layerCount = 1 .layerCount = 1
}, },
}, });
cmd_buffer, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT);
VkFramebuffer fb; VkFramebuffer fb;
radv_CreateFramebuffer(device_h, radv_CreateFramebuffer(device_h,

3
src/amd/vulkan/radv_meta_decompress.c
View File

@@ -318,8 +318,7 @@ static void radv_process_depth_image_inplace(struct radv_cmd_buffer *cmd_buffer,
.baseArrayLayer = subresourceRange->baseArrayLayer + layer, .baseArrayLayer = subresourceRange->baseArrayLayer + layer,
.layerCount = 1, .layerCount = 1,
}, },
}, });
cmd_buffer, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT);
VkFramebuffer fb_h; VkFramebuffer fb_h;

3
src/amd/vulkan/radv_meta_fast_clear.c
View File

@@ -367,8 +367,7 @@ radv_fast_clear_flush_image_inplace(struct radv_cmd_buffer *cmd_buffer,
.baseArrayLayer = subresourceRange->baseArrayLayer + layer, .baseArrayLayer = subresourceRange->baseArrayLayer + layer,
.layerCount = 1, .layerCount = 1,
}, },
}, });
cmd_buffer, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT);
VkFramebuffer fb_h; VkFramebuffer fb_h;
radv_CreateFramebuffer(device_h, radv_CreateFramebuffer(device_h,

6
src/amd/vulkan/radv_meta_resolve.c
View File

@@ -458,8 +458,7 @@ void radv_CmdResolveImage(
.baseArrayLayer = src_base_layer + layer, .baseArrayLayer = src_base_layer + layer,
.layerCount = 1, .layerCount = 1,
}, },
}, });
cmd_buffer, VK_IMAGE_USAGE_SAMPLED_BIT);
struct radv_image_view dest_iview; struct radv_image_view dest_iview;
radv_image_view_init(&dest_iview, cmd_buffer->device, radv_image_view_init(&dest_iview, cmd_buffer->device,
@@ -475,8 +474,7 @@ void radv_CmdResolveImage(
.baseArrayLayer = dest_base_layer + layer, .baseArrayLayer = dest_base_layer + layer,
.layerCount = 1, .layerCount = 1,
}, },
}, });
cmd_buffer, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT);
VkFramebuffer fb_h; VkFramebuffer fb_h;
radv_CreateFramebuffer(device_h, radv_CreateFramebuffer(device_h,

6
src/amd/vulkan/radv_meta_resolve_cs.c
View File

@@ -394,8 +394,7 @@ void radv_meta_resolve_compute_image(struct radv_cmd_buffer *cmd_buffer,
.baseArrayLayer = src_base_layer + layer, .baseArrayLayer = src_base_layer + layer,
.layerCount = 1, .layerCount = 1,
}, },
}, });
cmd_buffer, VK_IMAGE_USAGE_SAMPLED_BIT);
struct radv_image_view dest_iview; struct radv_image_view dest_iview;
radv_image_view_init(&dest_iview, cmd_buffer->device, radv_image_view_init(&dest_iview, cmd_buffer->device,
@@ -411,8 +410,7 @@ void radv_meta_resolve_compute_image(struct radv_cmd_buffer *cmd_buffer,
.baseArrayLayer = dest_base_layer + layer, .baseArrayLayer = dest_base_layer + layer,
.layerCount = 1, .layerCount = 1,
}, },
}, });
cmd_buffer, VK_IMAGE_USAGE_STORAGE_BIT);
emit_resolve(cmd_buffer, emit_resolve(cmd_buffer,
&src_iview, &src_iview,

6
src/amd/vulkan/radv_meta_resolve_fs.c
View File

@@ -543,8 +543,7 @@ void radv_meta_resolve_fragment_image(struct radv_cmd_buffer *cmd_buffer,
.baseArrayLayer = src_base_layer + layer, .baseArrayLayer = src_base_layer + layer,
.layerCount = 1, .layerCount = 1,
}, },
}, });
cmd_buffer, VK_IMAGE_USAGE_SAMPLED_BIT);
struct radv_image_view dest_iview; struct radv_image_view dest_iview;
radv_image_view_init(&dest_iview, cmd_buffer->device, radv_image_view_init(&dest_iview, cmd_buffer->device,
@@ -560,8 +559,7 @@ void radv_meta_resolve_fragment_image(struct radv_cmd_buffer *cmd_buffer,
.baseArrayLayer = dest_base_layer + layer, .baseArrayLayer = dest_base_layer + layer,
.layerCount = 1, .layerCount = 1,
}, },
}, });
cmd_buffer, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT);
VkFramebuffer fb; VkFramebuffer fb;

4
src/amd/vulkan/radv_private.h
View File

@@ -1285,9 +1285,7 @@ VkResult radv_image_create(VkDevice _device,
void radv_image_view_init(struct radv_image_view *view, void radv_image_view_init(struct radv_image_view *view,
struct radv_device *device, struct radv_device *device,
const VkImageViewCreateInfo* pCreateInfo, const VkImageViewCreateInfo* pCreateInfo);
struct radv_cmd_buffer *cmd_buffer,
VkImageUsageFlags usage_mask);
struct radv_buffer_view { struct radv_buffer_view {
struct radeon_winsys_bo *bo; struct radeon_winsys_bo *bo;