[Bf-blender-cvs] [1c975749b0c] tmp-gpu-shader-descriptor-2: Moved builtin create infos into infos folder.

[Jeroen Bakker]

Commit: 1c975749b0ce5cabd4324de3766cfedc7fd69fdd
Author: Jeroen Bakker
Date:   Fri Jan 7 08:09:34 2022 +0100
Branches: tmp-gpu-shader-descriptor-2
https://developer.blender.org/rB1c975749b0ce5cabd4324de3766cfedc7fd69fdd

Moved builtin create infos into infos folder.

This isn't the final location, but has been done to speed up refactoring
time.

===================================================================

M	source/blender/gpu/CMakeLists.txt
M	source/blender/gpu/intern/gpu_shader_create_info.cc
R100	source/blender/gpu/shaders/gpu_clip_planes_info.hh	source/blender/gpu/shaders/infos/gpu_clip_planes_info.hh
R100	source/blender/gpu/shaders/gpu_shader_3D_flat_color_info.hh	source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_info.hh
R100	source/blender/gpu/shaders/gpu_shader_3D_image_modulate_alpha_info.hh	source/blender/gpu/shaders/infos/gpu_shader_3D_image_modulate_alpha_info.hh

===================================================================

diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index a02c93f7983..8c54ee3f04f 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -415,10 +415,9 @@ set(SHADER_CREATE_INFOS
 ../draw/intern/shaders/draw_fullscreen_info.hh
 ../draw/intern/shaders/draw_view_info.hh
 ../draw/intern/shaders/draw_object_infos_info.hh
-shaders/gpu_shader_3D_flat_color_info.hh
-shaders/gpu_shader_3D_image_modulate_alpha_info.hh
-
-shaders/gpu_clip_planes_info.hh
+shaders/infos/gpu_shader_3D_flat_color_info.hh
+shaders/infos/gpu_shader_3D_image_modulate_alpha_info.hh
+shaders/infos/gpu_clip_planes_info.hh
 )
 
 set(SHADER_CREATE_INFOS_CONTENT "")
diff --git a/source/blender/gpu/intern/gpu_shader_create_info.cc b/source/blender/gpu/intern/gpu_shader_create_info.cc
index 50e89212153..7dafa077bd2 100644
--- a/source/blender/gpu/intern/gpu_shader_create_info.cc
+++ b/source/blender/gpu/intern/gpu_shader_create_info.cc
@@ -152,9 +152,12 @@ void gpu_shader_create_info_compile_all()
 {
   for (ShaderCreateInfo *info : g_create_infos->values()) {
     if (info->do_static_compilation_) {
-      // printf("Compiling %s: ... ", info->name_.c_str());
+      printf("Compiling %s: ... ", info->name_.c_str());
       GPU_shader_create_from_info(reinterpret_cast<const GPUShaderCreateInfo *>(info));
-      // printf("Success\n");
+      printf("Success\n");
+    }
+    else {
+      printf("Skipping non static %s\n", info->name_.c_str());
     }
   }
 }
diff --git a/source/blender/gpu/shaders/gpu_clip_planes_info.hh b/source/blender/gpu/shaders/infos/gpu_clip_planes_info.hh
similarity index 100%
rename from source/blender/gpu/shaders/gpu_clip_planes_info.hh
rename to source/blender/gpu/shaders/infos/gpu_clip_planes_info.hh
diff --git a/source/blender/gpu/shaders/gpu_shader_3D_flat_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_info.hh
similarity index 100%
rename from source/blender/gpu/shaders/gpu_shader_3D_flat_color_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_info.hh
diff --git a/source/blender/gpu/shaders/gpu_shader_3D_image_modulate_alpha_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_image_modulate_alpha_info.hh
similarity index 100%
rename from source/blender/gpu/shaders/gpu_shader_3D_image_modulate_alpha_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_3D_image_modulate_alpha_info.hh