From f3b7fefde4c34b1c3a944bb7ef276ff7d1e9ccae Mon Sep 17 00:00:00 2001
From: Jannik Vogel <email@jannikvogel.de>
Date: Mon, 18 Feb 2019 22:59:41 +0100
Subject: [PATCH] vsh: Fix skinning mode order

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

diff --git a/hw/xbox/nv2a/nv2a_shaders.c b/hw/xbox/nv2a/nv2a_shaders.c
index 72836549ac..cbe5406fc2 100644
--- a/hw/xbox/nv2a/nv2a_shaders.c
+++ b/hw/xbox/nv2a/nv2a_shaders.c
@@ -372,14 +372,14 @@ GLSL_DEFINE(sceneAmbientColor, GLSL_LTCTXA(NV_IGRAPH_XF_LTCTXA_FR_AMB) ".xyz")
         mix = false; count = 0; break;
     case SKINNING_1WEIGHTS:
         mix = true; count = 2; break;
-    case SKINNING_2WEIGHTS:
-        mix = true; count = 3; break;
-    case SKINNING_3WEIGHTS:
-        mix = true; count = 4; break;
     case SKINNING_2WEIGHTS2MATRICES:
         mix = false; count = 2; break;
+    case SKINNING_2WEIGHTS:
+        mix = true; count = 3; break;
     case SKINNING_3WEIGHTS3MATRICES:
         mix = false; count = 3; break;
+    case SKINNING_3WEIGHTS:
+        mix = true; count = 4; break;
     case SKINNING_4WEIGHTS4MATRICES:
         mix = false; count = 4; break;
     default:
diff --git a/hw/xbox/nv2a/nv2a_vsh.h b/hw/xbox/nv2a/nv2a_vsh.h
index 771b887dd9..c12cff5700 100644
--- a/hw/xbox/nv2a/nv2a_vsh.h
+++ b/hw/xbox/nv2a/nv2a_vsh.h
@@ -63,10 +63,10 @@ enum VshFoggen {
 enum VshSkinning {
     SKINNING_OFF,
     SKINNING_1WEIGHTS,
-    SKINNING_2WEIGHTS,
-    SKINNING_3WEIGHTS,
     SKINNING_2WEIGHTS2MATRICES,
+    SKINNING_2WEIGHTS,
     SKINNING_3WEIGHTS3MATRICES,
+    SKINNING_3WEIGHTS,
     SKINNING_4WEIGHTS4MATRICES,
 };