Commit: 0b6dbbc306b0a7e60abe36968d154241bb90c1df
Author: Campbell Barton
Date: Sun Feb 10 11:06:22 2019 +1100
Branches: master
https://developer.blender.org/rB0b6dbbc306b0a7e60abe36968d154241bb90c1df
Cleanup: move clipping shader lib & define into struct
Also compare clipping with the draw context instead of
accessing the RegionView3D, currently they're matching
but this might not always be the case.
===================================================================
M source/blender/draw/engines/basic/basic_engine.c
M source/blender/draw/intern/draw_common.c
M source/blender/draw/modes/edit_curve_mode.c
M source/blender/draw/modes/edit_lattice_mode.c
M source/blender/draw/modes/edit_mesh_mode.c
M source/blender/draw/modes/edit_metaball_mode.c
M source/blender/draw/modes/object_mode.c
M source/blender/draw/modes/overlay_mode.c
M source/blender/draw/modes/paint_vertex_mode.c
M source/blender/draw/modes/paint_weight_mode.c
M source/blender/gpu/GPU_shader.h
M source/blender/gpu/intern/gpu_shader.c
===================================================================
diff --git a/source/blender/draw/engines/basic/basic_engine.c
b/source/blender/draw/engines/basic/basic_engine.c
index 72ff8de2002..5123132c3e8 100644
--- a/source/blender/draw/engines/basic/basic_engine.c
+++ b/source/blender/draw/engines/basic/basic_engine.c
@@ -94,9 +94,8 @@ static void basic_cache_init(void *vedata)
const DRWContextState *draw_ctx = DRW_context_state_get();
BASIC_Shaders *sh_data = &e_data.sh_data[draw_ctx->sh_cfg];
const RegionView3D *rv3d = draw_ctx->rv3d;
- const bool is_clip = (rv3d->rflag & RV3D_CLIPPING) != 0;
- if (is_clip) {
+ if (draw_ctx->sh_cfg == GPU_SHADER_CFG_CLIPPED) {
DRW_state_clip_planes_set_from_rv3d(draw_ctx->rv3d);
}
@@ -109,7 +108,7 @@ static void basic_cache_init(void *vedata)
psl->depth_pass = DRW_pass_create(
"Depth Pass", DRW_STATE_WRITE_DEPTH |
DRW_STATE_DEPTH_LESS_EQUAL | DRW_STATE_WIRE);
stl->g_data->depth_shgrp = DRW_shgroup_create(sh_data->depth,
psl->depth_pass);
- if (rv3d->rflag & RV3D_CLIPPING) {
+ if (draw_ctx->sh_cfg == GPU_SHADER_CFG_CLIPPED) {
DRW_shgroup_world_clip_planes_from_rv3d(stl->g_data->depth_shgrp, rv3d);
}
@@ -117,7 +116,7 @@ static void basic_cache_init(void *vedata)
"Depth Pass Cull",
DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL |
DRW_STATE_CULL_BACK);
stl->g_data->depth_shgrp_cull =
DRW_shgroup_create(sh_data->depth, psl->depth_pass_cull);
- if (rv3d->rflag & RV3D_CLIPPING) {
+ if (draw_ctx->sh_cfg == GPU_SHADER_CFG_CLIPPED) {
DRW_shgroup_world_clip_planes_from_rv3d(stl->g_data->depth_shgrp_cull, rv3d);
}
}
diff --git a/source/blender/draw/intern/draw_common.c
b/source/blender/draw/intern/draw_common.c
index e222a6bba25..b44e9734076 100644
--- a/source/blender/draw/intern/draw_common.c
+++ b/source/blender/draw/intern/draw_common.c
@@ -228,7 +228,6 @@ extern char datatoc_armature_stick_frag_glsl[];
extern char datatoc_armature_dof_vert_glsl[];
extern char datatoc_common_globals_lib_glsl[];
-extern char datatoc_gpu_shader_cfg_world_clip_lib_glsl[];
extern char datatoc_gpu_shader_flat_color_frag_glsl[];
extern char datatoc_gpu_shader_3D_smooth_color_frag_glsl[];
@@ -501,13 +500,12 @@ DRWShadingGroup *shgroup_instance_alpha(DRWPass *pass,
struct GPUBatch *geom, eG
DRWShadingGroup *shgroup_instance_empty_axes(DRWPass *pass, struct GPUBatch
*geom, eGPUShaderConfig sh_cfg)
{
COMMON_Shaders *sh_data = &g_shaders[sh_cfg];
- const char *world_clip_lib_or_empty = (sh_cfg ==
GPU_SHADER_CFG_CLIPPED) ? datatoc_gpu_shader_cfg_world_clip_lib_glsl : "";
- const char *world_clip_def_or_empty = (sh_cfg ==
GPU_SHADER_CFG_CLIPPED) ? "#define USE_WORLD_CLIP_PLANES\n" : "";
if (sh_data->empty_axes_sh == NULL) {
+ const GPUShaderConfigData *sh_cfg_data =
&GPU_shader_cfg_data[sh_cfg];
sh_data->empty_axes_sh = GPU_shader_create_from_arrays({
- .vert = (const char *[]){world_clip_lib_or_empty,
datatoc_object_empty_axes_vert_glsl, NULL},
+ .vert = (const char *[]){sh_cfg_data->lib,
datatoc_object_empty_axes_vert_glsl, NULL},
.frag = (const char
*[]){datatoc_gpu_shader_flat_color_frag_glsl, NULL},
- .defs = (const char *[]){world_clip_def_or_empty, NULL},
+ .defs = (const char *[]){sh_cfg_data->def, NULL},
});
}
@@ -702,13 +700,11 @@ DRWShadingGroup *shgroup_instance_mball_handles(DRWPass
*pass, eGPUShaderConfig
{
COMMON_Shaders *sh_data = &g_shaders[sh_cfg];
if (sh_data->mball_handles == NULL) {
- bool is_clip = (sh_cfg == GPU_SHADER_CFG_CLIPPED);
- const char *world_clip_lib_or_empty = is_clip ?
datatoc_gpu_shader_cfg_world_clip_lib_glsl : "";
- const char *world_clip_def_or_empty = is_clip ? "#define
USE_WORLD_CLIP_PLANES\n" : "";
+ const GPUShaderConfigData *sh_cfg_data =
&GPU_shader_cfg_data[sh_cfg];
sh_data->mball_handles = GPU_shader_create_from_arrays({
- .vert = (const char *[]){world_clip_lib_or_empty,
datatoc_object_mball_handles_vert_glsl, NULL},
+ .vert = (const char *[]){sh_cfg_data->lib,
datatoc_object_mball_handles_vert_glsl, NULL},
.frag = (const char
*[]){datatoc_gpu_shader_flat_color_frag_glsl, NULL},
- .defs = (const char *[]){world_clip_def_or_empty, NULL},
+ .defs = (const char *[]){sh_cfg_data->def, NULL},
});
}
@@ -735,13 +731,12 @@ DRWShadingGroup *shgroup_instance_bone_shape_outline(
{
COMMON_Shaders *sh_data = &g_shaders[sh_cfg];
if (sh_data->shape_outline == NULL) {
- const char *world_clip_lib_or_empty = (sh_cfg ==
GPU_SHADER_CFG_CLIPPED) ? datatoc_gpu_shader_cfg_world_clip_lib_glsl : "";
- const char *world_clip_def_or_empty = (sh_cfg ==
GPU_SHADER_CFG_CLIPPED) ? "#define USE_WORLD_CLIP_PLANES\n" : "";
+ const GPUShaderConfigData *sh_cfg_data =
&GPU_shader_cfg_data[sh_cfg];
sh_data->shape_outline = GPU_shader_create_from_arrays({
- .vert = (const char *[]){world_clip_lib_or_empty,
datatoc_armature_shape_outline_vert_glsl, NULL},
- .geom = (const char *[]){world_clip_lib_or_empty,
datatoc_armature_shape_outline_geom_glsl, NULL},
+ .vert = (const char *[]){sh_cfg_data->lib,
datatoc_armature_shape_outline_vert_glsl, NULL},
+ .geom = (const char *[]){sh_cfg_data->lib,
datatoc_armature_shape_outline_geom_glsl, NULL},
.frag = (const char
*[]){datatoc_gpu_shader_flat_color_frag_glsl, NULL},
- .defs = (const char *[]){world_clip_def_or_empty, NULL},
+ .defs = (const char *[]){sh_cfg_data->def, NULL},
});
}
@@ -765,12 +760,11 @@ DRWShadingGroup *shgroup_instance_bone_shape_solid(
{
COMMON_Shaders *sh_data = &g_shaders[sh_cfg];
if (sh_data->shape_solid == NULL) {
- const char *world_clip_lib_or_empty = (sh_cfg ==
GPU_SHADER_CFG_CLIPPED) ? datatoc_gpu_shader_cfg_world_clip_lib_glsl : "";
- const char *world_clip_def_or_empty = (sh_cfg ==
GPU_SHADER_CFG_CLIPPED) ? "#define USE_WORLD_CLIP_PLANES\n" : "";
+ const GPUShaderConfigData *sh_cfg_data =
&GPU_shader_cfg_data[sh_cfg];
sh_data->shape_solid = GPU_shader_create_from_arrays({
- .vert = (const char *[]){world_clip_lib_or_empty,
datatoc_armature_shape_solid_vert_glsl, NULL},
+ .vert = (const char *[]){sh_cfg_data->lib,
datatoc_armature_shape_solid_vert_glsl, NULL},
.frag = (const char
*[]){datatoc_armature_shape_solid_frag_glsl, NULL},
- .defs = (const char *[]){world_clip_def_or_empty, NULL},
+ .defs = (const char *[]){sh_cfg_data->def, NULL},
});
}
@@ -841,12 +835,11 @@ DRWShadingGroup *shgroup_instance_bone_stick(DRWPass
*pass, eGPUShaderConfig sh_
{
COMMON_Shaders *sh_data = &g_shaders[sh_cfg];
if (sh_data->bone_stick == NULL) {
- const char *world_clip_lib_or_empty = (sh_cfg ==
GPU_SHADER_CFG_CLIPPED) ? datatoc_gpu_shader_cfg_world_clip_lib_glsl : "";
- const char *world_clip_def_or_empty = (sh_cfg ==
GPU_SHADER_CFG_CLIPPED) ? "#define USE_WORLD_CLIP_PLANES\n" : "";
+ const GPUShaderConfigData *sh_cfg_data =
&GPU_shader_cfg_data[sh_cfg];
sh_data->bone_stick = GPU_shader_create_from_arrays({
- .vert = (const char *[]){world_clip_lib_or_empty,
datatoc_armature_stick_vert_glsl, NULL},
+ .vert = (const char *[]){sh_cfg_data->lib,
datatoc_armature_stick_vert_glsl, NULL},
.frag = (const char
*[]){datatoc_armature_stick_frag_glsl, NULL},
- .defs = (const char *[]){world_clip_def_or_empty, NULL},
+ .defs = (const char *[]){sh_cfg_data->def, NULL},
});
}
diff --git a/source/blender/draw/modes/edit_curve_mode.c
b/source/blender/draw/modes/edit_curve_mode.c
index 0a2a8ede1d9..2289a583885 100644
--- a/source/blender/draw/modes/edit_curve_mode.c
+++ b/source/blender/draw/modes/edit_curve_mode.c
@@ -38,7 +38,6 @@
* Not needed for constant color. */
extern char datatoc_common_globals_lib_glsl[];
-extern char datatoc_gpu_shader_cfg_world_clip_lib_glsl[];
extern char datatoc_edit_curve_overlay_loosevert_vert_glsl[];
extern char datatoc_edit_curve_overlay_normals_vert_glsl[];
extern char datatoc_edit_curve_overlay_handle_vert_glsl[];
@@ -108,14 +107,12 @@ static void EDIT_CURVE_engine_init(void *UNUSED(vedata))
{
const DRWContextState *draw_ctx = DRW_context_state_get();
EDIT_CURVE_Shaders *sh_data = &e_data.sh_data[draw_ctx->sh_cfg];
- const bool is_clip = (draw_ctx->rv3d->rflag & RV3D_CLIPPING) != 0;
- if (is_clip) {
+ if (draw_ctx->sh_cfg == GPU_SHADER_CFG_CLIPPED) {
DRW_state_clip_planes_set_from_rv3d(draw_ctx->rv3d);
}
- const char *world_clip_lib_or_empty = is_clip ?
datatoc_gpu_shader_cfg_world_clip_lib_glsl : "";
- const char *world_clip_def_or_empty = is_clip ? "#define
USE_WORLD_CLIP_PLANES\n" : "";
+ const GPUShaderConfigData *sh_cfg_data =
&GPU_shader_cfg_data[draw_ctx->sh_cfg];
if (!sh_data->wire_sh) {
sh_data->wire_sh = GPU_shader_get_builtin_shader_with_config(
@@ -124,26 +121,26 @@ static void EDIT_CURVE_engine_init(void *UNUSED(vedata))
if (!sh_data->wire_normals_sh) {
sh_data->wire_normals_sh = GPU_shader_create_from_arrays({
- .vert = (const char *[]){world_clip_lib_or_empty,
datatoc_edit_curve_overlay_normals_vert_glsl, NULL},
+ .vert = (const char *[]){sh_cfg_data->lib,
datatoc_edit_curve_overlay_normals_vert_glsl, NULL},
.frag = (const char
*[]){datatoc_gpu_shader_uniform_color_frag_glsl, NULL},
- .defs = (const char *[]){world_clip_def_or_empty, NULL},
+ .defs = (const char *[]){sh_cfg_data->def, NULL},
});
}
if (!sh_data->overlay_edge_sh) {
sh_data->overlay_edge_sh = GPU_shader_create_from_arrays({
- .vert = (const char *[]){world_clip_lib_or_empty,
datatoc_edit_curve_overlay_handle_vert_glsl, NULL},
- .geom = (const char *[]){world_clip_lib_or_empty,
datatoc_common_globals_lib_glsl, datatoc_edit_curve_overlay_handle_geom_glsl,
NULL},
+ .vert = (const char *[]){sh_cfg_data->lib,
datatoc_edit_curve_overlay_handle_vert_glsl, NULL},
+ .geom = (const char *[]){sh_cfg_data->lib,
datatoc_common_globals_lib_glsl, datatoc_edit_curve_overlay_handle_geom_glsl,
NULL},
.frag = (const char
*[]){datatoc_gpu_shader_3D_smooth_color_frag_glsl, NULL},
- .defs = (const char *[]){world_clip_def_or_empty, NULL},
+ .defs = (const char *[]){sh_cfg_data->def,
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
