[Bf-blender-cvs] [57da4548728] blender2.8: Uniform Buffer Object: No more dirty tagging calls/check

[Dalai Felinto]

Commit: 57da4548728fe0573ab602a7a674ec9d72aa5560
Author: Dalai Felinto
Date:   Thu Jun 7 19:42:00 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB57da4548728fe0573ab602a7a674ec9d72aa5560

Uniform Buffer Object: No more dirty tagging calls/check

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

M       source/blender/gpu/GPU_material.h
M       source/blender/gpu/GPU_uniformbuffer.h
M       source/blender/gpu/intern/gpu_material.c
M       source/blender/gpu/intern/gpu_uniformbuffer.c

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

diff --git a/source/blender/gpu/GPU_material.h 
b/source/blender/gpu/GPU_material.h
index 152597331fa..505665b6f1f 100644
--- a/source/blender/gpu/GPU_material.h
+++ b/source/blender/gpu/GPU_material.h
@@ -261,7 +261,6 @@ GPUMaterialStatus GPU_material_status(GPUMaterial *mat);
 
 struct GPUUniformBuffer *GPU_material_get_uniform_buffer(GPUMaterial 
*material);
 void GPU_material_uniform_buffer_create(GPUMaterial *material, ListBase 
*inputs);
-void GPU_material_uniform_buffer_tag_dirty(struct ListBase *gpumaterials);
 
 void GPU_material_vertex_attributes(GPUMaterial *material,
        struct GPUVertexAttribs *attrib);
diff --git a/source/blender/gpu/GPU_uniformbuffer.h 
b/source/blender/gpu/GPU_uniformbuffer.h
index c2480f8ba03..4c5d52e5c4e 100644
--- a/source/blender/gpu/GPU_uniformbuffer.h
+++ b/source/blender/gpu/GPU_uniformbuffer.h
@@ -52,7 +52,6 @@ int GPU_uniformbuffer_bindpoint(GPUUniformBuffer *ubo);
 
 bool GPU_uniformbuffer_is_empty(GPUUniformBuffer *ubo);
 bool GPU_uniformbuffer_is_dirty(GPUUniformBuffer *ubo);
-void GPU_uniformbuffer_tag_dirty(GPUUniformBuffer *ubo);
 
 #define GPU_UBO_BLOCK_NAME "nodeTree"
 
diff --git a/source/blender/gpu/intern/gpu_material.c 
b/source/blender/gpu/intern/gpu_material.c
index d1681a16c48..cb72c4c614f 100644
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/source/blender/gpu/intern/gpu_material.c
@@ -214,16 +214,6 @@ void GPU_material_uniform_buffer_create(GPUMaterial 
*material, ListBase *inputs)
        material->ubo = GPU_uniformbuffer_dynamic_create(inputs, NULL);
 }
 
-void GPU_material_uniform_buffer_tag_dirty(ListBase *gpumaterials)
-{
-       for (LinkData *link = gpumaterials->first; link; link = link->next) {
-               GPUMaterial *material = link->data;
-               if (material->ubo != NULL) {
-                       GPU_uniformbuffer_tag_dirty(material->ubo);
-               }
-       }
-}
-
 /* Eevee Subsurface scattering. */
 /* Based on Separable SSS. by Jorge Jimenez and Diego Gutierrez */
 
diff --git a/source/blender/gpu/intern/gpu_uniformbuffer.c 
b/source/blender/gpu/intern/gpu_uniformbuffer.c
index afd43600d9b..a5cae1813c2 100644
--- a/source/blender/gpu/intern/gpu_uniformbuffer.c
+++ b/source/blender/gpu/intern/gpu_uniformbuffer.c
@@ -368,11 +368,4 @@ int GPU_uniformbuffer_bindpoint(GPUUniformBuffer *ubo)
        return ubo->bindpoint;
 }
 
-void GPU_uniformbuffer_tag_dirty(GPUUniformBuffer *ubo_)
-{
-       BLI_assert(ubo_->type == GPU_UBO_DYNAMIC);
-       GPUUniformBufferDynamic *ubo = (GPUUniformBufferDynamic *)ubo_;
-       ubo->flag |= GPU_UBO_FLAG_DIRTY;
-}
-
 #undef MAX_UBO_GPU_TYPE

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs