Mesa (staging/20.0): r300g: Remove extra printf format specifiers.

[GitLab Mirror]

Module: Mesa
Branch: staging/20.0
Commit: ffdd605674dbe86cc6d9cd3b74a25878cf90d37c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ffdd605674dbe86cc6d9cd3b74a25878cf90d37c

Author: Vinson Lee <vlee at freedesktop.org>
Date:   Fri May 29 17:13:35 2020 -0700

r300g: Remove extra printf format specifiers.

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 <vlee at freedesktop.org>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5274>
(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 df57c13a527..f43a687eb96 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -310,7 +310,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);
 		}
 	    }
 	}