From dd1b27fcb48efb354decf5903efd15b5e9eee8c5 Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Mon, 30 Jan 2023 20:12:01 -0600
Subject: [PATCH] nvk: Use mme_load_addr64()

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
---
 src/nouveau/vulkan/nvk_cmd_draw.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/nouveau/vulkan/nvk_cmd_draw.c b/src/nouveau/vulkan/nvk_cmd_draw.c
index fe11272c75c..7cac61fb954 100644
--- a/src/nouveau/vulkan/nvk_cmd_draw.c
+++ b/src/nouveau/vulkan/nvk_cmd_draw.c
@@ -1385,9 +1385,7 @@ void
 nvk_mme_draw_indirect(struct nvk_device *dev, struct mme_builder *b)
 {
    struct mme_value begin = mme_load(b);
-   struct mme_value draw_addr_hi = mme_load(b);
-   struct mme_value draw_addr_lo = mme_load(b);
-   struct mme_value64 draw_addr = mme_value64(draw_addr_lo, draw_addr_hi);
+   struct mme_value64 draw_addr = mme_load_addr64(b);
    struct mme_value draw_count = mme_load(b);
    struct mme_value stride = mme_load(b);
 
@@ -1439,9 +1437,7 @@ void
 nvk_mme_draw_indexed_indirect(struct nvk_device *dev, struct mme_builder *b)
 {
    struct mme_value begin = mme_load(b);
-   struct mme_value draw_addr_hi = mme_load(b);
-   struct mme_value draw_addr_lo = mme_load(b);
-   struct mme_value64 draw_addr = mme_value64(draw_addr_lo, draw_addr_hi);
+   struct mme_value64 draw_addr = mme_load_addr64(b);
    struct mme_value draw_count = mme_load(b);
    struct mme_value stride = mme_load(b);