blender
/
blender
136
408
Fork 591
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

GPencil: Cleanup - Remove unused old shaders 

These fill shaders were used with the old draw engine.
This commit is contained in:
Antonio Vazquez 2020-11-26 17:44:34 +01:00
parent 9add12ff05
commit 226b028523
4 changed files with 0 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/gpu/CMakeLists.txt
View File

@ -362,9 +362,6 @@ data_to_c_simple(shaders/gpu_shader_gpencil_stroke_vert.glsl SRC)
data_to_c_simple(shaders/gpu_shader_gpencil_stroke_frag.glsl SRC)
data_to_c_simple(shaders/gpu_shader_gpencil_stroke_geom.glsl SRC)
data_to_c_simple(shaders/gpu_shader_gpencil_fill_vert.glsl SRC)
data_to_c_simple(shaders/gpu_shader_gpencil_fill_frag.glsl SRC)
data_to_c_simple(shaders/gpu_shader_cfg_world_clip_lib.glsl SRC)
data_to_c_simple(shaders/gpu_shader_colorspace_lib.glsl SRC)

9
source/blender/gpu/intern/gpu_shader_builtin.c
View File

@ -128,8 +128,6 @@ extern char datatoc_gpu_shader_gpencil_stroke_vert_glsl[];
extern char datatoc_gpu_shader_gpencil_stroke_frag_glsl[];
extern char datatoc_gpu_shader_gpencil_stroke_geom_glsl[];
extern char datatoc_gpu_shader_gpencil_fill_vert_glsl[];
extern char datatoc_gpu_shader_gpencil_fill_frag_glsl[];
extern char datatoc_gpu_shader_cfg_world_clip_lib_glsl[];
extern char datatoc_gpu_shader_colorspace_lib_glsl[];
@ -513,13 +511,6 @@ static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = {
.geom = datatoc_gpu_shader_gpencil_stroke_geom_glsl,
.frag = datatoc_gpu_shader_gpencil_stroke_frag_glsl,
},
[GPU_SHADER_GPENCIL_FILL] =
{
.name = "GPU_SHADER_GPENCIL_FILL",
.vert = datatoc_gpu_shader_gpencil_fill_vert_glsl,
.frag = datatoc_gpu_shader_gpencil_fill_frag_glsl,
},
};
GPUShader *GPU_shader_get_builtin_shader_with_config(eGPUBuiltinShader shader,

180
source/blender/gpu/shaders/gpu_shader_gpencil_fill_frag.glsl
View File

@ -1,180 +0,0 @@
uniform vec4 color;
uniform vec4 color2;
uniform int fill_type;
uniform float mix_factor;
uniform float g_angle;
uniform float g_radius;
uniform float g_boxsize;
uniform vec2 g_scale;
uniform vec2 g_shift;
uniform float t_angle;
uniform vec2 t_scale;
uniform vec2 t_offset;
uniform int t_mix;
uniform int t_flip;
uniform float t_opacity;
uniform sampler2D myTexture;
/* keep this list synchronized with list in DNA_brush_types.h */
#define SOLID 0
#define GRADIENT 1
#define RADIAL 2
#define CHECKER 3
#define TEXTURE 4
in vec2 texCoord_interp;
out vec4 fragColor;
#define texture2D texture
void set_color(in vec4 color,
in vec4 color2,
in vec4 tcolor,
in float mixv,
in float factor,
in int tmix,
in int flip,
out vec4 ocolor)
{
/* full color A */
if (mixv == 1.0) {
if (tmix == 1) {
if (flip == 0) {
ocolor = color;
}
else {
ocolor = tcolor;
}
}
else {
if (flip == 0) {
ocolor = color;
}
else {
ocolor = color2;
}
}
}
/* full color B */
else if (mixv == 0.0) {
if (tmix == 1) {
if (flip == 0) {
ocolor = tcolor;
}
else {
ocolor = color;
}
}
else {
if (flip == 0) {
ocolor = color2;
}
else {
ocolor = color;
}
}
}
/* mix of colors */
else {
if (tmix == 1) {
if (flip == 0) {
ocolor = mix(color, tcolor, factor);
}
else {
ocolor = mix(tcolor, color, factor);
}
}
else {
if (flip == 0) {
ocolor = mix(color, color2, factor);
}
else {
ocolor = mix(color2, color, factor);
}
}
}
}
void main()
{
vec2 t_center = vec2(0.5, 0.5);
mat2 matrot_tex = mat2(cos(t_angle), -sin(t_angle), sin(t_angle), cos(t_angle));
vec2 rot_tex = (matrot_tex * (texCoord_interp - t_center)) + t_center + t_offset;
vec4 tmp_color = texture2D(myTexture, rot_tex * t_scale);
vec4 text_color = vec4(tmp_color[0], tmp_color[1], tmp_color[2], tmp_color[3] * t_opacity);
vec4 checker_color;
/* solid fill */
if (fill_type == SOLID) {
if (t_mix == 1) {
fragColor = mix(color, text_color, mix_factor);
}
else {
fragColor = color;
}
}
else {
vec2 center = vec2(0.5, 0.5) + g_shift;
mat2 matrot = mat2(cos(g_angle), -sin(g_angle), sin(g_angle), cos(g_angle));
vec2 rot = (((matrot * (texCoord_interp - center)) + center) * g_scale) + g_shift;
/* gradient */
if (fill_type == GRADIENT) {
set_color(color,
color2,
text_color,
mix_factor,
rot.x - mix_factor + 0.5,
t_mix,
t_flip,
fragColor);
}
/* radial gradient */
if (fill_type == RADIAL) {
float in_rad = g_radius * mix_factor;
float ex_rad = g_radius - in_rad;
float intensity = 0;
float distance = length((center - texCoord_interp) * g_scale);
if (distance > g_radius) {
discard;
}
if (distance > in_rad) {
intensity = clamp(((distance - in_rad) / ex_rad), 0.0, 1.0);
}
set_color(color, color2, text_color, mix_factor, intensity, t_mix, t_flip, fragColor);
}
/* Checkerboard */
if (fill_type == CHECKER) {
vec2 pos = rot / g_boxsize;
if ((fract(pos.x) < 0.5 && fract(pos.y) < 0.5) ||
(fract(pos.x) > 0.5 && fract(pos.y) > 0.5)) {
if (t_flip == 0) {
checker_color = color;
}
else {
checker_color = color2;
}
}
else {
if (t_flip == 0) {
checker_color = color2;
}
else {
checker_color = color;
}
}
/* mix with texture */
if (t_mix == 1) {
fragColor = mix(checker_color, text_color, mix_factor);
}
else {
fragColor = checker_color;
}
}
/* texture */
if (fill_type == TEXTURE) {
fragColor = text_color;
}
}
}

11
source/blender/gpu/shaders/gpu_shader_gpencil_fill_vert.glsl
View File

@ -1,11 +0,0 @@
uniform mat4 ModelViewProjectionMatrix;
in vec3 pos;
in vec2 texCoord;
out vec2 texCoord_interp;
void main(void)
{
gl_Position = ModelViewProjectionMatrix * vec4(pos, 1.0);
texCoord_interp = texCoord;
}