From a40588c8b9ef2d5609a08dbed77742f71b9cff36 Mon Sep 17 00:00:00 2001 From: SmileTheory Date: Wed, 8 Jun 2016 03:36:15 -0700 Subject: [PATCH] OpenGL2: Set cubemap mip selection to match output from ggxcc. --- code/renderergl2/glsl/lightall_fp.glsl | 6 +++--- code/renderergl2/tr_glsl.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/code/renderergl2/glsl/lightall_fp.glsl b/code/renderergl2/glsl/lightall_fp.glsl index 64cae3fa..9e53d4a8 100644 --- a/code/renderergl2/glsl/lightall_fp.glsl +++ b/code/renderergl2/glsl/lightall_fp.glsl @@ -370,11 +370,11 @@ void main() // from http://seblagarde.wordpress.com/2012/09/29/image-based-lighting-approaches-and-parallax-corrected-cubemap/ vec3 parallax = u_CubeMapInfo.xyz + u_CubeMapInfo.w * viewDir; - vec3 cubeLightColor = textureCubeLod(u_CubeMap, R + parallax, 7.0 * roughness).rgb * u_EnableTextures.w; + vec3 cubeLightColor = textureCubeLod(u_CubeMap, R + parallax, ROUGHNESS_MIPS * roughness).rgb * u_EnableTextures.w; - // normalize cubemap based on lowest mip (~diffuse) + // normalize cubemap based on last roughness mip (~diffuse) // multiplying cubemap values by lighting below depends on either this or the cubemap being normalized at generation - //vec3 cubeLightDiffuse = max(textureCubeLod(u_CubeMap, N, 6.0).rgb, 0.5 / 255.0); + //vec3 cubeLightDiffuse = max(textureCubeLod(u_CubeMap, N, ROUGHNESS_MIPS).rgb, 0.5 / 255.0); //cubeLightColor /= dot(cubeLightDiffuse, vec3(0.2125, 0.7154, 0.0721)); #if defined(USE_PBR) diff --git a/code/renderergl2/tr_glsl.c b/code/renderergl2/tr_glsl.c index 683e173d..8c40573e 100644 --- a/code/renderergl2/tr_glsl.c +++ b/code/renderergl2/tr_glsl.c @@ -325,6 +325,20 @@ static void GLSL_GetShaderHeader( GLenum shaderType, const GLcharARB *extra, cha if (r_pbr->integer) Q_strcat(dest, size, "#define USE_PBR\n"); + if (r_cubeMapping->integer) + { + int cubeMipSize = r_cubemapSize->integer; + int numRoughnessMips = 0; + + while (cubeMipSize) + { + cubeMipSize >>= 1; + numRoughnessMips++; + } + numRoughnessMips = MAX(1, numRoughnessMips - 2); + Q_strcat(dest, size, va("#define ROUGHNESS_MIPS float(%d)\n", numRoughnessMips)); + } + if (extra) { Q_strcat(dest, size, extra);