From cb7d9222cfe3ec11363505a1fa39bc8bcb2a4cee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Tue, 25 Feb 2025 18:41:51 +0100 Subject: [PATCH] Cleanup: DRW: Remove legacy object data create infos Remove deprecated (and unused) create infos and mass rename the `*_new` ones. --- .../draw/engines/eevee_next/eevee_shader.cc | 6 +- .../shaders/eevee_attributes_curves_lib.glsl | 2 +- .../eevee_attributes_pointcloud_lib.glsl | 2 +- .../shaders/infos/eevee_material_info.hh | 18 ++--- .../shaders/infos/eevee_shadow_info.hh | 2 +- .../gpencil/shaders/infos/gpencil_info.hh | 2 +- .../shaders/infos/overlay_edit_mode_info.hh | 8 +- .../shaders/infos/overlay_extra_info.hh | 3 +- .../shaders/infos/overlay_outline_info.hh | 18 ++--- .../infos/overlay_sculpt_curves_info.hh | 2 +- .../infos/overlay_viewer_attribute_info.hh | 4 +- .../shaders/infos/overlay_volume_info.hh | 12 +-- .../shaders/infos/overlay_wireframe_info.hh | 6 +- .../shaders/infos/workbench_prepass_info.hh | 4 +- .../shaders/infos/workbench_volume_info.hh | 4 +- .../engines/workbench/workbench_defines.hh | 2 +- .../draw/intern/shaders/common_hair_lib.glsl | 6 +- .../shaders/draw_grease_pencil_lib.glsl | 2 +- .../intern/shaders/draw_object_infos_info.hh | 73 ++----------------- 19 files changed, 58 insertions(+), 118 deletions(-) diff --git a/source/blender/draw/engines/eevee_next/eevee_shader.cc b/source/blender/draw/engines/eevee_next/eevee_shader.cc index b51715993b5..cc078f8f221 100644 --- a/source/blender/draw/engines/eevee_next/eevee_shader.cc +++ b/source/blender/draw/engines/eevee_next/eevee_shader.cc @@ -469,7 +469,7 @@ void ShaderModule::material_create_info_amend(GPUMaterial *gpumat, GPUCodegenOut /* WORKAROUND: Add new ob attr buffer. */ if (GPU_material_uniform_attributes(gpumat) != nullptr) { - info.additional_info("draw_object_attribute_new"); + info.additional_info("draw_object_attributes"); /* Search and remove the old object attribute UBO which would creating bind point collision. */ for (auto &resource_info : info.batch_resources_) { @@ -772,8 +772,8 @@ void ShaderModule::material_create_info_amend(GPUMaterial *gpumat, GPUCodegenOut frag_gen << "return 0.0;\n"; } else { - if (info.additional_infos_.first_index_of_try("draw_object_infos_new") == -1) { - info.additional_info("draw_object_infos_new"); + if (info.additional_infos_.first_index_of_try("draw_object_infos") == -1) { + info.additional_info("draw_object_infos"); } /* TODO(fclem): Should use `to_scale` but the gpu_shader_math_matrix_lib.glsl isn't * included everywhere yet. */ diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_attributes_curves_lib.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_attributes_curves_lib.glsl index c1306cedc8c..4b7b07e1797 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_attributes_curves_lib.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_attributes_curves_lib.glsl @@ -13,7 +13,7 @@ SHADER_LIBRARY_CREATE_INFO(draw_modelmat_new) SHADER_LIBRARY_CREATE_INFO(draw_resource_handle_new) -SHADER_LIBRARY_CREATE_INFO(draw_hair_new) +SHADER_LIBRARY_CREATE_INFO(draw_hair) #include "common_hair_lib.glsl" /* TODO rename to curve. */ #include "draw_model_lib.glsl" diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_attributes_pointcloud_lib.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_attributes_pointcloud_lib.glsl index 017dd443370..f1d70e06030 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_attributes_pointcloud_lib.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_attributes_pointcloud_lib.glsl @@ -13,7 +13,7 @@ SHADER_LIBRARY_CREATE_INFO(draw_modelmat_new) SHADER_LIBRARY_CREATE_INFO(draw_resource_handle_new) -SHADER_LIBRARY_CREATE_INFO(draw_pointcloud_new) +SHADER_LIBRARY_CREATE_INFO(draw_pointcloud) #include "draw_model_lib.glsl" #include "draw_pointcloud_lib.glsl" diff --git a/source/blender/draw/engines/eevee_next/shaders/infos/eevee_material_info.hh b/source/blender/draw/engines/eevee_next/shaders/infos/eevee_material_info.hh index a421270c5db..a917781ed13 100644 --- a/source/blender/draw/engines/eevee_next/shaders/infos/eevee_material_info.hh +++ b/source/blender/draw/engines/eevee_next/shaders/infos/eevee_material_info.hh @@ -50,7 +50,7 @@ VERTEX_IN(1, VEC3, nor) VERTEX_SOURCE("eevee_geom_mesh_vert.glsl") VERTEX_OUT(eevee_surf_iface) ADDITIONAL_INFO(draw_modelmat_new) -ADDITIONAL_INFO(draw_object_infos_new) +ADDITIONAL_INFO(draw_object_infos) ADDITIONAL_INFO(draw_resource_id_varying) ADDITIONAL_INFO(draw_view) GPU_SHADER_CREATE_END() @@ -70,9 +70,9 @@ VERTEX_SOURCE("eevee_geom_pointcloud_vert.glsl") VERTEX_OUT(eevee_surf_iface) VERTEX_OUT(eevee_surf_pointcloud_iface) VERTEX_OUT(eevee_surf_pointcloud_flat_iface) -ADDITIONAL_INFO(draw_pointcloud_new) +ADDITIONAL_INFO(draw_pointcloud) ADDITIONAL_INFO(draw_modelmat_new) -ADDITIONAL_INFO(draw_object_infos_new) +ADDITIONAL_INFO(draw_object_infos) ADDITIONAL_INFO(draw_resource_id_varying) ADDITIONAL_INFO(draw_view) GPU_SHADER_CREATE_END() @@ -84,7 +84,7 @@ VERTEX_IN(0, VEC3, pos) VERTEX_OUT(eevee_surf_iface) VERTEX_SOURCE("eevee_geom_volume_vert.glsl") ADDITIONAL_INFO(draw_modelmat_new) -ADDITIONAL_INFO(draw_object_infos_new) +ADDITIONAL_INFO(draw_object_infos) ADDITIONAL_INFO(draw_resource_id_varying) ADDITIONAL_INFO(draw_volume_infos) ADDITIONAL_INFO(draw_view) @@ -95,9 +95,9 @@ ADDITIONAL_INFO(eevee_shared) DEFINE("MAT_GEOM_GPENCIL") VERTEX_SOURCE("eevee_geom_gpencil_vert.glsl") VERTEX_OUT(eevee_surf_iface) -ADDITIONAL_INFO(draw_gpencil_new) +ADDITIONAL_INFO(draw_gpencil) ADDITIONAL_INFO(draw_modelmat_new) -ADDITIONAL_INFO(draw_object_infos_new) +ADDITIONAL_INFO(draw_object_infos) ADDITIONAL_INFO(draw_resource_id_varying) ADDITIONAL_INFO(draw_resource_id_new) GPU_SHADER_CREATE_END() @@ -122,10 +122,10 @@ VERTEX_OUT(eevee_surf_iface) VERTEX_OUT(eevee_surf_curve_iface) VERTEX_OUT(eevee_surf_curve_flat_iface) ADDITIONAL_INFO(draw_modelmat_new) -ADDITIONAL_INFO(draw_object_infos_new) +ADDITIONAL_INFO(draw_object_infos) ADDITIONAL_INFO(draw_resource_id_varying) ADDITIONAL_INFO(draw_view) -ADDITIONAL_INFO(draw_hair_new) +ADDITIONAL_INFO(draw_hair) ADDITIONAL_INFO(draw_curves_infos) GPU_SHADER_CREATE_END() @@ -136,7 +136,7 @@ BUILTINS(BuiltinBits::VERTEX_ID) VERTEX_SOURCE("eevee_geom_world_vert.glsl") VERTEX_OUT(eevee_surf_iface) ADDITIONAL_INFO(draw_modelmat_new) -ADDITIONAL_INFO(draw_object_infos_new) /* Unused, but allow debug compilation. */ +ADDITIONAL_INFO(draw_object_infos) /* Unused, but allow debug compilation. */ ADDITIONAL_INFO(draw_resource_id_varying) ADDITIONAL_INFO(draw_view) GPU_SHADER_CREATE_END() diff --git a/source/blender/draw/engines/eevee_next/shaders/infos/eevee_shadow_info.hh b/source/blender/draw/engines/eevee_next/shaders/infos/eevee_shadow_info.hh index 3a2fe9de2cf..75b8ab9f663 100644 --- a/source/blender/draw/engines/eevee_next/shaders/infos/eevee_shadow_info.hh +++ b/source/blender/draw/engines/eevee_next/shaders/infos/eevee_shadow_info.hh @@ -315,7 +315,7 @@ PUSH_CONSTANT(INT, visibility_word_per_draw) COMPUTE_SOURCE("eevee_shadow_visibility_comp.glsl") ADDITIONAL_INFO(draw_view) ADDITIONAL_INFO(draw_view_culling) -ADDITIONAL_INFO(draw_object_infos_new) +ADDITIONAL_INFO(draw_object_infos) GPU_SHADER_CREATE_END() /** \} */ diff --git a/source/blender/draw/engines/gpencil/shaders/infos/gpencil_info.hh b/source/blender/draw/engines/gpencil/shaders/infos/gpencil_info.hh index d2c790bb834..67483ada488 100644 --- a/source/blender/draw/engines/gpencil/shaders/infos/gpencil_info.hh +++ b/source/blender/draw/engines/gpencil/shaders/infos/gpencil_info.hh @@ -79,7 +79,7 @@ DEPTH_WRITE(DepthWrite::ANY) ADDITIONAL_INFO(draw_view) ADDITIONAL_INFO(draw_modelmat_new) ADDITIONAL_INFO(draw_resource_handle_new) -ADDITIONAL_INFO(draw_gpencil_new) +ADDITIONAL_INFO(draw_gpencil) GPU_SHADER_CREATE_END() /** \} */ diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_edit_mode_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_edit_mode_info.hh index 3b31abdc978..94a28eff9d0 100644 --- a/source/blender/draw/engines/overlay/shaders/infos/overlay_edit_mode_info.hh +++ b/source/blender/draw/engines/overlay/shaders/infos/overlay_edit_mode_info.hh @@ -804,8 +804,8 @@ PUSH_CONSTANT(VEC4, gpDepthPlane) /* TODO(fclem): Move to a GPencil object UB ADDITIONAL_INFO(draw_view) ADDITIONAL_INFO(draw_resource_handle_new) ADDITIONAL_INFO(draw_globals) -ADDITIONAL_INFO(draw_gpencil_new) -ADDITIONAL_INFO(draw_object_infos_new) +ADDITIONAL_INFO(draw_gpencil) +ADDITIONAL_INFO(draw_object_infos) GPU_SHADER_CREATE_END() OVERLAY_INFO_VARIATIONS_MODELMAT(overlay_depth_gpencil, overlay_depth_gpencil_base) @@ -813,7 +813,7 @@ OVERLAY_INFO_VARIATIONS_MODELMAT(overlay_depth_gpencil, overlay_depth_gpencil_ba GPU_SHADER_CREATE_INFO(overlay_depth_pointcloud_base) VERTEX_SOURCE("overlay_depth_only_pointcloud_vert.glsl") FRAGMENT_SOURCE("overlay_depth_only_frag.glsl") -ADDITIONAL_INFO(draw_pointcloud_new) +ADDITIONAL_INFO(draw_pointcloud) ADDITIONAL_INFO(draw_globals) ADDITIONAL_INFO(draw_view) ADDITIONAL_INFO(draw_resource_handle_new) @@ -824,7 +824,7 @@ OVERLAY_INFO_VARIATIONS_MODELMAT(overlay_depth_pointcloud, overlay_depth_pointcl GPU_SHADER_CREATE_INFO(overlay_depth_curves_base) VERTEX_SOURCE("overlay_depth_only_curves_vert.glsl") FRAGMENT_SOURCE("overlay_depth_only_frag.glsl") -ADDITIONAL_INFO(draw_hair_new) +ADDITIONAL_INFO(draw_hair) ADDITIONAL_INFO(draw_globals) ADDITIONAL_INFO(draw_view) ADDITIONAL_INFO(draw_resource_handle_new) diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_extra_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_extra_info.hh index 4bfe6f4996a..f30c76caf8b 100644 --- a/source/blender/draw/engines/overlay/shaders/infos/overlay_extra_info.hh +++ b/source/blender/draw/engines/overlay/shaders/infos/overlay_extra_info.hh @@ -303,6 +303,7 @@ FRAGMENT_OUT(1, VEC4, lineOutput) VERTEX_SOURCE("overlay_edit_gpencil_canvas_vert.glsl") FRAGMENT_SOURCE("overlay_extra_frag.glsl") ADDITIONAL_INFO(draw_mesh) +ADDITIONAL_INFO(draw_view) ADDITIONAL_INFO(draw_globals) GPU_SHADER_CREATE_END() @@ -368,7 +369,7 @@ FRAGMENT_OUT(1, VEC4, lineOutput) VERTEX_SOURCE("overlay_particle_hair_vert.glsl") FRAGMENT_SOURCE("overlay_particle_shape_frag.glsl") ADDITIONAL_INFO(draw_view) -ADDITIONAL_INFO(draw_object_infos_new) +ADDITIONAL_INFO(draw_object_infos) ADDITIONAL_INFO(draw_resource_handle_new) ADDITIONAL_INFO(draw_globals) GPU_SHADER_CREATE_END() diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_outline_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_outline_info.hh index 5e9a5365222..f985a6edcce 100644 --- a/source/blender/draw/engines/overlay/shaders/infos/overlay_outline_info.hh +++ b/source/blender/draw/engines/overlay/shaders/infos/overlay_outline_info.hh @@ -50,7 +50,7 @@ ADDITIONAL_INFO(draw_view) ADDITIONAL_INFO(draw_modelmat_new) ADDITIONAL_INFO(draw_resource_handle_new) ADDITIONAL_INFO(draw_globals) -ADDITIONAL_INFO(draw_object_infos_new) +ADDITIONAL_INFO(draw_object_infos) ADDITIONAL_INFO(overlay_outline_prepass) GPU_SHADER_CREATE_END() @@ -67,8 +67,8 @@ ADDITIONAL_INFO(draw_view) ADDITIONAL_INFO(draw_modelmat_new) ADDITIONAL_INFO(draw_resource_handle_new) ADDITIONAL_INFO(draw_globals) -ADDITIONAL_INFO(draw_hair_new) -ADDITIONAL_INFO(draw_object_infos_new) +ADDITIONAL_INFO(draw_hair) +ADDITIONAL_INFO(draw_object_infos) ADDITIONAL_INFO(overlay_outline_prepass) GPU_SHADER_CREATE_END() @@ -78,8 +78,8 @@ GPU_SHADER_CREATE_INFO(overlay_outline_prepass_wire) DO_STATIC_COMPILATION() ADDITIONAL_INFO(overlay_outline_prepass) ADDITIONAL_INFO(draw_view) -ADDITIONAL_INFO(draw_mesh_new) -ADDITIONAL_INFO(draw_object_infos_new) +ADDITIONAL_INFO(draw_mesh) +ADDITIONAL_INFO(draw_object_infos) ADDITIONAL_INFO(draw_resource_handle_new) ADDITIONAL_INFO(gpu_index_buffer_load) STORAGE_BUF_FREQ(0, READ, float, pos[], GEOMETRY) @@ -116,8 +116,8 @@ ADDITIONAL_INFO(draw_view) ADDITIONAL_INFO(draw_modelmat_new) ADDITIONAL_INFO(draw_resource_handle_new) ADDITIONAL_INFO(draw_globals) -ADDITIONAL_INFO(draw_gpencil_new) -ADDITIONAL_INFO(draw_object_infos_new) +ADDITIONAL_INFO(draw_gpencil) +ADDITIONAL_INFO(draw_object_infos) GPU_SHADER_CREATE_END() OVERLAY_INFO_CLIP_VARIATION(overlay_outline_prepass_gpencil) @@ -129,8 +129,8 @@ ADDITIONAL_INFO(draw_view) ADDITIONAL_INFO(draw_modelmat_new) ADDITIONAL_INFO(draw_resource_handle_new) ADDITIONAL_INFO(draw_globals) -ADDITIONAL_INFO(draw_pointcloud_new) -ADDITIONAL_INFO(draw_object_infos_new) +ADDITIONAL_INFO(draw_pointcloud) +ADDITIONAL_INFO(draw_object_infos) ADDITIONAL_INFO(overlay_outline_prepass) GPU_SHADER_CREATE_END() diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_sculpt_curves_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_sculpt_curves_info.hh index e98918086b9..6538ad494ce 100644 --- a/source/blender/draw/engines/overlay/shaders/infos/overlay_sculpt_curves_info.hh +++ b/source/blender/draw/engines/overlay/shaders/infos/overlay_sculpt_curves_info.hh @@ -33,7 +33,7 @@ ADDITIONAL_INFO(draw_view) ADDITIONAL_INFO(draw_modelmat_new) ADDITIONAL_INFO(draw_resource_handle_new) ADDITIONAL_INFO(draw_globals) -ADDITIONAL_INFO(draw_hair_new) +ADDITIONAL_INFO(draw_hair) GPU_SHADER_CREATE_END() OVERLAY_INFO_CLIP_VARIATION(overlay_sculpt_curves_selection) diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_viewer_attribute_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_viewer_attribute_info.hh index fa986e96137..529650ab8e7 100644 --- a/source/blender/draw/engines/overlay/shaders/infos/overlay_viewer_attribute_info.hh +++ b/source/blender/draw/engines/overlay/shaders/infos/overlay_viewer_attribute_info.hh @@ -54,7 +54,7 @@ FRAGMENT_OUT(1, VEC4, lineOutput) SAMPLER(3, FLOAT_BUFFER, attribute_tx) VERTEX_OUT(overlay_viewer_attribute_iface) ADDITIONAL_INFO(overlay_viewer_attribute_common) -ADDITIONAL_INFO(draw_pointcloud_new) +ADDITIONAL_INFO(draw_pointcloud) ADDITIONAL_INFO(draw_globals) ADDITIONAL_INFO(draw_view) ADDITIONAL_INFO(draw_modelmat_new) @@ -89,7 +89,7 @@ SAMPLER(1, FLOAT_BUFFER, color_tx) PUSH_CONSTANT(BOOL, is_point_domain) VERTEX_OUT(overlay_viewer_attribute_iface) ADDITIONAL_INFO(overlay_viewer_attribute_common) -ADDITIONAL_INFO(draw_hair_new) +ADDITIONAL_INFO(draw_hair) ADDITIONAL_INFO(draw_view) ADDITIONAL_INFO(draw_globals) ADDITIONAL_INFO(draw_modelmat_new) diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_volume_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_volume_info.hh index 615f043d19b..16d44451343 100644 --- a/source/blender/draw/engines/overlay/shaders/infos/overlay_volume_info.hh +++ b/source/blender/draw/engines/overlay/shaders/infos/overlay_volume_info.hh @@ -49,7 +49,7 @@ GPU_SHADER_CREATE_END() GPU_SHADER_CREATE_INFO(overlay_volume_velocity_streamline) DO_STATIC_COMPILATION() -ADDITIONAL_INFO(draw_volume_new) +ADDITIONAL_INFO(draw_volume) ADDITIONAL_INFO(draw_view) ADDITIONAL_INFO(overlay_volume_velocity) GPU_SHADER_CREATE_END() @@ -62,7 +62,7 @@ DEFINE("USE_MAC") PUSH_CONSTANT(BOOL, drawMACX) PUSH_CONSTANT(BOOL, drawMACY) PUSH_CONSTANT(BOOL, drawMACZ) -ADDITIONAL_INFO(draw_volume_new) +ADDITIONAL_INFO(draw_volume) ADDITIONAL_INFO(draw_view) ADDITIONAL_INFO(overlay_volume_velocity) GPU_SHADER_CREATE_END() @@ -72,7 +72,7 @@ OVERLAY_INFO_SELECT_VARIATION(overlay_volume_velocity_mac) GPU_SHADER_CREATE_INFO(overlay_volume_velocity_needle) DO_STATIC_COMPILATION() DEFINE("USE_NEEDLE") -ADDITIONAL_INFO(draw_volume_new) +ADDITIONAL_INFO(draw_volume) ADDITIONAL_INFO(draw_view) ADDITIONAL_INFO(overlay_volume_velocity) GPU_SHADER_CREATE_END() @@ -109,7 +109,7 @@ GPU_SHADER_CREATE_END() GPU_SHADER_CREATE_INFO(overlay_volume_gridlines_flat) DO_STATIC_COMPILATION() -ADDITIONAL_INFO(draw_volume_new) +ADDITIONAL_INFO(draw_volume) ADDITIONAL_INFO(draw_view) ADDITIONAL_INFO(overlay_volume_gridlines) GPU_SHADER_CREATE_END() @@ -120,7 +120,7 @@ GPU_SHADER_CREATE_INFO(overlay_volume_gridlines_flags) DO_STATIC_COMPILATION() DEFINE("SHOW_FLAGS") SAMPLER(0, UINT_3D, flagTexture) -ADDITIONAL_INFO(draw_volume_new) +ADDITIONAL_INFO(draw_volume) ADDITIONAL_INFO(draw_view) ADDITIONAL_INFO(overlay_volume_gridlines) GPU_SHADER_CREATE_END() @@ -136,7 +136,7 @@ PUSH_CONSTANT(VEC4, rangeColor) PUSH_CONSTANT(INT, cellFilter) SAMPLER(0, UINT_3D, flagTexture) SAMPLER(1, FLOAT_3D, fieldTexture) -ADDITIONAL_INFO(draw_volume_new) +ADDITIONAL_INFO(draw_volume) ADDITIONAL_INFO(draw_view) ADDITIONAL_INFO(overlay_volume_gridlines) GPU_SHADER_CREATE_END() diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_wireframe_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_wireframe_info.hh index ee0d974fd19..58c683000b2 100644 --- a/source/blender/draw/engines/overlay/shaders/infos/overlay_wireframe_info.hh +++ b/source/blender/draw/engines/overlay/shaders/infos/overlay_wireframe_info.hh @@ -46,7 +46,7 @@ DEPTH_WRITE(DepthWrite::ANY) SPECIALIZATION_CONSTANT(BOOL, use_custom_depth_bias, true) ADDITIONAL_INFO(draw_view) ADDITIONAL_INFO(draw_resource_handle_new) -ADDITIONAL_INFO(draw_object_infos_new) +ADDITIONAL_INFO(draw_object_infos) ADDITIONAL_INFO(draw_globals) GPU_SHADER_CREATE_END() @@ -67,7 +67,7 @@ FRAGMENT_OUT(0, VEC4, fragColor) FRAGMENT_OUT(1, VEC4, lineOutput) ADDITIONAL_INFO(draw_view) ADDITIONAL_INFO(draw_resource_handle_new) -ADDITIONAL_INFO(draw_object_infos_new) +ADDITIONAL_INFO(draw_object_infos) ADDITIONAL_INFO(draw_globals) GPU_SHADER_CREATE_END() @@ -92,7 +92,7 @@ FRAGMENT_OUT(0, VEC4, fragColor) FRAGMENT_OUT(1, VEC4, lineOutput) ADDITIONAL_INFO(draw_view) ADDITIONAL_INFO(draw_resource_handle_new) -ADDITIONAL_INFO(draw_object_infos_new) +ADDITIONAL_INFO(draw_object_infos) ADDITIONAL_INFO(draw_globals) GPU_SHADER_CREATE_END() diff --git a/source/blender/draw/engines/workbench/shaders/infos/workbench_prepass_info.hh b/source/blender/draw/engines/workbench/shaders/infos/workbench_prepass_info.hh index 1eda6e71192..0e2771a586a 100644 --- a/source/blender/draw/engines/workbench/shaders/infos/workbench_prepass_info.hh +++ b/source/blender/draw/engines/workbench/shaders/infos/workbench_prepass_info.hh @@ -51,14 +51,14 @@ PUSH_CONSTANT(INT, emitter_object_id) VERTEX_SOURCE("workbench_prepass_hair_vert.glsl") ADDITIONAL_INFO(draw_modelmat_new_with_custom_id) ADDITIONAL_INFO(draw_resource_handle_new) -ADDITIONAL_INFO(draw_hair_new) +ADDITIONAL_INFO(draw_hair) GPU_SHADER_CREATE_END() GPU_SHADER_CREATE_INFO(workbench_pointcloud) VERTEX_SOURCE("workbench_prepass_pointcloud_vert.glsl") ADDITIONAL_INFO(draw_modelmat_new_with_custom_id) ADDITIONAL_INFO(draw_resource_handle_new) -ADDITIONAL_INFO(draw_pointcloud_new) +ADDITIONAL_INFO(draw_pointcloud) GPU_SHADER_CREATE_END() /** \} */ diff --git a/source/blender/draw/engines/workbench/shaders/infos/workbench_volume_info.hh b/source/blender/draw/engines/workbench/shaders/infos/workbench_volume_info.hh index fa201b51eee..81ff5b6e8f3 100644 --- a/source/blender/draw/engines/workbench/shaders/infos/workbench_volume_info.hh +++ b/source/blender/draw/engines/workbench/shaders/infos/workbench_volume_info.hh @@ -43,7 +43,7 @@ GPU_SHADER_CREATE_END() GPU_SHADER_CREATE_INFO(workbench_volume) SAMPLER(6, UINT_2D, stencil_tx) ADDITIONAL_INFO(workbench_volume_common) -ADDITIONAL_INFO(draw_object_infos_new) +ADDITIONAL_INFO(draw_object_infos) ADDITIONAL_INFO(draw_view) GPU_SHADER_CREATE_END() /** \} */ @@ -74,7 +74,7 @@ GPU_SHADER_CREATE_END() GPU_SHADER_CREATE_INFO(workbench_volume_object) ADDITIONAL_INFO(workbench_volume_object_common) -ADDITIONAL_INFO(draw_volume_new) +ADDITIONAL_INFO(draw_volume) GPU_SHADER_CREATE_END() /** \} */ diff --git a/source/blender/draw/engines/workbench/workbench_defines.hh b/source/blender/draw/engines/workbench/workbench_defines.hh index 67ca00aea93..8e7561bdbc1 100644 --- a/source/blender/draw/engines/workbench/workbench_defines.hh +++ b/source/blender/draw/engines/workbench/workbench_defines.hh @@ -7,7 +7,7 @@ /* Resources bind slots. */ /* Textures. */ -/* Slot 0 is reserved by draw_hair_new. */ +/* Slot 0 is reserved by draw_hair. */ #define WB_MATCAP_SLOT 1 #define WB_TEXTURE_SLOT 2 #define WB_TILE_ARRAY_SLOT 3 diff --git a/source/blender/draw/intern/shaders/common_hair_lib.glsl b/source/blender/draw/intern/shaders/common_hair_lib.glsl index bdb2c73635d..3b2431fb18d 100644 --- a/source/blender/draw/intern/shaders/common_hair_lib.glsl +++ b/source/blender/draw/intern/shaders/common_hair_lib.glsl @@ -80,7 +80,7 @@ uniform usamplerBuffer hairStrandSegBuffer; /* R16UI */ float hair_get_local_time() { # ifdef GPU_VERTEX_SHADER - VERTEX_SHADER_CREATE_INFO(draw_hair_new) + VERTEX_SHADER_CREATE_INFO(draw_hair) return float(gl_VertexID % hairStrandsRes) / float(hairStrandsRes - 1); # elif defined(GPU_COMPUTE_SHADER) COMPUTE_SHADER_CREATE_INFO(draw_hair_refine_compute) @@ -93,7 +93,7 @@ float hair_get_local_time() int hair_get_id() { # ifdef GPU_VERTEX_SHADER - VERTEX_SHADER_CREATE_INFO(draw_hair_new) + VERTEX_SHADER_CREATE_INFO(draw_hair) return gl_VertexID / hairStrandsRes; # elif defined(GPU_COMPUTE_SHADER) COMPUTE_SHADER_CREATE_INFO(draw_hair_refine_compute) @@ -151,7 +151,7 @@ void hair_get_interp_attrs( */ # if !defined(HAIR_PHASE_SUBDIV) && defined(GPU_VERTEX_SHADER) -VERTEX_SHADER_CREATE_INFO(draw_hair_new) +VERTEX_SHADER_CREATE_INFO(draw_hair) int hair_get_strand_id() { diff --git a/source/blender/draw/intern/shaders/draw_grease_pencil_lib.glsl b/source/blender/draw/intern/shaders/draw_grease_pencil_lib.glsl index 112d52bbdc0..9e7d2db643d 100644 --- a/source/blender/draw/intern/shaders/draw_grease_pencil_lib.glsl +++ b/source/blender/draw/intern/shaders/draw_grease_pencil_lib.glsl @@ -6,7 +6,7 @@ #include "draw_object_infos_info.hh" -SHADER_LIBRARY_CREATE_INFO(draw_gpencil_new) +SHADER_LIBRARY_CREATE_INFO(draw_gpencil) #include "draw_model_lib.glsl" #include "draw_view_lib.glsl" diff --git a/source/blender/draw/intern/shaders/draw_object_infos_info.hh b/source/blender/draw/intern/shaders/draw_object_infos_info.hh index ed589e03518..35419a988c1 100644 --- a/source/blender/draw/intern/shaders/draw_object_infos_info.hh +++ b/source/blender/draw/intern/shaders/draw_object_infos_info.hh @@ -25,15 +25,6 @@ #include "draw_defines.hh" #include "gpu_shader_create_info.hh" -GPU_SHADER_CREATE_INFO(draw_object_infos) -TYPEDEF_SOURCE("draw_shader_shared.hh") -DEFINE("OBINFO_LIB") -DEFINE_VALUE("OrcoTexCoFactors", "(drw_infos[resource_id].orco_mul_bias)") -DEFINE_VALUE("ObjectInfo", "(drw_infos[resource_id].infos)") -DEFINE_VALUE("ObjectColor", "(drw_infos[resource_id].ob_color)") -UNIFORM_BUF_FREQ(DRW_OBJ_INFOS_UBO_SLOT, ObjectInfos, drw_infos[DRW_RESOURCE_CHUNK_LEN], BATCH) -GPU_SHADER_CREATE_END() - GPU_SHADER_CREATE_INFO(draw_volume_infos) TYPEDEF_SOURCE("draw_shader_shared.hh") DEFINE("VOLUME_INFO_LIB") @@ -54,7 +45,7 @@ UNIFORM_BUF_FREQ(DRW_LAYER_ATTR_UBO_SLOT, BATCH) GPU_SHADER_CREATE_END() -GPU_SHADER_CREATE_INFO(draw_object_infos_new) +GPU_SHADER_CREATE_INFO(draw_object_infos) TYPEDEF_SOURCE("draw_shader_shared.hh") DEFINE("OBINFO_LIB") DEFINE("OBINFO_NEW") @@ -64,13 +55,13 @@ DEFINE_VALUE("ObjectColor", "(drw_infos[resource_id].ob_color)") STORAGE_BUF(DRW_OBJ_INFOS_SLOT, READ, ObjectInfos, drw_infos[]) GPU_SHADER_CREATE_END() -/** \note Requires draw_object_infos_new. */ -GPU_SHADER_CREATE_INFO(draw_object_attribute_new) +/** \note Requires draw_object_infos. */ +GPU_SHADER_CREATE_INFO(draw_object_attributes) DEFINE("OBATTR_LIB") DEFINE_VALUE("ObjectAttributeStart", "(drw_infos[resource_id].orco_mul_bias[0].w)") DEFINE_VALUE("ObjectAttributeLen", "(drw_infos[resource_id].orco_mul_bias[1].w)") STORAGE_BUF(DRW_OBJ_ATTR_SLOT, READ, ObjectAttribute, drw_attrs[]) -ADDITIONAL_INFO(draw_object_infos_new) +ADDITIONAL_INFO(draw_object_infos) GPU_SHADER_CREATE_END() /* -------------------------------------------------------------------- */ @@ -78,11 +69,6 @@ GPU_SHADER_CREATE_END() * \{ */ GPU_SHADER_CREATE_INFO(draw_mesh) -ADDITIONAL_INFO(draw_modelmat) -ADDITIONAL_INFO(draw_resource_id) -GPU_SHADER_CREATE_END() - -GPU_SHADER_CREATE_INFO(draw_mesh_new) ADDITIONAL_INFO(draw_modelmat_new) ADDITIONAL_INFO(draw_resource_id) GPU_SHADER_CREATE_END() @@ -90,23 +76,6 @@ GPU_SHADER_CREATE_END() GPU_SHADER_CREATE_INFO(draw_hair) DEFINE("HAIR_SHADER") DEFINE("DRW_HAIR_INFO") -SAMPLER(15, FLOAT_BUFFER, hairPointBuffer) -/* TODO(@fclem): Pack these into one UBO. */ -PUSH_CONSTANT(INT, hairStrandsRes) -PUSH_CONSTANT(INT, hairThicknessRes) -PUSH_CONSTANT(FLOAT, hairRadRoot) -PUSH_CONSTANT(FLOAT, hairRadTip) -PUSH_CONSTANT(FLOAT, hairRadShape) -PUSH_CONSTANT(BOOL, hairCloseTip) -PUSH_CONSTANT(INT, hairStrandOffset) -PUSH_CONSTANT(MAT4, hairDupliMatrix) -ADDITIONAL_INFO(draw_modelmat) -ADDITIONAL_INFO(draw_resource_id) -GPU_SHADER_CREATE_END() - -GPU_SHADER_CREATE_INFO(draw_hair_new) -DEFINE("HAIR_SHADER") -DEFINE("DRW_HAIR_INFO") SAMPLER(0, FLOAT_BUFFER, hairPointBuffer) /* TODO(@fclem): Pack these into one UBO. */ PUSH_CONSTANT(INT, hairStrandsRes) @@ -119,28 +88,13 @@ PUSH_CONSTANT(INT, hairStrandOffset) PUSH_CONSTANT(MAT4, hairDupliMatrix) GPU_SHADER_CREATE_END() -#ifndef GPU_SHADER /* Conflicts with define for C++ shader test. */ GPU_SHADER_CREATE_INFO(draw_pointcloud) SAMPLER_FREQ(0, FLOAT_BUFFER, ptcloud_pos_rad_tx, BATCH) DEFINE("POINTCLOUD_SHADER") DEFINE("DRW_POINTCLOUD_INFO") -ADDITIONAL_INFO(draw_modelmat_instanced_attr) -ADDITIONAL_INFO(draw_resource_id_uniform) -GPU_SHADER_CREATE_END() -#endif - -GPU_SHADER_CREATE_INFO(draw_pointcloud_new) -SAMPLER_FREQ(0, FLOAT_BUFFER, ptcloud_pos_rad_tx, BATCH) -DEFINE("POINTCLOUD_SHADER") -DEFINE("DRW_POINTCLOUD_INFO") GPU_SHADER_CREATE_END() GPU_SHADER_CREATE_INFO(draw_volume) -ADDITIONAL_INFO(draw_modelmat) -ADDITIONAL_INFO(draw_resource_id_uniform) -GPU_SHADER_CREATE_END() - -GPU_SHADER_CREATE_INFO(draw_volume_new) ADDITIONAL_INFO(draw_modelmat_new) ADDITIONAL_INFO(draw_resource_handle_new) GPU_SHADER_CREATE_END() @@ -156,24 +110,9 @@ PUSH_CONSTANT(FLOAT, gpThicknessWorldScale) /* TODO(fclem): Same as above. */ DEFINE_VALUE("gpThicknessIsScreenSpace", "(gpThicknessWorldScale < 0.0)") /* Per Layer */ PUSH_CONSTANT(FLOAT, gpThicknessOffset) -ADDITIONAL_INFO(draw_modelmat) +ADDITIONAL_INFO(draw_resource_id_varying) +ADDITIONAL_INFO(draw_view) ADDITIONAL_INFO(draw_object_infos) GPU_SHADER_CREATE_END() -GPU_SHADER_CREATE_INFO(draw_gpencil_new) -TYPEDEF_SOURCE("gpencil_shader_shared.h") -DEFINE("DRW_GPENCIL_INFO") -SAMPLER(0, FLOAT_BUFFER, gp_pos_tx) -SAMPLER(1, FLOAT_BUFFER, gp_col_tx) -/* Per Object */ -PUSH_CONSTANT(FLOAT, gpThicknessScale) /* TODO(fclem): Replace with object info. */ -PUSH_CONSTANT(FLOAT, gpThicknessWorldScale) /* TODO(fclem): Same as above. */ -DEFINE_VALUE("gpThicknessIsScreenSpace", "(gpThicknessWorldScale < 0.0)") -/* Per Layer */ -PUSH_CONSTANT(FLOAT, gpThicknessOffset) -ADDITIONAL_INFO(draw_resource_id_varying) -ADDITIONAL_INFO(draw_view) -ADDITIONAL_INFO(draw_object_infos_new) -GPU_SHADER_CREATE_END() - /** \} */