From a6fa1b5969fa03425e6e8f03dad014941f9fd030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Wed, 16 Apr 2025 20:19:09 +0200 Subject: [PATCH] DRW: Rename `common_*_lib.glsl` to follow module prefix --- source/blender/draw/CMakeLists.txt | 16 ++++++++-------- .../shaders/eevee_attributes_curves_lib.glsl | 2 +- .../eevee/shaders/eevee_geom_curves_vert.glsl | 2 +- .../shaders/eevee_horizon_scan_eval_lib.glsl | 2 +- .../shaders/eevee_shadow_tag_update_comp.glsl | 2 +- .../shaders/eevee_shadow_tag_usage_vert.glsl | 2 +- .../eevee/shaders/eevee_shadow_tilemap_lib.glsl | 2 +- .../eevee/shaders/eevee_surf_capture_frag.glsl | 2 +- .../eevee/shaders/eevee_surf_deferred_frag.glsl | 2 +- .../eevee/shaders/eevee_surf_depth_frag.glsl | 2 +- .../eevee/shaders/eevee_surf_forward_frag.glsl | 2 +- .../eevee/shaders/eevee_surf_hybrid_frag.glsl | 2 +- .../engines/gpencil/shaders/gpencil_frag.glsl | 2 +- .../image/shaders/image_engine_color_frag.glsl | 2 +- .../image/shaders/image_engine_depth_frag.glsl | 2 +- .../shaders/overlay_depth_only_curves_vert.glsl | 2 +- .../shaders/overlay_edit_uv_image_mask_frag.glsl | 2 +- .../overlay/shaders/overlay_image_frag.glsl | 2 +- .../overlay_outline_prepass_curves_vert.glsl | 2 +- .../shaders/overlay_paint_texture_frag.glsl | 2 +- .../overlay_sculpt_curves_selection_vert.glsl | 2 +- .../overlay_viewer_attribute_curves_vert.glsl | 2 +- .../shaders/workbench_prepass_hair_vert.glsl | 2 +- .../blender/draw/intern/shaders/CMakeLists.txt | 2 +- .../{common_aabb_lib.glsl => draw_aabb_lib.glsl} | 2 +- ...nt_lib.glsl => draw_colormanagement_lib.glsl} | 0 ...common_hair_lib.glsl => draw_curves_lib.glsl} | 0 ...ug_draw_lib.glsl => draw_debug_draw_lib.glsl} | 0 ..._shape_lib.glsl => draw_debug_shape_lib.glsl} | 4 ++-- .../{common_fxaa_lib.glsl => draw_fxaa_lib.glsl} | 0 ...fine_comp.glsl => draw_hair_refine_comp.glsl} | 2 +- .../draw/intern/shaders/draw_hair_refine_info.hh | 2 +- .../draw/intern/shaders/draw_intersect_lib.glsl | 2 +- ...common_shape_lib.glsl => draw_shape_lib.glsl} | 0 .../gpu/glsl_preprocess/glsl_preprocess.hh | 2 +- .../blender/gpu/intern/gpu_shader_dependency.cc | 2 +- .../python/gpu/gpu_py_shader_create_info.cc | 6 +++--- 37 files changed, 42 insertions(+), 42 deletions(-) rename source/blender/draw/intern/shaders/{common_aabb_lib.glsl => draw_aabb_lib.glsl} (97%) rename source/blender/draw/intern/shaders/{common_colormanagement_lib.glsl => draw_colormanagement_lib.glsl} (100%) rename source/blender/draw/intern/shaders/{common_hair_lib.glsl => draw_curves_lib.glsl} (100%) rename source/blender/draw/intern/shaders/{common_debug_draw_lib.glsl => draw_debug_draw_lib.glsl} (100%) rename source/blender/draw/intern/shaders/{common_debug_shape_lib.glsl => draw_debug_shape_lib.glsl} (96%) rename source/blender/draw/intern/shaders/{common_fxaa_lib.glsl => draw_fxaa_lib.glsl} (100%) rename source/blender/draw/intern/shaders/{common_hair_refine_comp.glsl => draw_hair_refine_comp.glsl} (94%) rename source/blender/draw/intern/shaders/{common_shape_lib.glsl => draw_shape_lib.glsl} (100%) diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index 5fc23486fc9..7542022f73c 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -537,14 +537,6 @@ set(GLSL_SRC engines/workbench/workbench_shader_shared.h - intern/shaders/common_aabb_lib.glsl - intern/shaders/common_colormanagement_lib.glsl - intern/shaders/common_debug_draw_lib.glsl - intern/shaders/common_debug_shape_lib.glsl - intern/shaders/common_fxaa_lib.glsl - intern/shaders/common_hair_lib.glsl - intern/shaders/common_hair_refine_comp.glsl - intern/shaders/common_shape_lib.glsl intern/shaders/subdiv_custom_data_interp_comp.glsl intern/shaders/subdiv_ibo_lines_comp.glsl intern/shaders/subdiv_ibo_tris_comp.glsl @@ -557,6 +549,14 @@ set(GLSL_SRC intern/shaders/subdiv_vbo_edituv_strech_area_comp.glsl intern/shaders/subdiv_vbo_lnor_comp.glsl intern/shaders/subdiv_vbo_sculpt_data_comp.glsl + intern/shaders/draw_aabb_lib.glsl + intern/shaders/draw_colormanagement_lib.glsl + intern/shaders/draw_debug_draw_lib.glsl + intern/shaders/draw_debug_shape_lib.glsl + intern/shaders/draw_fxaa_lib.glsl + intern/shaders/draw_curves_lib.glsl + intern/shaders/draw_hair_refine_comp.glsl + intern/shaders/draw_shape_lib.glsl intern/shaders/draw_command_generate_comp.glsl intern/shaders/draw_debug_draw_display_frag.glsl intern/shaders/draw_debug_draw_display_vert.glsl diff --git a/source/blender/draw/engines/eevee/shaders/eevee_attributes_curves_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_attributes_curves_lib.glsl index 7cf14f9e2c0..737bfe9a5d8 100644 --- a/source/blender/draw/engines/eevee/shaders/eevee_attributes_curves_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/eevee_attributes_curves_lib.glsl @@ -14,7 +14,7 @@ SHADER_LIBRARY_CREATE_INFO(draw_modelmat) SHADER_LIBRARY_CREATE_INFO(draw_hair) -#include "common_hair_lib.glsl" /* TODO rename to curve. */ +#include "draw_curves_lib.glsl" /* TODO rename to curve. */ #include "draw_model_lib.glsl" #include "draw_object_infos_lib.glsl" #include "gpu_shader_codegen_lib.glsl" diff --git a/source/blender/draw/engines/eevee/shaders/eevee_geom_curves_vert.glsl b/source/blender/draw/engines/eevee/shaders/eevee_geom_curves_vert.glsl index ab8dcfe55a5..86eb25d20cf 100644 --- a/source/blender/draw/engines/eevee/shaders/eevee_geom_curves_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/eevee_geom_curves_vert.glsl @@ -7,7 +7,7 @@ VERTEX_SHADER_CREATE_INFO(eevee_clip_plane) VERTEX_SHADER_CREATE_INFO(eevee_geom_curves) -#include "common_hair_lib.glsl" /* TODO rename to curve. */ +#include "draw_curves_lib.glsl" /* TODO rename to curve. */ #include "draw_model_lib.glsl" #include "eevee_attributes_curves_lib.glsl" #include "eevee_nodetree_lib.glsl" diff --git a/source/blender/draw/engines/eevee/shaders/eevee_horizon_scan_eval_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_horizon_scan_eval_lib.glsl index a4c3549e1a2..b2869f29c8c 100644 --- a/source/blender/draw/engines/eevee/shaders/eevee_horizon_scan_eval_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/eevee_horizon_scan_eval_lib.glsl @@ -19,7 +19,7 @@ SHADER_LIBRARY_CREATE_INFO(eevee_horizon_scan) -#include "common_shape_lib.glsl" +#include "draw_shape_lib.glsl" #include "draw_view_lib.glsl" #include "eevee_bxdf_lib.glsl" #include "eevee_horizon_scan_lib.glsl" diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_update_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_update_comp.glsl index e356e43d89c..7b7ed3e4ae0 100644 --- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_update_comp.glsl +++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_update_comp.glsl @@ -15,7 +15,7 @@ COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tag_update) -#include "common_aabb_lib.glsl" +#include "draw_aabb_lib.glsl" #include "draw_intersect_lib.glsl" #include "draw_view_lib.glsl" diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_vert.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_vert.glsl index 48945fb9877..946829754c5 100644 --- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_vert.glsl @@ -13,8 +13,8 @@ VERTEX_SHADER_CREATE_INFO(eevee_shadow_tag_usage_transparent) -#include "common_shape_lib.glsl" #include "draw_model_lib.glsl" +#include "draw_shape_lib.glsl" #include "gpu_shader_math_vector_lib.glsl" #include "gpu_shader_utildefines_lib.glsl" diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_lib.glsl index 2b798debba4..f6c92ec9a37 100644 --- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_lib.glsl @@ -6,7 +6,7 @@ #include "infos/eevee_common_info.hh" -#include "common_shape_lib.glsl" +#include "draw_shape_lib.glsl" #include "gpu_shader_math_vector_lib.glsl" #include "gpu_shader_utildefines_lib.glsl" diff --git a/source/blender/draw/engines/eevee/shaders/eevee_surf_capture_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_surf_capture_frag.glsl index f29c54a7aef..da81e9f20ef 100644 --- a/source/blender/draw/engines/eevee/shaders/eevee_surf_capture_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/eevee_surf_capture_frag.glsl @@ -14,7 +14,7 @@ FRAGMENT_SHADER_CREATE_INFO(eevee_geom_mesh) FRAGMENT_SHADER_CREATE_INFO(eevee_surf_capture) -#include "common_hair_lib.glsl" +#include "draw_curves_lib.glsl" #include "draw_view_lib.glsl" #include "eevee_gbuffer_lib.glsl" #include "eevee_nodetree_lib.glsl" diff --git a/source/blender/draw/engines/eevee/shaders/eevee_surf_deferred_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_surf_deferred_frag.glsl index 4df43244088..3feae6e65be 100644 --- a/source/blender/draw/engines/eevee/shaders/eevee_surf_deferred_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/eevee_surf_deferred_frag.glsl @@ -17,7 +17,7 @@ FRAGMENT_SHADER_CREATE_INFO(eevee_surf_deferred) FRAGMENT_SHADER_CREATE_INFO(eevee_render_pass_out) FRAGMENT_SHADER_CREATE_INFO(eevee_cryptomatte_out) -#include "common_hair_lib.glsl" +#include "draw_curves_lib.glsl" #include "draw_view_lib.glsl" #include "eevee_ambient_occlusion_lib.glsl" #include "eevee_gbuffer_lib.glsl" diff --git a/source/blender/draw/engines/eevee/shaders/eevee_surf_depth_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_surf_depth_frag.glsl index 21432238b89..0056f7ed7f7 100644 --- a/source/blender/draw/engines/eevee/shaders/eevee_surf_depth_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/eevee_surf_depth_frag.glsl @@ -12,7 +12,7 @@ FRAGMENT_SHADER_CREATE_INFO(eevee_clip_plane) FRAGMENT_SHADER_CREATE_INFO(eevee_geom_mesh) FRAGMENT_SHADER_CREATE_INFO(eevee_surf_depth) -#include "common_hair_lib.glsl" +#include "draw_curves_lib.glsl" #include "draw_view_lib.glsl" #include "eevee_nodetree_lib.glsl" #include "eevee_sampling_lib.glsl" diff --git a/source/blender/draw/engines/eevee/shaders/eevee_surf_forward_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_surf_forward_frag.glsl index cc396794ce6..051ad474a14 100644 --- a/source/blender/draw/engines/eevee/shaders/eevee_surf_forward_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/eevee_surf_forward_frag.glsl @@ -13,7 +13,7 @@ FRAGMENT_SHADER_CREATE_INFO(eevee_geom_mesh) FRAGMENT_SHADER_CREATE_INFO(eevee_surf_forward) -#include "common_hair_lib.glsl" +#include "draw_curves_lib.glsl" #include "draw_view_lib.glsl" #include "eevee_ambient_occlusion_lib.glsl" #include "eevee_forward_lib.glsl" diff --git a/source/blender/draw/engines/eevee/shaders/eevee_surf_hybrid_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_surf_hybrid_frag.glsl index b87d0e70975..e5541e79d47 100644 --- a/source/blender/draw/engines/eevee/shaders/eevee_surf_hybrid_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/eevee_surf_hybrid_frag.glsl @@ -17,7 +17,7 @@ FRAGMENT_SHADER_CREATE_INFO(eevee_surf_deferred_hybrid) FRAGMENT_SHADER_CREATE_INFO(eevee_render_pass_out) FRAGMENT_SHADER_CREATE_INFO(eevee_cryptomatte_out) -#include "common_hair_lib.glsl" +#include "draw_curves_lib.glsl" #include "draw_view_lib.glsl" #include "eevee_ambient_occlusion_lib.glsl" #include "eevee_forward_lib.glsl" diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_frag.glsl index 25d5b5bb7ff..480c21daa5e 100644 --- a/source/blender/draw/engines/gpencil/shaders/gpencil_frag.glsl +++ b/source/blender/draw/engines/gpencil/shaders/gpencil_frag.glsl @@ -6,7 +6,7 @@ FRAGMENT_SHADER_CREATE_INFO(gpencil_geometry) -#include "common_colormanagement_lib.glsl" +#include "draw_colormanagement_lib.glsl" #include "draw_grease_pencil_lib.glsl" float3 gpencil_lighting() diff --git a/source/blender/draw/engines/image/shaders/image_engine_color_frag.glsl b/source/blender/draw/engines/image/shaders/image_engine_color_frag.glsl index d11cb2b2c07..333f5fd8632 100644 --- a/source/blender/draw/engines/image/shaders/image_engine_color_frag.glsl +++ b/source/blender/draw/engines/image/shaders/image_engine_color_frag.glsl @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "common_colormanagement_lib.glsl" +#include "draw_colormanagement_lib.glsl" /* Keep in sync with image_engine.c */ #define IMAGE_DRAW_FLAG_SHOW_ALPHA (1 << 0) diff --git a/source/blender/draw/engines/image/shaders/image_engine_depth_frag.glsl b/source/blender/draw/engines/image/shaders/image_engine_depth_frag.glsl index 4781b62672a..4634adcba87 100644 --- a/source/blender/draw/engines/image/shaders/image_engine_depth_frag.glsl +++ b/source/blender/draw/engines/image/shaders/image_engine_depth_frag.glsl @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "common_colormanagement_lib.glsl" +#include "draw_colormanagement_lib.glsl" #define Z_DEPTH_BORDER 1.0f #define Z_DEPTH_IMAGE 0.75f diff --git a/source/blender/draw/engines/overlay/shaders/overlay_depth_only_curves_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_depth_only_curves_vert.glsl index ffbe1b57fee..25b9dea6598 100644 --- a/source/blender/draw/engines/overlay/shaders/overlay_depth_only_curves_vert.glsl +++ b/source/blender/draw/engines/overlay/shaders/overlay_depth_only_curves_vert.glsl @@ -6,7 +6,7 @@ VERTEX_SHADER_CREATE_INFO(overlay_depth_curves) -#include "common_hair_lib.glsl" +#include "draw_curves_lib.glsl" #include "draw_model_lib.glsl" #include "draw_view_clipping_lib.glsl" #include "draw_view_lib.glsl" diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_image_mask_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_image_mask_frag.glsl index 8e29e071854..922f5ca3695 100644 --- a/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_image_mask_frag.glsl +++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_uv_image_mask_frag.glsl @@ -6,7 +6,7 @@ FRAGMENT_SHADER_CREATE_INFO(overlay_edit_uv_mask_image) -#include "common_colormanagement_lib.glsl" +#include "draw_colormanagement_lib.glsl" void main() { diff --git a/source/blender/draw/engines/overlay/shaders/overlay_image_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_image_frag.glsl index fcd82a7f754..128db172837 100644 --- a/source/blender/draw/engines/overlay/shaders/overlay_image_frag.glsl +++ b/source/blender/draw/engines/overlay/shaders/overlay_image_frag.glsl @@ -6,7 +6,7 @@ FRAGMENT_SHADER_CREATE_INFO(overlay_image_base) -#include "common_colormanagement_lib.glsl" +#include "draw_colormanagement_lib.glsl" #include "select_lib.glsl" void main() diff --git a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_curves_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_curves_vert.glsl index beecf805cc8..61027b74ce9 100644 --- a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_curves_vert.glsl +++ b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_curves_vert.glsl @@ -6,7 +6,7 @@ VERTEX_SHADER_CREATE_INFO(overlay_outline_prepass_curves) -#include "common_hair_lib.glsl" +#include "draw_curves_lib.glsl" #include "draw_model_lib.glsl" #include "draw_object_infos_lib.glsl" #include "draw_view_clipping_lib.glsl" diff --git a/source/blender/draw/engines/overlay/shaders/overlay_paint_texture_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_paint_texture_frag.glsl index fd491fd574d..9d5e30e059b 100644 --- a/source/blender/draw/engines/overlay/shaders/overlay_paint_texture_frag.glsl +++ b/source/blender/draw/engines/overlay/shaders/overlay_paint_texture_frag.glsl @@ -6,7 +6,7 @@ FRAGMENT_SHADER_CREATE_INFO(overlay_paint_texture) -#include "common_colormanagement_lib.glsl" +#include "draw_colormanagement_lib.glsl" void main() { diff --git a/source/blender/draw/engines/overlay/shaders/overlay_sculpt_curves_selection_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_sculpt_curves_selection_vert.glsl index 197cccfbc1b..9edf84f827d 100644 --- a/source/blender/draw/engines/overlay/shaders/overlay_sculpt_curves_selection_vert.glsl +++ b/source/blender/draw/engines/overlay/shaders/overlay_sculpt_curves_selection_vert.glsl @@ -6,7 +6,7 @@ VERTEX_SHADER_CREATE_INFO(overlay_sculpt_curves_selection) -#include "common_hair_lib.glsl" +#include "draw_curves_lib.glsl" #include "draw_model_lib.glsl" #include "draw_view_clipping_lib.glsl" #include "draw_view_lib.glsl" diff --git a/source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_curves_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_curves_vert.glsl index 8cd11ef5b3c..16c4f857dfb 100644 --- a/source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_curves_vert.glsl +++ b/source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_curves_vert.glsl @@ -6,7 +6,7 @@ VERTEX_SHADER_CREATE_INFO(overlay_viewer_attribute_curves) -#include "common_hair_lib.glsl" +#include "draw_curves_lib.glsl" #include "draw_model_lib.glsl" #include "draw_view_clipping_lib.glsl" #include "draw_view_lib.glsl" diff --git a/source/blender/draw/engines/workbench/shaders/workbench_prepass_hair_vert.glsl b/source/blender/draw/engines/workbench/shaders/workbench_prepass_hair_vert.glsl index 28d3fff0363..6056d420136 100644 --- a/source/blender/draw/engines/workbench/shaders/workbench_prepass_hair_vert.glsl +++ b/source/blender/draw/engines/workbench/shaders/workbench_prepass_hair_vert.glsl @@ -9,7 +9,7 @@ VERTEX_SHADER_CREATE_INFO(workbench_lighting_flat) VERTEX_SHADER_CREATE_INFO(workbench_transparent_accum) VERTEX_SHADER_CREATE_INFO(workbench_curves) -#include "common_hair_lib.glsl" +#include "draw_curves_lib.glsl" #include "draw_model_lib.glsl" #include "draw_view_clipping_lib.glsl" #include "draw_view_lib.glsl" diff --git a/source/blender/draw/intern/shaders/CMakeLists.txt b/source/blender/draw/intern/shaders/CMakeLists.txt index 83776719b3d..77140e6e348 100644 --- a/source/blender/draw/intern/shaders/CMakeLists.txt +++ b/source/blender/draw/intern/shaders/CMakeLists.txt @@ -24,7 +24,7 @@ set(SRC_GLSL_FRAG ) set(SRC_GLSL_COMP - common_hair_refine_comp.glsl + draw_hair_refine_comp.glsl draw_command_generate_comp.glsl # Failed because of mixed definition of ObjectInfos # draw_resource_finalize_comp.glsl diff --git a/source/blender/draw/intern/shaders/common_aabb_lib.glsl b/source/blender/draw/intern/shaders/draw_aabb_lib.glsl similarity index 97% rename from source/blender/draw/intern/shaders/common_aabb_lib.glsl rename to source/blender/draw/intern/shaders/draw_aabb_lib.glsl index 24a932f2ee0..c872ff79245 100644 --- a/source/blender/draw/intern/shaders/common_aabb_lib.glsl +++ b/source/blender/draw/intern/shaders/draw_aabb_lib.glsl @@ -4,7 +4,7 @@ #pragma once -#include "common_shape_lib.glsl" +#include "draw_shape_lib.glsl" /* ---------------------------------------------------------------------- */ /** \name Axis Aligned Bound Box diff --git a/source/blender/draw/intern/shaders/common_colormanagement_lib.glsl b/source/blender/draw/intern/shaders/draw_colormanagement_lib.glsl similarity index 100% rename from source/blender/draw/intern/shaders/common_colormanagement_lib.glsl rename to source/blender/draw/intern/shaders/draw_colormanagement_lib.glsl diff --git a/source/blender/draw/intern/shaders/common_hair_lib.glsl b/source/blender/draw/intern/shaders/draw_curves_lib.glsl similarity index 100% rename from source/blender/draw/intern/shaders/common_hair_lib.glsl rename to source/blender/draw/intern/shaders/draw_curves_lib.glsl diff --git a/source/blender/draw/intern/shaders/common_debug_draw_lib.glsl b/source/blender/draw/intern/shaders/draw_debug_draw_lib.glsl similarity index 100% rename from source/blender/draw/intern/shaders/common_debug_draw_lib.glsl rename to source/blender/draw/intern/shaders/draw_debug_draw_lib.glsl diff --git a/source/blender/draw/intern/shaders/common_debug_shape_lib.glsl b/source/blender/draw/intern/shaders/draw_debug_shape_lib.glsl similarity index 96% rename from source/blender/draw/intern/shaders/common_debug_shape_lib.glsl rename to source/blender/draw/intern/shaders/draw_debug_shape_lib.glsl index 2ac878f4bb0..8baeb652624 100644 --- a/source/blender/draw/intern/shaders/common_debug_shape_lib.glsl +++ b/source/blender/draw/intern/shaders/draw_debug_shape_lib.glsl @@ -8,8 +8,8 @@ * Debug drawing of shapes. */ -#include "common_debug_draw_lib.glsl" -#include "common_shape_lib.glsl" +#include "draw_debug_draw_lib.glsl" +#include "draw_shape_lib.glsl" void drw_debug(Box shape, float4 color) { diff --git a/source/blender/draw/intern/shaders/common_fxaa_lib.glsl b/source/blender/draw/intern/shaders/draw_fxaa_lib.glsl similarity index 100% rename from source/blender/draw/intern/shaders/common_fxaa_lib.glsl rename to source/blender/draw/intern/shaders/draw_fxaa_lib.glsl diff --git a/source/blender/draw/intern/shaders/common_hair_refine_comp.glsl b/source/blender/draw/intern/shaders/draw_hair_refine_comp.glsl similarity index 94% rename from source/blender/draw/intern/shaders/common_hair_refine_comp.glsl rename to source/blender/draw/intern/shaders/draw_hair_refine_comp.glsl index a5f302bc337..de88c59fdae 100644 --- a/source/blender/draw/intern/shaders/common_hair_refine_comp.glsl +++ b/source/blender/draw/intern/shaders/draw_hair_refine_comp.glsl @@ -4,7 +4,7 @@ #include "draw_hair_refine_info.hh" -#include "common_hair_lib.glsl" +#include "draw_curves_lib.glsl" COMPUTE_SHADER_CREATE_INFO(draw_hair_refine_compute) diff --git a/source/blender/draw/intern/shaders/draw_hair_refine_info.hh b/source/blender/draw/intern/shaders/draw_hair_refine_info.hh index b91a247bb14..c4d614b4773 100644 --- a/source/blender/draw/intern/shaders/draw_hair_refine_info.hh +++ b/source/blender/draw/intern/shaders/draw_hair_refine_info.hh @@ -25,7 +25,7 @@ STORAGE_BUF(0, WRITE, float4, posTime[]) /* Per strands data. */ SAMPLER(1, UINT_BUFFER, hairStrandBuffer) SAMPLER(2, UINT_BUFFER, hairStrandSegBuffer) -COMPUTE_SOURCE("common_hair_refine_comp.glsl") +COMPUTE_SOURCE("draw_hair_refine_comp.glsl") DEFINE("HAIR_PHASE_SUBDIV") ADDITIONAL_INFO(draw_hair) DO_STATIC_COMPILATION() diff --git a/source/blender/draw/intern/shaders/draw_intersect_lib.glsl b/source/blender/draw/intern/shaders/draw_intersect_lib.glsl index e1030c8fdab..9442cc822e4 100644 --- a/source/blender/draw/intern/shaders/draw_intersect_lib.glsl +++ b/source/blender/draw/intern/shaders/draw_intersect_lib.glsl @@ -11,8 +11,8 @@ #include "draw_view_info.hh" -#include "common_shape_lib.glsl" #include "draw_math_geom_lib.glsl" +#include "draw_shape_lib.glsl" #include "gpu_shader_utildefines_lib.glsl" /* ---------------------------------------------------------------------- */ diff --git a/source/blender/draw/intern/shaders/common_shape_lib.glsl b/source/blender/draw/intern/shaders/draw_shape_lib.glsl similarity index 100% rename from source/blender/draw/intern/shaders/common_shape_lib.glsl rename to source/blender/draw/intern/shaders/draw_shape_lib.glsl diff --git a/source/blender/gpu/glsl_preprocess/glsl_preprocess.hh b/source/blender/gpu/glsl_preprocess/glsl_preprocess.hh index 80604c305b1..d89b68868c0 100644 --- a/source/blender/gpu/glsl_preprocess/glsl_preprocess.hh +++ b/source/blender/gpu/glsl_preprocess/glsl_preprocess.hh @@ -307,7 +307,7 @@ class Preprocessor { return ""; } - const bool skip_drw_debug = filename.find("common_debug_draw_lib.glsl") != std::string::npos || + const bool skip_drw_debug = filename.find("draw_debug_draw_lib.glsl") != std::string::npos || filename.find("draw_debug_draw_display_vert.glsl") != std::string::npos; diff --git a/source/blender/gpu/intern/gpu_shader_dependency.cc b/source/blender/gpu/intern/gpu_shader_dependency.cc index 75fa11a57e3..2e524ef9874 100644 --- a/source/blender/gpu/intern/gpu_shader_dependency.cc +++ b/source/blender/gpu/intern/gpu_shader_dependency.cc @@ -379,7 +379,7 @@ struct GPUSource { dependencies.append_non_duplicates(dict.lookup("gpu_shader_print_lib.glsl")); } if ((builtins & BuiltinBits::USE_DEBUG_DRAW) == BuiltinBits::USE_DEBUG_DRAW) { - dependencies.append_non_duplicates(dict.lookup("common_debug_draw_lib.glsl")); + dependencies.append_non_duplicates(dict.lookup("draw_debug_draw_lib.glsl")); } for (auto dependency_name : dependencies_names) { diff --git a/source/blender/python/gpu/gpu_py_shader_create_info.cc b/source/blender/python/gpu/gpu_py_shader_create_info.cc index 347777ad740..d3cf8bd0032 100644 --- a/source/blender/python/gpu/gpu_py_shader_create_info.cc +++ b/source/blender/python/gpu/gpu_py_shader_create_info.cc @@ -1024,7 +1024,7 @@ static PyObject *pygpu_shader_info_vertex_source(BPyGPUShaderCreateInfo *self, P #endif ShaderCreateInfo *info = reinterpret_cast(self->info); - info->vertex_source("common_colormanagement_lib.glsl"); + info->vertex_source("draw_colormanagement_lib.glsl"); info->vertex_source_generated = vertex_source; Py_RETURN_NONE; @@ -1070,7 +1070,7 @@ static PyObject *pygpu_shader_info_compute_source(BPyGPUShaderCreateInfo *self, #endif ShaderCreateInfo *info = reinterpret_cast(self->info); - info->compute_source("common_colormanagement_lib.glsl"); + info->compute_source("draw_colormanagement_lib.glsl"); info->compute_source_generated = compute_source; Py_RETURN_NONE; @@ -1112,7 +1112,7 @@ static PyObject *pygpu_shader_info_fragment_source(BPyGPUShaderCreateInfo *self, #endif ShaderCreateInfo *info = reinterpret_cast(self->info); - info->fragment_source("common_colormanagement_lib.glsl"); + info->fragment_source("draw_colormanagement_lib.glsl"); info->fragment_source_generated = fragment_source; Py_RETURN_NONE;