Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GLSL: rename edit_overlay -> edit_mesh_overlay

Browse Source 
Avoid confusion with overlays with non-mesh types
This commit is contained in:
Campbell Barton
2017-04-13 14:13:46 +10:00
parent 64660b902c
commit c0a9e388b3
13 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/mesh_render.c
View File

@@ -611,7 +611,7 @@ enum {
VFLAG_EDGE_SEAM = 1 << 3, VFLAG_EDGE_SEAM = 1 << 3,
VFLAG_EDGE_SHARP = 1 << 4, VFLAG_EDGE_SHARP = 1 << 4,
/* Beware to not go over 1 << 7 /* Beware to not go over 1 << 7
* (see gpu_shader_edit_overlay_geom.glsl) */ * (see gpu_shader_edit_mesh_overlay_geom.glsl) */
}; };
static unsigned char mesh_render_data_looptri_flag(MeshRenderData *mrdata, const int f) static unsigned char mesh_render_data_looptri_flag(MeshRenderData *mrdata, const int f)

20
source/blender/draw/CMakeLists.txt
View File

@@ -112,16 +112,16 @@ data_to_c_simple(engines/eevee/shaders/bsdf_common_lib.glsl SRC)
data_to_c_simple(engines/eevee/shaders/ltc_lib.glsl SRC) data_to_c_simple(engines/eevee/shaders/ltc_lib.glsl SRC)
data_to_c_simple(modes/shaders/common_globals_lib.glsl SRC) data_to_c_simple(modes/shaders/common_globals_lib.glsl SRC)
data_to_c_simple(modes/shaders/edit_overlay_frag.glsl SRC) data_to_c_simple(modes/shaders/edit_mesh_overlay_frag.glsl SRC)
data_to_c_simple(modes/shaders/edit_overlay_vert.glsl SRC) data_to_c_simple(modes/shaders/edit_mesh_overlay_vert.glsl SRC)
data_to_c_simple(modes/shaders/edit_overlay_geom_tri.glsl SRC) data_to_c_simple(modes/shaders/edit_mesh_overlay_geom_tri.glsl SRC)
data_to_c_simple(modes/shaders/edit_overlay_geom_edge.glsl SRC) data_to_c_simple(modes/shaders/edit_mesh_overlay_geom_edge.glsl SRC)
data_to_c_simple(modes/shaders/edit_overlay_loosevert_vert.glsl SRC) data_to_c_simple(modes/shaders/edit_mesh_overlay_loosevert_vert.glsl SRC)
data_to_c_simple(modes/shaders/edit_overlay_facedot_frag.glsl SRC) data_to_c_simple(modes/shaders/edit_mesh_overlay_facedot_frag.glsl SRC)
data_to_c_simple(modes/shaders/edit_overlay_facedot_vert.glsl SRC) data_to_c_simple(modes/shaders/edit_mesh_overlay_facedot_vert.glsl SRC)
data_to_c_simple(modes/shaders/edit_overlay_mix_frag.glsl SRC) data_to_c_simple(modes/shaders/edit_mesh_overlay_mix_frag.glsl SRC)
data_to_c_simple(modes/shaders/edit_overlay_facefill_vert.glsl SRC) data_to_c_simple(modes/shaders/edit_mesh_overlay_facefill_vert.glsl SRC)
data_to_c_simple(modes/shaders/edit_overlay_facefill_frag.glsl SRC) data_to_c_simple(modes/shaders/edit_mesh_overlay_facefill_frag.glsl SRC)
data_to_c_simple(modes/shaders/edit_normals_vert.glsl SRC) data_to_c_simple(modes/shaders/edit_normals_vert.glsl SRC)
data_to_c_simple(modes/shaders/edit_normals_geom.glsl SRC) data_to_c_simple(modes/shaders/edit_normals_geom.glsl SRC)
data_to_c_simple(modes/shaders/object_outline_resolve_frag.glsl SRC) data_to_c_simple(modes/shaders/object_outline_resolve_frag.glsl SRC)

72
source/blender/draw/modes/edit_mesh_mode.c
View File

@@ -36,17 +36,17 @@
extern struct GPUUniformBuffer *globals_ubo; /* draw_common.c */ extern struct GPUUniformBuffer *globals_ubo; /* draw_common.c */
extern struct GlobalsUboStorage ts; /* draw_common.c */ extern struct GlobalsUboStorage ts; /* draw_common.c */
extern char datatoc_edit_overlay_frag_glsl[]; extern char datatoc_edit_mesh_overlay_frag_glsl[];
extern char datatoc_edit_overlay_vert_glsl[]; extern char datatoc_edit_mesh_overlay_vert_glsl[];
extern char datatoc_edit_overlay_geom_tri_glsl[]; extern char datatoc_edit_mesh_overlay_geom_tri_glsl[];
extern char datatoc_edit_overlay_geom_edge_glsl[]; extern char datatoc_edit_mesh_overlay_geom_edge_glsl[];
extern char datatoc_edit_overlay_loosevert_vert_glsl[]; extern char datatoc_edit_mesh_overlay_loosevert_vert_glsl[];
extern char datatoc_edit_overlay_facedot_frag_glsl[]; extern char datatoc_edit_mesh_overlay_facedot_frag_glsl[];
extern char datatoc_edit_overlay_facedot_vert_glsl[]; extern char datatoc_edit_mesh_overlay_facedot_vert_glsl[];
extern char datatoc_edit_overlay_mix_vert_glsl[]; extern char datatoc_edit_mesh_overlay_mix_vert_glsl[];
extern char datatoc_edit_overlay_mix_frag_glsl[]; extern char datatoc_edit_mesh_overlay_mix_frag_glsl[];
extern char datatoc_edit_overlay_facefill_vert_glsl[]; extern char datatoc_edit_mesh_overlay_facefill_vert_glsl[];
extern char datatoc_edit_overlay_facefill_frag_glsl[]; extern char datatoc_edit_mesh_overlay_facefill_frag_glsl[];
extern char datatoc_edit_normals_vert_glsl[]; extern char datatoc_edit_normals_vert_glsl[];
extern char datatoc_edit_normals_geom_glsl[]; extern char datatoc_edit_normals_geom_glsl[];
extern char datatoc_common_globals_lib_glsl[]; extern char datatoc_common_globals_lib_glsl[];
@@ -142,70 +142,70 @@ static void EDIT_MESH_engine_init(void *vedata)
if (!e_data.overlay_tri_sh) { if (!e_data.overlay_tri_sh) {
e_data.overlay_tri_sh = DRW_shader_create_with_lib( e_data.overlay_tri_sh = DRW_shader_create_with_lib(
datatoc_edit_overlay_vert_glsl, datatoc_edit_mesh_overlay_vert_glsl,
datatoc_edit_overlay_geom_tri_glsl, datatoc_edit_mesh_overlay_geom_tri_glsl,
datatoc_edit_overlay_frag_glsl, datatoc_edit_mesh_overlay_frag_glsl,
datatoc_common_globals_lib_glsl, "#define EDGE_FIX\n"); datatoc_common_globals_lib_glsl, "#define EDGE_FIX\n");
} }
if (!e_data.overlay_tri_fast_sh) { if (!e_data.overlay_tri_fast_sh) {
e_data.overlay_tri_fast_sh = DRW_shader_create_with_lib( e_data.overlay_tri_fast_sh = DRW_shader_create_with_lib(
datatoc_edit_overlay_vert_glsl, datatoc_edit_mesh_overlay_vert_glsl,
datatoc_edit_overlay_geom_tri_glsl, datatoc_edit_mesh_overlay_geom_tri_glsl,
datatoc_edit_overlay_frag_glsl, datatoc_edit_mesh_overlay_frag_glsl,
datatoc_common_globals_lib_glsl, NULL); datatoc_common_globals_lib_glsl, NULL);
} }
if (!e_data.overlay_tri_vcol_sh) { if (!e_data.overlay_tri_vcol_sh) {
e_data.overlay_tri_vcol_sh = DRW_shader_create_with_lib( e_data.overlay_tri_vcol_sh = DRW_shader_create_with_lib(
datatoc_edit_overlay_vert_glsl, datatoc_edit_mesh_overlay_vert_glsl,
datatoc_edit_overlay_geom_tri_glsl, datatoc_edit_mesh_overlay_geom_tri_glsl,
datatoc_edit_overlay_frag_glsl, datatoc_edit_mesh_overlay_frag_glsl,
datatoc_common_globals_lib_glsl, datatoc_common_globals_lib_glsl,
"#define EDGE_FIX\n" "#define EDGE_FIX\n"
"#define VERTEX_SELECTION\n"); "#define VERTEX_SELECTION\n");
} }
if (!e_data.overlay_tri_vcol_fast_sh) { if (!e_data.overlay_tri_vcol_fast_sh) {
e_data.overlay_tri_vcol_fast_sh = DRW_shader_create_with_lib( e_data.overlay_tri_vcol_fast_sh = DRW_shader_create_with_lib(
datatoc_edit_overlay_vert_glsl, datatoc_edit_mesh_overlay_vert_glsl,
datatoc_edit_overlay_geom_tri_glsl, datatoc_edit_mesh_overlay_geom_tri_glsl,
datatoc_edit_overlay_frag_glsl, datatoc_edit_mesh_overlay_frag_glsl,
datatoc_common_globals_lib_glsl, datatoc_common_globals_lib_glsl,
"#define VERTEX_SELECTION\n"); "#define VERTEX_SELECTION\n");
} }
if (!e_data.overlay_edge_sh) { if (!e_data.overlay_edge_sh) {
e_data.overlay_edge_sh = DRW_shader_create_with_lib( e_data.overlay_edge_sh = DRW_shader_create_with_lib(
datatoc_edit_overlay_vert_glsl, datatoc_edit_mesh_overlay_vert_glsl,
datatoc_edit_overlay_geom_edge_glsl, datatoc_edit_mesh_overlay_geom_edge_glsl,
datatoc_edit_overlay_frag_glsl, datatoc_edit_mesh_overlay_frag_glsl,
datatoc_common_globals_lib_glsl, NULL); datatoc_common_globals_lib_glsl, NULL);
} }
if (!e_data.overlay_edge_vcol_sh) { if (!e_data.overlay_edge_vcol_sh) {
e_data.overlay_edge_vcol_sh = DRW_shader_create_with_lib( e_data.overlay_edge_vcol_sh = DRW_shader_create_with_lib(
datatoc_edit_overlay_vert_glsl, datatoc_edit_mesh_overlay_vert_glsl,
datatoc_edit_overlay_geom_edge_glsl, datatoc_edit_mesh_overlay_geom_edge_glsl,
datatoc_edit_overlay_frag_glsl, datatoc_edit_mesh_overlay_frag_glsl,
datatoc_common_globals_lib_glsl, datatoc_common_globals_lib_glsl,
"#define VERTEX_SELECTION\n"); "#define VERTEX_SELECTION\n");
} }
if (!e_data.overlay_vert_sh) { if (!e_data.overlay_vert_sh) {
e_data.overlay_vert_sh = DRW_shader_create_with_lib( e_data.overlay_vert_sh = DRW_shader_create_with_lib(
datatoc_edit_overlay_loosevert_vert_glsl, NULL, datatoc_edit_mesh_overlay_loosevert_vert_glsl, NULL,
datatoc_edit_overlay_frag_glsl, datatoc_edit_mesh_overlay_frag_glsl,
datatoc_common_globals_lib_glsl, datatoc_common_globals_lib_glsl,
"#define VERTEX_SELECTION\n"); "#define VERTEX_SELECTION\n");
} }
if (!e_data.overlay_facedot_sh) { if (!e_data.overlay_facedot_sh) {
e_data.overlay_facedot_sh = DRW_shader_create_with_lib( e_data.overlay_facedot_sh = DRW_shader_create_with_lib(
datatoc_edit_overlay_facedot_vert_glsl, NULL, datatoc_edit_mesh_overlay_facedot_vert_glsl, NULL,
datatoc_edit_overlay_facedot_frag_glsl, datatoc_edit_mesh_overlay_facedot_frag_glsl,
datatoc_common_globals_lib_glsl, NULL); datatoc_common_globals_lib_glsl, NULL);
} }
if (!e_data.overlay_mix_sh) { if (!e_data.overlay_mix_sh) {
e_data.overlay_mix_sh = DRW_shader_create_fullscreen(datatoc_edit_overlay_mix_frag_glsl, NULL); e_data.overlay_mix_sh = DRW_shader_create_fullscreen(datatoc_edit_mesh_overlay_mix_frag_glsl, NULL);
} }
if (!e_data.overlay_facefill_sh) { if (!e_data.overlay_facefill_sh) {
e_data.overlay_facefill_sh = DRW_shader_create_with_lib( e_data.overlay_facefill_sh = DRW_shader_create_with_lib(
datatoc_edit_overlay_facefill_vert_glsl, NULL, datatoc_edit_mesh_overlay_facefill_vert_glsl, NULL,
datatoc_edit_overlay_facefill_frag_glsl, datatoc_edit_mesh_overlay_facefill_frag_glsl,
datatoc_common_globals_lib_glsl, NULL); datatoc_common_globals_lib_glsl, NULL);
} }
if (!e_data.normals_face_sh) { if (!e_data.normals_face_sh) {

0
source/blender/draw/modes/shaders/edit_overlay_facedot_frag.glsl → source/blender/draw/modes/shaders/edit_mesh_overlay_facedot_frag.glsl
View File

0
source/blender/draw/modes/shaders/edit_overlay_facedot_vert.glsl → source/blender/draw/modes/shaders/edit_mesh_overlay_facedot_vert.glsl
View File

0
source/blender/draw/modes/shaders/edit_overlay_facefill_frag.glsl → source/blender/draw/modes/shaders/edit_mesh_overlay_facefill_frag.glsl
View File

0
source/blender/draw/modes/shaders/edit_overlay_facefill_vert.glsl → source/blender/draw/modes/shaders/edit_mesh_overlay_facefill_vert.glsl
View File

0
source/blender/draw/modes/shaders/edit_overlay_frag.glsl → source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl
View File

0
source/blender/draw/modes/shaders/edit_overlay_geom_edge.glsl → source/blender/draw/modes/shaders/edit_mesh_overlay_geom_edge.glsl
View File

0
source/blender/draw/modes/shaders/edit_overlay_geom_tri.glsl → source/blender/draw/modes/shaders/edit_mesh_overlay_geom_tri.glsl
View File

0
source/blender/draw/modes/shaders/edit_overlay_loosevert_vert.glsl → source/blender/draw/modes/shaders/edit_mesh_overlay_loosevert_vert.glsl
View File

0
source/blender/draw/modes/shaders/edit_overlay_mix_frag.glsl → source/blender/draw/modes/shaders/edit_mesh_overlay_mix_frag.glsl
View File

0
source/blender/draw/modes/shaders/edit_overlay_vert.glsl → source/blender/draw/modes/shaders/edit_mesh_overlay_vert.glsl
View File