diff options
| author | skidau <skidau@gmail.com> | 2012-06-02 11:25:44 +1000 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2012-06-02 11:25:44 +1000 |
| commit | bb4c9e2205d4117f48fd4ca50774ee56c28c92e4 (patch) | |
| tree | 24493b98232d9a096f18bb44ae72b5aaa3d93433 /Source/Core/VideoCommon | |
| parent | b0d271db3c7e79e3cf27131393d7a490f5e122d1 (diff) | |
Fixed "Failed to compile pixel shader" error when Per-Pixel Lighting is enabled. Thanks to slmpika for the fix.
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 437ec4514c..9b7f55dd9d 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -490,7 +490,7 @@ static const char *tevIndFmtScale[] = {"255.0f", "31.0f", "15.0f", "7.0f" }; static char swapModeTable[4][5]; static char text[16384]; -static bool PixelLigthingEnabled; +static bool PixelLightingEnabled; static bool DepthTextureEnable; static bool MustWriteToDepth; static bool FastZcomploc; @@ -531,7 +531,7 @@ const char *GeneratePixelShaderCode(PSGRENDER_MODE PSGRenderMode, API_TYPE ApiTy nIndirectStagesUsed |= 1 << bpmem.tevind[i].bt; } } - PixelLigthingEnabled = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting; + PixelLightingEnabled = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting; DepthTextureEnable = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc && (bpmem.zmode.testenable || bpmem.zmode.updateenable)); MustWriteToDepth = DepthTextureEnable || g_ActiveConfig.bEnablePerPixelDepth; FastZcomploc = bpmem.zcontrol.zcomploc && bpmem.zmode.updateenable && false; @@ -576,7 +576,7 @@ const char *GeneratePixelShaderCode(PSGRENDER_MODE PSGRenderMode, API_TYPE ApiTy WRITE(p, "uniform float4 " I_INDTEXMTX"[6] : register(c%d);\n", C_INDTEXMTX); WRITE(p, "uniform float4 " I_FOG"[3] : register(c%d);\n", C_FOG); - if(PixelLigthingEnabled) + if(PixelLightingEnabled) { WRITE(p,"typedef struct { float4 col; float4 cosatt; float4 distatt; float4 pos; float4 dir; } Light;\n"); WRITE(p,"typedef struct { Light lights[8]; } s_" I_PLIGHTS";\n"); @@ -609,15 +609,15 @@ const char *GeneratePixelShaderCode(PSGRENDER_MODE PSGRenderMode, API_TYPE ApiTy for (int i = 0; i < numTexgen; ++i) WRITE(p, ",\n in float3 uv%d : TEXCOORD%d", i, i); WRITE(p, ",\n in float4 clipPos : TEXCOORD%d", numTexgen); - if(PixelLigthingEnabled) + if(PixelLightingEnabled) WRITE(p, ",\n in float4 Normal : TEXCOORD%d", numTexgen + 1); } else { // wpos is in w of first 4 texcoords - if(PixelLigthingEnabled) + if(PixelLightingEnabled) { - for (int i = 0; i < numTexgen; ++i) + for (int i = 0; i < (numTexgen + 1); ++i) WRITE(p, ",\n in float4 uv%d : TEXCOORD%d", i, i); } else @@ -692,7 +692,7 @@ const char *GeneratePixelShaderCode(PSGRENDER_MODE PSGRenderMode, API_TYPE ApiTy " float4 cc2=float4(0.0f,0.0f,0.0f,0.0f), cprev=float4(0.0f,0.0f,0.0f,0.0f);\n" " float4 crastemp=float4(0.0f,0.0f,0.0f,0.0f),ckonsttemp=float4(0.0f,0.0f,0.0f,0.0f);\n\n"); - if(PixelLigthingEnabled) + if(PixelLightingEnabled) { if (numTexgen < 7) { |