diff options
Diffstat (limited to 'source/blender/gpu/shaders/infos')
3 files changed, 65 insertions, 1 deletions
diff --git a/source/blender/gpu/shaders/infos/gpu_interface_info.hh b/source/blender/gpu/shaders/infos/gpu_interface_info.hh index d77c65e48a7..060def16f81 100644 --- a/source/blender/gpu/shaders/infos/gpu_interface_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_interface_info.hh @@ -18,3 +18,6 @@ GPU_SHADER_INTERFACE_INFO(smooth_radii_outline_iface, "").smooth(Type::VEC4, "ra GPU_SHADER_INTERFACE_INFO(flat_color_smooth_tex_coord_interp_iface, "") .flat(Type::VEC4, "finalColor") .smooth(Type::VEC2, "texCoord_interp"); +GPU_SHADER_INTERFACE_INFO(smooth_icon_interp_iface, "") + .smooth(Type::VEC2, "texCoord_interp") + .smooth(Type::VEC2, "mask_coord_interp"); diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_info.hh index 396ee64454c..23f6790abfc 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_info.hh @@ -9,7 +9,7 @@ #include "gpu_shader_create_info.hh" GPU_SHADER_INTERFACE_INFO(gpu_shader_3D_polyline_iface, "interp") - .smooth(Type::VEC4, "color") + .smooth(Type::VEC4, "final_color") .smooth(Type::FLOAT, "clip") .no_perspective(Type::FLOAT, "smoothline"); @@ -29,12 +29,31 @@ GPU_SHADER_CREATE_INFO(gpu_shader_3D_polyline) .fragment_source("gpu_shader_3D_polyline_frag.glsl") .additional_info("gpu_srgb_to_framebuffer_space"); +GPU_SHADER_CREATE_INFO(gpu_shader_3D_polyline_no_geom) + .define("SMOOTH_WIDTH", "1.0") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::VEC2, "viewportSize") + .push_constant(Type::FLOAT, "lineWidth") + .push_constant(Type::BOOL, "lineSmooth") + .vertex_in(0, Type::VEC3, "pos") + .vertex_out(gpu_shader_3D_polyline_iface) + .fragment_out(0, Type::VEC4, "fragColor") + .vertex_source("gpu_shader_3D_polyline_vert_no_geom.glsl") + .fragment_source("gpu_shader_3D_polyline_frag.glsl") + .additional_info("gpu_srgb_to_framebuffer_space"); + GPU_SHADER_CREATE_INFO(gpu_shader_3D_polyline_uniform_color) .do_static_compilation(true) .define("UNIFORM") .push_constant(Type::VEC4, "color") .additional_info("gpu_shader_3D_polyline"); +GPU_SHADER_CREATE_INFO(gpu_shader_3D_polyline_uniform_color_no_geom) + // .do_static_compilation(true) /* TODO fix on GL */ + .define("UNIFORM") + .push_constant(Type::VEC4, "color") + .additional_info("gpu_shader_3D_polyline_no_geom"); + GPU_SHADER_CREATE_INFO(gpu_shader_3D_polyline_uniform_color_clipped) .do_static_compilation(true) /* TODO(fclem): Put in a UBO to fit the 128byte requirement. */ @@ -43,14 +62,34 @@ GPU_SHADER_CREATE_INFO(gpu_shader_3D_polyline_uniform_color_clipped) .define("CLIP") .additional_info("gpu_shader_3D_polyline_uniform_color"); +GPU_SHADER_CREATE_INFO(gpu_shader_3D_polyline_uniform_color_clipped_no_geom) + // .do_static_compilation(true) /* TODO fix on GL */ + /* TODO(fclem): Put in an UBO to fit the 128byte requirement. */ + .push_constant(Type::MAT4, "ModelMatrix") + .push_constant(Type::VEC4, "ClipPlane") + .define("CLIP") + .additional_info("gpu_shader_3D_polyline_uniform_color_no_geom"); + GPU_SHADER_CREATE_INFO(gpu_shader_3D_polyline_flat_color) .do_static_compilation(true) .define("FLAT") .vertex_in(1, Type::VEC4, "color") .additional_info("gpu_shader_3D_polyline"); +GPU_SHADER_CREATE_INFO(gpu_shader_3D_polyline_flat_color_no_geom) + // .do_static_compilation(true) /* TODO fix on GL */ + .define("FLAT") + .vertex_in(1, Type::VEC4, "color") + .additional_info("gpu_shader_3D_polyline_no_geom"); + GPU_SHADER_CREATE_INFO(gpu_shader_3D_polyline_smooth_color) .do_static_compilation(true) .define("SMOOTH") .vertex_in(1, Type::VEC4, "color") .additional_info("gpu_shader_3D_polyline"); + +GPU_SHADER_CREATE_INFO(gpu_shader_3D_polyline_smooth_color_no_geom) + // .do_static_compilation(true) /* TODO fix on GL */ + .define("SMOOTH") + .vertex_in(1, Type::VEC4, "color") + .additional_info("gpu_shader_3D_polyline_no_geom"); diff --git a/source/blender/gpu/shaders/infos/gpu_shader_icon_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_icon_info.hh new file mode 100644 index 00000000000..3d4077bdb09 --- /dev/null +++ b/source/blender/gpu/shaders/infos/gpu_shader_icon_info.hh @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later + * Copyright 2022 Blender Foundation. All rights reserved. */ + +/** \file + * \ingroup gpu + */ + +#include "gpu_interface_info.hh" +#include "gpu_shader_create_info.hh" + +GPU_SHADER_CREATE_INFO(gpu_shader_icon) + .vertex_out(smooth_icon_interp_iface) + .fragment_out(0, Type::VEC4, "fragColor") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::VEC4, "color") + .push_constant(Type::VEC4, "rect_icon") + .push_constant(Type::VEC4, "rect_geom") + .push_constant(Type::FLOAT, "text_width") + .sampler(0, ImageType::FLOAT_2D, "image") + .vertex_source("gpu_shader_icon_vert.glsl") + .fragment_source("gpu_shader_icon_frag.glsl") + .do_static_compilation(true); |