Merge branch 'master' into soc-2021-uv-edge-select-support

1 files changed, 15 insertions, 104 deletions

diff --git a/source/blender/draw/engines/basic/basic_engine.c b/source/blender/draw/engines/basic/basic_engine.c
index f4fdb9d0912..8a825a7c81f 100644
--- a/source/blender/draw/engines/basic/basic_engine.c
+++ b/source/blender/draw/engines/basic/basic_engine.c
@@ -36,17 +36,10 @@
 #include "GPU_shader.h"
 
 #include "basic_engine.h"
-/* Shaders */
+#include "basic_private.h"
 
 #define BASIC_ENGINE "BLENDER_BASIC"
 
-extern char datatoc_depth_frag_glsl[];
-extern char datatoc_depth_vert_glsl[];
-extern char datatoc_conservative_depth_geom_glsl[];
-
-extern char datatoc_common_view_lib_glsl[];
-extern char datatoc_common_pointcloud_lib_glsl[];
-
 /* *********** LISTS *********** */
 
 /* GPUViewport.storage
@@ -69,20 +62,8 @@ typedef struct BASIC_Data {
   BASIC_StorageList *stl;
 } BASIC_Data;
 
-typedef struct BASIC_Shaders {
-  /* Depth Pre Pass */
-  struct GPUShader *depth;
-  struct GPUShader *pointcloud_depth;
-  struct GPUShader *depth_conservative;
-  struct GPUShader *pointcloud_depth_conservative;
-} BASIC_Shaders;
-
 /* *********** STATIC *********** */
 
-static struct {
-  BASIC_Shaders sh_data[GPU_SHADER_CFG_LEN];
-} e_data = {{{NULL}}}; /* Engine data */
-
 typedef struct BASIC_PrivateData {
   DRWShadingGroup *depth_shgrp[2];
   DRWShadingGroup *depth_shgrp_cull[2];
@@ -91,74 +72,6 @@ typedef struct BASIC_PrivateData {
   bool use_material_slot_selection;
 } BASIC_PrivateData; /* Transient data */
 
-/* Functions */
-
-static void basic_engine_init(void *UNUSED(vedata))
-{
-  const DRWContextState *draw_ctx = DRW_context_state_get();
-  BASIC_Shaders *sh_data = &e_data.sh_data[draw_ctx->sh_cfg];
-
-  /* Depth prepass */
-  if (!sh_data->depth) {
-    const GPUShaderConfigData *sh_cfg = &GPU_shader_cfg_data[draw_ctx->sh_cfg];
-
-    sh_data->depth = GPU_shader_create_from_arrays({
-        .vert = (const char *[]){sh_cfg->lib,
-                                 datatoc_common_view_lib_glsl,
-                                 datatoc_depth_vert_glsl,
-                                 NULL},
-        .frag = (const char *[]){datatoc_depth_frag_glsl, NULL},
-        .defs = (const char *[]){sh_cfg->def, NULL},
-    });
-
-    sh_data->pointcloud_depth = GPU_shader_create_from_arrays({
-        .vert = (const char *[]){sh_cfg->lib,
-                                 datatoc_common_view_lib_glsl,
-                                 datatoc_common_pointcloud_lib_glsl,
-                                 datatoc_depth_vert_glsl,
-                                 NULL},
-        .frag = (const char *[]){datatoc_depth_frag_glsl, NULL},
-        .defs = (const char *[]){sh_cfg->def,
-                                 "#define POINTCLOUD\n",
-                                 "#define INSTANCED_ATTR\n",
-                                 "#define UNIFORM_RESOURCE_ID\n",
-                                 NULL},
-    });
-
-    sh_data->depth_conservative = GPU_shader_create_from_arrays({
-        .vert = (const char *[]){sh_cfg->lib,
-                                 datatoc_common_view_lib_glsl,
-                                 datatoc_depth_vert_glsl,
-                                 NULL},
-        .geom = (const char *[]){sh_cfg->lib,
-                                 datatoc_common_view_lib_glsl,
-                                 datatoc_conservative_depth_geom_glsl,
-                                 NULL},
-        .frag = (const char *[]){datatoc_depth_frag_glsl, NULL},
-        .defs = (const char *[]){sh_cfg->def, "#define CONSERVATIVE_RASTER\n", NULL},
-    });
-
-    sh_data->pointcloud_depth_conservative = GPU_shader_create_from_arrays({
-        .vert = (const char *[]){sh_cfg->lib,
-                                 datatoc_common_view_lib_glsl,
-                                 datatoc_common_pointcloud_lib_glsl,
-                                 datatoc_depth_vert_glsl,
-                                 NULL},
-        .geom = (const char *[]){sh_cfg->lib,
-                                 datatoc_common_view_lib_glsl,
-                                 datatoc_conservative_depth_geom_glsl,
-                                 NULL},
-        .frag = (const char *[]){datatoc_depth_frag_glsl, NULL},
-        .defs = (const char *[]){sh_cfg->def,
-                                 "#define CONSERVATIVE_RASTER\n",
-                                 "#define POINTCLOUD\n",
-                                 "#define INSTANCED_ATTR\n",
-                                 "#define UNIFORM_RESOURCE_ID\n",
-                                 NULL},
-    });
-  }
-}
-
 static void basic_cache_init(void *vedata)
 {
   BASIC_PassList *psl = ((BASIC_Data *)vedata)->psl;
@@ -166,7 +79,6 @@ static void basic_cache_init(void *vedata)
   DRWShadingGroup *grp;
 
   const DRWContextState *draw_ctx = DRW_context_state_get();
-  BASIC_Shaders *sh_data = &e_data.sh_data[draw_ctx->sh_cfg];
 
   if (!stl->g_data) {
     /* Alloc transient pointers */
@@ -181,24 +93,29 @@ static void basic_cache_init(void *vedata)
     DRWState infront_state = (DRW_state_is_select() && (i == 1)) ? DRW_STATE_IN_FRONT_SELECT : 0;
     DRWState state = DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL;
 
-    GPUShader *sh = DRW_state_is_select() ? sh_data->depth_conservative : sh_data->depth;
+    GPUShader *sh = DRW_state_is_select() ?
+                        BASIC_shaders_depth_conservative_sh_get(draw_ctx->sh_cfg) :
+                        BASIC_shaders_depth_sh_get(draw_ctx->sh_cfg);
 
     DRW_PASS_CREATE(psl->depth_pass[i], state | clip_state | infront_state);
     stl->g_data->depth_shgrp[i] = grp = DRW_shgroup_create(sh, psl->depth_pass[i]);
     DRW_shgroup_uniform_vec2(grp, "sizeViewport", DRW_viewport_size_get(), 1);
     DRW_shgroup_uniform_vec2(grp, "sizeViewportInv", DRW_viewport_invert_size_get(), 1);
 
-    sh = DRW_state_is_select() ? sh_data->pointcloud_depth_conservative : sh_data->pointcloud_depth;
+    sh = DRW_state_is_select() ?
+             BASIC_shaders_pointcloud_depth_conservative_sh_get(draw_ctx->sh_cfg) :
+             BASIC_shaders_pointcloud_depth_sh_get(draw_ctx->sh_cfg);
     DRW_PASS_CREATE(psl->depth_pass_pointcloud[i], state | clip_state | infront_state);
-    stl->g_data->depth_pointcloud_shgrp[i] = grp = DRW_shgroup_create(sh, psl->depth_pass_pointcloud[i]);
+    stl->g_data->depth_pointcloud_shgrp[i] = grp = DRW_shgroup_create(
+        sh, psl->depth_pass_pointcloud[i]);
     DRW_shgroup_uniform_vec2(grp, "sizeViewport", DRW_viewport_size_get(), 1);
     DRW_shgroup_uniform_vec2(grp, "sizeViewportInv", DRW_viewport_invert_size_get(), 1);
 
-    stl->g_data->depth_hair_shgrp[i] = grp = DRW_shgroup_create(sh_data->depth,
-                                                                psl->depth_pass[i]);
+    stl->g_data->depth_hair_shgrp[i] = grp = DRW_shgroup_create(
+        BASIC_shaders_depth_sh_get(draw_ctx->sh_cfg), psl->depth_pass[i]);
 
-
-    sh = DRW_state_is_select() ? sh_data->depth_conservative : sh_data->depth;
+    sh = DRW_state_is_select() ? BASIC_shaders_depth_conservative_sh_get(draw_ctx->sh_cfg) :
+                                 BASIC_shaders_depth_sh_get(draw_ctx->sh_cfg);
     state |= DRW_STATE_CULL_BACK;
     DRW_PASS_CREATE(psl->depth_pass_cull[i], state | clip_state | infront_state);
     stl->g_data->depth_shgrp_cull[i] = grp = DRW_shgroup_create(sh, psl->depth_pass_cull[i]);
@@ -336,13 +253,7 @@ static void basic_draw_scene(void *vedata)
 
 static void basic_engine_free(void)
 {
-  for (int i = 0; i < GPU_SHADER_CFG_LEN; i++) {
-    BASIC_Shaders *sh_data = &e_data.sh_data[i];
-    DRW_SHADER_FREE_SAFE(sh_data->depth);
-    DRW_SHADER_FREE_SAFE(sh_data->depth_conservative);
-    DRW_SHADER_FREE_SAFE(sh_data->pointcloud_depth);
-    DRW_SHADER_FREE_SAFE(sh_data->pointcloud_depth_conservative);
-  }
+  BASIC_shaders_free();
 }
 
 static const DrawEngineDataSize basic_data_size = DRW_VIEWPORT_DATA_SIZE(BASIC_Data);
@@ -352,7 +263,7 @@ DrawEngineType draw_engine_basic_type = {
     NULL,
     N_("Basic"),
     &basic_data_size,
-    &basic_engine_init,
+    NULL,
     &basic_engine_free,
     &basic_cache_init,
     &basic_cache_populate,