From c0a9e388b34298daa6c9f1e9c8f68fde85e319a8 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 13 Apr 2017 14:13:46 +1000 Subject: [PATCH] GLSL: rename edit_overlay -> edit_mesh_overlay Avoid confusion with overlays with non-mesh types --- .../blender/blenkernel/intern/mesh_render.c | 2 +- source/blender/draw/CMakeLists.txt | 20 +++--- source/blender/draw/modes/edit_mesh_mode.c | 72 +++++++++---------- ...sl => edit_mesh_overlay_facedot_frag.glsl} | 0 ...sl => edit_mesh_overlay_facedot_vert.glsl} | 0 ...l => edit_mesh_overlay_facefill_frag.glsl} | 0 ...l => edit_mesh_overlay_facefill_vert.glsl} | 0 ..._frag.glsl => edit_mesh_overlay_frag.glsl} | 0 ....glsl => edit_mesh_overlay_geom_edge.glsl} | 0 ...i.glsl => edit_mesh_overlay_geom_tri.glsl} | 0 ... => edit_mesh_overlay_loosevert_vert.glsl} | 0 ...g.glsl => edit_mesh_overlay_mix_frag.glsl} | 0 ..._vert.glsl => edit_mesh_overlay_vert.glsl} | 0 13 files changed, 47 insertions(+), 47 deletions(-) rename source/blender/draw/modes/shaders/{edit_overlay_facedot_frag.glsl => edit_mesh_overlay_facedot_frag.glsl} (100%) rename source/blender/draw/modes/shaders/{edit_overlay_facedot_vert.glsl => edit_mesh_overlay_facedot_vert.glsl} (100%) rename source/blender/draw/modes/shaders/{edit_overlay_facefill_frag.glsl => edit_mesh_overlay_facefill_frag.glsl} (100%) rename source/blender/draw/modes/shaders/{edit_overlay_facefill_vert.glsl => edit_mesh_overlay_facefill_vert.glsl} (100%) rename source/blender/draw/modes/shaders/{edit_overlay_frag.glsl => edit_mesh_overlay_frag.glsl} (100%) rename source/blender/draw/modes/shaders/{edit_overlay_geom_edge.glsl => edit_mesh_overlay_geom_edge.glsl} (100%) rename source/blender/draw/modes/shaders/{edit_overlay_geom_tri.glsl => edit_mesh_overlay_geom_tri.glsl} (100%) rename source/blender/draw/modes/shaders/{edit_overlay_loosevert_vert.glsl => edit_mesh_overlay_loosevert_vert.glsl} (100%) rename source/blender/draw/modes/shaders/{edit_overlay_mix_frag.glsl => edit_mesh_overlay_mix_frag.glsl} (100%) rename source/blender/draw/modes/shaders/{edit_overlay_vert.glsl => edit_mesh_overlay_vert.glsl} (100%) diff --git a/source/blender/blenkernel/intern/mesh_render.c b/source/blender/blenkernel/intern/mesh_render.c index 2fd5435ba6f..b1c7a5f2791 100644 --- a/source/blender/blenkernel/intern/mesh_render.c +++ b/source/blender/blenkernel/intern/mesh_render.c @@ -611,7 +611,7 @@ enum { VFLAG_EDGE_SEAM = 1 << 3, VFLAG_EDGE_SHARP = 1 << 4, /* 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) diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index 67a1a6d5e88..8c3c5b8e679 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -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(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_overlay_vert.glsl SRC) -data_to_c_simple(modes/shaders/edit_overlay_geom_tri.glsl SRC) -data_to_c_simple(modes/shaders/edit_overlay_geom_edge.glsl SRC) -data_to_c_simple(modes/shaders/edit_overlay_loosevert_vert.glsl SRC) -data_to_c_simple(modes/shaders/edit_overlay_facedot_frag.glsl SRC) -data_to_c_simple(modes/shaders/edit_overlay_facedot_vert.glsl SRC) -data_to_c_simple(modes/shaders/edit_overlay_mix_frag.glsl SRC) -data_to_c_simple(modes/shaders/edit_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_frag.glsl SRC) +data_to_c_simple(modes/shaders/edit_mesh_overlay_vert.glsl SRC) +data_to_c_simple(modes/shaders/edit_mesh_overlay_geom_tri.glsl SRC) +data_to_c_simple(modes/shaders/edit_mesh_overlay_geom_edge.glsl SRC) +data_to_c_simple(modes/shaders/edit_mesh_overlay_loosevert_vert.glsl SRC) +data_to_c_simple(modes/shaders/edit_mesh_overlay_facedot_frag.glsl SRC) +data_to_c_simple(modes/shaders/edit_mesh_overlay_facedot_vert.glsl SRC) +data_to_c_simple(modes/shaders/edit_mesh_overlay_mix_frag.glsl SRC) +data_to_c_simple(modes/shaders/edit_mesh_overlay_facefill_vert.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_geom.glsl SRC) data_to_c_simple(modes/shaders/object_outline_resolve_frag.glsl SRC) diff --git a/source/blender/draw/modes/edit_mesh_mode.c b/source/blender/draw/modes/edit_mesh_mode.c index 46a3e8e2e4e..b75dd5ae96d 100644 --- a/source/blender/draw/modes/edit_mesh_mode.c +++ b/source/blender/draw/modes/edit_mesh_mode.c @@ -36,17 +36,17 @@ extern struct GPUUniformBuffer *globals_ubo; /* draw_common.c */ extern struct GlobalsUboStorage ts; /* draw_common.c */ -extern char datatoc_edit_overlay_frag_glsl[]; -extern char datatoc_edit_overlay_vert_glsl[]; -extern char datatoc_edit_overlay_geom_tri_glsl[]; -extern char datatoc_edit_overlay_geom_edge_glsl[]; -extern char datatoc_edit_overlay_loosevert_vert_glsl[]; -extern char datatoc_edit_overlay_facedot_frag_glsl[]; -extern char datatoc_edit_overlay_facedot_vert_glsl[]; -extern char datatoc_edit_overlay_mix_vert_glsl[]; -extern char datatoc_edit_overlay_mix_frag_glsl[]; -extern char datatoc_edit_overlay_facefill_vert_glsl[]; -extern char datatoc_edit_overlay_facefill_frag_glsl[]; +extern char datatoc_edit_mesh_overlay_frag_glsl[]; +extern char datatoc_edit_mesh_overlay_vert_glsl[]; +extern char datatoc_edit_mesh_overlay_geom_tri_glsl[]; +extern char datatoc_edit_mesh_overlay_geom_edge_glsl[]; +extern char datatoc_edit_mesh_overlay_loosevert_vert_glsl[]; +extern char datatoc_edit_mesh_overlay_facedot_frag_glsl[]; +extern char datatoc_edit_mesh_overlay_facedot_vert_glsl[]; +extern char datatoc_edit_mesh_overlay_mix_vert_glsl[]; +extern char datatoc_edit_mesh_overlay_mix_frag_glsl[]; +extern char datatoc_edit_mesh_overlay_facefill_vert_glsl[]; +extern char datatoc_edit_mesh_overlay_facefill_frag_glsl[]; extern char datatoc_edit_normals_vert_glsl[]; extern char datatoc_edit_normals_geom_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) { e_data.overlay_tri_sh = DRW_shader_create_with_lib( - datatoc_edit_overlay_vert_glsl, - datatoc_edit_overlay_geom_tri_glsl, - datatoc_edit_overlay_frag_glsl, + datatoc_edit_mesh_overlay_vert_glsl, + datatoc_edit_mesh_overlay_geom_tri_glsl, + datatoc_edit_mesh_overlay_frag_glsl, datatoc_common_globals_lib_glsl, "#define EDGE_FIX\n"); } if (!e_data.overlay_tri_fast_sh) { e_data.overlay_tri_fast_sh = DRW_shader_create_with_lib( - datatoc_edit_overlay_vert_glsl, - datatoc_edit_overlay_geom_tri_glsl, - datatoc_edit_overlay_frag_glsl, + datatoc_edit_mesh_overlay_vert_glsl, + datatoc_edit_mesh_overlay_geom_tri_glsl, + datatoc_edit_mesh_overlay_frag_glsl, datatoc_common_globals_lib_glsl, NULL); } if (!e_data.overlay_tri_vcol_sh) { e_data.overlay_tri_vcol_sh = DRW_shader_create_with_lib( - datatoc_edit_overlay_vert_glsl, - datatoc_edit_overlay_geom_tri_glsl, - datatoc_edit_overlay_frag_glsl, + datatoc_edit_mesh_overlay_vert_glsl, + datatoc_edit_mesh_overlay_geom_tri_glsl, + datatoc_edit_mesh_overlay_frag_glsl, datatoc_common_globals_lib_glsl, "#define EDGE_FIX\n" "#define VERTEX_SELECTION\n"); } if (!e_data.overlay_tri_vcol_fast_sh) { e_data.overlay_tri_vcol_fast_sh = DRW_shader_create_with_lib( - datatoc_edit_overlay_vert_glsl, - datatoc_edit_overlay_geom_tri_glsl, - datatoc_edit_overlay_frag_glsl, + datatoc_edit_mesh_overlay_vert_glsl, + datatoc_edit_mesh_overlay_geom_tri_glsl, + datatoc_edit_mesh_overlay_frag_glsl, datatoc_common_globals_lib_glsl, "#define VERTEX_SELECTION\n"); } if (!e_data.overlay_edge_sh) { e_data.overlay_edge_sh = DRW_shader_create_with_lib( - datatoc_edit_overlay_vert_glsl, - datatoc_edit_overlay_geom_edge_glsl, - datatoc_edit_overlay_frag_glsl, + datatoc_edit_mesh_overlay_vert_glsl, + datatoc_edit_mesh_overlay_geom_edge_glsl, + datatoc_edit_mesh_overlay_frag_glsl, datatoc_common_globals_lib_glsl, NULL); } if (!e_data.overlay_edge_vcol_sh) { e_data.overlay_edge_vcol_sh = DRW_shader_create_with_lib( - datatoc_edit_overlay_vert_glsl, - datatoc_edit_overlay_geom_edge_glsl, - datatoc_edit_overlay_frag_glsl, + datatoc_edit_mesh_overlay_vert_glsl, + datatoc_edit_mesh_overlay_geom_edge_glsl, + datatoc_edit_mesh_overlay_frag_glsl, datatoc_common_globals_lib_glsl, "#define VERTEX_SELECTION\n"); } if (!e_data.overlay_vert_sh) { e_data.overlay_vert_sh = DRW_shader_create_with_lib( - datatoc_edit_overlay_loosevert_vert_glsl, NULL, - datatoc_edit_overlay_frag_glsl, + datatoc_edit_mesh_overlay_loosevert_vert_glsl, NULL, + datatoc_edit_mesh_overlay_frag_glsl, datatoc_common_globals_lib_glsl, "#define VERTEX_SELECTION\n"); } if (!e_data.overlay_facedot_sh) { e_data.overlay_facedot_sh = DRW_shader_create_with_lib( - datatoc_edit_overlay_facedot_vert_glsl, NULL, - datatoc_edit_overlay_facedot_frag_glsl, + datatoc_edit_mesh_overlay_facedot_vert_glsl, NULL, + datatoc_edit_mesh_overlay_facedot_frag_glsl, datatoc_common_globals_lib_glsl, NULL); } 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) { e_data.overlay_facefill_sh = DRW_shader_create_with_lib( - datatoc_edit_overlay_facefill_vert_glsl, NULL, - datatoc_edit_overlay_facefill_frag_glsl, + datatoc_edit_mesh_overlay_facefill_vert_glsl, NULL, + datatoc_edit_mesh_overlay_facefill_frag_glsl, datatoc_common_globals_lib_glsl, NULL); } if (!e_data.normals_face_sh) { diff --git a/source/blender/draw/modes/shaders/edit_overlay_facedot_frag.glsl b/source/blender/draw/modes/shaders/edit_mesh_overlay_facedot_frag.glsl similarity index 100% rename from source/blender/draw/modes/shaders/edit_overlay_facedot_frag.glsl rename to source/blender/draw/modes/shaders/edit_mesh_overlay_facedot_frag.glsl diff --git a/source/blender/draw/modes/shaders/edit_overlay_facedot_vert.glsl b/source/blender/draw/modes/shaders/edit_mesh_overlay_facedot_vert.glsl similarity index 100% rename from source/blender/draw/modes/shaders/edit_overlay_facedot_vert.glsl rename to source/blender/draw/modes/shaders/edit_mesh_overlay_facedot_vert.glsl diff --git a/source/blender/draw/modes/shaders/edit_overlay_facefill_frag.glsl b/source/blender/draw/modes/shaders/edit_mesh_overlay_facefill_frag.glsl similarity index 100% rename from source/blender/draw/modes/shaders/edit_overlay_facefill_frag.glsl rename to source/blender/draw/modes/shaders/edit_mesh_overlay_facefill_frag.glsl diff --git a/source/blender/draw/modes/shaders/edit_overlay_facefill_vert.glsl b/source/blender/draw/modes/shaders/edit_mesh_overlay_facefill_vert.glsl similarity index 100% rename from source/blender/draw/modes/shaders/edit_overlay_facefill_vert.glsl rename to source/blender/draw/modes/shaders/edit_mesh_overlay_facefill_vert.glsl diff --git a/source/blender/draw/modes/shaders/edit_overlay_frag.glsl b/source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl similarity index 100% rename from source/blender/draw/modes/shaders/edit_overlay_frag.glsl rename to source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl diff --git a/source/blender/draw/modes/shaders/edit_overlay_geom_edge.glsl b/source/blender/draw/modes/shaders/edit_mesh_overlay_geom_edge.glsl similarity index 100% rename from source/blender/draw/modes/shaders/edit_overlay_geom_edge.glsl rename to source/blender/draw/modes/shaders/edit_mesh_overlay_geom_edge.glsl diff --git a/source/blender/draw/modes/shaders/edit_overlay_geom_tri.glsl b/source/blender/draw/modes/shaders/edit_mesh_overlay_geom_tri.glsl similarity index 100% rename from source/blender/draw/modes/shaders/edit_overlay_geom_tri.glsl rename to source/blender/draw/modes/shaders/edit_mesh_overlay_geom_tri.glsl diff --git a/source/blender/draw/modes/shaders/edit_overlay_loosevert_vert.glsl b/source/blender/draw/modes/shaders/edit_mesh_overlay_loosevert_vert.glsl similarity index 100% rename from source/blender/draw/modes/shaders/edit_overlay_loosevert_vert.glsl rename to source/blender/draw/modes/shaders/edit_mesh_overlay_loosevert_vert.glsl diff --git a/source/blender/draw/modes/shaders/edit_overlay_mix_frag.glsl b/source/blender/draw/modes/shaders/edit_mesh_overlay_mix_frag.glsl similarity index 100% rename from source/blender/draw/modes/shaders/edit_overlay_mix_frag.glsl rename to source/blender/draw/modes/shaders/edit_mesh_overlay_mix_frag.glsl diff --git a/source/blender/draw/modes/shaders/edit_overlay_vert.glsl b/source/blender/draw/modes/shaders/edit_mesh_overlay_vert.glsl similarity index 100% rename from source/blender/draw/modes/shaders/edit_overlay_vert.glsl rename to source/blender/draw/modes/shaders/edit_mesh_overlay_vert.glsl