summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2011-12-11 11:08:18 +0100
committerPierre Bourdon <delroth@gmail.com>2011-12-11 11:08:18 +0100
commit014c474024e28e77d2bb72e0af7acb31850fba64 (patch)
tree0113e31a4c88918001d6fc33bec21094c776de96 /Source/Core/VideoCommon
parent1724385c8c52769c350d626b9b35b3bfd788522a (diff)
8 spaces indentation -> tabs
Diffstat (limited to 'Source/Core/VideoCommon')
-rw-r--r--Source/Core/VideoCommon/Src/PixelShaderGen.h20
-rw-r--r--Source/Core/VideoCommon/Src/TextureConversionShader.cpp22
-rw-r--r--Source/Core/VideoCommon/Src/VertexShaderGen.h18
-rw-r--r--Source/Core/VideoCommon/Src/VideoCommon.h6
4 files changed, 33 insertions, 33 deletions
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index b32b7408c3..3228d50b99 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -49,16 +49,16 @@
// Annoying sure, can be removed once we get up to GLSL ~1.3
const s_svar PSVar_Loc[] = { {I_COLORS, C_COLORS, 4 },
- {I_KCOLORS, C_KCOLORS, 4 },
- {I_ALPHA, C_ALPHA, 1 },
- {I_TEXDIMS, C_TEXDIMS, 8 },
- {I_ZBIAS , C_ZBIAS, 2 },
- {I_INDTEXSCALE , C_INDTEXSCALE, 2 },
- {I_INDTEXMTX, C_INDTEXMTX, 6 },
- {I_FOG, C_FOG, 3 },
- {I_PLIGHTS, C_PLIGHTS, 40 },
- {I_PMATERIALS, C_PMATERIALS, 4 },
- };
+ {I_KCOLORS, C_KCOLORS, 4 },
+ {I_ALPHA, C_ALPHA, 1 },
+ {I_TEXDIMS, C_TEXDIMS, 8 },
+ {I_ZBIAS , C_ZBIAS, 2 },
+ {I_INDTEXSCALE , C_INDTEXSCALE, 2 },
+ {I_INDTEXMTX, C_INDTEXMTX, 6 },
+ {I_FOG, C_FOG, 3 },
+ {I_PLIGHTS, C_PLIGHTS, 40 },
+ {I_PMATERIALS, C_PMATERIALS, 4 },
+ };
// DO NOT make anything in this class virtual.
template<bool safe>
diff --git a/Source/Core/VideoCommon/Src/TextureConversionShader.cpp b/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
index 262b2cee87..2f21c816b7 100644
--- a/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
+++ b/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
@@ -68,11 +68,11 @@ u16 GetEncodedSampleCount(u32 format)
}
const char* WriteRegister(API_TYPE ApiType, const char *prefix, const u32 num)
{
- if(ApiType == API_GLSL)
- return ""; // Once we switch to GLSL 1.3 we can do something here
- static char result[64];
- sprintf(result, " : register(%s%d)", prefix, num);
- return result;
+ if(ApiType == API_GLSL)
+ return ""; // Once we switch to GLSL 1.3 we can do something here
+ static char result[64];
+ sprintf(result, " : register(%s%d)", prefix, num);
+ return result;
}
const char *WriteLocation(API_TYPE ApiType)
{
@@ -821,13 +821,13 @@ void WriteZ24Encoder(char* p, API_TYPE ApiType)
for (int i = 0; i < 2; i++)
{
- WRITE(p, " depth%i *= 16777215.0f;\n", i);
+ WRITE(p, " depth%i *= 16777215.0f;\n", i);
- WRITE(p, " expanded%i.r = floor(depth%i / (256 * 256));\n", i, i);
- WRITE(p, " depth%i -= expanded%i.r * 256 * 256;\n", i, i);
- WRITE(p, " expanded%i.g = floor(depth%i / 256);\n", i, i);
- WRITE(p, " depth%i -= expanded%i.g * 256;\n", i, i);
- WRITE(p, " expanded%i.b = depth%i;\n", i, i);
+ WRITE(p, " expanded%i.r = floor(depth%i / (256 * 256));\n", i, i);
+ WRITE(p, " depth%i -= expanded%i.r * 256 * 256;\n", i, i);
+ WRITE(p, " expanded%i.g = floor(depth%i / 256);\n", i, i);
+ WRITE(p, " depth%i -= expanded%i.g * 256;\n", i, i);
+ WRITE(p, " expanded%i.b = depth%i;\n", i, i);
}
WRITE(p, " if(cl > 0.5f) {\n");
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.h b/Source/Core/VideoCommon/Src/VertexShaderGen.h
index c711aa7876..5cfb9f801d 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.h
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.h
@@ -48,15 +48,15 @@
#define C_DEPTHPARAMS (C_POSTTRANSFORMMATRICES + 64)
#define C_VENVCONST_END (C_DEPTHPARAMS + 1)
const s_svar VSVar_Loc[] = { {I_POSNORMALMATRIX, C_POSNORMALMATRIX, 6 },
- {I_PROJECTION , C_PROJECTION, 4 },
- {I_MATERIALS, C_MATERIALS, 4 },
- {I_LIGHTS, C_LIGHTS, 40 },
- {I_TEXMATRICES, C_TEXMATRICES, 24 },
- {I_TRANSFORMMATRICES , C_TRANSFORMMATRICES, 64 },
- {I_NORMALMATRICES , C_NORMALMATRICES, 32 },
- {I_POSTTRANSFORMMATRICES, C_POSTTRANSFORMMATRICES, 64 },
- {I_DEPTHPARAMS, C_DEPTHPARAMS, 1 },
- };
+ {I_PROJECTION , C_PROJECTION, 4 },
+ {I_MATERIALS, C_MATERIALS, 4 },
+ {I_LIGHTS, C_LIGHTS, 40 },
+ {I_TEXMATRICES, C_TEXMATRICES, 24 },
+ {I_TRANSFORMMATRICES , C_TRANSFORMMATRICES, 64 },
+ {I_NORMALMATRICES , C_NORMALMATRICES, 32 },
+ {I_POSTTRANSFORMMATRICES, C_POSTTRANSFORMMATRICES, 64 },
+ {I_DEPTHPARAMS, C_DEPTHPARAMS, 1 },
+ };
template<bool safe>
class _VERTEXSHADERUID
{
diff --git a/Source/Core/VideoCommon/Src/VideoCommon.h b/Source/Core/VideoCommon/Src/VideoCommon.h
index f87cb7e9b1..9d9148ec7b 100644
--- a/Source/Core/VideoCommon/Src/VideoCommon.h
+++ b/Source/Core/VideoCommon/Src/VideoCommon.h
@@ -154,9 +154,9 @@ inline unsigned int GetPow2(unsigned int val)
}
struct s_svar
{
- const char *name;
- const unsigned int reg;
- const unsigned int size;
+ const char *name;
+ const unsigned int reg;
+ const unsigned int size;
};
#endif // _VIDEOCOMMON_H