Revert "GPUShaderCreateInfo for interface abstraction"

This reverts commit 8fb2ff458ba579dba08bfdf57d043ad158b5db07.
Missing some files.

1 files changed, 151 insertions, 93 deletions

diff --git a/source/blender/gpu/intern/gpu_shader_builtin.c b/source/blender/gpu/intern/gpu_shader_builtin.c
index cae7383f885..24ca691be78 100644
--- a/source/blender/gpu/intern/gpu_shader_builtin.c
+++ b/source/blender/gpu/intern/gpu_shader_builtin.c
@@ -41,9 +41,6 @@
 #include "GPU_texture.h"
 #include "GPU_uniform_buffer.h"
 
-/* TODO(jbakker): Need a better way to retrieve create_infos. */
-#include "gpu_shader_create_info_private.hh"
-
 /* Adjust these constants as needed. */
 #define MAX_DEFINE_LENGTH 256
 #define MAX_EXT_DEFINE_LENGTH 512
@@ -148,68 +145,106 @@ typedef struct {
   const char *frag;
   /** Optional. */
   const char *defs;
-
-  const char *create_info;
-  const char *clipped_create_info;
 } GPUShaderStages;
 
 static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = {
     [GPU_SHADER_TEXT] =
         {
             .name = "GPU_SHADER_TEXT",
-            .create_info = "gpu_shader_text",
+            .vert = datatoc_gpu_shader_text_vert_glsl,
+            .frag = datatoc_gpu_shader_text_frag_glsl,
         },
     [GPU_SHADER_KEYFRAME_SHAPE] =
         {
             .name = "GPU_SHADER_KEYFRAME_SHAPE",
-            .create_info = "gpu_shader_keyframe_shape",
+            .vert = datatoc_gpu_shader_keyframe_shape_vert_glsl,
+            .frag = datatoc_gpu_shader_keyframe_shape_frag_glsl,
         },
     [GPU_SHADER_SIMPLE_LIGHTING] =
         {
             .name = "GPU_SHADER_SIMPLE_LIGHTING",
-            .create_info = "gpu_shader_simple_lighting",
+            .vert = datatoc_gpu_shader_3D_normal_vert_glsl,
+            .frag = datatoc_gpu_shader_simple_lighting_frag_glsl,
         },
     [GPU_SHADER_3D_IMAGE_MODULATE_ALPHA] =
         {
-            .name = "GPU_SHADER_3D_IMAGE_MODULATE_ALPHA",
-            .create_info = "gpu_shader_3D_image_modulate_alpha",
+            .vert = datatoc_gpu_shader_3D_image_vert_glsl,
+            .frag = datatoc_gpu_shader_image_modulate_alpha_frag_glsl,
         },
     [GPU_SHADER_2D_CHECKER] =
         {
             .name = "GPU_SHADER_2D_CHECKER",
-            .create_info = "gpu_shader_2D_checker",
+            .vert = datatoc_gpu_shader_2D_vert_glsl,
+            .frag = datatoc_gpu_shader_checker_frag_glsl,
         },
 
     [GPU_SHADER_2D_DIAG_STRIPES] =
         {
             .name = "GPU_SHADER_2D_DIAG_STRIPES",
-            .create_info = "gpu_shader_2D_diag_stripes",
+            .vert = datatoc_gpu_shader_2D_vert_glsl,
+            .frag = datatoc_gpu_shader_diag_stripes_frag_glsl,
         },
 
-    [GPU_SHADER_2D_UNIFORM_COLOR] = {.name = "GPU_SHADER_2D_UNIFORM_COLOR",
-                                     .create_info = "gpu_shader_2D_uniform_color"},
-    [GPU_SHADER_2D_FLAT_COLOR] = {.name = "GPU_SHADER_2D_FLAT_COLOR",
-                                  .create_info = "gpu_shader_2D_flat_color"},
-    [GPU_SHADER_2D_SMOOTH_COLOR] = {.name = "GPU_SHADER_2D_SMOOTH_COLOR",
-                                    .create_info = "gpu_shader_2D_smooth_color"},
-    [GPU_SHADER_2D_IMAGE_OVERLAYS_MERGE] = {.name = "GPU_SHADER_2D_IMAGE_OVERLAYS_MERGE",
-                                            .create_info = "gpu_shader_2D_image_overlays_merge"},
+    [GPU_SHADER_2D_UNIFORM_COLOR] =
+        {
+            .name = "GPU_SHADER_2D_UNIFORM_COLOR",
+            .vert = datatoc_gpu_shader_2D_vert_glsl,
+            .frag = datatoc_gpu_shader_uniform_color_frag_glsl,
+        },
+    [GPU_SHADER_2D_FLAT_COLOR] =
+        {
+            .name = "GPU_SHADER_2D_FLAT_COLOR",
+            .vert = datatoc_gpu_shader_2D_flat_color_vert_glsl,
+            .frag = datatoc_gpu_shader_flat_color_frag_glsl,
+        },
+    [GPU_SHADER_2D_SMOOTH_COLOR] =
+        {
+            .name = "GPU_SHADER_2D_SMOOTH_COLOR",
+            .vert = datatoc_gpu_shader_2D_smooth_color_vert_glsl,
+            .frag = datatoc_gpu_shader_2D_smooth_color_frag_glsl,
+        },
+    [GPU_SHADER_2D_IMAGE_OVERLAYS_MERGE] =
+        {
+            .name = "GPU_SHADER_2D_IMAGE_OVERLAYS_MERGE",
+            .vert = datatoc_gpu_shader_2D_image_vert_glsl,
+            .frag = datatoc_gpu_shader_image_overlays_merge_frag_glsl,
+        },
     [GPU_SHADER_2D_IMAGE_OVERLAYS_STEREO_MERGE] =
-        {.name = "GPU_SHADER_2D_IMAGE_OVERLAYS_STEREO_MERGE",
-         .create_info = "gpu_shader_2D_image_overlays_stereo_merge"},
-    [GPU_SHADER_2D_IMAGE] = {.name = "GPU_SHADER_2D_IMAGE", .create_info = "gpu_shader_2D_image"},
-    [GPU_SHADER_2D_IMAGE_COLOR] = {.name = "GPU_SHADER_2D_IMAGE_COLOR",
-                                   .create_info = "gpu_shader_2D_image_color"},
-    [GPU_SHADER_2D_IMAGE_DESATURATE_COLOR] = {.name = "GPU_SHADER_2D_IMAGE_DESATURATE_COLOR",
-                                              .create_info =
-                                                  "gpu_shader_2D_image_desaturate_color"},
+        {
+            .name = "GPU_SHADER_2D_IMAGE_OVERLAYS_STEREO_MERGE",
+            .vert = datatoc_gpu_shader_2D_vert_glsl,
+            .frag = datatoc_gpu_shader_image_overlays_stereo_merge_frag_glsl,
+        },
+    [GPU_SHADER_2D_IMAGE] =
+        {
+            .name = "GPU_SHADER_2D_IMAGE",
+            .vert = datatoc_gpu_shader_2D_image_vert_glsl,
+            .frag = datatoc_gpu_shader_image_frag_glsl,
+        },
+    [GPU_SHADER_2D_IMAGE_COLOR] =
+        {
+            .name = "GPU_SHADER_2D_IMAGE_COLOR",
+            .vert = datatoc_gpu_shader_2D_image_vert_glsl,
+            .frag = datatoc_gpu_shader_image_color_frag_glsl,
+        },
+    [GPU_SHADER_2D_IMAGE_DESATURATE_COLOR] =
+        {
+            .name = "GPU_SHADER_2D_IMAGE_DESATURATE_COLOR",
+            .vert = datatoc_gpu_shader_2D_image_vert_glsl,
+            .frag = datatoc_gpu_shader_image_desaturate_frag_glsl,
+        },
     [GPU_SHADER_2D_IMAGE_SHUFFLE_COLOR] =
         {
             .name = "GPU_SHADER_2D_IMAGE_SHUFFLE_COLOR",
-            .create_info = "gpu_shader_2D_image_shuffle_color",
+            .vert = datatoc_gpu_shader_2D_image_vert_glsl,
+            .frag = datatoc_gpu_shader_image_shuffle_color_frag_glsl,
+        },
+    [GPU_SHADER_2D_IMAGE_RECT_COLOR] =
+        {
+            .name = "GPU_SHADER_2D_IMAGE_RECT_COLOR",
+            .vert = datatoc_gpu_shader_2D_image_rect_vert_glsl,
+            .frag = datatoc_gpu_shader_image_color_frag_glsl,
         },
-    [GPU_SHADER_2D_IMAGE_RECT_COLOR] = {.name = "GPU_SHADER_2D_IMAGE_RECT_COLOR",
-                                        .create_info = "gpu_shader_2D_image_rect_color"},
     [GPU_SHADER_2D_IMAGE_MULTI_RECT_COLOR] =
         {
             .name = "GPU_SHADER_2D_IMAGE_MULTI_RECT_COLOR",
@@ -220,18 +255,27 @@ static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = {
     [GPU_SHADER_3D_UNIFORM_COLOR] =
         {
             .name = "GPU_SHADER_3D_UNIFORM_COLOR",
-            .create_info = "gpu_shader_3D_uniform_color",
-            .clipped_create_info = "gpu_shader_3D_uniform_color_clipped",
-        },
-    [GPU_SHADER_3D_FLAT_COLOR] = {.name = "GPU_SHADER_3D_FLAT_COLOR",
-                                  .create_info = "gpu_shader_3D_flat_color",
-                                  .clipped_create_info = "gpu_shader_3D_flat_color_clipped"},
-    [GPU_SHADER_3D_SMOOTH_COLOR] = {.name = "GPU_SHADER_3D_SMOOTH_COLOR",
-                                    .create_info = "gpu_shader_3D_smooth_color",
-                                    .clipped_create_info = "gpu_shader_3D_smooth_color_clipped"},
-    [GPU_SHADER_3D_DEPTH_ONLY] = {.name = "GPU_SHADER_3D_DEPTH_ONLY",
-                                  .create_info = "gpu_shader_3D_depth_only",
-                                  .clipped_create_info = "gpu_shader_3D_depth_only_clipped"},
+            .vert = datatoc_gpu_shader_3D_vert_glsl,
+            .frag = datatoc_gpu_shader_uniform_color_frag_glsl,
+        },
+    [GPU_SHADER_3D_FLAT_COLOR] =
+        {
+            .name = "GPU_SHADER_3D_FLAT_COLOR",
+            .vert = datatoc_gpu_shader_3D_flat_color_vert_glsl,
+            .frag = datatoc_gpu_shader_flat_color_frag_glsl,
+        },
+    [GPU_SHADER_3D_SMOOTH_COLOR] =
+        {
+            .name = "GPU_SHADER_3D_SMOOTH_COLOR",
+            .vert = datatoc_gpu_shader_3D_smooth_color_vert_glsl,
+            .frag = datatoc_gpu_shader_3D_smooth_color_frag_glsl,
+        },
+    [GPU_SHADER_3D_DEPTH_ONLY] =
+        {
+            .name = "GPU_SHADER_3D_DEPTH_ONLY",
+            .vert = datatoc_gpu_shader_3D_vert_glsl,
+            .frag = datatoc_gpu_shader_depth_only_frag_glsl,
+        },
     [GPU_SHADER_3D_CLIPPED_UNIFORM_COLOR] =
         {
             .name = "GPU_SHADER_3D_CLIPPED_UNIFORM_COLOR",
@@ -289,23 +333,33 @@ static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = {
     [GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA] =
         {
             .name = "GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA",
-            .create_info = "gpu_shader_2D_point_uniform_size_uniform_color_aa",
+            .vert = datatoc_gpu_shader_2D_point_uniform_size_aa_vert_glsl,
+            .frag = datatoc_gpu_shader_point_uniform_color_aa_frag_glsl,
         },
     [GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_OUTLINE_AA] =
         {
             .name = "GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_OUTLINE_AA",
-            .create_info = "gpu_shader_2D_point_uniform_size_uniform_color_outline_aa",
+            .vert = datatoc_gpu_shader_2D_point_uniform_size_outline_aa_vert_glsl,
+            .frag = datatoc_gpu_shader_point_uniform_color_outline_aa_frag_glsl,
         },
     [GPU_SHADER_3D_POINT_FIXED_SIZE_VARYING_COLOR] =
-        {.name = "GPU_SHADER_3D_POINT_FIXED_SIZE_VARYING_COLOR",
-         .create_info = "gpu_shader_3D_point_fixed_size_varying_color"},
+        {
+            .name = "GPU_SHADER_3D_POINT_FIXED_SIZE_VARYING_COLOR",
+            .vert = datatoc_gpu_shader_3D_point_fixed_size_varying_color_vert_glsl,
+            .frag = datatoc_gpu_shader_point_varying_color_frag_glsl,
+        },
     [GPU_SHADER_3D_POINT_VARYING_SIZE_VARYING_COLOR] =
-        {.name = "GPU_SHADER_3D_POINT_VARYING_SIZE_VARYING_COLOR",
-         .create_info = "gpu_shader_3D_point_varying_size_varying_color"},
+        {
+            .name = "GPU_SHADER_3D_POINT_VARYING_SIZE_VARYING_COLOR",
+            .vert = datatoc_gpu_shader_3D_point_varying_size_varying_color_vert_glsl,
+            .frag = datatoc_gpu_shader_point_varying_color_frag_glsl,
+        },
     [GPU_SHADER_3D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA] =
-        {.name = "GPU_SHADER_3D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA",
-         .create_info = "gpu_shader_3D_point_uniform_size_uniform_color_aa",
-         .clipped_create_info = "gpu_shader_3D_point_uniform_size_uniform_color_aa_clipped"},
+        {
+            .name = "GPU_SHADER_3D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA",
+            .vert = datatoc_gpu_shader_3D_point_uniform_size_aa_vert_glsl,
+            .frag = datatoc_gpu_shader_point_uniform_color_aa_frag_glsl,
+        },
 
     [GPU_SHADER_INSTANCE_VARIYING_COLOR_VARIYING_SIZE] =
         {
@@ -315,8 +369,12 @@ static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = {
             .defs = "#define UNIFORM_SCALE\n",
         },
 
-    [GPU_SHADER_2D_AREA_BORDERS] = {.name = "GPU_SHADER_2D_AREA_BORDERS",
-                                    .create_info = "gpu_shader_2D_area_borders"},
+    [GPU_SHADER_2D_AREA_BORDERS] =
+        {
+            .name = "GPU_SHADER_2D_AREA_BORDERS",
+            .vert = datatoc_gpu_shader_2D_area_borders_vert_glsl,
+            .frag = datatoc_gpu_shader_2D_area_borders_frag_glsl,
+        },
     [GPU_SHADER_2D_WIDGET_BASE] =
         {
             .name = "GPU_SHADER_2D_WIDGET_BASE",
@@ -336,14 +394,27 @@ static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = {
             .vert = datatoc_gpu_shader_2D_widget_shadow_vert_glsl,
             .frag = datatoc_gpu_shader_2D_widget_shadow_frag_glsl,
         },
-    [GPU_SHADER_2D_NODELINK] = {.name = "GPU_SHADER_2D_NODELINK",
-                                .create_info = "gpu_shader_2D_nodelink"},
-
-    [GPU_SHADER_2D_NODELINK_INST] = {.name = "GPU_SHADER_2D_NODELINK_INST",
-                                     .create_info = "gpu_shader_2D_nodelink_inst"},
+    [GPU_SHADER_2D_NODELINK] =
+        {
+            .name = "GPU_SHADER_2D_NODELINK",
+            .vert = datatoc_gpu_shader_2D_nodelink_vert_glsl,
+            .frag = datatoc_gpu_shader_2D_nodelink_frag_glsl,
+        },
+    [GPU_SHADER_2D_NODELINK_INST] =
+        {
+            .name = "GPU_SHADER_2D_NODELINK_INST",
+            .vert = datatoc_gpu_shader_2D_nodelink_vert_glsl,
+            .frag = datatoc_gpu_shader_2D_nodelink_frag_glsl,
+            .defs = "#define USE_INSTANCE\n",
+        },
 
-    [GPU_SHADER_GPENCIL_STROKE] = {.name = "GPU_SHADER_GPENCIL_STROKE",
-                                   .create_info = "gpu_shader_gpencil_stroke"},
+    [GPU_SHADER_GPENCIL_STROKE] =
+        {
+            .name = "GPU_SHADER_GPENCIL_STROKE",
+            .vert = datatoc_gpu_shader_gpencil_stroke_vert_glsl,
+            .geom = datatoc_gpu_shader_gpencil_stroke_geom_glsl,
+            .frag = datatoc_gpu_shader_gpencil_stroke_frag_glsl,
+        },
 };
 
 GPUShader *GPU_shader_get_builtin_shader_with_config(eGPUBuiltinShader shader,
@@ -358,20 +429,14 @@ GPUShader *GPU_shader_get_builtin_shader_with_config(eGPUBuiltinShader shader,
 
     /* common case */
     if (sh_cfg == GPU_SHADER_CFG_DEFAULT) {
-      if (stages->create_info != NULL) {
-        *sh_p = GPU_shader_create_from_info(gpu_shader_create_info_get(stages->create_info));
-      }
-      else {
-        *sh_p = GPU_shader_create_from_arrays_named(
-            stages->name,
-            {
-                .vert = (const char *[]){stages->vert, NULL},
-                .geom = (const char *[]){stages->geom, NULL},
-                .frag =
-                    (const char *[]){datatoc_gpu_shader_colorspace_lib_glsl, stages->frag, NULL},
-                .defs = (const char *[]){stages->defs, NULL},
-            });
-      }
+      *sh_p = GPU_shader_create_from_arrays_named(
+          stages->name,
+          {
+              .vert = (const char *[]){stages->vert, NULL},
+              .geom = (const char *[]){stages->geom, NULL},
+              .frag = (const char *[]){datatoc_gpu_shader_colorspace_lib_glsl, stages->frag, NULL},
+              .defs = (const char *[]){stages->defs, NULL},
+          });
     }
     else if (sh_cfg == GPU_SHADER_CFG_CLIPPED) {
       /* Remove eventually, for now ensure support for each shader has been added. */
@@ -383,24 +448,17 @@ GPUShader *GPU_shader_get_builtin_shader_with_config(eGPUBuiltinShader shader,
                       GPU_SHADER_3D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA,
                       GPU_SHADER_3D_FLAT_COLOR,
                       GPU_SHADER_3D_LINE_DASHED_UNIFORM_COLOR));
+      const char *world_clip_lib = datatoc_gpu_shader_cfg_world_clip_lib_glsl;
+      const char *world_clip_def = "#define USE_WORLD_CLIP_PLANES\n";
       /* In rare cases geometry shaders calculate clipping themselves. */
-      if (stages->clipped_create_info != NULL) {
-        *sh_p = GPU_shader_create_from_info(
-            gpu_shader_create_info_get(stages->clipped_create_info));
-      }
-      else {
-        const char *world_clip_lib = datatoc_gpu_shader_cfg_world_clip_lib_glsl;
-        const char *world_clip_def = "#define USE_WORLD_CLIP_PLANES\n";
-        *sh_p = GPU_shader_create_from_arrays_named(
-            stages->name,
-            {
-                .vert = (const char *[]){world_clip_lib, stages->vert, NULL},
-                .geom = (const char *[]){stages->geom ? world_clip_lib : NULL, stages->geom, NULL},
-                .frag =
-                    (const char *[]){datatoc_gpu_shader_colorspace_lib_glsl, stages->frag, NULL},
-                .defs = (const char *[]){world_clip_def, stages->defs, NULL},
-            });
-      }
+      *sh_p = GPU_shader_create_from_arrays_named(
+          stages->name,
+          {
+              .vert = (const char *[]){world_clip_lib, stages->vert, NULL},
+              .geom = (const char *[]){stages->geom ? world_clip_lib : NULL, stages->geom, NULL},
+              .frag = (const char *[]){datatoc_gpu_shader_colorspace_lib_glsl, stages->frag, NULL},
+              .defs = (const char *[]){world_clip_def, stages->defs, NULL},
+          });
     }
     else {
       BLI_assert(0);