[Bf-blender-cvs] [1d79b1d625c] temp-T97352-3d-texturing-seam-bleeding-b2: GPU: Update shader builder stubs.

Jeroen Bakker noreply at git.blender.org
Mon Jul 11 15:36:23 CEST 2022


Commit: 1d79b1d625c48b5d82ffb6d1187af303e3c84a1f
Author: Jeroen Bakker
Date:   Mon Jul 11 13:36:29 2022 +0200
Branches: temp-T97352-3d-texturing-seam-bleeding-b2
https://developer.blender.org/rB1d79b1d625c48b5d82ffb6d1187af303e3c84a1f

GPU: Update shader builder stubs.

Fixes workflow when using WITH_GPU_SHADER_BUILDER=On.

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

M	source/blender/gpu/intern/gpu_shader_builder_stubs.cc

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

diff --git a/source/blender/gpu/intern/gpu_shader_builder_stubs.cc b/source/blender/gpu/intern/gpu_shader_builder_stubs.cc
index 515f65adb73..d8af2fc584d 100644
--- a/source/blender/gpu/intern/gpu_shader_builder_stubs.cc
+++ b/source/blender/gpu/intern/gpu_shader_builder_stubs.cc
@@ -12,6 +12,7 @@
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
+#include "BKE_attribute.h"
 #include "BKE_customdata.h"
 #include "BKE_global.h"
 #include "BKE_material.h"
@@ -100,6 +101,38 @@ void UI_GetThemeColorShadeAlpha4ubv(int UNUSED(colorid),
 
 /** \} */
 
+/* -------------------------------------------------------------------- */
+/** \name Stubs of BKE_attribute.h
+ * \{ */
+
+void BKE_id_attribute_copy_domains_temp(short UNUSED(id_type),
+                                        const struct CustomData *UNUSED(vdata),
+                                        const struct CustomData *UNUSED(edata),
+                                        const struct CustomData *UNUSED(ldata),
+                                        const struct CustomData *UNUSED(pdata),
+                                        const struct CustomData *UNUSED(cdata),
+                                        struct ID *UNUSED(i_id))
+{
+}
+
+struct CustomDataLayer *BKE_id_attributes_active_color_get(const struct ID *UNUSED(id))
+{
+  return nullptr;
+}
+
+struct CustomDataLayer *BKE_id_attributes_render_color_get(const struct ID *UNUSED(id))
+{
+  return nullptr;
+}
+
+eAttrDomain BKE_id_attribute_domain(const struct ID *UNUSED(id),
+                                    const struct CustomDataLayer *UNUSED(layer))
+{
+  return ATTR_DOMAIN_AUTO;
+}
+
+/** \} */
+
 /* -------------------------------------------------------------------- */
 /** \name Stubs of BKE_paint.h
  * \{ */
@@ -170,6 +203,28 @@ int CustomData_get_offset(const struct CustomData *UNUSED(data), int UNUSED(type
   return 0;
 }
 
+int CustomData_get_named_layer_index(const struct CustomData *UNUSED(data),
+                                     int UNUSED(type),
+                                     const char *UNUSED(name))
+{
+  return -1;
+}
+
+int CustomData_get_active_layer_index(const struct CustomData *UNUSED(data), int UNUSED(type))
+{
+  return -1;
+}
+
+int CustomData_get_render_layer_index(const struct CustomData *UNUSED(data), int UNUSED(type))
+{
+  return -1;
+}
+
+bool CustomData_has_layer(const struct CustomData *UNUSED(data), int UNUSED(type))
+{
+  return false;
+}
+
 /** \} */
 
 /* -------------------------------------------------------------------- */
@@ -237,5 +292,14 @@ void DRW_deferred_shader_remove(struct GPUMaterial *UNUSED(mat))
   BLI_assert_unreachable();
 }
 
+void DRW_cdlayer_attr_aliases_add(struct GPUVertFormat *UNUSED(format),
+                                  const char *UNUSED(base_name),
+                                  const struct CustomData *UNUSED(data),
+                                  const struct CustomDataLayer *UNUSED(cl),
+                                  bool UNUSED(is_active_render),
+                                  bool UNUSED(is_active_layer))
+{
+}
+
 /** \} */
 }



More information about the Bf-blender-cvs mailing list