From 811673cfde4cf2e277e707449759c2484877517e Mon Sep 17 00:00:00 2001
From: Jannik Vogel <email@jannikvogel.de>
Date: Thu, 16 Jul 2015 22:59:32 +0200
Subject: [PATCH] Give VSH and PSH types a prefix

---
 hw/xbox/nv2a.c     | 6 +++---
 hw/xbox/nv2a_psh.c | 4 ++--
 hw/xbox/nv2a_psh.h | 4 ++--
 hw/xbox/nv2a_vsh.h | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/hw/xbox/nv2a.c b/hw/xbox/nv2a.c
index eb3ca5cc8d..407822508b 100644
--- a/hw/xbox/nv2a.c
+++ b/hw/xbox/nv2a.c
@@ -1337,12 +1337,12 @@ typedef struct ShaderState {
     bool alphakill[4];
 
     bool alpha_test;
-    enum AlphaFunc alpha_func;
+    enum PshAlphaFunc alpha_func;
 
     bool texture_matrix_enable[4];
-    enum Texgen texgen[4][4];
+    enum VshTexgen texgen[4][4];
 
-    enum Skinning skinning;
+    enum VshSkinning skinning;
 
     bool normalization;
 
diff --git a/hw/xbox/nv2a_psh.c b/hw/xbox/nv2a_psh.c
index 780760f350..fbd83f909b 100644
--- a/hw/xbox/nv2a_psh.c
+++ b/hw/xbox/nv2a_psh.c
@@ -204,7 +204,7 @@ struct PixelShader {
     bool alphakill[4];
 
     bool alpha_test;
-    enum AlphaFunc alpha_func;
+    enum PshAlphaFunc alpha_func;
 
     QString *varE, *varF;
     QString *code;
@@ -769,7 +769,7 @@ QString *psh_translate(uint32_t combiner_control, uint32_t shader_stage_program,
                        const bool rect_tex[4],
                        const bool compare_mode[4][4],
                        const bool alphakill[4],
-                       bool alpha_test, enum AlphaFunc alpha_func)
+                       bool alpha_test, enum PshAlphaFunc alpha_func)
 {
     int i;
     struct PixelShader ps;
diff --git a/hw/xbox/nv2a_psh.h b/hw/xbox/nv2a_psh.h
index d75043797d..965b238612 100644
--- a/hw/xbox/nv2a_psh.h
+++ b/hw/xbox/nv2a_psh.h
@@ -24,7 +24,7 @@
 
 #include "qapi/qmp/qstring.h"
 
-enum AlphaFunc {
+enum PshAlphaFunc {
     ALPHA_FUNC_NEVER,
     ALPHA_FUNC_LESS,
     ALPHA_FUNC_EQUAL,
@@ -47,6 +47,6 @@ QString *psh_translate(uint32_t combiner_control, uint32_t shader_stage_program,
                        const bool rect_tex[4],
                        const bool compare_mode[4][4],
                        const bool alphakill[4],
-                       bool alpha_test, enum AlphaFunc alpha_func);
+                       bool alpha_test, enum PshAlphaFunc alpha_func);
 
 #endif
diff --git a/hw/xbox/nv2a_vsh.h b/hw/xbox/nv2a_vsh.h
index c41069ee30..d541ec2dbc 100644
--- a/hw/xbox/nv2a_vsh.h
+++ b/hw/xbox/nv2a_vsh.h
@@ -24,7 +24,7 @@
 
 #include "qapi/qmp/qstring.h"
 
-enum Texgen {
+enum VshTexgen {
     TEXGEN_DISABLE,
     TEXGEN_EYE_LINEAR,
     TEXGEN_OBJECT_LINEAR,
@@ -33,7 +33,7 @@ enum Texgen {
     TEXGEN_REFLECTION_MAP,
 };
 
-enum Skinning {
+enum VshSkinning {
     SKINNING_OFF,
     SKINNING_1WEIGHTS,
     SKINNING_2WEIGHTS,