Page MenuHome
Paste P2713

(An Untitled Masterwork)
ActivePublic
Actions

Authored by Jeroen Bakker (jbakker) on Jan 11 2022, 12:02 PM.
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index fd30c3311bb..64878989923 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -438,6 +438,7 @@ shaders/infos/gpu_shader_2D_area_borders_info.hh
shaders/infos/gpu_shader_instance_varying_color_varying_size_info.hh
shaders/infos/gpu_shader_3D_point_info.hh
shaders/infos/gpu_shader_2D_nodelink_info.hh
+shaders/infos/gpu_shader_gpencil_stroke_info.hh
#shaders/infos/gpu_shader_todo_info.hh
)
diff --git a/source/blender/gpu/GPU_shader_shared.h b/source/blender/gpu/GPU_shader_shared.h
index 99a3cfe8557..67c55bb2c49 100644
--- a/source/blender/gpu/GPU_shader_shared.h
+++ b/source/blender/gpu/GPU_shader_shared.h
@@ -22,3 +22,15 @@ struct NodeLinkInstanceData {
float arrowSize;
float2 pad;
};
+
+struct GPencilStrokeData {
+ float2 viewport;
+ float pixsize;
+ float objscale;
+ float pixfactor;
+ int xraymode;
+ int caps_start;
+ int caps_end;
+ bool1 keep_size;
+ bool1 fill_stroke;
+};
diff --git a/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_frag.glsl b/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_frag.glsl
index bf35e803888..37541bb91f3 100644
--- a/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_frag.glsl
@@ -8,11 +8,11 @@ out vec4 fragColor;
void main()
{
const vec2 center = vec2(0, 0.5);
- vec4 tColor = vec4(mColor);
+ vec4 tColor = vec4(geometry_out.mColor);
/* if alpha < 0, then encap */
- if (mColor.a < 0) {
+ if (geometry_out.mColor.a < 0) {
tColor.a = tColor.a * -1.0;
- float dist = length(mTexCoord - center);
+ float dist = length(geometry_out.mTexCoord - center);
if (dist > 0.25) {
discard;
}
diff --git a/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_geom.glsl b/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_geom.glsl
index d3037663c14..d7f3d4ee00c 100644
--- a/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_geom.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_geom.glsl
@@ -1,3 +1,6 @@
+layout(lines_adjacency) in;
+layout(triangle_strip, max_vertices = 13) out;
+
#ifndef USE_GPU_SHADER_CREATE_INFO
uniform mat4 ModelViewProjectionMatrix;
uniform vec2 Viewport;
@@ -6,9 +9,6 @@ uniform int caps_start;
uniform int caps_end;
uniform int fill_stroke;
-layout(lines_adjacency) in;
-layout(triangle_strip, max_vertices = 13) out;
-
in vec4 finalColor[4];
in float finalThickness[4];
@@ -25,19 +25,19 @@ out vec2 mTexCoord;
/* project 3d point to 2d on screen space */
vec2 toScreenSpace(vec4 vertex)
{
- return vec2(vertex.xy / vertex.w) * Viewport;
+ return vec2(vertex.xy / vertex.w) * gpencil_stroke_data.viewport;
}
/* get zdepth value */
float getZdepth(vec4 point)
{
- if (xraymode == GP_XRAY_FRONT) {
+ if (gpencil_stroke_data.xraymode == GP_XRAY_FRONT) {
return 0.0;
}
- if (xraymode == GP_XRAY_3DSPACE) {
+ if (gpencil_stroke_data.xraymode == GP_XRAY_3DSPACE) {
return (point.z / point.w);
}
- if (xraymode == GP_XRAY_BACK) {
+ if (gpencil_stroke_data.xraymode == GP_XRAY_BACK) {
return 1.0;
}
@@ -77,7 +77,7 @@ void main(void)
vec2 sp3 = toScreenSpace(P3); /* end of next segment */
/* culling outside viewport */
- vec2 area = Viewport * 4.0;
+ vec2 area = gpencil_stroke_data.viewport * 4.0;
if (sp1.x < -area.x || sp1.x > area.x) {
return;
}
@@ -114,8 +114,8 @@ void main(void)
if (bn1 == 0) {
bn1 = 1;
}
- float length_a = finalThickness[1] / an1;
- float length_b = finalThickness[2] / bn1;
+ float length_a = geometry_in[1].finalThickness / an1;
+ float length_b = geometry_in[2].finalThickness / bn1;
if (length_a <= 0.0) {
length_a = 0.01;
}
@@ -126,41 +126,49 @@ void main(void)
/* prevent excessively long miters at sharp corners */
if (dot(v0, v1) < -MiterLimit) {
miter_a = n1;
- length_a = finalThickness[1];
+ length_a = geometry_in[1].finalThickness;
/* close the gap */
if (dot(v0, n1) > 0) {
- mTexCoord = vec2(0, 0);
- mColor = finalColor[1];
- gl_Position = vec4((sp1 + finalThickness[1] * n0) / Viewport, getZdepth(P1), 1.0);
+ geometry_out.mTexCoord = vec2(0, 0);
+ geometry_out.mColor = geometry_in[1].finalColor;
+ gl_Position = vec4((sp1 + geometry_in[1].finalThickness * n0) / gpencil_stroke_data.viewport,
+ getZdepth(P1),
+ 1.0);
EmitVertex();
- mTexCoord = vec2(0, 0);
- mColor = finalColor[1];
- gl_Position = vec4((sp1 + finalThickness[1] * n1) / Viewport, getZdepth(P1), 1.0);
+ geometry_out.mTexCoord = vec2(0, 0);
+ geometry_out.mColor = geometry_in[1].finalColor;
+ gl_Position = vec4((sp1 + geometry_in[1].finalThickness * n1) / gpencil_stroke_data.viewport,
+ getZdepth(P1),
+ 1.0);
EmitVertex();
- mTexCoord = vec2(0, 0.5);
- mColor = finalColor[1];
- gl_Position = vec4(sp1 / Viewport, getZdepth(P1), 1.0);
+ geometry_out.mTexCoord = vec2(0, 0.5);
+ geometry_out.mColor = geometry_in[1].finalColor;
+ gl_Position = vec4(sp1 / gpencil_stroke_data.viewport, getZdepth(P1), 1.0);
EmitVertex();
EndPrimitive();
}
else {
- mTexCoord = vec2(0, 1);
- mColor = finalColor[1];
- gl_Position = vec4((sp1 - finalThickness[1] * n1) / Viewport, getZdepth(P1), 1.0);
+ geometry_out.mTexCoord = vec2(0, 1);
+ geometry_out.mColor = geometry_in[1].finalColor;
+ gl_Position = vec4((sp1 - geometry_in[1].finalThickness * n1) / gpencil_stroke_data.viewport,
+ getZdepth(P1),
+ 1.0);
EmitVertex();
- mTexCoord = vec2(0, 1);
- mColor = finalColor[1];
- gl_Position = vec4((sp1 - finalThickness[1] * n0) / Viewport, getZdepth(P1), 1.0);
+ geometry_out.mTexCoord = vec2(0, 1);
+ geometry_out.mColor = geometry_in[1].finalColor;
+ gl_Position = vec4((sp1 - geometry_in[1].finalThickness * n0) / gpencil_stroke_data.viewport,
+ getZdepth(P1),
+ 1.0);
EmitVertex();
- mTexCoord = vec2(0, 0.5);
- mColor = finalColor[1];
- gl_Position = vec4(sp1 / Viewport, getZdepth(P1), 1.0);
+ geometry_out.mTexCoord = vec2(0, 0.5);
+ geometry_out.mColor = geometry_in[1].finalColor;
+ gl_Position = vec4(sp1 / gpencil_stroke_data.viewport, getZdepth(P1), 1.0);
EmitVertex();
EndPrimitive();
@@ -169,66 +177,74 @@ void main(void)
if (dot(v1, v2) < -MiterLimit) {
miter_b = n1;
- length_b = finalThickness[2];
+ length_b = geometry_in[2].finalThickness;
}
/* Generate the start end-cap (alpha < 0 used as end-cap flag). */
- float extend = (fill_stroke > 0) ? 2 : 1;
- if ((caps_start != GPENCIL_FLATCAP) && is_equal(P0, P2)) {
- mTexCoord = vec2(1, 0.5);
- mColor = vec4(finalColor[1].rgb, finalColor[1].a * -1.0);
+ float extend = gpencil_stroke_data.fill_stroke ? 2 : 1;
+ if ((gpencil_stroke_data.caps_start != GPENCIL_FLATCAP) && is_equal(P0, P2)) {
+ geometry_out.mTexCoord = vec2(1, 0.5);
+ geometry_out.mColor = vec4(geometry_in[1].finalColor.rgb, geometry_in[1].finalColor.a * -1.0);
vec2 svn1 = normalize(sp1 - sp2) * length_a * 4.0 * extend;
- gl_Position = vec4((sp1 + svn1) / Viewport, getZdepth(P1), 1.0);
+ gl_Position = vec4((sp1 + svn1) / gpencil_stroke_data.viewport, getZdepth(P1), 1.0);
EmitVertex();
- mTexCoord = vec2(0, 0);
- mColor = vec4(finalColor[1].rgb, finalColor[1].a * -1.0);
- gl_Position = vec4((sp1 - (length_a * 2.0) * miter_a) / Viewport, getZdepth(P1), 1.0);
+ geometry_out.mTexCoord = vec2(0, 0);
+ geometry_out.mColor = vec4(geometry_in[1].finalColor.rgb, geometry_in[1].finalColor.a * -1.0);
+ gl_Position = vec4(
+ (sp1 - (length_a * 2.0) * miter_a) / gpencil_stroke_data.viewport, getZdepth(P1), 1.0);
EmitVertex();
- mTexCoord = vec2(0, 1);
- mColor = vec4(finalColor[1].rgb, finalColor[1].a * -1.0);
- gl_Position = vec4((sp1 + (length_a * 2.0) * miter_a) / Viewport, getZdepth(P1), 1.0);
+ geometry_out.mTexCoord = vec2(0, 1);
+ geometry_out.mColor = vec4(geometry_in[1].finalColor.rgb, geometry_in[1].finalColor.a * -1.0);
+ gl_Position = vec4(
+ (sp1 + (length_a * 2.0) * miter_a) / gpencil_stroke_data.viewport, getZdepth(P1), 1.0);
EmitVertex();
}
/* generate the triangle strip */
- mTexCoord = vec2(0, 0);
- mColor = finalColor[1];
- gl_Position = vec4((sp1 + length_a * miter_a) / Viewport, getZdepth(P1), 1.0);
+ geometry_out.mTexCoord = vec2(0, 0);
+ geometry_out.mColor = geometry_in[1].finalColor;
+ gl_Position = vec4(
+ (sp1 + length_a * miter_a) / gpencil_stroke_data.viewport, getZdepth(P1), 1.0);
EmitVertex();
- mTexCoord = vec2(0, 1);
- mColor = finalColor[1];
- gl_Position = vec4((sp1 - length_a * miter_a) / Viewport, getZdepth(P1), 1.0);
+ geometry_out.mTexCoord = vec2(0, 1);
+ geometry_out.mColor = geometry_in[1].finalColor;
+ gl_Position = vec4(
+ (sp1 - length_a * miter_a) / gpencil_stroke_data.viewport, getZdepth(P1), 1.0);
EmitVertex();
- mTexCoord = vec2(0, 0);
- mColor = finalColor[2];
- gl_Position = vec4((sp2 + length_b * miter_b) / Viewport, getZdepth(P2), 1.0);
+ geometry_out.mTexCoord = vec2(0, 0);
+ geometry_out.mColor = geometry_in[2].finalColor;
+ gl_Position = vec4(
+ (sp2 + length_b * miter_b) / gpencil_stroke_data.viewport, getZdepth(P2), 1.0);
EmitVertex();
- mTexCoord = vec2(0, 1);
- mColor = finalColor[2];
- gl_Position = vec4((sp2 - length_b * miter_b) / Viewport, getZdepth(P2), 1.0);
+ geometry_out.mTexCoord = vec2(0, 1);
+ geometry_out.mColor = geometry_in[2].finalColor;
+ gl_Position = vec4(
+ (sp2 - length_b * miter_b) / gpencil_stroke_data.viewport, getZdepth(P2), 1.0);
EmitVertex();
/* Generate the end end-cap (alpha < 0 used as end-cap flag). */
- if ((caps_end != GPENCIL_FLATCAP) && is_equal(P1, P3)) {
- mTexCoord = vec2(0, 1);
- mColor = vec4(finalColor[2].rgb, finalColor[2].a * -1.0);
- gl_Position = vec4((sp2 + (length_b * 2.0) * miter_b) / Viewport, getZdepth(P2), 1.0);
+ if ((gpencil_stroke_data.caps_end != GPENCIL_FLATCAP) && is_equal(P1, P3)) {
+ geometry_out.mTexCoord = vec2(0, 1);
+ geometry_out.mColor = vec4(geometry_in[2].finalColor.rgb, geometry_in[2].finalColor.a * -1.0);
+ gl_Position = vec4(
+ (sp2 + (length_b * 2.0) * miter_b) / gpencil_stroke_data.viewport, getZdepth(P2), 1.0);
EmitVertex();
- mTexCoord = vec2(0, 0);
- mColor = vec4(finalColor[2].rgb, finalColor[2].a * -1.0);
- gl_Position = vec4((sp2 - (length_b * 2.0) * miter_b) / Viewport, getZdepth(P2), 1.0);
+ geometry_out.mTexCoord = vec2(0, 0);
+ geometry_out.mColor = vec4(geometry_in[2].finalColor.rgb, geometry_in[2].finalColor.a * -1.0);
+ gl_Position = vec4(
+ (sp2 - (length_b * 2.0) * miter_b) / gpencil_stroke_data.viewport, getZdepth(P2), 1.0);
EmitVertex();
- mTexCoord = vec2(1, 0.5);
- mColor = vec4(finalColor[2].rgb, finalColor[2].a * -1.0);
+ geometry_out.mTexCoord = vec2(1, 0.5);
+ geometry_out.mColor = vec4(geometry_in[2].finalColor.rgb, geometry_in[2].finalColor.a * -1.0);
vec2 svn2 = normalize(sp2 - sp1) * length_b * 4.0 * extend;
- gl_Position = vec4((sp2 + svn2) / Viewport, getZdepth(P2), 1.0);
+ gl_Position = vec4((sp2 + svn2) / gpencil_stroke_data.viewport, getZdepth(P2), 1.0);
EmitVertex();
}
diff --git a/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert.glsl b/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert.glsl
index 8ede404a866..16e12b2989e 100644
--- a/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert.glsl
@@ -15,21 +15,19 @@ out vec4 finalColor;
out float finalThickness;
#endif
-#define TRUE 1
-
-float defaultpixsize = pixsize * (1000.0 / pixfactor);
+float defaultpixsize = gpencil_stroke_data.pixsize * (1000.0 / gpencil_stroke_data.pixfactor);
void main(void)
{
gl_Position = ModelViewProjectionMatrix * vec4(pos, 1.0);
- finalColor = color;
+ geometry_in.finalColor = color;
- if (keep_size == TRUE) {
- finalThickness = thickness;
+ if (gpencil_stroke_data.keep_size) {
+ geometry_in.finalThickness = thickness;
}
else {
float size = (ProjectionMatrix[3][3] == 0.0) ? (thickness / (gl_Position.z * defaultpixsize)) :
(thickness / defaultpixsize);
- finalThickness = max(size * objscale, 1.0);
+ geometry_in.finalThickness = max(size * gpencil_stroke_data.objscale, 1.0);
}
}
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_todo_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_todo_info.hh
index 9bffe8ab63f..645d2f5bf69 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_todo_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_todo_info.hh
@@ -47,17 +47,4 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_widget_shadow)
.vert = datatoc_gpu_shader_2D_widget_shadow_vert_glsl,
.frag = datatoc_gpu_shader_2D_widget_shadow_frag_glsl,
},
-*/
-GPU_SHADER_CREATE_INFO(gpu_shader_gpencil_stroke)
- .vertex_source("gpu_shader_gpencil_stroke_vert.glsl")
- .geometry_source("gpu_shader_gpencil_stroke_geom.glsl")
- .fragment_source("gpu_shader_gpencil_stroke_frag.glsl")
- .do_static_compilation(true);
-/*
- [GPU_SHADER_GPENCIL_STROKE] = {
- .name = "GPU_SHADER_GPENCIL_STROKE",
- .vert = datatoc_gpu_shader_gpencil_stroke_vert_glsl,
- .geom = datatoc_gpu_shader_gpencil_stroke_geom_glsl,
- .frag = datatoc_gpu_shader_gpencil_stroke_frag_glsl,
-},
*/
\ No newline at end of file

Event Timeline

Jeroen Bakker (jbakker) created this paste.Jan 11 2022, 12:02 PM