Commit: f06a1368bbdbbf6e7b41ddcb124c68d27879cde1 Author: Jeroen Bakker Date: Fri Dec 9 10:29:34 2022 +0100 Branches: master https://developer.blender.org/rBf06a1368bbdbbf6e7b41ddcb124c68d27879cde1
Cleanup: sanatize namespaces in image engine. Some files were missing namespaces and sometimes the closing comment of namespaces were incorrectly placed. No functional changes. =================================================================== M source/blender/draw/engines/image/image_batches.hh M source/blender/draw/engines/image/image_buffer_cache.hh M source/blender/draw/engines/image/image_engine.cc M source/blender/draw/engines/image/image_instance_data.hh M source/blender/draw/engines/image/image_shader_params.hh M source/blender/draw/engines/image/image_space.hh M source/blender/draw/engines/image/image_texture_info.hh M source/blender/draw/engines/image/image_usage.hh =================================================================== diff --git a/source/blender/draw/engines/image/image_batches.hh b/source/blender/draw/engines/image/image_batches.hh index 356e3f0db6b..34dca043ccc 100644 --- a/source/blender/draw/engines/image/image_batches.hh +++ b/source/blender/draw/engines/image/image_batches.hh @@ -9,6 +9,8 @@ #include "image_texture_info.hh" +namespace blender::draw::image_engine { + /** \brief Create GPUBatch for a IMAGE_ScreenSpaceTextureInfo. */ class BatchUpdater { TextureInfo &info; @@ -89,3 +91,5 @@ class BatchUpdater { } } }; + +} // namespace blender::draw::image_engine diff --git a/source/blender/draw/engines/image/image_buffer_cache.hh b/source/blender/draw/engines/image/image_buffer_cache.hh index 6c1be27f9f7..5c6b01d8add 100644 --- a/source/blender/draw/engines/image/image_buffer_cache.hh +++ b/source/blender/draw/engines/image/image_buffer_cache.hh @@ -13,6 +13,8 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" +namespace blender::draw::image_engine { + struct FloatImageBuffer { ImBuf *source_buffer = nullptr; ImBuf *float_buffer = nullptr; @@ -62,7 +64,7 @@ struct FloatImageBuffer { */ struct FloatBufferCache { private: - blender::Vector<FloatImageBuffer> cache_; + Vector<FloatImageBuffer> cache_; public: ImBuf *cached_float_buffer(ImBuf *image_buffer) @@ -130,3 +132,5 @@ struct FloatBufferCache { cache_.clear(); } }; + +} // namespace blender::draw::image_engine diff --git a/source/blender/draw/engines/image/image_engine.cc b/source/blender/draw/engines/image/image_engine.cc index 0151c6925bf..1284231d5e9 100644 --- a/source/blender/draw/engines/image/image_engine.cc +++ b/source/blender/draw/engines/image/image_engine.cc @@ -128,7 +128,7 @@ class ImageEngine { { drawing_mode.draw_scene(vedata); } -}; // namespace blender::draw::image_engine +}; /* -------------------------------------------------------------------- */ /** \name Engine Callbacks diff --git a/source/blender/draw/engines/image/image_instance_data.hh b/source/blender/draw/engines/image/image_instance_data.hh index c8de4d0ac83..b027b732aeb 100644 --- a/source/blender/draw/engines/image/image_instance_data.hh +++ b/source/blender/draw/engines/image/image_instance_data.hh @@ -19,6 +19,8 @@ #include "DRW_render.h" +namespace blender::draw::image_engine { + /** * \brief max allowed textures to use by the ScreenSpaceDrawingMode. * @@ -124,3 +126,5 @@ struct IMAGE_InstanceData { } } }; + +} // namespace blender::draw::image_engine diff --git a/source/blender/draw/engines/image/image_shader_params.hh b/source/blender/draw/engines/image/image_shader_params.hh index 4bc121a49a4..41159d85e05 100644 --- a/source/blender/draw/engines/image/image_shader_params.hh +++ b/source/blender/draw/engines/image/image_shader_params.hh @@ -19,6 +19,8 @@ #include "image_space.hh" +namespace blender::draw::image_engine { + struct ShaderParameters { int flags = 0; float shuffle[4]; @@ -40,3 +42,5 @@ struct ShaderParameters { space->get_shader_parameters(*this, image_buffer); } }; + +} // namespace blender::draw::image_engine diff --git a/source/blender/draw/engines/image/image_space.hh b/source/blender/draw/engines/image/image_space.hh index 03973d892df..fa9c68efb05 100644 --- a/source/blender/draw/engines/image/image_space.hh +++ b/source/blender/draw/engines/image/image_space.hh @@ -7,6 +7,8 @@ #pragma once +namespace blender::draw::image_engine { + struct ShaderParameters; /** @@ -79,5 +81,6 @@ class AbstractSpaceAccessor { virtual void init_ss_to_texture_matrix(const ARegion *region, const float image_resolution[2], float r_uv_to_texture[4][4]) const = 0; +}; -}; // namespace blender::draw::image_engine +} // namespace blender::draw::image_engine diff --git a/source/blender/draw/engines/image/image_texture_info.hh b/source/blender/draw/engines/image/image_texture_info.hh index b2ceabfc2c4..acab434a76d 100644 --- a/source/blender/draw/engines/image/image_texture_info.hh +++ b/source/blender/draw/engines/image/image_texture_info.hh @@ -13,6 +13,8 @@ #include "GPU_batch.h" #include "GPU_texture.h" +namespace blender::draw::image_engine { + struct TextureInfo { /** * \brief does this texture need a full update. @@ -82,3 +84,5 @@ struct TextureInfo { top_right_region.y); } }; + +} // namespace blender::draw::image_engine diff --git a/source/blender/draw/engines/image/image_usage.hh b/source/blender/draw/engines/image/image_usage.hh index f4ba3f495ce..e582d61d064 100644 --- a/source/blender/draw/engines/image/image_usage.hh +++ b/source/blender/draw/engines/image/image_usage.hh @@ -7,6 +7,8 @@ #pragma once +namespace blender::draw::image_engine { + /** * ImageUsage contains data of the image and image user to identify changes that require a rebuild * the texture slots. @@ -47,3 +49,5 @@ struct ImageUsage { return !(*this == other); } }; + +} // namespace blender::draw::image_engine _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs