[Bf-blender-cvs] [0ba5e6a8dde] temp-image-engine: Rename dirty to need_full_update.
Jeroen Bakker
noreply at git.blender.org
Wed Dec 7 14:28:46 CET 2022
Commit: 0ba5e6a8ddeb8f49307302463742531cd11f8045
Author: Jeroen Bakker
Date: Wed Dec 7 08:45:48 2022 +0100
Branches: temp-image-engine
https://developer.blender.org/rB0ba5e6a8ddeb8f49307302463742531cd11f8045
Rename dirty to need_full_update.
===================================================================
M source/blender/draw/engines/image/image_drawing_mode.hh
M source/blender/draw/engines/image/image_instance_data.hh
M source/blender/draw/engines/image/image_texture_info.hh
===================================================================
diff --git a/source/blender/draw/engines/image/image_drawing_mode.hh b/source/blender/draw/engines/image/image_drawing_mode.hh
index 48c68f12922..7337dc1815c 100644
--- a/source/blender/draw/engines/image/image_drawing_mode.hh
+++ b/source/blender/draw/engines/image/image_drawing_mode.hh
@@ -91,10 +91,10 @@ struct FullScreenTextures {
max_co.x,
mid_co.y,
max_co.y);
- instance_data->texture_infos[0].dirty = true;
- instance_data->texture_infos[1].dirty = true;
- instance_data->texture_infos[2].dirty = true;
- instance_data->texture_infos[3].dirty = true;
+ instance_data->texture_infos[0].need_full_update = true;
+ instance_data->texture_infos[1].need_full_update = true;
+ instance_data->texture_infos[2].need_full_update = true;
+ instance_data->texture_infos[3].need_full_update = true;
}
};
@@ -277,7 +277,7 @@ template<typename TextureMethod> class ScreenSpaceDrawingMode : public AbstractD
for (int i = 0; i < SCREEN_SPACE_DRAWING_MODE_TEXTURE_LEN; i++) {
const TextureInfo &info = instance_data.texture_infos[i];
/* Dirty images will receive a full update. No need to do a partial one now. */
- if (info.dirty) {
+ if (info.need_full_update) {
continue;
}
if (!info.visible) {
@@ -381,7 +381,7 @@ template<typename TextureMethod> class ScreenSpaceDrawingMode : public AbstractD
{
for (int i = 0; i < SCREEN_SPACE_DRAWING_MODE_TEXTURE_LEN; i++) {
TextureInfo &info = instance_data.texture_infos[i];
- if (!info.dirty) {
+ if (!info.need_full_update) {
continue;
}
if (!info.visible) {
diff --git a/source/blender/draw/engines/image/image_instance_data.hh b/source/blender/draw/engines/image/image_instance_data.hh
index 213a6a89964..522d9095cc8 100644
--- a/source/blender/draw/engines/image/image_instance_data.hh
+++ b/source/blender/draw/engines/image/image_instance_data.hh
@@ -93,7 +93,7 @@ struct IMAGE_InstanceData {
DRW_texture_ensure_fullscreen_2d(
&info.texture, GPU_RGBA16F, static_cast<DRWTextureFlag>(0));
}
- info.dirty |= should_be_created;
+ info.need_full_update |= should_be_created;
}
}
@@ -101,7 +101,7 @@ struct IMAGE_InstanceData {
{
for (int i = 0; i < SCREEN_SPACE_DRAWING_MODE_TEXTURE_LEN; i++) {
TextureInfo &info = texture_infos[i];
- if (!info.dirty) {
+ if (!info.need_full_update) {
continue;
}
BatchUpdater batch_updater(info);
@@ -124,7 +124,7 @@ struct IMAGE_InstanceData {
void reset_dirty_flag(bool new_value)
{
for (int i = 0; i < SCREEN_SPACE_DRAWING_MODE_TEXTURE_LEN; i++) {
- texture_infos[i].dirty = new_value;
+ texture_infos[i].need_full_update = new_value;
}
}
};
diff --git a/source/blender/draw/engines/image/image_texture_info.hh b/source/blender/draw/engines/image/image_texture_info.hh
index 6b30f4e0e07..018e84836a1 100644
--- a/source/blender/draw/engines/image/image_texture_info.hh
+++ b/source/blender/draw/engines/image/image_texture_info.hh
@@ -26,7 +26,7 @@ struct TextureInfo {
*
* When set to false the texture can be updated using a partial update.
*/
- bool dirty : 1;
+ bool need_full_update : 1;
/** \brief area of the texture in screen space. */
rctf clipping_bounds;
More information about the Bf-blender-cvs
mailing list