From 7170f7a0414ecded72fba3ef69e28be2be148291 Mon Sep 17 00:00:00 2001
From: Jeroen Bakker <jeroen@blender.org>
Date: Mon, 7 Sep 2020 08:19:09 +0200
Subject: EEVEE: Shaders tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This will add the remaining static shaders to the eevee shader test suite.

- Downsampling
- GGX LUT generation
- Mist
- Motion Blur
- Ambient Occlusion
- Render Passes
- Screen Raytracing
- Shadows
- Subsurface
- Volumes

Reviewed By: Clément Foucault

Differential Revision: https://developer.blender.org/D8779
---
 .../draw/engines/eevee/eevee_screen_raytrace.c     | 62 ++--------------------
 1 file changed, 5 insertions(+), 57 deletions(-)

(limited to 'source/blender/draw/engines/eevee/eevee_screen_raytrace.c')

diff --git a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c
index 88029c2e940..ed7d53b51af 100644
--- a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c
+++ b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c
@@ -32,55 +32,10 @@
 #include "GPU_texture.h"
 #include "eevee_private.h"
 
-/* SSR shader variations */
-enum {
-  SSR_RESOLVE = (1 << 0),
-  SSR_FULL_TRACE = (1 << 1),
-  SSR_AO = (1 << 3),
-  SSR_MAX_SHADER = (1 << 4),
-};
-
 static struct {
-  /* Screen Space Reflection */
-  struct GPUShader *ssr_sh[SSR_MAX_SHADER];
-
   /* These are just references, not actually allocated */
   struct GPUTexture *depth_src;
-} e_data = {{NULL}}; /* Engine data */
-
-extern char datatoc_effect_ssr_frag_glsl[];
-
-static struct GPUShader *eevee_effects_screen_raytrace_shader_get(int options)
-{
-  if (e_data.ssr_sh[options] == NULL) {
-    DRWShaderLibrary *lib = EEVEE_shader_lib_get();
-
-    DynStr *ds_defines = BLI_dynstr_new();
-    BLI_dynstr_append(ds_defines, SHADER_DEFINES);
-    if (options & SSR_RESOLVE) {
-      BLI_dynstr_append(ds_defines, "#define STEP_RESOLVE\n");
-    }
-    else {
-      BLI_dynstr_append(ds_defines, "#define STEP_RAYTRACE\n");
-      BLI_dynstr_append(ds_defines, "#define PLANAR_PROBE_RAYTRACE\n");
-    }
-    if (options & SSR_FULL_TRACE) {
-      BLI_dynstr_append(ds_defines, "#define FULLRES\n");
-    }
-    if (options & SSR_AO) {
-      BLI_dynstr_append(ds_defines, "#define SSR_AO\n");
-    }
-    char *ssr_define_str = BLI_dynstr_get_cstring(ds_defines);
-    BLI_dynstr_free(ds_defines);
-
-    e_data.ssr_sh[options] = DRW_shader_create_fullscreen_with_shaderlib(
-        datatoc_effect_ssr_frag_glsl, lib, ssr_define_str);
-
-    MEM_freeN(ssr_define_str);
-  }
-
-  return e_data.ssr_sh[options];
-}
+} e_data = {NULL}; /* Engine data */
 
 int EEVEE_screen_raytrace_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
 {
@@ -187,12 +142,12 @@ void EEVEE_screen_raytrace_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *v
   struct GPUBatch *quad = DRW_cache_fullscreen_quad_get();
 
   if ((effects->enabled_effects & EFFECT_SSR) != 0) {
-    int options = (effects->reflection_trace_full) ? SSR_FULL_TRACE : 0;
+    EEVEE_SSRShaderOptions options = (effects->reflection_trace_full) ? SSR_FULL_TRACE : 0;
     options |= ((effects->enabled_effects & EFFECT_GTAO) != 0) ? SSR_AO : 0;
 
-    struct GPUShader *trace_shader = eevee_effects_screen_raytrace_shader_get(options);
-    struct GPUShader *resolve_shader = eevee_effects_screen_raytrace_shader_get(SSR_RESOLVE |
-                                                                                options);
+    struct GPUShader *trace_shader = EEVEE_shaders_effect_screen_raytrace_sh_get(options);
+    struct GPUShader *resolve_shader = EEVEE_shaders_effect_screen_raytrace_sh_get(SSR_RESOLVE |
+                                                                                   options);
 
     /** Screen space raytracing overview
      *
@@ -357,10 +312,3 @@ void EEVEE_reflection_output_accumulate(EEVEE_ViewLayerData *UNUSED(sldata), EEV
     DRW_draw_pass(psl->ssr_resolve);
   }
 }
-
-void EEVEE_screen_raytrace_free(void)
-{
-  for (int i = 0; i < SSR_MAX_SHADER; i++) {
-    DRW_SHADER_FREE_SAFE(e_data.ssr_sh[i]);
-  }
-}
-- 
cgit v1.2.3