summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJannik Vogel <email@jannikvogel.de>2016-12-25 20:56:42 +0100
committerJannik Vogel <email@jannikvogel.de>2016-12-25 21:38:10 +0100
commit6ed4206f878da69bbd71e018eb6c82872a1f328b (patch)
tree67f4d248d80e59002a751cf40c50cbdd395e31c3
parentOffset lighting LUT samples correctly (diff)
downloadyuzu-6ed4206f878da69bbd71e018eb6c82872a1f328b.tar
yuzu-6ed4206f878da69bbd71e018eb6c82872a1f328b.tar.gz
yuzu-6ed4206f878da69bbd71e018eb6c82872a1f328b.tar.bz2
yuzu-6ed4206f878da69bbd71e018eb6c82872a1f328b.tar.lz
yuzu-6ed4206f878da69bbd71e018eb6c82872a1f328b.tar.xz
yuzu-6ed4206f878da69bbd71e018eb6c82872a1f328b.tar.zst
yuzu-6ed4206f878da69bbd71e018eb6c82872a1f328b.zip
Diffstat (limited to '')
-rw-r--r--src/video_core/renderer_opengl/gl_shader_gen.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_gen.cpp b/src/video_core/renderer_opengl/gl_shader_gen.cpp
index d485ddacf..4c4f98ac9 100644
--- a/src/video_core/renderer_opengl/gl_shader_gen.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_gen.cpp
@@ -293,7 +293,7 @@ static void AppendAlphaTestCondition(std::string& out, Regs::CompareFunc func) {
case CompareFunc::GreaterThanOrEqual: {
static const char* op[] = {"!=", "==", ">=", ">", "<=", "<"};
unsigned index = (unsigned)func - (unsigned)CompareFunc::Equal;
- out += "int(last_tex_env_out.a * 255.0f) " + std::string(op[index]) + " alphatest_ref";
+ out += "int(last_tex_env_out.a * 255.0) " + std::string(op[index]) + " alphatest_ref";
break;
}
@@ -422,7 +422,7 @@ static void WriteLighting(std::string& out, const PicaShaderConfig& config) {
if (abs) {
// LUT index is in the range of (0.0, 1.0)
index = lighting.light[light_num].two_sided_diffuse ? "abs(" + index + ")"
- : "max(" + index + ", 0.f)";
+ : "max(" + index + ", 0.0)";
} else {
// LUT index is in the range of (-1.0, 1.0)
index = "((" + index + " < 0) ? " + index + " + 2.0 : " + index + ") / 2.0";
@@ -577,7 +577,6 @@ std::string GenerateFragmentShader(const PicaShaderConfig& config) {
#version 330 core
#define NUM_TEV_STAGES 6
#define NUM_LIGHTS 8
-#define LIGHTING_LUT_SIZE 256
// Texture coordinate offsets and scales
#define OFFSET_256 (0.5 / 256.0)