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

DRW: Rename common_*_lib.glsl to follow module prefix

Browse Source
This commit is contained in:
Clément Foucault
2025-04-16 20:19:09 +02:00
parent f2025f28e7
commit a6fa1b5969
37 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/draw/CMakeLists.txt
View File

@@ -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

2
source/blender/draw/engines/eevee/shaders/eevee_attributes_curves_lib.glsl
View File

@@ -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"

2
source/blender/draw/engines/eevee/shaders/eevee_geom_curves_vert.glsl
View File

@@ -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"

2
source/blender/draw/engines/eevee/shaders/eevee_horizon_scan_eval_lib.glsl
View File

@@ -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"

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_update_comp.glsl
View File

@@ -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"

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_vert.glsl
View File

@@ -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"

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_lib.glsl
View File

@@ -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"

2
source/blender/draw/engines/eevee/shaders/eevee_surf_capture_frag.glsl
View File

@@ -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"

2
source/blender/draw/engines/eevee/shaders/eevee_surf_deferred_frag.glsl
View File

@@ -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"

2
source/blender/draw/engines/eevee/shaders/eevee_surf_depth_frag.glsl
View File

@@ -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"

2
source/blender/draw/engines/eevee/shaders/eevee_surf_forward_frag.glsl
View File

@@ -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"

2
source/blender/draw/engines/eevee/shaders/eevee_surf_hybrid_frag.glsl
View File

@@ -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"

2
source/blender/draw/engines/gpencil/shaders/gpencil_frag.glsl
View File

@@ -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()

2
source/blender/draw/engines/image/shaders/image_engine_color_frag.glsl
View File

@@ -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)

2
source/blender/draw/engines/image/shaders/image_engine_depth_frag.glsl
View File

@@ -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

2
source/blender/draw/engines/overlay/shaders/overlay_depth_only_curves_vert.glsl
View File

@@ -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"

2
source/blender/draw/engines/overlay/shaders/overlay_edit_uv_image_mask_frag.glsl
View File

@@ -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()
{

2
source/blender/draw/engines/overlay/shaders/overlay_image_frag.glsl
View File

@@ -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()

2
source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_curves_vert.glsl
View File

@@ -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"

2
source/blender/draw/engines/overlay/shaders/overlay_paint_texture_frag.glsl
View File

@@ -6,7 +6,7 @@
FRAGMENT_SHADER_CREATE_INFO(overlay_paint_texture)
#include "common_colormanagement_lib.glsl"
#include "draw_colormanagement_lib.glsl"
void main()
{

2
source/blender/draw/engines/overlay/shaders/overlay_sculpt_curves_selection_vert.glsl
View File

@@ -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"

2
source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_curves_vert.glsl
View File

@@ -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"

2
source/blender/draw/engines/workbench/shaders/workbench_prepass_hair_vert.glsl
View File

@@ -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"

2
source/blender/draw/intern/shaders/CMakeLists.txt
View File

@@ -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

2
source/blender/draw/intern/shaders/common_aabb_lib.glsl → source/blender/draw/intern/shaders/draw_aabb_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once
#include "common_shape_lib.glsl"
#include "draw_shape_lib.glsl"
/* ---------------------------------------------------------------------- */
/** \name Axis Aligned Bound Box

0
source/blender/draw/intern/shaders/common_colormanagement_lib.glsl → source/blender/draw/intern/shaders/draw_colormanagement_lib.glsl
View File

0
source/blender/draw/intern/shaders/common_hair_lib.glsl → source/blender/draw/intern/shaders/draw_curves_lib.glsl
View File

0
source/blender/draw/intern/shaders/common_debug_draw_lib.glsl → source/blender/draw/intern/shaders/draw_debug_draw_lib.glsl
View File

4
source/blender/draw/intern/shaders/common_debug_shape_lib.glsl → source/blender/draw/intern/shaders/draw_debug_shape_lib.glsl
View File

@@ -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)
{

0
source/blender/draw/intern/shaders/common_fxaa_lib.glsl → source/blender/draw/intern/shaders/draw_fxaa_lib.glsl
View File

2
source/blender/draw/intern/shaders/common_hair_refine_comp.glsl → source/blender/draw/intern/shaders/draw_hair_refine_comp.glsl
View File

@@ -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)

2
source/blender/draw/intern/shaders/draw_hair_refine_info.hh
View File

@@ -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()

2
source/blender/draw/intern/shaders/draw_intersect_lib.glsl
View File

@@ -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"
/* ---------------------------------------------------------------------- */

0
source/blender/draw/intern/shaders/common_shape_lib.glsl → source/blender/draw/intern/shaders/draw_shape_lib.glsl
View File

2
source/blender/gpu/glsl_preprocess/glsl_preprocess.hh
View File

@@ -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;

2
source/blender/gpu/intern/gpu_shader_dependency.cc
View File

@@ -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) {

6
source/blender/python/gpu/gpu_py_shader_create_info.cc
View File

@@ -1024,7 +1024,7 @@ static PyObject *pygpu_shader_info_vertex_source(BPyGPUShaderCreateInfo *self, P
#endif
ShaderCreateInfo *info = reinterpret_cast<ShaderCreateInfo *>(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<ShaderCreateInfo *>(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<ShaderCreateInfo *>(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;