Eevee: Cleanup remaining shadow geometry references.
authorClément Foucault <foucault.clem@gmail.com>
Sun, 15 Apr 2018 20:23:28 +0000 (22:23 +0200)
committerClément Foucault <foucault.clem@gmail.com>
Sun, 15 Apr 2018 20:23:51 +0000 (22:23 +0200)
source/blender/draw/CMakeLists.txt
source/blender/draw/engines/eevee/eevee_lights.c
source/blender/draw/engines/eevee/eevee_materials.c
source/blender/draw/engines/eevee/eevee_private.h
source/blender/draw/engines/eevee/shaders/shadow_copy_frag.glsl
source/blender/draw/engines/eevee/shaders/shadow_geom.glsl [deleted file]
source/blender/draw/engines/eevee/shaders/shadow_store_frag.glsl

index eb66e9c20ea49bbc5a654610a1e84570215458a4..d292e4d9405fa8e8ba892b6d5fef35540acb9079 100644 (file)
@@ -181,7 +181,6 @@ data_to_c_simple(engines/eevee/shaders/lightprobe_planar_downsample_vert.glsl SR
 data_to_c_simple(engines/eevee/shaders/prepass_frag.glsl SRC)
 data_to_c_simple(engines/eevee/shaders/prepass_vert.glsl SRC)
 data_to_c_simple(engines/eevee/shaders/shadow_frag.glsl SRC)
-data_to_c_simple(engines/eevee/shaders/shadow_geom.glsl SRC)
 data_to_c_simple(engines/eevee/shaders/shadow_vert.glsl SRC)
 data_to_c_simple(engines/eevee/shaders/shadow_store_frag.glsl SRC)
 data_to_c_simple(engines/eevee/shaders/shadow_copy_frag.glsl SRC)
index 3f067dca5d25d00bbec597f9219694acae0fb411..86c9b9c850b5d6eb19978cb025b4c4435c3a7058 100644 (file)
@@ -44,7 +44,6 @@ static struct {
 } e_data = {NULL}; /* Engine data */
 
 extern char datatoc_shadow_vert_glsl[];
-extern char datatoc_shadow_geom_glsl[];
 extern char datatoc_shadow_frag_glsl[];
 extern char datatoc_shadow_store_frag_glsl[];
 extern char datatoc_shadow_copy_frag_glsl[];
index 9cf4df17e90c535783f2a8e619fd6fb4538dc643..e64b8c4282f1bb552d51b223128fda7230ed4c00 100644 (file)
@@ -89,7 +89,6 @@ extern char datatoc_lit_surface_vert_glsl[];
 extern char datatoc_raytrace_lib_glsl[];
 extern char datatoc_ssr_lib_glsl[];
 extern char datatoc_shadow_vert_glsl[];
-extern char datatoc_shadow_geom_glsl[];
 extern char datatoc_lightprobe_geom_glsl[];
 extern char datatoc_lightprobe_vert_glsl[];
 extern char datatoc_background_vert_glsl[];
index 306a5c8bb017ffbb72c02f4027a63e19cf6424c6..f0ba458dcc88bf235649a7ba56070c00bedec1c5 100644 (file)
@@ -312,8 +312,6 @@ typedef struct EEVEE_ShadowCascade {
 } EEVEE_ShadowCascade;
 
 typedef struct EEVEE_ShadowRender {
-       float shadowmat[6][4][4]; /* World->Lamp->NDC : used to render the shadow map. 6 frustum for cubemap shadow */
-       float viewmat[6][4][4]; /* World->Lamp : used to render the shadow map. 6 viewmat for cubemap shadow */
        float position[3], pad;
        float cube_texel_size;
        float stored_texel_size;
index 67b0fc2bdfcf28b3c6875e4b2b037eb1ee062f8a..4ae22b480f171f687f2505b18c7f2ded617232e6 100644 (file)
@@ -2,8 +2,6 @@
  * to linear depth (or other storage method) and doing a 3x3 box filter. */
 
 layout(std140) uniform shadow_render_block {
-       mat4 ShadowMatrix[6];
-       mat4 FaceViewMatrix[6];
        vec4 lampPosition;
        float cubeTexelSize;
        float storedTexelSize;
diff --git a/source/blender/draw/engines/eevee/shaders/shadow_geom.glsl b/source/blender/draw/engines/eevee/shaders/shadow_geom.glsl
deleted file mode 100644 (file)
index ea51fa7..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-
-layout(std140) uniform shadow_render_block {
-       mat4 ShadowMatrix[6];
-       mat4 FaceViewMatrix[6];
-       vec4 lampPosition;
-       float cubeTexelSize;
-       float storedTexelSize;
-       float nearClip;
-       float farClip;
-       int shadowSampleCount;
-       float shadowInvSampleCount;
-};
-
-layout(triangles) in;
-layout(triangle_strip, max_vertices=3) out;
-
-in vec4 vPos[];
-flat in int face[];
-
-#ifdef MESH_SHADER
-in vec3 vNor[];
-#endif
-
-out vec3 worldPosition;
-#ifdef MESH_SHADER
-out vec3 viewPosition; /* Required. otherwise generate linking error. */
-out vec3 worldNormal; /* Required. otherwise generate linking error. */
-out vec3 viewNormal; /* Required. otherwise generate linking error. */
-flat out int shFace;
-#else
-int shFace;
-#endif
-
-void main() {
-       shFace = face[0];
-       gl_Layer = shFace;
-
-       for (int v = 0; v < 3; ++v) {
-               gl_Position = ShadowMatrix[shFace] * vPos[v];
-               worldPosition = vPos[v].xyz;
-#ifdef MESH_SHADER
-               worldNormal = vNor[v];
-               viewPosition = (FaceViewMatrix[shFace] * vec4(worldPosition, 1.0)).xyz;
-               viewNormal = (FaceViewMatrix[shFace] * vec4(worldNormal, 0.0)).xyz;
-#ifdef ATTRIB
-               pass_attrib(v);
-#endif
-#endif
-               EmitVertex();
-       }
-
-       EndPrimitive();
-}
\ No newline at end of file
index 0fc7e4c9396aac231b46c0c81d41381e2bfaaec5..b40155be454286366d42d95eca3790e670f24bf6 100644 (file)
@@ -1,7 +1,5 @@
 
 layout(std140) uniform shadow_render_block {
-       mat4 ShadowMatrix[6];
-       mat4 FaceViewMatrix[6];
        vec4 lampPosition;
        float cubeTexelSize;
        float storedTexelSize;