From 8b2d2dd43dcb0434a700e011352809c1ef3edcd2 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Wed, 2 Aug 2023 15:08:33 +0800 Subject: [PATCH] compiler: Move WRITEMASK_* from prog_instruction.h into shader_enums.h Because both compiler/glsl/* and intel/compiler accessed it, so do the move Signed-off-by: Yonggang Luo Reviewed-by: Faith Ekstrand Part-of: --- src/compiler/glsl/ir_builder.h | 9 --------- src/compiler/shader_enums.h | 21 +++++++++++++++++++++ src/mesa/program/prog_instruction.h | 23 ----------------------- 3 files changed, 21 insertions(+), 32 deletions(-) diff --git a/src/compiler/glsl/ir_builder.h b/src/compiler/glsl/ir_builder.h index 2a1d364..dc7d698 100644 --- a/src/compiler/glsl/ir_builder.h +++ b/src/compiler/glsl/ir_builder.h @@ -28,15 +28,6 @@ namespace ir_builder { -#ifndef WRITEMASK_X -enum writemask { - WRITEMASK_X = 0x1, - WRITEMASK_Y = 0x2, - WRITEMASK_Z = 0x4, - WRITEMASK_W = 0x8, -}; -#endif - /** * This little class exists to let the helper expression generators * take either an ir_rvalue * or an ir_variable * to be automatically diff --git a/src/compiler/shader_enums.h b/src/compiler/shader_enums.h index 39698a4..3eaaf2f 100644 --- a/src/compiler/shader_enums.h +++ b/src/compiler/shader_enums.h @@ -535,6 +535,27 @@ _mesa_varying_slot_in_fs(gl_varying_slot slot) /*@}*/ /** + * Writemask values, 1 bit per component. + */ +/*@{*/ +#define WRITEMASK_X 0x1 +#define WRITEMASK_Y 0x2 +#define WRITEMASK_XY 0x3 +#define WRITEMASK_Z 0x4 +#define WRITEMASK_XZ 0x5 +#define WRITEMASK_YZ 0x6 +#define WRITEMASK_XYZ 0x7 +#define WRITEMASK_W 0x8 +#define WRITEMASK_XW 0x9 +#define WRITEMASK_YW 0xa +#define WRITEMASK_XYW 0xb +#define WRITEMASK_ZW 0xc +#define WRITEMASK_XZW 0xd +#define WRITEMASK_YZW 0xe +#define WRITEMASK_XYZW 0xf +/*@}*/ + +/** * If the gl_register_file is PROGRAM_SYSTEM_VALUE, the register index will be * one of these values. If a NIR variable's mode is nir_var_system_value, it * will be one of these values. diff --git a/src/mesa/program/prog_instruction.h b/src/mesa/program/prog_instruction.h index e8a3f33..c879a9e 100644 --- a/src/mesa/program/prog_instruction.h +++ b/src/mesa/program/prog_instruction.h @@ -68,29 +68,6 @@ #define SWIZZLE_ZZZZ MAKE_SWIZZLE4(SWIZZLE_Z, SWIZZLE_Z, SWIZZLE_Z, SWIZZLE_Z) #define SWIZZLE_WWWW MAKE_SWIZZLE4(SWIZZLE_W, SWIZZLE_W, SWIZZLE_W, SWIZZLE_W) - -/** - * Writemask values, 1 bit per component. - */ -/*@{*/ -#define WRITEMASK_X 0x1 -#define WRITEMASK_Y 0x2 -#define WRITEMASK_XY 0x3 -#define WRITEMASK_Z 0x4 -#define WRITEMASK_XZ 0x5 -#define WRITEMASK_YZ 0x6 -#define WRITEMASK_XYZ 0x7 -#define WRITEMASK_W 0x8 -#define WRITEMASK_XW 0x9 -#define WRITEMASK_YW 0xa -#define WRITEMASK_XYW 0xb -#define WRITEMASK_ZW 0xc -#define WRITEMASK_XZW 0xd -#define WRITEMASK_YZW 0xe -#define WRITEMASK_XYZW 0xf -/*@}*/ - - /** * Per-component negation masks */ -- 2.7.4