summaryrefslogtreecommitdiffstats
path: root/src/video_core/renderer_opengl
diff options
context:
space:
mode:
authorwwylele <wwylele@gmail.com>2017-05-26 15:23:33 +0200
committerwwylele <wwylele@gmail.com>2017-05-30 09:54:58 +0200
commit10906dceec42b1975a7f10abd199678dce692838 (patch)
treec455260c78a7e4f2aa695eb15d506cff02aa54d3 /src/video_core/renderer_opengl
parentgl_rasterizer: sync spot light status (diff)
downloadyuzu-10906dceec42b1975a7f10abd199678dce692838.tar
yuzu-10906dceec42b1975a7f10abd199678dce692838.tar.gz
yuzu-10906dceec42b1975a7f10abd199678dce692838.tar.bz2
yuzu-10906dceec42b1975a7f10abd199678dce692838.tar.lz
yuzu-10906dceec42b1975a7f10abd199678dce692838.tar.xz
yuzu-10906dceec42b1975a7f10abd199678dce692838.tar.zst
yuzu-10906dceec42b1975a7f10abd199678dce692838.zip
Diffstat (limited to 'src/video_core/renderer_opengl')
-rw-r--r--src/video_core/renderer_opengl/gl_shader_gen.cpp30
1 files changed, 24 insertions, 6 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_gen.cpp b/src/video_core/renderer_opengl/gl_shader_gen.cpp
index fe23be340..3eeb47d33 100644
--- a/src/video_core/renderer_opengl/gl_shader_gen.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_gen.cpp
@@ -508,7 +508,8 @@ static void WriteLighting(std::string& out, const PicaShaderConfig& config) {
out += "vec4 diffuse_sum = vec4(0.0, 0.0, 0.0, 1.0);\n"
"vec4 specular_sum = vec4(0.0, 0.0, 0.0, 1.0);\n"
"vec3 light_vector = vec3(0.0);\n"
- "vec3 refl_value = vec3(0.0);\n";
+ "vec3 refl_value = vec3(0.0);\n"
+ "vec3 spot_dir = vec3(0.0);\n;";
// Compute fragment normals
if (lighting.bump_mode == LightingRegs::LightingBumpMode::NormalMap) {
@@ -569,6 +570,10 @@ static void WriteLighting(std::string& out, const PicaShaderConfig& config) {
index = std::string("dot(light_vector, normal)");
break;
+ case LightingRegs::LightingLutInput::SP:
+ index = std::string("dot(light_vector, spot_dir)");
+ break;
+
default:
LOG_CRITICAL(HW_GPU, "Unknown lighting LUT input %d\n", (int)input);
UNIMPLEMENTED();
@@ -605,21 +610,34 @@ static void WriteLighting(std::string& out, const PicaShaderConfig& config) {
else
out += "light_vector = normalize(" + light_src + ".position + view);\n";
+ out += "spot_dir = " + light_src + ".spot_direction;\n";
+
// Compute dot product of light_vector and normal, adjust if lighting is one-sided or
// two-sided
std::string dot_product = light_config.two_sided_diffuse
? "abs(dot(light_vector, normal))"
: "max(dot(light_vector, normal), 0.0)";
+ // If enabled, compute spot light attenuation value
+ std::string spot_atten = "1.0";
+ if (light_config.spot_atten_enable &&
+ LightingRegs::IsLightingSamplerSupported(
+ lighting.config, LightingRegs::LightingSampler::SpotlightAttenuation)) {
+ std::string index =
+ GetLutIndex(light_config.num, lighting.lut_sp.type, lighting.lut_sp.abs_input);
+ auto sampler = LightingRegs::SpotlightAttenuationSampler(light_config.num);
+ spot_atten = "(" + std::to_string(lighting.lut_sp.scale) + " * " +
+ GetLutValue(sampler, index) + ")";
+ }
+
// If enabled, compute distance attenuation value
std::string dist_atten = "1.0";
if (light_config.dist_atten_enable) {
std::string index = "(" + light_src + ".dist_atten_scale * length(-view - " +
light_src + ".position) + " + light_src + ".dist_atten_bias)";
index = "(OFFSET_256 + SCALE_256 * clamp(" + index + ", 0.0, 1.0))";
- const unsigned lut_num =
- ((unsigned)LightingRegs::LightingSampler::DistanceAttenuation + light_config.num);
- dist_atten = GetLutValue((LightingRegs::LightingSampler)lut_num, index);
+ auto sampler = LightingRegs::DistanceAttenuationSampler(light_config.num);
+ dist_atten = GetLutValue(sampler, index);
}
// If enabled, clamp specular component if lighting result is negative
@@ -720,11 +738,11 @@ static void WriteLighting(std::string& out, const PicaShaderConfig& config) {
// Compute primary fragment color (diffuse lighting) function
out += "diffuse_sum.rgb += ((" + light_src + ".diffuse * " + dot_product + ") + " +
- light_src + ".ambient) * " + dist_atten + ";\n";
+ light_src + ".ambient) * " + dist_atten + " * " + spot_atten + ";\n";
// Compute secondary fragment color (specular lighting) function
out += "specular_sum.rgb += (" + specular_0 + " + " + specular_1 + ") * " +
- clamp_highlights + " * " + dist_atten + ";\n";
+ clamp_highlights + " * " + dist_atten + " * " + spot_atten + ";\n";
}
// Sum final lighting result