From 7175da5c8ef60db21a2585a559ef7504a2eedb19 Mon Sep 17 00:00:00 2001
From: Aaron Robinson <caustik@caustik.com>
Date: Sun, 14 Mar 2004 07:41:11 +0000
Subject: [PATCH] minor formatting

---
 Cxbx.opt                                      | Bin 67072 -> 60928 bytes
 Include/Win32/CxbxKrnl/EmuD3D8/VertexShader.h |   5 +-
 .../Win32/CxbxKrnl/EmuD3D8/VertexShader.cpp   | 110 +++++++++++-------
 3 files changed, 69 insertions(+), 46 deletions(-)

diff --git a/Cxbx.opt b/Cxbx.opt
index 2c1030c4a55fb799cdb0cbbd55b9cbc320ab4ab3..5cfc806baa7346a26ab2f5b1b385cd77fe1a6187 100644
GIT binary patch
literal 60928
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
bfEi#0m;q*h85oZN*8f=lWBqUP>VN+QED^_R

delta 1336
zcmb_cUr19?96opV?(Sk6n>G8h5boU41)0-GBBXL#P-dbjG(yTbZ(v>Sy<V?5SLqbV
z1rcq(haQ?Sswa^^?~@SJL)f#g*-KAB6!f4}LayK4vLq)`c;P$e{J!%$-}%nD=bXel
zI&qJAaELOcsy)mgA!Md)no64z)HxV64O&-ox!fsa8xg?JUWY;4z~DTh#UPK-S)W1v
zKnx)fN8Ci*Lfl3SBSsJjM4D-)EU>`v<}<J6-m;)FZ8pMTM+pMQ=b+T=g(aqgW7iX!
zxfMbIKP;JDR0!;>FJJD1Hg;E`r4O@X_NQ5vdE#>9tHb#!9SB(|6f&<9t94^QoJK)N
zJCVr%QAv~t<O&I5BoPf`nTQyl#po)L!OiS<_=t%z46c0zqX8G(57fi!pr1Ml%Yk-|
zK~W>c=%!A>a`2n8>~u^MR4F3zAwdzO9zlxs>MJ4Eu4mcr^hjfd5E@508YEfcqq3x_
zvM35YCwBK7?~FuLS?W|&`I->b`a7es?ie8qR>Hrf$2LuOZII`TS+1*+2&*9vya?59
zv4ZqC2VA&=&HrEm;c(54Leqq+`Uq2^SDy}d7_0q6V{Vx<i28grf3a6OQpaBqL?O~I
zK)JZ5t_WW=*%1CUTS}||CCtDF(O&Y0)>ER#1fTEl(Aswpo=YsW$~-K}9;i=xk+Z;}
zQ~_1krzi)&Hc<t0GU_M{e3@`VPGRAp5zB74l&k=+QiYrkR^>|6s)R+ws}J?{?@VVn
zNCq3MR&=xeSg_58zrC>XC{Bf8Ak$*oaB`?_Sk8>V(xg-8#$Oh!{%v#3T5(%VzwJ!j
zy{tb=S|~l<_q7x^Smz#ZqoQqg_RaSBv(3(r(Ub!3<?>CoyZE|nkeJk1Jo|WaA;mUX
n*Y-Pq*HWyuCE=$=VS%oh>B>^6E<Zjm#=Bslb#6ZXUxt1HrvL@q

diff --git a/Include/Win32/CxbxKrnl/EmuD3D8/VertexShader.h b/Include/Win32/CxbxKrnl/EmuD3D8/VertexShader.h
index b0c9d792a..8aac719db 100644
--- a/Include/Win32/CxbxKrnl/EmuD3D8/VertexShader.h
+++ b/Include/Win32/CxbxKrnl/EmuD3D8/VertexShader.h
@@ -34,7 +34,7 @@
 #ifndef VERTEXSHADER_H
 #define VERTEXSHADER_H
 
-//#define _DEBUG_VSH
+#define _DEBUG_VSH
 
 // nv2a microcode header
 typedef struct
@@ -43,7 +43,8 @@ typedef struct
     uint08 Version;
     uint08 NumInst;
     uint08 Unknown0;
-} VSH_SHADER_HEADER;
+}
+VSH_SHADER_HEADER;
 
 #define VSH_INSTRUCTION_SIZE       4
 #define VSH_INSTRUCTION_SIZE_BYTES (VSH_INSTRUCTION_SIZE * sizeof(DWORD))
diff --git a/Source/Win32/CxbxKrnl/EmuD3D8/VertexShader.cpp b/Source/Win32/CxbxKrnl/EmuD3D8/VertexShader.cpp
index 01501f604..344dd772a 100644
--- a/Source/Win32/CxbxKrnl/EmuD3D8/VertexShader.cpp
+++ b/Source/Win32/CxbxKrnl/EmuD3D8/VertexShader.cpp
@@ -60,7 +60,7 @@ extern XTL::LPDIRECT3DDEVICE8 g_pD3DDevice8;  // Direct3D8 Device
 #define VSH_MAX_INTERMEDIATE_COUNT     1024 // The maximum number of intermediate format slots
 
 // Local types
-typedef enum
+typedef enum _VSH_FIELD_NAME
 {
     FLD_ILU = 0,
     FLD_MAC,
@@ -112,9 +112,10 @@ typedef enum
     FLD_A0X,
     // Final instruction
     FLD_FINAL
-} VSH_FIELD_NAME;
+}
+VSH_FIELD_NAME;
 
-typedef enum
+typedef enum _VSH_OREG_NAME
 {
     OREG_OPOS,
     OREG_UNUSED1,
@@ -132,29 +133,33 @@ typedef enum
     OREG_UNUSED3,
     OREG_UNUSED4,
     OREG_A0X
-} VSH_OREG_NAME;
+}
+VSH_OREG_NAME;
 
-typedef enum
+typedef enum _VSH_PARAMETER_TYPE
 {
     PARAM_UNKNOWN = 0,
     PARAM_R,
     PARAM_V,
     PARAM_C
-} VSH_PARAMETER_TYPE;
+}
+VSH_PARAMETER_TYPE;
 
-typedef enum
+typedef enum _VSH_OUTPUT_TYPE
 {
     OUTPUT_C = 0,
     OUTPUT_O
-} VSH_OUTPUT_TYPE;
+}
+VSH_OUTPUT_TYPE;
 
-typedef enum
+typedef enum _VSH_OUTPUT_MUX
 {
     OMUX_MAC = 0,
     OMUX_ILU
-} VSH_OUTPUT_MUX;
+}
+VSH_OUTPUT_MUX;
 
-typedef enum
+typedef enum _VSH_ILU
 {
     ILU_NOP = 0,
     ILU_MOV,
@@ -164,9 +169,10 @@ typedef enum
     ILU_EXP,
     ILU_LOG,
     ILU_LIT
-} VSH_ILU;
+}
+VSH_ILU;
 
-typedef enum
+typedef enum _VSH_MAC
 {
     MAC_NOP,
     MAC_MOV,
@@ -182,34 +188,38 @@ typedef enum
     MAC_SLT,
     MAC_SGE,
     MAC_ARL
-} VSH_MAC;
+}
+VSH_MAC;
 
-typedef struct
+typedef struct _VSH_OPCODE_PARAMS
 {
     VSH_ILU   ILU;
     VSH_MAC   MAC;
     boolean   A;
     boolean   B;
     boolean   C;
-} VSH_OPCODE_PARAMS;
+}
+VSH_OPCODE_PARAMS;
 
-typedef enum
+typedef enum _VSH_SWIZZLE
 {
     SWIZZLE_X = 0,
     SWIZZLE_Y,
     SWIZZLE_Z,
     SWIZZLE_W
-} VSH_SWIZZLE;
+}
+VSH_SWIZZLE;
 
-typedef struct
+typedef struct _VSH_PARAMETER
 {
     VSH_PARAMETER_TYPE  ParameterType;   // Parameter type, R, V or C
     boolean             Neg;             // TRUE if negated, FALSE if not
     VSH_SWIZZLE         Swizzle[4];      // The four swizzles
     int16               Address;         // Register address
-} VSH_PARAMETER;
+}
+VSH_PARAMETER;
 
-typedef struct
+typedef struct _VSH_OUTPUT
 {
     // Output register
     VSH_OUTPUT_MUX      OutputMux;       // MAC or ILU used as output
@@ -222,10 +232,11 @@ typedef struct
     // ILU output R register
     boolean             ILURMask[4];
     boolean             ILURAddress;
-} VSH_OUTPUT;
+}
+VSH_OUTPUT;
 
 // The raw, parsed shader instruction (can be many combined [paired] instructions)
-typedef struct
+typedef struct _VSH_SHADER_INSTRUCTION
 {
     VSH_ILU       ILU;
     VSH_MAC       MAC;
@@ -234,37 +245,42 @@ typedef struct
     VSH_PARAMETER B;
     VSH_PARAMETER C;
     boolean       a0x;
-} VSH_SHADER_INSTRUCTION;
+}
+VSH_SHADER_INSTRUCTION;
 
-typedef enum
+typedef enum _VSH_IMD_OUTPUT_TYPE
 {
     IMD_OUTPUT_C,
     IMD_OUTPUT_R,
     IMD_OUTPUT_O,
     IMD_OUTPUT_A0X
-} VSH_IMD_OUTPUT_TYPE;
+}
+VSH_IMD_OUTPUT_TYPE;
 
-typedef enum
+typedef enum _VSH_IMD_INSTRUCTION_TYPE
 {
     IMD_MAC,
     IMD_ILU
-} VSH_IMD_INSTRUCTION_TYPE;
+}
+VSH_IMD_INSTRUCTION_TYPE;
 
-typedef struct
+typedef struct _VSH_IMD_OUTPUT
 {
     VSH_IMD_OUTPUT_TYPE Type;
     boolean             Mask[4];
     int16               Address;
-} VSH_IMD_OUTPUT;
+}
+VSH_IMD_OUTPUT;
 
-typedef struct
+typedef struct _VSH_IMD_PARAMETER
 {
     boolean         Active;
     VSH_PARAMETER   Parameter;
     boolean         IsA0X;
-} VSH_IMD_PARAMETER;
+}
+VSH_IMD_PARAMETER;
 
-typedef struct
+typedef struct _VSH_INTERMEDIATE_FORMAT
 {
     
     boolean                  IsCombined;
@@ -273,23 +289,26 @@ typedef struct
     VSH_ILU                  ILU;
     VSH_IMD_OUTPUT           Output;
     VSH_IMD_PARAMETER        Parameters[3];
-} VSH_INTERMEDIATE_FORMAT;
+}
+VSH_INTERMEDIATE_FORMAT;
 
 // Used for xvu spec definition
-typedef struct
+typedef struct _VSH_FIELDMAPPING
 {
     VSH_FIELD_NAME  FieldName;
     uint08          SubToken;
     uint08          StartBit;
     uint08          BitLength;
-} VSH_FIELDMAPPING;
+}
+VSH_FIELDMAPPING;
 
-typedef struct
+typedef struct _VSH_XBOX_SHADER
 {
     XTL::VSH_SHADER_HEADER       ShaderHeader;
     uint16                  IntermediateCount;
     VSH_INTERMEDIATE_FORMAT Intermediate[VSH_MAX_INTERMEDIATE_COUNT];
-} VSH_XBOX_SHADER;
+}
+VSH_XBOX_SHADER;
 
 // Local constants
 static const VSH_FIELDMAPPING g_FieldMapping[] =
@@ -346,7 +365,8 @@ static const VSH_FIELDMAPPING g_FieldMapping[] =
     {  FLD_FINAL,            3,    0,     1 }
 };
 
-static const VSH_OPCODE_PARAMS g_OpCodeParams[] = {
+static const VSH_OPCODE_PARAMS g_OpCodeParams[] =
+{
     // ILU OP   MAC OP  ParamA ParamB ParamC
     { ILU_MOV, MAC_NOP, FALSE, FALSE, TRUE  },
     { ILU_RCP, MAC_NOP, FALSE, FALSE, TRUE  },
@@ -1294,13 +1314,15 @@ typedef struct _VSH_TYPE_PATCH_DATA
 {
     DWORD NbrTypes;
     UINT  Types[256];
-} VSH_TYPE_PATCH_DATA;
+}
+VSH_TYPE_PATCH_DATA;
 
 typedef struct _VSH_STREAM_PATCH_DATA
 {
     DWORD                     NbrStreams;
     XTL::STREAM_DYNAMIC_PATCH pStreamPatches[256];
-} VSH_STREAM_PATCH_DATA;
+}
+VSH_STREAM_PATCH_DATA;
 
 typedef struct _VSH_PATCH_DATA
 {
@@ -1308,8 +1330,8 @@ typedef struct _VSH_PATCH_DATA
     DWORD                ConversionStride;
     VSH_TYPE_PATCH_DATA  TypePatchData;
     VSH_STREAM_PATCH_DATA StreamPatchData;
-} VSH_PATCH_DATA;
-
+}
+VSH_PATCH_DATA;
 
 // VERTEX SHADER
 #define DEF_VSH_END 0xFFFFFFFF
@@ -1897,7 +1919,7 @@ extern HRESULT XTL::EmuRecompileVshFunction
         VshConvertShader(pShader, bNoReservedConstants);
         VshWriteShader(pShader, pShaderDisassembly);
 
-        DbgVshPrintf("-- After conversion ----\n");
+        DbgVshPrintf("-- After conversion ---\n");
         DbgVshPrintf("%s", pShaderDisassembly);
         DbgVshPrintf("-----------------------\n");