From 572854e706043353d28aa41e6dc7bbdc35de8029 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Wed, 20 Feb 2019 01:02:51 +0100 Subject: [PATCH] radv: Clean up a bunch of compiler warnings. Random unused vars. Reviewed-by: Timothy Arceri --- src/amd/vulkan/radv_nir_to_llvm.c | 4 ---- src/amd/vulkan/radv_pass.c | 2 -- src/amd/vulkan/radv_pipeline.c | 1 - 3 files changed, 7 deletions(-) diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c index 38ad9893644..e5a60e604d4 100644 --- a/src/amd/vulkan/radv_nir_to_llvm.c +++ b/src/amd/vulkan/radv_nir_to_llvm.c @@ -2066,7 +2066,6 @@ radv_fixup_vertex_input_fetches(struct radv_shader_context *ctx, { LLVMValueRef zero = is_float ? ctx->ac.f32_0 : ctx->ac.i32_0; LLVMValueRef one = is_float ? ctx->ac.f32_1 : ctx->ac.i32_1; - LLVMTypeRef elemtype; LLVMValueRef chan[4]; if (LLVMGetTypeKind(LLVMTypeOf(value)) == LLVMVectorTypeKind) { @@ -2079,14 +2078,11 @@ radv_fixup_vertex_input_fetches(struct radv_shader_context *ctx, for (unsigned i = 0; i < num_channels; i++) chan[i] = ac_llvm_extract_elem(&ctx->ac, value, i); - - elemtype = LLVMGetElementType(LLVMTypeOf(value)); } else { if (num_channels) { assert(num_channels == 1); chan[0] = value; } - elemtype = LLVMTypeOf(value); } for (unsigned i = num_channels; i < 4; i++) { diff --git a/src/amd/vulkan/radv_pass.c b/src/amd/vulkan/radv_pass.c index 7a724dc2da5..4d1e38a780e 100644 --- a/src/amd/vulkan/radv_pass.c +++ b/src/amd/vulkan/radv_pass.c @@ -250,7 +250,6 @@ VkResult radv_CreateRenderPass( p += desc->colorAttachmentCount; for (uint32_t j = 0; j < desc->colorAttachmentCount; j++) { - uint32_t a = desc->pResolveAttachments[j].attachment; subpass->resolve_attachments[j] = (struct radv_subpass_attachment) { .attachment = desc->pResolveAttachments[j].attachment, .layout = desc->pResolveAttachments[j].layout, @@ -397,7 +396,6 @@ VkResult radv_CreateRenderPass2KHR( p += desc->colorAttachmentCount; for (uint32_t j = 0; j < desc->colorAttachmentCount; j++) { - uint32_t a = desc->pResolveAttachments[j].attachment; subpass->resolve_attachments[j] = (struct radv_subpass_attachment) { .attachment = desc->pResolveAttachments[j].attachment, .layout = desc->pResolveAttachments[j].layout, diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index 519aad6cd58..2d9c3624045 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -3198,7 +3198,6 @@ radv_compute_db_shader_control(const struct radv_device *device, const struct radv_pipeline *pipeline, const struct radv_shader_variant *ps) { - const struct radv_multisample_state *ms = &pipeline->graphics.ms; unsigned z_order; if (ps->info.fs.early_fragment_test || !ps->info.info.ps.writes_memory) z_order = V_02880C_EARLY_Z_THEN_LATE_Z; -- 2.30.2