From 74800697032569bde5d4f87b9e2dbbcee4c9d922 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 3 Dec 2019 21:22:43 -0500 Subject: [PATCH] gallium: rename PIPE_RESOURCE_FLAG_ST_PRIV to FRONTEND_PRIV Acked-by: Eric Anholt Acked-by: Alyssa Rosenzweig Acked-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/frontends/nine/nine_defines.h | 4 ++-- src/gallium/include/pipe/p_defines.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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. -- 2.30.2