archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Draw Engines: Make g_data struct part of the viewport storage

Browse Source 
This makes viewport cache construction independant from each others and will allow multithread down the road.
This commit is contained in:
Clément Foucault
2017-03-26 20:13:34 +02:00
parent 7ee41920fa
commit deda6a43fc
19 changed files with 365 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/blender/draw/modes/edit_curve_mode.c
View File

@@ -76,6 +76,7 @@ typedef struct EDIT_CURVE_StorageList {
* free with MEM_freeN() when viewport is freed.
* (not per object) */
struct CustomStruct *block;
struct g_data *g_data;
} EDIT_CURVE_StorageList;
typedef struct EDIT_CURVE_Data {
@@ -99,16 +100,13 @@ static struct {
struct GPUShader *custom_shader;
} e_data = {NULL}; /* Engine data */
static struct {
/* This keeps the reference of the viewport engine data because
* DRW_viewport_engine_data_get is slow and we don't want to
* call it for every object */
EDIT_CURVE_Data *vedata;
typedef struct g_data {
/* This keeps the references of the shading groups for
* easy access in EDIT_CURVE_cache_populate() */
DRWShadingGroup *group;
} g_data = {NULL}; /* Transient data */
} g_data; /* Transient data */
/* *********** FUNCTIONS *********** */
@@ -117,7 +115,6 @@ static struct {
* (Optional) */
static void EDIT_CURVE_engine_init(void *vedata)
{
EDIT_CURVE_TextureList *txl = ((EDIT_CURVE_Data *)vedata)->txl;
EDIT_CURVE_FramebufferList *fbl = ((EDIT_CURVE_Data *)vedata)->fbl;
EDIT_CURVE_StorageList *stl = ((EDIT_CURVE_Data *)vedata)->stl;
@@ -148,11 +145,13 @@ static void EDIT_CURVE_engine_init(void *vedata)
* Assume that all Passes are NULL */
static void EDIT_CURVE_cache_init(void *vedata)
{
EDIT_CURVE_PassList *psl = ((EDIT_CURVE_Data *)vedata)->psl;
EDIT_CURVE_StorageList *stl = ((EDIT_CURVE_Data *)vedata)->stl;
UNUSED_VARS(stl);
if (!stl->g_data) {
/* Alloc transient pointers */
stl->g_data = MEM_mallocN(sizeof(g_data), "g_data");
}
{
/* Create a pass */
@@ -161,16 +160,16 @@ static void EDIT_CURVE_cache_init(void *vedata)
/* Create a shadingGroup using a function in draw_common.c or custom one */
/*
* g_data.group = shgroup_dynlines_uniform_color(psl->pass, ts.colorWire);
* stl->g_data->group = shgroup_dynlines_uniform_color(psl->pass, ts.colorWire);
* -- or --
* g_data.group = DRW_shgroup_create(e_data.custom_shader, psl->pass);
* stl->g_data->group = DRW_shgroup_create(e_data.custom_shader, psl->pass);
*/
g_data.group = DRW_shgroup_create(e_data.custom_shader, psl->pass);
stl->g_data->group = DRW_shgroup_create(e_data.custom_shader, psl->pass);
/* Uniforms need a pointer to it's value so be sure it's accessible at
* any given time (i.e. use static vars) */
static float color[4] = {0.2f, 0.5f, 0.3f, 1.0};
DRW_shgroup_uniform_vec4(g_data.group, "color", color, 1);
DRW_shgroup_uniform_vec4(stl->g_data->group, "color", color, 1);
}
}
@@ -188,7 +187,7 @@ static void EDIT_CURVE_cache_populate(void *vedata, Object *ob)
struct Batch *geom = DRW_cache_surface_get(ob);
/* Add geom to a shading group */
DRW_shgroup_call_add(g_data.group, geom, ob->obmat);
DRW_shgroup_call_add(stl->g_data->group, geom, ob->obmat);
}
}