Commit: caa8e7ff2894ed22ea436bc61b06fb292d844108
Author: Campbell Barton
Date: Thu Feb 14 13:59:30 2019 +1100
Branches: master
https://developer.blender.org/rBcaa8e7ff2894ed22ea436bc61b06fb292d844108
DRW: de-duplicate vertex & weight paint engines
These were almost exact duplicates, use one engine for drawing both
kinds of vertex color.
===================================================================
M source/blender/draw/CMakeLists.txt
M source/blender/draw/intern/draw_manager.c
M source/blender/draw/modes/draw_mode_engines.h
M source/blender/draw/modes/paint_vertex_mode.c
D source/blender/draw/modes/paint_weight_mode.c
===================================================================
diff --git a/source/blender/draw/CMakeLists.txt
b/source/blender/draw/CMakeLists.txt
index 74a9b3ae21e..80878ae9246 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -80,7 +80,6 @@ set(SRC
modes/overlay_mode.c
modes/paint_texture_mode.c
modes/paint_vertex_mode.c
- modes/paint_weight_mode.c
modes/particle_mode.c
modes/pose_mode.c
modes/sculpt_mode.c
diff --git a/source/blender/draw/intern/draw_manager.c
b/source/blender/draw/intern/draw_manager.c
index bd43a35bd47..464778280ff 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1218,8 +1218,6 @@ static void drw_engines_enable_from_paint_mode(int mode)
use_drw_engine(&draw_engine_sculpt_type);
break;
case CTX_MODE_PAINT_WEIGHT:
- use_drw_engine(&draw_engine_paint_weight_type);
- break;
case CTX_MODE_PAINT_VERTEX:
use_drw_engine(&draw_engine_paint_vertex_type);
break;
@@ -2541,7 +2539,6 @@ void DRW_engines_register(void)
DRW_engine_register(&draw_engine_overlay_type);
DRW_engine_register(&draw_engine_paint_texture_type);
DRW_engine_register(&draw_engine_paint_vertex_type);
- DRW_engine_register(&draw_engine_paint_weight_type);
DRW_engine_register(&draw_engine_particle_type);
DRW_engine_register(&draw_engine_pose_type);
DRW_engine_register(&draw_engine_sculpt_type);
diff --git a/source/blender/draw/modes/draw_mode_engines.h
b/source/blender/draw/modes/draw_mode_engines.h
index 14723930477..0ad7b06603a 100644
--- a/source/blender/draw/modes/draw_mode_engines.h
+++ b/source/blender/draw/modes/draw_mode_engines.h
@@ -32,7 +32,6 @@ extern DrawEngineType draw_engine_edit_text_type;
extern DrawEngineType draw_engine_motion_path_type;
extern DrawEngineType draw_engine_paint_texture_type;
extern DrawEngineType draw_engine_paint_vertex_type;
-extern DrawEngineType draw_engine_paint_weight_type;
extern DrawEngineType draw_engine_particle_type;
extern DrawEngineType draw_engine_pose_type;
extern DrawEngineType draw_engine_sculpt_type;
diff --git a/source/blender/draw/modes/paint_vertex_mode.c
b/source/blender/draw/modes/paint_vertex_mode.c
index 51eeacd76c4..e58399c8cb9 100644
--- a/source/blender/draw/modes/paint_vertex_mode.c
+++ b/source/blender/draw/modes/paint_vertex_mode.c
@@ -26,17 +26,18 @@
#include "draw_common.h"
-
#include "DNA_mesh_types.h"
#include "DNA_view3d_types.h"
#include "DEG_depsgraph_query.h"
+extern char datatoc_paint_face_vert_glsl[];
+extern char datatoc_paint_weight_vert_glsl[];
+extern char datatoc_paint_weight_frag_glsl[];
extern char datatoc_paint_vertex_vert_glsl[];
extern char datatoc_paint_vertex_frag_glsl[];
extern char datatoc_paint_wire_vert_glsl[];
extern char datatoc_paint_wire_frag_glsl[];
-extern char datatoc_paint_face_vert_glsl[];
extern char datatoc_paint_vert_frag_glsl[];
extern char datatoc_common_globals_lib_glsl[];
@@ -44,8 +45,16 @@ extern char datatoc_gpu_shader_uniform_color_frag_glsl[];
/* *********** LISTS *********** */
+enum {
+ VERTEX_MODE = 0,
+ WEIGHT_MODE = 1,
+};
+#define MODE_LEN (WEIGHT_MODE + 1)
+
typedef struct PAINT_VERTEX_PassList {
- struct DRWPass *vcolor_faces;
+ struct {
+ struct DRWPass *color_faces;
+ } by_mode[MODE_LEN];
struct DRWPass *wire_overlay;
struct DRWPass *wire_select_overlay;
struct DRWPass *face_select_overlay;
@@ -65,9 +74,11 @@ typedef struct PAINT_VERTEX_Data {
} PAINT_VERTEX_Data;
typedef struct PAINT_VERTEX_Shaders {
- struct GPUShader *vcolor_face;
- struct GPUShader *wire_overlay;
- struct GPUShader *wire_select_overlay;
+ struct {
+ struct GPUShader *color_face;
+ struct GPUShader *wire_overlay;
+ struct GPUShader *wire_select_overlay;
+ } by_mode[MODE_LEN];
struct GPUShader *face_select_overlay;
struct GPUShader *vert_select_overlay;
} PAINT_VERTEX_Shaders;
@@ -76,12 +87,14 @@ typedef struct PAINT_VERTEX_Shaders {
static struct {
PAINT_VERTEX_Shaders sh_data[GPU_SHADER_CFG_LEN];
-} e_data = {{{NULL}}}; /* Engine data */
+} e_data = {{{{{NULL}}}}}; /* Engine data */
typedef struct PAINT_VERTEX_PrivateData {
- DRWShadingGroup *fvcolor_shgrp;
- DRWShadingGroup *lwire_shgrp;
- DRWShadingGroup *lwire_select_shgrp;
+ struct {
+ DRWShadingGroup *color_shgrp;
+ DRWShadingGroup *lwire_shgrp;
+ DRWShadingGroup *lwire_select_shgrp;
+ } by_mode[MODE_LEN];
DRWShadingGroup *face_select_shgrp;
DRWShadingGroup *vert_select_shgrp;
} PAINT_VERTEX_PrivateData; /* Transient data */
@@ -98,23 +111,18 @@ static void PAINT_VERTEX_engine_init(void *UNUSED(vedata))
}
const GPUShaderConfigData *sh_cfg_data =
&GPU_shader_cfg_data[draw_ctx->sh_cfg];
- if (!sh_data->vcolor_face) {
-
- sh_data->vcolor_face = GPU_shader_create_from_arrays({
+ if (!sh_data->face_select_overlay) {
+ sh_data->by_mode[VERTEX_MODE].color_face =
GPU_shader_create_from_arrays({
.vert = (const char *[]){sh_cfg_data->lib,
datatoc_paint_vertex_vert_glsl, NULL},
.frag = (const char
*[]){datatoc_paint_vertex_frag_glsl, NULL},
.defs = (const char *[]){sh_cfg_data->def, NULL},
});
- sh_data->wire_overlay = GPU_shader_create_from_arrays({
- .vert = (const char *[]){sh_cfg_data->lib,
datatoc_common_globals_lib_glsl, datatoc_paint_wire_vert_glsl, NULL},
- .frag = (const char *[]){datatoc_paint_wire_frag_glsl,
NULL},
- .defs = (const char *[]){sh_cfg_data->def, "#define
VERTEX_MODE\n", NULL},
- });
- sh_data->wire_select_overlay = GPU_shader_create_from_arrays({
- .vert = (const char *[]){sh_cfg_data->lib,
datatoc_common_globals_lib_glsl, datatoc_paint_wire_vert_glsl, NULL},
- .frag = (const char *[]){datatoc_paint_wire_frag_glsl,
NULL},
- .defs = (const char *[]){sh_cfg_data->def, "#define
VERTEX_MODE\n" "#define USE_SELECT\n", NULL},
+ sh_data->by_mode[WEIGHT_MODE].color_face =
GPU_shader_create_from_arrays({
+ .vert = (const char *[]){sh_cfg_data->lib,
datatoc_common_globals_lib_glsl, datatoc_paint_weight_vert_glsl, NULL},
+ .frag = (const char
*[]){datatoc_common_globals_lib_glsl, datatoc_paint_weight_frag_glsl, NULL},
+ .defs = (const char *[]){sh_cfg_data->def, NULL},
});
+
sh_data->face_select_overlay = GPU_shader_create_from_arrays({
.vert = (const char *[]){sh_cfg_data->lib,
datatoc_paint_face_vert_glsl, NULL},
.frag = (const char
*[]){datatoc_gpu_shader_uniform_color_frag_glsl, NULL},
@@ -125,6 +133,23 @@ static void PAINT_VERTEX_engine_init(void *UNUSED(vedata))
.frag = (const char *[]){datatoc_paint_vert_frag_glsl,
NULL},
.defs = (const char *[]){sh_cfg_data->def, "#define
USE_SELECT\n", NULL},
});
+
+ const char *mode_defs[MODE_LEN] = {
+ "#define VERTEX_MODE\n",
+ "#define WEIGHT_MODE\n",
+ };
+ for (int i = 0; i < MODE_LEN; i++) {
+ sh_data->by_mode[i].wire_overlay =
GPU_shader_create_from_arrays({
+ .vert = (const char *[]){sh_cfg_data->lib,
datatoc_common_globals_lib_glsl, datatoc_paint_wire_vert_glsl, NULL},
+ .frag = (const char
*[]){datatoc_paint_wire_frag_glsl, NULL},
+ .defs = (const char *[]){sh_cfg_data->def,
mode_defs[i], NULL},
+ });
+ sh_data->by_mode[i].wire_select_overlay =
GPU_shader_create_from_arrays({
+ .vert = (const char *[]){sh_cfg_data->lib,
datatoc_common_globals_lib_glsl, datatoc_paint_wire_vert_glsl, NULL},
+ .frag = (const char
*[]){datatoc_paint_wire_frag_glsl, NULL},
+ .defs = (const char *[]){sh_cfg_data->def,
mode_defs[i], "#define USE_SELECT\n", NULL},
+ });
+ }
}
}
@@ -142,52 +167,74 @@ static void PAINT_VERTEX_cache_init(void *vedata)
stl->g_data = MEM_mallocN(sizeof(*stl->g_data), __func__);
}
+ /* Vertex color pass */
{
- /* Create a pass */
DRWPass *pass = DRW_pass_create(
"Vert Color Pass",
DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_EQUAL |
DRW_STATE_MULTIPLY);
- DRWShadingGroup *shgrp =
DRW_shgroup_create(sh_data->vcolor_face, pass);
+ DRWShadingGroup *shgrp =
DRW_shgroup_create(sh_data->by_mode[VERTEX_MODE].color_face, pass);
DRW_shgroup_uniform_float_copy(shgrp, "white_factor", 1.0f -
v3d->overlay.vertex_paint_mode_opacity);
if (rv3d->rflag & RV3D_CLIPPING) {
DRW_shgroup_world_clip_planes_from_rv3d(shgrp, rv3d);
}
- psl->vcolor_faces = pass;
- stl->g_data->fvcolor_shgrp = shgrp;
+ psl->by_mode[VERTEX_MODE].color_faces = pass;
+ stl->g_data->by_mode[VERTEX_MODE].color_shgrp = shgrp;
}
+ /* Weight color pass */
{
DRWPass *pass = DRW_pass_create(
- "Wire Pass",
- DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH |
DRW_STATE_DEPTH_LESS_EQUAL | DRW_STATE_OFFSET_NEGATIVE);
- DRWShadingGroup *shgrp =
DRW_shgroup_create(sh_data->wire_overlay, pass);
+ "Weight Pass",
+ DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_EQUAL |
DRW_STATE_MULTIPLY);
+ DRWShadingGroup *shgrp =
DRW_shgroup_create(sh_data->by_mode[WEIGHT_MODE].color_face, pass);
+ DRW_shgroup_uniform_bool_copy(shgrp, "drawContours",
(v3d->overlay.wpaint_flag & V3D_OVERLAY_WPAINT_CONTOURS) != 0);
+ DRW_shgroup_uniform_float(shgrp, "opacity",
&v3d->overlay.weight_paint_mode_opacity, 1);
+ DRW_shgroup_uniform_texture(shgrp, "colorramp",
G_draw.weight_ramp);
DRW_shgroup_uniform_block(shgrp, "globalsBlock",
G_draw.block_ubo);
if (rv3d->rflag & RV3D_CLIPPING) {
DRW_shgroup_world_clip_planes_from_rv3d(shgrp, rv3d);
}
+ psl->by_mode[WEIGHT_MODE].color_faces = pass;
+ stl->g_data->by_mode[WEIGHT_MODE].color_shgrp = shgrp;
+ }
+
+ {
+ DRWPass *pass = DRW_pass_create(
+ "Wire Pass",
+ DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH |
DRW_STATE_DEPTH_LESS_EQUAL | DRW_STATE_OFFSET_NEGATIVE);
+ for (int i = 0; i < MODE_LEN; i++) {
+ DRWShadingGroup *shgrp =
DRW_shgroup_create(sh_data->by_mode[i].wire_overlay, pass);
+ DRW_shgroup_uniform_block(shgrp, "globalsBlock",
G_draw.block_ubo);
+ if (rv3d->rflag & RV3D_CLIPPING) {
+ DRW_shgroup_world_clip_planes_from_rv3d(shgrp,
rv3d);
+ }
+ stl->g_data->by_mode[i].lwire_shgrp = shgrp;
+ }
psl->wire_overlay = pass;
- stl->g_data->lwire_shgrp = shgrp;
}
+
{
DRWPass *pass = DRW_pass_create(
"Wire Mask Pass",
DRW_STATE_W
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
