From: Marek Olšák <marek.olsak@amd.com>
Date: Wed, 4 Dec 2019 02:22:43 +0000 (-0500)
Subject: gallium: rename PIPE_RESOURCE_FLAG_ST_PRIV to FRONTEND_PRIV
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=74800697032569bde5d4f87b9e2dbbcee4c9d922;p=mesa.git

gallium: rename PIPE_RESOURCE_FLAG_ST_PRIV to FRONTEND_PRIV

Acked-by: Eric Anholt <eric@anholt.net>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4902>
---

diff --git a/src/gallium/frontends/nine/nine_defines.h b/src/gallium/frontends/nine/nine_defines.h
index 26aa064b1ac..4abbc124633 100644
--- a/src/gallium/frontends/nine/nine_defines.h
+++ b/src/gallium/frontends/nine/nine_defines.h
@@ -26,8 +26,8 @@
 #include "pipe/p_defines.h"
 
 
-#define NINE_RESOURCE_FLAG_LOCKABLE (PIPE_RESOURCE_FLAG_ST_PRIV << 1)
-#define NINE_RESOURCE_FLAG_DUMMY    (PIPE_RESOURCE_FLAG_ST_PRIV << 2)
+#define NINE_RESOURCE_FLAG_LOCKABLE (PIPE_RESOURCE_FLAG_FRONTEND_PRIV << 1)
+#define NINE_RESOURCE_FLAG_DUMMY    (PIPE_RESOURCE_FLAG_FRONTEND_PRIV << 2)
 
 /* vertexdeclaration9.c */
 uint16_t nine_d3d9_to_nine_declusage(unsigned usage, unsigned index);
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
index c805d3a78a7..e68b6642daf 100644
--- a/src/gallium/include/pipe/p_defines.h
+++ b/src/gallium/include/pipe/p_defines.h
@@ -503,7 +503,7 @@ enum pipe_flush_flags
 #define PIPE_RESOURCE_FLAG_SINGLE_THREAD_USE     (1 << 4)
 #define PIPE_RESOURCE_FLAG_ENCRYPTED             (1 << 5)
 #define PIPE_RESOURCE_FLAG_DRV_PRIV    (1 << 8) /* driver/winsys private */
-#define PIPE_RESOURCE_FLAG_ST_PRIV     (1 << 24) /* gallium frontend/winsys private */
+#define PIPE_RESOURCE_FLAG_FRONTEND_PRIV         (1 << 24) /* gallium frontend private */
 
 /**
  * Hint about the expected lifecycle of a resource.