diff options
| author | nakeee <nakeee@gmail.com> | 2009-09-02 07:59:06 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2009-09-02 07:59:06 +0000 |
| commit | b2533a5ef28ba01005a7c70d99c8a520004bcd07 (patch) | |
| tree | 25f5b8dbb12b3b0e64a59fd7c6ff5419d846c8c6 /Source/Core/VideoCommon | |
| parent | 7343382f80462ef5ec42d2dd222742d4adade414 (diff) | |
Fixed various warning fixes and potencial POD/crash bugs
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4156 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/Src/VertexShaderGen.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp index aaf984074a..191435b1dd 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp @@ -137,16 +137,18 @@ const char *GenerateVertexShader(u32 components, bool D3D) // inputs if (components & VB_HAS_NRM0) WRITE(p, " float3 rawnorm0 : NORMAL0,\n"); - if (components & VB_HAS_NRM1) - if (D3D) + if (components & VB_HAS_NRM1) { + if (D3D) WRITE(p, " float3 rawnorm1 : NORMAL1,\n"); else WRITE(p, " float3 rawnorm1 : ATTR%d,\n", SHADER_NORM1_ATTRIB); - if (components & VB_HAS_NRM2) - if (D3D) + } + if (components & VB_HAS_NRM2) { + if (D3D) WRITE(p, " float3 rawnorm2 : NORMAL2,\n"); else WRITE(p, " float3 rawnorm2 : ATTR%d,\n", SHADER_NORM2_ATTRIB); + } if (components & VB_HAS_COL0) WRITE(p, " float4 color0 : COLOR0,\n"); if (components & VB_HAS_COL1) @@ -156,14 +158,14 @@ const char *GenerateVertexShader(u32 components, bool D3D) if ((components & (VB_HAS_UV0<<i)) || hastexmtx ) WRITE(p, " float%d tex%d : TEXCOORD%d,\n", hastexmtx ? 3 : 2, i,i); } - if (components & VB_HAS_POSMTXIDX) + if (components & VB_HAS_POSMTXIDX) { if (D3D) { WRITE(p, " float4 blend_indices : BLENDINDICES,\n"); } else WRITE(p, " half posmtx : ATTR%d,\n", SHADER_POSMTX_ATTRIB); - + } WRITE(p, " float4 rawpos : POSITION) {\n"); WRITE(p, "VS_OUTPUT o;\n"); |