From a4d35d8263ccb6c4a7ca60dd0c1a31753c2d52a8 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@broadcom.com>
Date: Mon, 13 Jan 2025 06:36:48 -0700
Subject: [PATCH] svga: fix printing 64-bit value for 32-bit build

Closes: #12449, #12451
Fixes: b13e2a495e ("svga: add svga_resource_create_with_modifiers() function")
Signed-off-by: Brian Paul <brian.paul@broadcom.com>
Reviewed-by: Neha Bhende <neha.Bhende@broadcom.com>
Reviewed-by: Neha Bhende <None>
(cherry picked from commit 24107f2f67aab1e7304c0bbff77b1cef014673b9)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33113>
---
 .pick_status.json                        | 2 +-
 src/gallium/drivers/svga/svga_resource.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 3664ceafff6..6351bf11b96 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1694,7 +1694,7 @@
         "description": "svga: fix printing 64-bit value for 32-bit build",
         "nominated": false,
         "nomination_type": 2,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "b13e2a495e9e3da56add7d852ca01b2cd7eef52d",
         "notes": null
diff --git a/src/gallium/drivers/svga/svga_resource.c b/src/gallium/drivers/svga/svga_resource.c
index 1775b65fab1..aa145de9ffe 100644
--- a/src/gallium/drivers/svga/svga_resource.c
+++ b/src/gallium/drivers/svga/svga_resource.c
@@ -5,6 +5,7 @@
  * SPDX-License-Identifier: MIT
  */
 
+#include <inttypes.h>
 #include "util/u_debug.h"
 
 #include "svga_resource.h"
@@ -61,7 +62,7 @@ svga_resource_create_with_modifiers(struct pipe_screen *screen,
     * to deal with here.
     */
    if (count > 0 && modifiers != NULL && modifiers[0] != 0) {
-      debug_printf("vmware: unexpected format modifier 0x%lx\n",
+      debug_printf("vmware: unexpected format modifier 0x%" PRIx64 "\n",
                    modifiers[0]);
    }
    return svga_resource_create(screen, templat);