From 2e35ca295b61c8be0358b6ab668427ca4be2ebef Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Fri, 29 May 2020 17:13:35 -0700 Subject: [PATCH] r300g: Remove extra printf format specifiers. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix warning reported by Coverity Scan. Missing argument to printf format specifier (PRINTF_ARGS) missing_argument: No argument for format specifier %s. Fixes: 04c1536bf7ab ("r300g: rasterizer debug logging") Fixes: 85efb2fff0d4 ("r300g: try to use color varyings for texcoords if max texcoord limit is exceeded") Signed-off-by: Vinson Lee Reviewed-by: Marek Olšák Part-of: (cherry picked from commit d2f8105b606269c0e71cd599f57997279385d300) --- .pick_status.json | 2 +- src/gallium/drivers/r300/r300_state_derived.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 7d76ae6b51a..fe51a250282 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3226,7 +3226,7 @@ "description": "r300g: Remove extra printf format specifiers.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "04c1536bf7abe253e0e900c311ff9474ff4d1813" }, diff --git a/src/gallium/drivers/r300/r300_state_derived.c b/src/gallium/drivers/r300/r300_state_derived.c index bae669e78cb..848bbd392bc 100644 --- a/src/gallium/drivers/r300/r300_state_derived.c +++ b/src/gallium/drivers/r300/r300_state_derived.c @@ -376,7 +376,7 @@ static void r300_update_rs_block(struct r300_context *r300) if (fs_inputs->color[i] != ATTR_UNUSED) { fp_offset++; - DBG(r300, DBG_RS, "r300: FS input color %i unassigned%s.\n", + DBG(r300, DBG_RS, "r300: FS input color %i unassigned.\n", i); } } @@ -474,7 +474,7 @@ static void r300_update_rs_block(struct r300_context *r300) if (fs_inputs->generic[i] != ATTR_UNUSED) { fp_offset++; - DBG(r300, DBG_RS, "r300: FS input generic %i unassigned%s.\n", i); + DBG(r300, DBG_RS, "r300: FS input generic %i unassigned.\n", i); } } }