diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2017-08-18 23:31:06 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2017-08-19 02:20:09 +0300 |
commit | 2abc21ace5a046ee4043a6b9c8a317defb05a035 (patch) | |
tree | 23c1c7f032f15a38395af6f5a5ab7ccbaa757627 /source/blender/draw/engines/eevee/shaders/lightprobe_geom.glsl | |
parent | a702ff4c03860e0cc80a15f5efe9ba7d9f02b3ed (diff) |
Eevee: Fix problem with GPU_texture_generate_mipmap
This function was called to recreate the lower mip level of the probe texture. But this is not it's usage and it introduced a stall.
This patch add cubemap mipmap level regeneration in eevee_effects.c
Diffstat (limited to 'source/blender/draw/engines/eevee/shaders/lightprobe_geom.glsl')
-rw-r--r-- | source/blender/draw/engines/eevee/shaders/lightprobe_geom.glsl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_geom.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_geom.glsl index 222d272da72..7e63f4cdaf7 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_geom.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_geom.glsl @@ -6,6 +6,7 @@ uniform int Layer; in vec4 vPos[]; flat in int face[]; +flat out int fFace; out vec3 worldPosition; out vec3 viewPosition; /* Required. otherwise generate linking error. */ @@ -17,12 +18,12 @@ const vec3 x_axis[6] = vec3[6](vec3(0.0, 0.0, -1.0), vec3( 0.0, 0.0, 1.0), v const vec3 y_axis[6] = vec3[6](vec3(0.0, -1.0, 0.0), vec3( 0.0, -1.0, 0.0), vec3(0.0, 0.0, 1.0), vec3(0.0, 0.0, -1.0), vec3( 0.0, -1.0, 0.0), vec3( 0.0, -1.0, 0.0)); void main() { - int f = face[0]; - gl_Layer = Layer + f; + fFace = face[0]; + gl_Layer = Layer + fFace; for (int v = 0; v < 3; ++v) { gl_Position = vPos[v]; - worldPosition = x_axis[f] * vPos[v].x + y_axis[f] * vPos[v].y + maj_axes[f]; + worldPosition = x_axis[fFace] * vPos[v].x + y_axis[fFace] * vPos[v].y + maj_axes[fFace]; #ifdef ATTRIB pass_attrib(v); #endif |