griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: DRW: Remove uneeded point cloud vertex inputs

Browse Source
This commit is contained in:
Clément Foucault
2023-07-03 11:24:26 +02:00
parent 0aafc49c91
commit 8fa8f1ca78
2 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/draw/intern/shaders/common_pointcloud_lib.glsl
View File

@@ -4,22 +4,9 @@
#ifdef POINTCLOUD_SHADER
# define COMMON_POINTCLOUD_LIB
# ifndef USE_GPU_SHADER_CREATE_INFO
# ifndef DRW_SHADER_SHARED_H
in vec4 pos; /* Position and radius. */
/* ---- Instanced attribs ---- */
in vec3 pos_inst;
in vec3 nor;
# endif
# else
# ifndef DRW_POINTCLOUD_INFO
# error Ensure createInfo includes draw_pointcloud.
# endif
# endif /* !USE_GPU_SHADER_CREATE_INFO */
# ifndef DRW_POINTCLOUD_INFO
# error Ensure createInfo includes draw_pointcloud.
# endif
int pointcloud_get_point_id()
{

8
source/blender/draw/intern/shaders/draw_view_info.hh
View File

@@ -138,18 +138,12 @@ GPU_SHADER_CREATE_INFO(draw_pointcloud)
.sampler(0, ImageType::FLOAT_BUFFER, "ptcloud_pos_rad_tx", Frequency::BATCH)
.define("POINTCLOUD_SHADER")
.define("DRW_POINTCLOUD_INFO")
.vertex_in(0, Type::VEC4, "pos")
.vertex_in(1, Type::VEC3, "pos_inst")
.vertex_in(2, Type::VEC3, "nor")
.additional_info("draw_modelmat_instanced_attr", "draw_resource_id_uniform");
GPU_SHADER_CREATE_INFO(draw_pointcloud_new)
.sampler(0, ImageType::FLOAT_BUFFER, "ptcloud_pos_rad_tx", Frequency::BATCH)
.define("POINTCLOUD_SHADER")
.define("DRW_POINTCLOUD_INFO")
.vertex_in(0, Type::VEC4, "pos")
.vertex_in(1, Type::VEC3, "pos_inst")
.vertex_in(2, Type::VEC3, "nor");
.define("DRW_POINTCLOUD_INFO");
GPU_SHADER_CREATE_INFO(draw_volume).additional_info("draw_modelmat", "draw_resource_id_uniform");