[Bf-blender-cvs] [af37c863ebf] draw-colormanagement: Cleanup: EEVEE: Remove alpha checker drawing
Clément Foucault
noreply at git.blender.org
Wed Jan 22 19:39:56 CET 2020
Commit: af37c863ebf7e6dfcad87166c57edc2a17271473
Author: Clément Foucault
Date: Wed Jan 22 19:34:48 2020 +0100
Branches: draw-colormanagement
https://developer.blender.org/rBaf37c863ebf7e6dfcad87166c57edc2a17271473
Cleanup: EEVEE: Remove alpha checker drawing
This will be ported to the overlay engine.
===================================================================
M source/blender/draw/engines/eevee/eevee_effects.c
M source/blender/draw/engines/eevee/eevee_private.h
===================================================================
diff --git a/source/blender/draw/engines/eevee/eevee_effects.c b/source/blender/draw/engines/eevee/eevee_effects.c
index 824ea69ea73..a20921b639f 100644
--- a/source/blender/draw/engines/eevee/eevee_effects.c
+++ b/source/blender/draw/engines/eevee/eevee_effects.c
@@ -174,11 +174,6 @@ void EEVEE_effects_init(EEVEE_ViewLayerData *sldata,
effects->enabled_effects |= EFFECT_NORMAL_BUFFER;
}
- /* Alpha checker if background is not drawn in viewport. */
- if (!DRW_state_is_image_render() && !DRW_state_draw_background()) {
- effects->enabled_effects |= EFFECT_ALPHA_CHECKER;
- }
-
/**
* MinMax Pyramid
*/
@@ -342,31 +337,6 @@ void EEVEE_effects_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
DRW_shgroup_uniform_mat4(grp, "pastPersmat", effects->velocity_past_persmat);
DRW_shgroup_call(grp, quad, NULL);
}
-
- if ((effects->enabled_effects & EFFECT_ALPHA_CHECKER) != 0) {
- GPUShader *checker_sh = GPU_shader_get_builtin_shader(GPU_SHADER_2D_CHECKER);
-
- copy_v4_fl4(effects->color_checker_dark, 0.15f, 0.15f, 0.15f, 1.0f);
- copy_v4_fl4(effects->color_checker_light, 0.2f, 0.2f, 0.2f, 1.0f);
-
- DRW_PASS_CREATE(psl->alpha_checker,
- DRW_STATE_WRITE_COLOR | DRW_STATE_BLEND_ALPHA_UNDER_PREMUL);
- grp = DRW_shgroup_create(checker_sh, psl->alpha_checker);
- DRW_shgroup_uniform_vec4(grp, "color1", effects->color_checker_dark, 1);
- DRW_shgroup_uniform_vec4(grp, "color2", effects->color_checker_light, 1);
- DRW_shgroup_uniform_int_copy(grp, "size", 8);
- DRW_shgroup_call(grp, quad, NULL);
-
- float viewmat[4][4], winmat[4][4];
- unit_m4(viewmat);
- unit_m4(winmat);
- /* Winmat must be negative. */
- swap_v3_v3(winmat[0], winmat[1]);
-
- /* Using default view bypasses the culling. */
- const DRWView *default_view = DRW_view_default_get();
- effects->checker_view = DRW_view_create_sub(default_view, viewmat, winmat);
- }
}
void EEVEE_effects_draw_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata)
@@ -524,21 +494,6 @@ void EEVEE_downsample_cube_buffer(EEVEE_Data *vedata, GPUTexture *texture_src, i
DRW_stats_group_end();
}
-void EEVEE_draw_alpha_checker(EEVEE_Data *vedata)
-{
- EEVEE_PassList *psl = vedata->psl;
- EEVEE_StorageList *stl = vedata->stl;
- EEVEE_EffectsInfo *effects = stl->effects;
-
- if ((effects->enabled_effects & EFFECT_ALPHA_CHECKER) != 0) {
- DRW_view_set_active(effects->checker_view);
-
- DRW_draw_pass(psl->alpha_checker);
-
- DRW_view_set_active(NULL);
- }
-}
-
static void EEVEE_velocity_resolve(EEVEE_Data *vedata)
{
EEVEE_PassList *psl = vedata->psl;
diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h
index 616e088fde4..8ba68589cbd 100644
--- a/source/blender/draw/engines/eevee/eevee_private.h
+++ b/source/blender/draw/engines/eevee/eevee_private.h
@@ -523,7 +523,6 @@ typedef enum EEVEE_EffectsFlag {
EFFECT_VELOCITY_BUFFER = (1 << 12), /* Not really an effect but a feature */
EFFECT_TAA_REPROJECT = (1 << 13), /* should be mutually exclusive with EFFECT_TAA */
EFFECT_DEPTH_DOUBLE_BUFFER = (1 << 14), /* Not really an effect but a feature */
- EFFECT_ALPHA_CHECKER = (1 << 15), /* Not really an effect but a feature */
} EEVEE_EffectsFlag;
typedef struct EEVEE_EffectsInfo {
@@ -588,7 +587,6 @@ typedef struct EEVEE_EffectsInfo {
/* Alpha Checker */
float color_checker_dark[4];
float color_checker_light[4];
- struct DRWView *checker_view;
/* Other */
float prev_persmat[4][4];
/* Lookdev */
More information about the Bf-blender-cvs
mailing list