[Bf-blender-cvs] [230565fbf01] temp-gpu-image-engine: Remove global image locking. Buffers are locked per tile.
Jeroen Bakker
noreply at git.blender.org
Wed Dec 8 15:55:53 CET 2021
Commit: 230565fbf013c7786393a9fb2ec997131d79371f
Author: Jeroen Bakker
Date: Wed Dec 8 15:33:27 2021 +0100
Branches: temp-gpu-image-engine
https://developer.blender.org/rB230565fbf013c7786393a9fb2ec997131d79371f
Remove global image locking. Buffers are locked per tile.
===================================================================
M source/blender/draw/engines/image/image_drawing_mode.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_private.hh
A source/blender/draw/engines/image/image_shader_params.hh
A source/blender/draw/engines/image/image_space.hh
===================================================================
diff --git a/source/blender/draw/engines/image/image_drawing_mode.hh b/source/blender/draw/engines/image/image_drawing_mode.hh
index 91e74cf76f1..0328bcc70a2 100644
--- a/source/blender/draw/engines/image/image_drawing_mode.hh
+++ b/source/blender/draw/engines/image/image_drawing_mode.hh
@@ -117,9 +117,9 @@ template<typename TextureMethod> class ScreenSpaceDrawingMode : public AbstractD
return DRW_pass_create("Image", state);
}
- void add_shgroups(const IMAGE_InstanceData *instance_data,
- const ShaderParameters &sh_params) const
+ void add_shgroups(const IMAGE_InstanceData *instance_data) const
{
+ const ShaderParameters &sh_params = instance_data->sh_params;
GPUShader *shader = IMAGE_shader_image_get(false);
DRWShadingGroup *shgrp = DRW_shgroup_create(shader, instance_data->passes.image_pass);
@@ -321,17 +321,20 @@ template<typename TextureMethod> class ScreenSpaceDrawingMode : public AbstractD
IMB_initImBuf(&texture_buffer, texture_width, texture_height, 0, IB_rectfloat);
ImageUser tile_user = *image_user;
+ void *lock;
+
Image *image = instance_data.image;
LISTBASE_FOREACH (ImageTile *, image_tile_ptr, &image->tiles) {
const ImageTileWrapper image_tile(image_tile_ptr);
tile_user.tile = image_tile.get_tile_number();
- ImBuf *tile_buffer = BKE_image_acquire_ibuf(image, &tile_user, NULL);
+
+ ImBuf *tile_buffer = BKE_image_acquire_ibuf(image, &tile_user, &lock);
if (tile_buffer == nullptr) {
/* Couldn't load the image buffer of the tile. */
continue;
}
do_full_update_texture_slot(instance_data, info, texture_buffer, *tile_buffer, image_tile);
- BKE_image_release_ibuf(image, tile_buffer, nullptr);
+ BKE_image_release_ibuf(image, tile_buffer, lock);
}
GPU_texture_update(info.texture, GPU_DATA_FLOAT, texture_buffer.rect_float);
imb_freerectImbuf_all(&texture_buffer);
@@ -400,15 +403,11 @@ template<typename TextureMethod> class ScreenSpaceDrawingMode : public AbstractD
instance_data->passes.image_pass = create_image_pass();
}
- void cache_image(AbstractSpaceAccessor *space,
- IMAGE_Data *vedata,
- Image *image,
- ImageUser *iuser,
- ImBuf *image_buffer) const override
+ void cache_image(IMAGE_Data *vedata, Image *image, ImageUser *iuser) const override
{
const DRWContextState *draw_ctx = DRW_context_state_get();
IMAGE_InstanceData *instance_data = vedata->instance_data;
- TextureMethod pda(instance_data);
+ TextureMethod method(instance_data);
instance_data->partial_update.ensure_image(image);
instance_data->max_uv_update();
@@ -417,28 +416,16 @@ template<typename TextureMethod> class ScreenSpaceDrawingMode : public AbstractD
// Step: Find out which screen space textures are needed to draw on the screen. Remove the
// screen space textures that aren't needed.
const ARegion *region = draw_ctx->region;
- pda.update_screen_space_bounds(region);
- pda.update_uv_bounds();
+ method.update_screen_space_bounds(region);
+ method.update_uv_bounds();
// Step: Update the GPU textures based on the changes in the image.
instance_data->update_gpu_texture_allocations();
update_textures(*instance_data, image, iuser);
// Step: Add the GPU textures to the shgroup.
- ShaderParameters sh_params;
- sh_params.use_premul_alpha = BKE_image_has_gpu_texture_premultiplied_alpha(image,
- image_buffer);
-
- const Scene *scene = draw_ctx->scene;
- if (scene->camera && scene->camera->type == OB_CAMERA) {
- Camera *camera = static_cast<Camera *>(scene->camera->data);
- copy_v2_fl2(sh_params.far_near, camera->clip_end, camera->clip_start);
- }
- const bool is_tiled_image = (image->source == IMA_SRC_TILED);
- space->get_shader_parameters(sh_params, image_buffer, is_tiled_image);
-
instance_data->update_batches();
- add_shgroups(instance_data, sh_params);
+ add_shgroups(instance_data);
}
void draw_finish(IMAGE_Data *UNUSED(vedata)) const override
diff --git a/source/blender/draw/engines/image/image_engine.cc b/source/blender/draw/engines/image/image_engine.cc
index f9000b2c324..12b03690275 100644
--- a/source/blender/draw/engines/image/image_engine.cc
+++ b/source/blender/draw/engines/image/image_engine.cc
@@ -106,10 +106,14 @@ class ImageEngine {
}
instance_data->flags.do_tile_drawing = instance_data->image->source != IMA_SRC_TILED &&
space->use_tile_drawing();
- instance_data->ibuf = space->acquire_image_buffer(instance_data->image, &instance_data->lock);
+ void *lock;
+ ImBuf *image_buffer = space->acquire_image_buffer(instance_data->image, &lock);
+ const Scene *scene = DRW_context_state_get()->scene;
+ instance_data->sh_params.update(space.get(), scene, instance_data->image, image_buffer);
+ space->release_buffer(instance_data->image, image_buffer, lock);
+
ImageUser *iuser = space->get_image_user();
- drawing_mode.cache_image(
- space.get(), vedata, instance_data->image, iuser, instance_data->ibuf);
+ drawing_mode.cache_image(vedata, instance_data->image, iuser);
}
void draw_finish()
@@ -117,9 +121,7 @@ class ImageEngine {
drawing_mode.draw_finish(vedata);
IMAGE_InstanceData *instance_data = vedata->instance_data;
- space->release_buffer(instance_data->image, instance_data->ibuf, instance_data->lock);
instance_data->image = nullptr;
- instance_data->ibuf = nullptr;
}
void draw_scene()
diff --git a/source/blender/draw/engines/image/image_instance_data.hh b/source/blender/draw/engines/image/image_instance_data.hh
index 7c4912dc98a..09a79b12a17 100644
--- a/source/blender/draw/engines/image/image_instance_data.hh
+++ b/source/blender/draw/engines/image/image_instance_data.hh
@@ -25,6 +25,7 @@
#include "image_batches.hh"
#include "image_partial_updater.hh"
#include "image_private.hh"
+#include "image_shader_params.hh"
#include "image_texture_info.hh"
#include "image_wrappers.hh"
@@ -38,17 +39,12 @@
constexpr int SCREEN_SPACE_DRAWING_MODE_TEXTURE_LEN = 4;
struct IMAGE_InstanceData {
- PartialImageUpdater partial_update;
-
- void *lock;
- struct ImBuf *ibuf;
struct Image *image;
- struct DRWView *view;
- struct {
- DRWPass *image_pass;
- } passes;
+ PartialImageUpdater partial_update;
+ struct DRWView *view;
+ ShaderParameters sh_params;
struct {
/**
* \brief should we perform tile drawing (wrap repeat).
@@ -59,6 +55,10 @@ struct IMAGE_InstanceData {
bool do_tile_drawing : 1;
} flags;
+ struct {
+ DRWPass *image_pass;
+ } passes;
+
TextureInfo texture_infos[SCREEN_SPACE_DRAWING_MODE_TEXTURE_LEN];
/**
diff --git a/source/blender/draw/engines/image/image_private.hh b/source/blender/draw/engines/image/image_private.hh
index 2fb229ae116..8c63894afd0 100644
--- a/source/blender/draw/engines/image/image_private.hh
+++ b/source/blender/draw/engines/image/image_private.hh
@@ -29,7 +29,6 @@
#include "image_instance_data.hh"
#include "image_texture_info.hh"
-
/* Forward declarations */
extern "C" {
struct GPUTexture;
@@ -57,107 +56,6 @@ struct IMAGE_Data {
#define IMAGE_DRAW_FLAG_DEPTH (1 << 3)
#define IMAGE_DRAW_FLAG_DO_REPEAT (1 << 4)
-struct ShaderParameters {
- constexpr static float color[4] = {1.0f, 1.0f, 1.0f, 1.0f};
-
- int flags = 0;
- float shuffle[4];
- float far_near[2];
- bool use_premul_alpha = false;
-
- ShaderParameters()
- {
- copy_v4_fl(shuffle, 1.0f);
- copy_v2_fl2(far_near, 100.0f, 0.0f);
- }
-};
-
-/**
- * Space accessor.
- *
- * Image engine is used to draw the images inside multiple spaces \see SpaceLink.
- * The AbstractSpaceAccessor is an interface to communicate with a space.
- */
-class AbstractSpaceAccessor {
- public:
- virtual ~AbstractSpaceAccessor() = default;
-
- /**
- * Return the active image of the space.
- *
- * The returned image will be drawn in the space.
- *
- * The return value is optional.
- */
- virtual Image *get_image(Main *bmain) = 0;
-
- /**
- * Return the #ImageUser of the space.
- *
- * The return value is optional.
- */
- virtual ImageUser *get_image_user() = 0;
-
- /**
- * Acquire the image buffer of the image.
- *
- * \param image: Image to get the buffer from. Image is the same as returned from the #get_image
- * member.
- * \param lock: pointer to a lock object.
- * \return Image buffer of the given image.
- */
- virtual ImBuf *acquire_image_buffer(Image *image, void **lock) = 0;
-
- /**
- * Release a previous locked image from #acquire_image_buffer.
- */
- virtual void release_buffer(Image *image, ImBuf *image_buffer, void *lock) = 0;
-
- /**
- * Update the r_shader_parameters with space specific settings.
- *
- * Only update the #ShaderParameters.flags and #ShaderParameters.shuffle. Other parameters
- * are updated inside the image engine.
- */
- virtual void get_shader_parameters(ShaderParameters &r_shader_parameters,
- ImBuf *image_buffer,
- bool is_tiled) = 0;
-
- /**
- * Retrieve the gpu textures to draw.
- */
- virtual void get_gpu_textures(Image *image,
- ImageUser *iuser,
- ImBuf *image_buffer,
- GPUTexture **r_gpu_texture,
- bool *r_owns_texture,
- GPUTexture **r_tex_tile_data) = 0;
-
- /**
- * Does this space override the view.
- * When so this member should return true and the create_view_override must return the view to
- * use during drawing.
- */
- virtual bool has_view_override() const = 0;
-
- /**
- * Override the view for drawing.
- * Should match #has_view_override.
- */
- virtual DRWView *create_view_override(const ARegion *UNUSED(region)) = 0;
-
- /**
- * Initialize the matrix that will be used to draw the image. The matrix will be send as obje
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list