diff options
| author | NeoBrainX <NeoBrainX@gmail.com> | 2013-06-17 12:20:21 +0200 |
|---|---|---|
| committer | NeoBrainX <NeoBrainX@gmail.com> | 2013-06-17 12:29:47 +0200 |
| commit | c505260ec18656aa17c4ce80f5bbc72f4d10e952 (patch) | |
| tree | 6735cadae05cb69f8c2b0c7efdc84a56d113baa9 /Source/Core | |
| parent | ca22872daed7c384db350b2987b21ea92299a9e8 (diff) | |
Fix some merge conflicts.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/VideoCommon/Src/LightingShaderGen.h | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoCommon/Src/LightingShaderGen.h b/Source/Core/VideoCommon/Src/LightingShaderGen.h index 36bc52749a..ace785a477 100644 --- a/Source/Core/VideoCommon/Src/LightingShaderGen.h +++ b/Source/Core/VideoCommon/Src/LightingShaderGen.h @@ -251,7 +251,7 @@ static void GenerateLightingShader(T& object, LightingUidData& uid_data, int com GenerateLightShader<T>(object, uid_data, i, lit_index, lightsName, coloralpha); } } - object.Write("%s%d = mat * saturate(lacc);\n", dest, j); + object.Write("%s%d = mat * clamp(lacc, 0.0, 1.0);\n", dest, j); object.Write("}\n"); } } diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 9b8f3a9426..83b61cb164 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -945,7 +945,7 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE out.SetConstantsUsed(C_COLORS+2,C_COLORS+2); if(RegisterStates[2].AlphaNeedOverflowControl || RegisterStates[2].ColorNeedOverflowControl) { - out.Write("cc1 = frac(c1 * (255.0f/256.0f)) * (256.0f/255.0f);\n", GLSLConvertFunctions[FUNC_FRAC + bOpenGL]); + out.Write("cc1 = %s(c1 * (255.0f/256.0f)) * (256.0f/255.0f);\n", GLSLConvertFunctions[FUNC_FRAC + bOpenGL]); RegisterStates[2].AlphaNeedOverflowControl = false; RegisterStates[2].ColorNeedOverflowControl = false; } |