blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Cleanup: Equalize ImageEngine method names with Eevee-next. 

- `cache_init` -> `begin_sync`
- `cache_populate` -> `image_sync`
- `draw_scene` -> `draw_viewport`
This commit is contained in:
Jeroen Bakker 2022-12-09 11:50:54 +01:00
parent 50ef008c61
commit 83b78b1976
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/draw/engines/image/image_drawing_mode.hh
View File

@ -499,14 +499,14 @@ template<typename TextureMethod> class ScreenSpaceDrawingMode : public AbstractD
}
public:
void cache_init(IMAGE_Data *vedata) const override
void begin_sync(IMAGE_Data *vedata) const override
{
IMAGE_InstanceData *instance_data = vedata->instance_data;
instance_data->passes.image_pass = create_image_pass();
instance_data->passes.depth_pass = create_depth_pass();
}
void cache_image(IMAGE_Data *vedata, Image *image, ImageUser *iuser) const override
void image_sync(IMAGE_Data *vedata, Image *image, ImageUser *iuser) const override
{
const DRWContextState *draw_ctx = DRW_context_state_get();
IMAGE_InstanceData *instance_data = vedata->instance_data;
@ -542,7 +542,7 @@ template<typename TextureMethod> class ScreenSpaceDrawingMode : public AbstractD
instance_data->float_buffers.remove_unused_buffers();
}
void draw_scene(IMAGE_Data *vedata) const override
void draw_viewport(IMAGE_Data *vedata) const override
{
IMAGE_InstanceData *instance_data = vedata->instance_data;

18
source/blender/draw/engines/image/image_engine.cc
View File

@ -69,10 +69,10 @@ class ImageEngine {
virtual ~ImageEngine() = default;
void cache_init()
void begin_sync()
{
IMAGE_InstanceData *instance_data = vedata->instance_data;
drawing_mode.cache_init(vedata);
drawing_mode.begin_sync(vedata);
/* Setup full screen view matrix. */
const ARegion *region = draw_ctx->region;
@ -82,7 +82,7 @@ class ImageEngine {
instance_data->view = DRW_view_create(viewmat, winmat, nullptr, nullptr, nullptr);
}
void cache_populate()
void image_sync()
{
IMAGE_InstanceData *instance_data = vedata->instance_data;
Main *bmain = CTX_data_main(draw_ctx->evil_C);
@ -113,7 +113,7 @@ class ImageEngine {
else {
BKE_image_multiview_index(instance_data->image, iuser);
}
drawing_mode.cache_image(vedata, instance_data->image, iuser);
drawing_mode.image_sync(vedata, instance_data->image, iuser);
}
void draw_finish()
@ -124,9 +124,9 @@ class ImageEngine {
instance_data->image = nullptr;
}
void draw_scene()
void draw_viewport()
{
drawing_mode.draw_scene(vedata);
drawing_mode.draw_viewport(vedata);
}
};
@ -146,8 +146,8 @@ static void IMAGE_cache_init(void *vedata)
{
const DRWContextState *draw_ctx = DRW_context_state_get();
ImageEngine image_engine(draw_ctx, static_cast<IMAGE_Data *>(vedata));
image_engine.cache_init();
image_engine.cache_populate();
image_engine.begin_sync();
image_engine.image_sync();
}
static void IMAGE_cache_populate(void * /*vedata*/, Object * /*ob*/)
@ -159,7 +159,7 @@ static void IMAGE_draw_scene(void *vedata)
{
const DRWContextState *draw_ctx = DRW_context_state_get();
ImageEngine image_engine(draw_ctx, static_cast<IMAGE_Data *>(vedata));
image_engine.draw_scene();
image_engine.draw_viewport();
image_engine.draw_finish();
}

6
source/blender/draw/engines/image/image_private.hh
View File

@ -49,9 +49,9 @@ struct IMAGE_Data {
class AbstractDrawingMode {
public:
virtual ~AbstractDrawingMode() = default;
virtual void cache_init(IMAGE_Data *vedata) const = 0;
virtual void cache_image(IMAGE_Data *vedata, Image *image, ImageUser *iuser) const = 0;
virtual void draw_scene(IMAGE_Data *vedata) const = 0;
virtual void begin_sync(IMAGE_Data *vedata) const = 0;
virtual void image_sync(IMAGE_Data *vedata, Image *image, ImageUser *iuser) const = 0;
virtual void draw_viewport(IMAGE_Data *vedata) const = 0;
virtual void draw_finish(IMAGE_Data *vedata) const = 0;
};