AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v3dv: fix release build warnings

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6766>
This commit is contained in:
Iago Toral Quiroga
2020-06-10 12:12:21 +02:00
committed by Marge Bot
parent d7278818e3
commit ca1e29abc4
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/broadcom/vulkan/v3dv_cmd_buffer.c
+9 -10
View File
@@ -2045,8 +2045,8 @@ struct v3dv_job *
v3dv_cmd_buffer_subpass_start(struct v3dv_cmd_buffer *cmd_buffer,
uint32_t subpass_idx)
{
struct v3dv_cmd_buffer_state *state = &cmd_buffer->state;
assert(subpass_idx < state->pass->subpass_count);
assert(cmd_buffer->state.pass);
assert(subpass_idx < cmd_buffer->state.pass->subpass_count);
struct v3dv_job *job =
cmd_buffer_subpass_create_job(cmd_buffer, subpass_idx,
@@ -2082,8 +2082,8 @@ struct v3dv_job *
v3dv_cmd_buffer_subpass_resume(struct v3dv_cmd_buffer *cmd_buffer,
uint32_t subpass_idx)
{
struct v3dv_cmd_buffer_state *state = &cmd_buffer->state;
assert(subpass_idx < state->pass->subpass_count);
assert(cmd_buffer->state.pass);
assert(subpass_idx < cmd_buffer->state.pass->subpass_count);
struct v3dv_job *job;
if (cmd_buffer->level == VK_COMMAND_BUFFER_LEVEL_PRIMARY) {
@@ -2795,7 +2795,7 @@ v3dv_CmdSetViewport(VkCommandBuffer commandBuffer,
memcpy(state->dynamic.viewport.viewports + firstViewport, pViewports,
viewportCount * sizeof(*pViewports));
for (uint32_t i = firstViewport; i < firstViewport + viewportCount; i++) {
for (uint32_t i = firstViewport; i < total_count; i++) {
v3dv_viewport_compute_xform(&state->dynamic.viewport.viewports[i],
state->dynamic.viewport.scale[i],
state->dynamic.viewport.translate[i]);
@@ -2812,10 +2812,10 @@ v3dv_CmdSetScissor(VkCommandBuffer commandBuffer,
{
V3DV_FROM_HANDLE(v3dv_cmd_buffer, cmd_buffer, commandBuffer);
struct v3dv_cmd_buffer_state *state = &cmd_buffer->state;
const uint32_t total_count = firstScissor + scissorCount;
assert(firstScissor < MAX_SCISSORS);
assert(total_count >= 1 && total_count <= MAX_SCISSORS);
assert(firstScissor + scissorCount >= 1 &&
firstScissor + scissorCount <= MAX_SCISSORS);
/* See note on CmdSetViewport related to anv/radv differences about setting
* total viewports used. Also applies to scissor.
@@ -3658,8 +3658,6 @@ cmd_buffer_emit_pre_draw(struct v3dv_cmd_buffer *cmd_buffer)
/* FIXME: likely to be filtered by really needed states */
uint32_t *dirty = &cmd_buffer->state.dirty;
struct v3dv_dynamic_state *dynamic = &cmd_buffer->state.dynamic;
if (*dirty & (V3DV_CMD_DIRTY_PIPELINE |
V3DV_CMD_DIRTY_VERTEX_BUFFER |
V3DV_CMD_DIRTY_DESCRIPTOR_SETS |
@@ -3674,7 +3672,8 @@ cmd_buffer_emit_pre_draw(struct v3dv_cmd_buffer *cmd_buffer)
}
if (*dirty & (V3DV_CMD_DIRTY_VIEWPORT | V3DV_CMD_DIRTY_SCISSOR)) {
assert(dynamic->scissor.count > 0 || dynamic->viewport.count > 0);
assert(cmd_buffer->state.dynamic.scissor.count > 0 ||
cmd_buffer->state.dynamic.viewport.count > 0);
emit_scissor(cmd_buffer);
}
src/broadcom/vulkan/v3dv_meta_clear.c
+1 -2
View File
@@ -640,8 +640,7 @@ emit_ds_clear_rect(struct v3dv_cmd_buffer *cmd_buffer,
VkFormat format =
cmd_buffer->state.pass->attachments[attachment_idx].desc.format;
VkImageAspectFlags format_aspects = vk_format_aspects(format);
assert ((aspects & ~format_aspects) == 0);
assert ((aspects & ~vk_format_aspects(format)) == 0);
enum pipe_format pformat = vk_format_to_pipe_format(format);
VkClearColorValue clear_color;
src/broadcom/vulkan/v3dv_meta_copy.c
+2 -1
View File
@@ -1484,6 +1484,7 @@ clear_image_tlb(struct v3dv_cmd_buffer *cmd_buffer,
max_layer = range->baseArrayLayer + layer_count;
} else {
min_layer = 0;
max_layer = 0;
}
for (uint32_t level = min_level; level < max_level; level++) {
@@ -1712,7 +1713,7 @@ copy_buffer(struct v3dv_cmd_buffer *cmd_buffer,
uint32_t num_items = region->size / item_size;
assert(num_items > 0);
struct v3dv_job *job;
struct v3dv_job *job = NULL;
src_offset += region->srcOffset;
dst_offset += region->dstOffset;
while (num_items > 0) {