blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Cleanup: DRW: Remove, rename stuffs

This commit is contained in:
Clément Foucault 2019-05-21 23:56:55 +02:00
parent 6914f7125b
commit 7b3f64e12a
5 changed files with 47 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/blender/draw/intern/DRW_render.h
View File

@ -393,7 +393,6 @@ DRWShadingGroup *DRW_shgroup_transform_feedback_create(struct GPUShader *shader,
/* return final visibility */
typedef bool(DRWCallVisibilityFn)(bool vis_in, void *user_data);
/* TODO(fclem): Remove the _add suffix. */
void DRW_shgroup_call(DRWShadingGroup *sh, struct GPUBatch *geom, float (*obmat)[4]);
void DRW_shgroup_call_range(
DRWShadingGroup *sh, struct GPUBatch *geom, float (*obmat)[4], uint v_sta, uint v_ct);
@ -480,14 +479,6 @@ void DRW_shgroup_uniform_vec4(DRWShadingGroup *shgroup,
const char *name,
const float *value,
int arraysize);
void DRW_shgroup_uniform_short_to_int(DRWShadingGroup *shgroup,
const char *name,
const short *value,
int arraysize);
void DRW_shgroup_uniform_short_to_float(DRWShadingGroup *shgroup,
const char *name,
const short *value,
int arraysize);
/* Boolean are expected to be 4bytes longs for opengl! */
void DRW_shgroup_uniform_bool(DRWShadingGroup *shgroup,
const char *name,
@ -577,17 +568,10 @@ bool DRW_culling_sphere_test(const DRWView *view, const BoundSphere *bsphere);
bool DRW_culling_box_test(const DRWView *view, const BoundBox *bbox);
bool DRW_culling_plane_test(const DRWView *view, const float plane[4]);
/* Viewport */
void DRW_culling_frustum_corners_get(const DRWView *view, BoundBox *corners);
void DRW_culling_frustum_planes_get(const DRWView *view, float planes[6][4]);
typedef struct DRWMatrixState {
/* keep in sync with the enum DRWViewportMatrixType. */
float persmat[4][4];
float persinv[4][4];
float viewmat[4][4];
float viewinv[4][4];
float winmat[4][4];
float wininv[4][4];
} DRWMatrixState;
/* Viewport */
const float *DRW_viewport_size_get(void);
const float *DRW_viewport_invert_size_get(void);
@ -656,11 +640,6 @@ void DRW_state_reset_ex(DRWState state);
void DRW_state_reset(void);
void DRW_state_lock(DRWState state);
void DRW_state_clip_planes_len_set(uint plane_len);
void DRW_culling_frustum_corners_get(const DRWView *view, BoundBox *corners);
void DRW_culling_frustum_planes_get(const DRWView *view, float planes[6][4]);
/* Selection */
void DRW_select_load_id(uint id);

2
source/blender/draw/intern/draw_manager.c
View File

@ -683,7 +683,7 @@ static void drw_viewport_var_init(void)
memset(&DST.RST, 0x0, sizeof(DST.RST));
if (G_draw.view_ubo == NULL) {
G_draw.view_ubo = DRW_uniformbuffer_create(sizeof(ViewUboStorage), NULL);
G_draw.view_ubo = DRW_uniformbuffer_create(sizeof(DRWViewUboStorage), NULL);
}
memset(DST.object_instance_data, 0x0, sizeof(DST.object_instance_data));

17
source/blender/draw/intern/draw_manager.h
View File

@ -215,12 +215,19 @@ struct DRWPass {
};
/* keep in sync with viewBlock */
typedef struct ViewUboStorage {
DRWMatrixState matstate;
typedef struct DRWViewUboStorage {
/* View matrices */
float persmat[4][4];
float persinv[4][4];
float viewmat[4][4];
float viewinv[4][4];
float winmat[4][4];
float wininv[4][4];
float clipplanes[6][4];
/* Should not be here. Not view dependant (only main view). */
float viewcamtexcofac[4];
} ViewUboStorage;
} DRWViewUboStorage;
#define MAX_CULLED_VIEWS 32
@ -228,7 +235,7 @@ struct DRWView {
/** Parent view if this is a sub view. NULL otherwise. */
struct DRWView *parent;
ViewUboStorage storage;
DRWViewUboStorage storage;
/** Number of active clipplanes. */
int clip_planes_len;
/** Does culling result needs to be updated. */
@ -327,7 +334,7 @@ typedef struct DRWManager {
uint primary_view_ct;
/** TODO(fclem) Remove this. Only here to support
* shaders without common_view_lib.glsl */
ViewUboStorage view_storage_cpy;
DRWViewUboStorage view_storage_cpy;
#ifdef USE_GPU_SELECT
uint select_id;

62
source/blender/draw/intern/draw_manager_data.c
View File

@ -867,13 +867,13 @@ static void drw_shgroup_init(DRWShadingGroup *shgroup, GPUShader *shader)
else {
/* Only here to support builtin shaders. This should not be used by engines. */
/* TODO remove. */
DRWMatrixState *matstate = &DST.view_storage_cpy.matstate;
drw_shgroup_builtin_uniform(shgroup, GPU_UNIFORM_VIEW, matstate->viewmat, 16, 1);
drw_shgroup_builtin_uniform(shgroup, GPU_UNIFORM_VIEW_INV, matstate->viewinv, 16, 1);
drw_shgroup_builtin_uniform(shgroup, GPU_UNIFORM_VIEWPROJECTION, matstate->persmat, 16, 1);
drw_shgroup_builtin_uniform(shgroup, GPU_UNIFORM_VIEWPROJECTION_INV, matstate->persinv, 16, 1);
drw_shgroup_builtin_uniform(shgroup, GPU_UNIFORM_PROJECTION, matstate->winmat, 16, 1);
drw_shgroup_builtin_uniform(shgroup, GPU_UNIFORM_PROJECTION_INV, matstate->wininv, 16, 1);
DRWViewUboStorage *storage = &DST.view_storage_cpy;
drw_shgroup_builtin_uniform(shgroup, GPU_UNIFORM_VIEW, storage->viewmat, 16, 1);
drw_shgroup_builtin_uniform(shgroup, GPU_UNIFORM_VIEW_INV, storage->viewinv, 16, 1);
drw_shgroup_builtin_uniform(shgroup, GPU_UNIFORM_VIEWPROJECTION, storage->persmat, 16, 1);
drw_shgroup_builtin_uniform(shgroup, GPU_UNIFORM_VIEWPROJECTION_INV, storage->persinv, 16, 1);
drw_shgroup_builtin_uniform(shgroup, GPU_UNIFORM_PROJECTION, storage->winmat, 16, 1);
drw_shgroup_builtin_uniform(shgroup, GPU_UNIFORM_PROJECTION_INV, storage->wininv, 16, 1);
drw_shgroup_builtin_uniform(
shgroup, GPU_UNIFORM_CAMERATEXCO, DST.view_storage_cpy.viewcamtexcofac, 4, 1);
}
@ -1289,22 +1289,22 @@ static void draw_frustum_bound_sphere_calc(const BoundBox *bbox,
}
}
static void draw_matrix_state_from_view(DRWMatrixState *mstate,
const float viewmat[4][4],
const float winmat[4][4])
static void draw_view_matrix_state_update(DRWViewUboStorage *storage,
const float viewmat[4][4],
const float winmat[4][4])
{
/* If only one the matrices is negative, then the
* polygon winding changes and we don't want that. */
BLI_assert(is_negative_m4(viewmat) != is_negative_m4(winmat));
copy_m4_m4(mstate->viewmat, viewmat);
invert_m4_m4(mstate->viewinv, mstate->viewmat);
copy_m4_m4(storage->viewmat, viewmat);
invert_m4_m4(storage->viewinv, storage->viewmat);
copy_m4_m4(mstate->winmat, winmat);
invert_m4_m4(mstate->wininv, mstate->winmat);
copy_m4_m4(storage->winmat, winmat);
invert_m4_m4(storage->wininv, storage->winmat);
mul_m4_m4m4(mstate->persmat, winmat, viewmat);
invert_m4_m4(mstate->persinv, mstate->persmat);
mul_m4_m4m4(storage->persmat, winmat, viewmat);
invert_m4_m4(storage->persinv, storage->persmat);
}
/* Create a view with culling. */
@ -1370,11 +1370,10 @@ DRWView *DRW_view_create_sub(const DRWView *parent_view,
void DRW_view_update_sub(DRWView *view, const float viewmat[4][4], const float winmat[4][4])
{
BLI_assert(view->parent != NULL);
DRWMatrixState *mstate = &view->storage.matstate;
view->is_dirty = true;
draw_matrix_state_from_view(mstate, viewmat, winmat);
draw_view_matrix_state_update(&view->storage, viewmat, winmat);
}
/* Update matrices of a view created with DRW_view_create. */
@ -1388,11 +1387,10 @@ void DRW_view_update(DRWView *view,
* Create subviews instead, or a copy. */
BLI_assert(view != DST.view_default);
BLI_assert(view->parent == NULL);
DRWMatrixState *mstate = &view->storage.matstate;
view->is_dirty = true;
draw_matrix_state_from_view(mstate, viewmat, winmat);
draw_view_matrix_state_update(&view->storage, viewmat, winmat);
/* Prepare frustum culling. */
@ -1420,7 +1418,7 @@ void DRW_view_update(DRWView *view,
invert_m4_m4(wininv, winmat);
}
else {
copy_m4_m4(wininv, mstate->wininv);
copy_m4_m4(wininv, view->storage.wininv);
}
float viewinv[4][4];
@ -1429,7 +1427,7 @@ void DRW_view_update(DRWView *view,
invert_m4_m4(viewinv, viewmat);
}
else {
copy_m4_m4(viewinv, mstate->viewinv);
copy_m4_m4(viewinv, view->storage.viewinv);
}
draw_frustum_boundbox_calc(viewinv, winmat, &view->frustum_corners);
@ -1489,13 +1487,13 @@ void DRW_view_frustum_planes_get(const DRWView *view, float planes[6][4])
bool DRW_view_is_persp_get(const DRWView *view)
{
view = (view) ? view : DST.view_default;
return view->storage.matstate.winmat[3][3] == 0.0f;
return view->storage.winmat[3][3] == 0.0f;
}
float DRW_view_near_distance_get(const DRWView *view)
{
view = (view) ? view : DST.view_default;
const float(*projmat)[4] = view->storage.matstate.winmat;
const float(*projmat)[4] = view->storage.winmat;
if (DRW_view_is_persp_get(view)) {
return -projmat[3][2] / (projmat[2][2] - 1.0f);
@ -1508,7 +1506,7 @@ float DRW_view_near_distance_get(const DRWView *view)
float DRW_view_far_distance_get(const DRWView *view)
{
view = (view) ? view : DST.view_default;
const float(*projmat)[4] = view->storage.matstate.winmat;
const float(*projmat)[4] = view->storage.winmat;
if (DRW_view_is_persp_get(view)) {
return -projmat[3][2] / (projmat[2][2] + 1.0f);
@ -1521,22 +1519,22 @@ float DRW_view_far_distance_get(const DRWView *view)
void DRW_view_viewmat_get(const DRWView *view, float mat[4][4], bool inverse)
{
view = (view) ? view : DST.view_default;
const DRWMatrixState *state = &view->storage.matstate;
copy_m4_m4(mat, (inverse) ? state->viewinv : state->viewmat);
const DRWViewUboStorage *storage = &view->storage;
copy_m4_m4(mat, (inverse) ? storage->viewinv : storage->viewmat);
}
void DRW_view_winmat_get(const DRWView *view, float mat[4][4], bool inverse)
{
view = (view) ? view : DST.view_default;
const DRWMatrixState *state = &view->storage.matstate;
copy_m4_m4(mat, (inverse) ? state->wininv : state->winmat);
const DRWViewUboStorage *storage = &view->storage;
copy_m4_m4(mat, (inverse) ? storage->wininv : storage->winmat);
}
void DRW_view_persmat_get(const DRWView *view, float mat[4][4], bool inverse)
{
view = (view) ? view : DST.view_default;
const DRWMatrixState *state = &view->storage.matstate;
copy_m4_m4(mat, (inverse) ? state->persinv : state->persmat);
const DRWViewUboStorage *storage = &view->storage;
copy_m4_m4(mat, (inverse) ? storage->persinv : storage->persmat);
}
/** \} */
@ -1658,7 +1656,7 @@ static int pass_shgroup_dist_sort(void *thunk, const void *a, const void *b)
*/
void DRW_pass_sort_shgroup_z(DRWPass *pass)
{
const float(*viewinv)[4] = DST.view_active->storage.matstate.viewinv;
const float(*viewinv)[4] = DST.view_active->storage.viewinv;
ZSortData zsortdata = {viewinv[2], viewinv[3]};

12
source/blender/draw/intern/draw_manager_exec.c
View File

@ -387,16 +387,6 @@ void DRW_state_reset(void)
glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
}
/**
* This only works if DRWPasses have been tagged with DRW_STATE_CLIP_PLANES,
* and if the shaders have support for it (see usage of gl_ClipDistance).
*/
void DRW_state_clip_planes_len_set(uint plane_len)
{
BLI_assert(plane_len <= MAX_CLIP_PLANES);
/* DUMMY TO REMOVE */
}
/** \} */
/* -------------------------------------------------------------------- */
@ -592,7 +582,7 @@ static void draw_geometry_prepare(DRWShadingGroup *shgroup, DRWCall *call)
* and is slow (since it does not cache the result). */
if (shgroup->modelviewprojection != -1) {
float mvp[4][4];
mul_m4_m4m4(mvp, DST.view_active->storage.matstate.persmat, state->model);
mul_m4_m4m4(mvp, DST.view_active->storage.persmat, state->model);
GPU_shader_uniform_vector(shgroup->shader, shgroup->modelviewprojection, 16, 1, (float *)mvp);
}
}