[PATCH 01/21] etnaviv: prefix COMPARE_FUNC enum values in rnndb

[Philipp Zabel]

The COMPARE_FUNC enum values from rnndb state_3d.xml conflict with the
enum compare_func values from shader_enums.h, but they are not used
anywhere. Move them out of the way by adding a prefix.

TODO: The state_3d.xml.h header is generated and actually the generator
must be fixed to generate the prefixed macro.

Signed-off-by: Philipp Zabel <p.zabel at pengutronix.de>
Signed-off-by: Michael Tretter <m.tretter at pengutronix.de>
---
 src/gallium/drivers/etnaviv/hw/state_3d.xml.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gallium/drivers/etnaviv/hw/state_3d.xml.h b/src/gallium/drivers/etnaviv/hw/state_3d.xml.h
index 13122789ec12..ff5f1fde14db 100644
--- a/src/gallium/drivers/etnaviv/hw/state_3d.xml.h
+++ b/src/gallium/drivers/etnaviv/hw/state_3d.xml.h
@@ -45,14 +45,14 @@ DEALINGS IN THE SOFTWARE.
 */
 
 
-#define COMPARE_FUNC_NEVER					0x00000000
-#define COMPARE_FUNC_LESS					0x00000001
-#define COMPARE_FUNC_EQUAL					0x00000002
-#define COMPARE_FUNC_LEQUAL					0x00000003
-#define COMPARE_FUNC_GREATER					0x00000004
-#define COMPARE_FUNC_NOTEQUAL					0x00000005
-#define COMPARE_FUNC_GEQUAL					0x00000006
-#define COMPARE_FUNC_ALWAYS					0x00000007
+#define ETNA_COMPARE_FUNC_NEVER					0x00000000
+#define ETNA_COMPARE_FUNC_LESS					0x00000001
+#define ETNA_COMPARE_FUNC_EQUAL					0x00000002
+#define ETNA_COMPARE_FUNC_LEQUAL				0x00000003
+#define ETNA_COMPARE_FUNC_GREATER				0x00000004
+#define ETNA_COMPARE_FUNC_NOTEQUAL				0x00000005
+#define ETNA_COMPARE_FUNC_GEQUAL				0x00000006
+#define ETNA_COMPARE_FUNC_ALWAYS				0x00000007
 #define STENCIL_OP_KEEP						0x00000000
 #define STENCIL_OP_ZERO						0x00000001
 #define STENCIL_OP_REPLACE					0x00000002
-- 
2.17.1