diff --git a/source/blender/draw/intern/shaders/common_pointcloud_lib.glsl b/source/blender/draw/intern/shaders/common_pointcloud_lib.glsl index f2d857885ee..e50dc4a524b 100644 --- a/source/blender/draw/intern/shaders/common_pointcloud_lib.glsl +++ b/source/blender/draw/intern/shaders/common_pointcloud_lib.glsl @@ -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() { diff --git a/source/blender/draw/intern/shaders/draw_view_info.hh b/source/blender/draw/intern/shaders/draw_view_info.hh index 7d5c9f0941b..0fedcbd563b 100644 --- a/source/blender/draw/intern/shaders/draw_view_info.hh +++ b/source/blender/draw/intern/shaders/draw_view_info.hh @@ -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");