1 files changed, 20 insertions, 5 deletions

diff --git a/source/blender/gpu/intern/gpu_shader_create_info.cc b/source/blender/gpu/intern/gpu_shader_create_info.cc
index f5b90989481..a18fdcd32df 100644
--- a/source/blender/gpu/intern/gpu_shader_create_info.cc
+++ b/source/blender/gpu/intern/gpu_shader_create_info.cc
@@ -19,7 +19,6 @@
 #include "gpu_shader_create_info.hh"
 #include "gpu_shader_create_info_private.hh"
 #include "gpu_shader_dependency_private.h"
-#include "gpu_shader_private.hh"
 
 #undef GPU_SHADER_INTERFACE_INFO
 #undef GPU_SHADER_CREATE_INFO
@@ -155,13 +154,13 @@ std::string ShaderCreateInfo::check_error() const
   }
   else {
     if (!this->vertex_source_.is_empty()) {
-      error += "Compute shader has vertex_source_ shader attached in" + this->name_ + ".\n";
+      error += "Compute shader has vertex_source_ shader attached in " + this->name_ + ".\n";
     }
     if (!this->geometry_source_.is_empty()) {
-      error += "Compute shader has geometry_source_ shader attached in" + this->name_ + ".\n";
+      error += "Compute shader has geometry_source_ shader attached in " + this->name_ + ".\n";
     }
     if (!this->fragment_source_.is_empty()) {
-      error += "Compute shader has fragment_source_ shader attached in" + this->name_ + ".\n";
+      error += "Compute shader has fragment_source_ shader attached in " + this->name_ + ".\n";
     }
   }
 
@@ -301,12 +300,25 @@ void gpu_shader_create_info_init()
     draw_modelmat = draw_modelmat_legacy;
   }
 
+  /* WORKAROUND: Replace the use of gpu_BaseInstance by an instance attribute. */
+  if (GPU_shader_draw_parameters_support() == false) {
+    draw_resource_id_new = draw_resource_id_fallback;
+  }
+
   for (ShaderCreateInfo *info : g_create_infos->values()) {
     if (info->do_static_compilation_) {
       info->builtins_ |= gpu_shader_dependency_get_builtins(info->vertex_source_);
       info->builtins_ |= gpu_shader_dependency_get_builtins(info->fragment_source_);
       info->builtins_ |= gpu_shader_dependency_get_builtins(info->geometry_source_);
       info->builtins_ |= gpu_shader_dependency_get_builtins(info->compute_source_);
+
+      /* Automatically amend the create info for ease of use of the debug feature. */
+      if ((info->builtins_ & BuiltinBits::USE_DEBUG_DRAW) == BuiltinBits::USE_DEBUG_DRAW) {
+        info->additional_info("draw_debug_draw");
+      }
+      if ((info->builtins_ & BuiltinBits::USE_DEBUG_PRINT) == BuiltinBits::USE_DEBUG_PRINT) {
+        info->additional_info("draw_debug_print");
+      }
     }
   }
 
@@ -334,8 +346,11 @@ bool gpu_shader_create_info_compile_all()
   int skipped = 0;
   int total = 0;
   for (ShaderCreateInfo *info : g_create_infos->values()) {
+    info->finalize();
     if (info->do_static_compilation_) {
-      if (GPU_compute_shader_support() == false && info->compute_source_ != nullptr) {
+      if ((GPU_compute_shader_support() == false && info->compute_source_ != nullptr) ||
+          (GPU_shader_image_load_store_support() == false && info->has_resource_image()) ||
+          (GPU_shader_storage_buffer_objects_support() == false && info->has_resource_storage())) {
         skipped++;
         continue;
       }