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

GPU: Rename shader_shared.h files to .hh

Browse Source 
This makes more sense now that everything is C++.
This commit is contained in:
Clément Foucault
2025-04-16 20:26:48 +02:00
parent a6fa1b5969
commit 0f71bb6c71
29 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -288,7 +288,7 @@ set(SRC
engines/workbench/workbench_engine.h
engines/workbench/workbench_enums.hh
engines/workbench/workbench_private.hh
engines/workbench/workbench_shader_shared.h
engines/workbench/workbench_shader_shared.hh
)
set(LIB
@@ -535,7 +535,7 @@ set(GLSL_SRC
engines/workbench/shaders/workbench_volume_vert.glsl
engines/workbench/shaders/workbench_world_light_lib.glsl
engines/workbench/workbench_shader_shared.h
engines/workbench/workbench_shader_shared.hh
intern/shaders/subdiv_custom_data_interp_comp.glsl
intern/shaders/subdiv_ibo_lines_comp.glsl
@@ -593,8 +593,8 @@ set(GLSL_SRC
engines/gpencil/shaders/gpencil_depth_merge_vert.glsl
engines/gpencil/shaders/gpencil_vfx_frag.glsl
engines/gpencil/gpencil_defines.h
engines/gpencil/gpencil_shader_shared.h
engines/gpencil/gpencil_defines.hh
engines/gpencil/gpencil_shader_shared.hh
engines/select/shaders/select_id_vert.glsl
engines/select/shaders/select_id_frag.glsl
@@ -722,7 +722,7 @@ set(GLSL_SRC
engines/overlay/shaders/overlay_wireframe_vert.glsl
engines/overlay/shaders/overlay_xray_fade_frag.glsl
engines/overlay/overlay_shader_shared.h
engines/overlay/overlay_shader_shared.hh
engines/image/shaders/image_engine_color_frag.glsl
engines/image/shaders/image_engine_color_vert.glsl

0
source/blender/draw/engines/gpencil/gpencil_defines.h → source/blender/draw/engines/gpencil/gpencil_defines.hh
View File

4
source/blender/draw/engines/gpencil/gpencil_engine_private.hh
View File

@@ -23,9 +23,9 @@
#define GP_LIGHT
#include "gpencil_defines.h"
#include "gpencil_defines.hh"
#include "gpencil_shader.hh"
#include "gpencil_shader_shared.h"
#include "gpencil_shader_shared.hh"
struct GpencilBatchCache;
struct Object;

0
source/blender/draw/engines/gpencil/gpencil_shader_shared.h → source/blender/draw/engines/gpencil/gpencil_shader_shared.hh
View File

6
source/blender/draw/engines/gpencil/shaders/infos/gpencil_info.hh
View File

@@ -9,7 +9,7 @@
# define GP_LIGHT
# include "gpencil_shader_shared.h"
# include "gpencil_shader_shared.hh"
# include "draw_object_infos_info.hh"
# include "draw_view_info.hh"
@@ -25,7 +25,7 @@
#include "gpu_shader_create_info.hh"
#include "gpencil_defines.h"
#include "gpencil_defines.hh"
/* -------------------------------------------------------------------- */
/** \name GPencil Object rendering
@@ -51,7 +51,7 @@ GPU_SHADER_NAMED_INTERFACE_END(gp_interp_noperspective)
GPU_SHADER_CREATE_INFO(gpencil_geometry)
DO_STATIC_COMPILATION()
DEFINE("GP_LIGHT")
TYPEDEF_SOURCE("gpencil_defines.h")
TYPEDEF_SOURCE("gpencil_defines.hh")
SAMPLER(2, FLOAT_2D, gpFillTexture)
SAMPLER(3, FLOAT_2D, gpStrokeTexture)
SAMPLER(4, DEPTH_2D, gpSceneDepthTexture)

2
source/blender/draw/engines/gpencil/shaders/infos/gpencil_vfx_info.hh
View File

@@ -7,7 +7,7 @@
# include "gpu_glsl_cpp_stubs.hh"
# include "gpencil_shader_shared.h"
# include "gpencil_shader_shared.hh"
# include "draw_view_info.hh"
# include "gpu_shader_fullscreen_info.hh"

2
source/blender/draw/engines/overlay/overlay_next_armature.hh
View File

@@ -15,7 +15,7 @@
#include "DRW_render.hh"
#include "overlay_next_base.hh"
#include "overlay_shader_shared.h"
#include "overlay_shader_shared.hh"
namespace blender::draw::overlay {
using namespace blender;

2
source/blender/draw/engines/overlay/overlay_next_private.hh
View File

@@ -27,7 +27,7 @@
#include "gpu_shader_create_info.hh"
#include "../select/select_instance.hh"
#include "overlay_shader_shared.h"
#include "overlay_shader_shared.hh"
#include "draw_common.hh"

2
source/blender/draw/engines/overlay/overlay_private.hh
View File

@@ -19,7 +19,7 @@
#include "draw_handle.hh"
#include "overlay_shader_shared.h"
#include "overlay_shader_shared.hh"
/* Needed for eSpaceImage_UVDT_Stretch and eMaskOverlayMode */
#include "DNA_mask_types.h"

0
source/blender/draw/engines/overlay/overlay_shader_shared.h → source/blender/draw/engines/overlay/overlay_shader_shared.hh
View File

14
source/blender/draw/engines/overlay/shaders/infos/overlay_armature_info.hh
View File

@@ -13,7 +13,7 @@
# include "gpu_index_load_info.hh"
# include "overlay_common_info.hh"
# include "overlay_shader_shared.h"
# include "overlay_shader_shared.hh"
#endif
#include "overlay_common_info.hh"
@@ -152,7 +152,7 @@ PUSH_CONSTANT(bool, use_arrow_drawing)
VERTEX_OUT(overlay_armature_shape_wire_iface)
VERTEX_SOURCE("overlay_armature_shape_wire_vert.glsl")
FRAGMENT_SOURCE("overlay_armature_shape_wire_frag.glsl")
TYPEDEF_SOURCE("overlay_shader_shared.h")
TYPEDEF_SOURCE("overlay_shader_shared.hh")
ADDITIONAL_INFO(overlay_frag_output)
ADDITIONAL_INFO(overlay_armature_common)
ADDITIONAL_INFO(gpu_index_buffer_load)
@@ -177,7 +177,7 @@ OVERLAY_INFO_VARIATIONS(overlay_armature_shape_wire_strip)
GPU_SHADER_CREATE_INFO(overlay_armature_envelope_outline)
DO_STATIC_COMPILATION()
TYPEDEF_SOURCE("overlay_shader_shared.h")
TYPEDEF_SOURCE("overlay_shader_shared.hh")
VERTEX_IN(0, float2, pos0)
VERTEX_IN(1, float2, pos1)
VERTEX_IN(2, float2, pos2)
@@ -200,7 +200,7 @@ GPU_SHADER_INTERFACE_END()
GPU_SHADER_CREATE_INFO(overlay_armature_envelope_solid)
DO_STATIC_COMPILATION()
TYPEDEF_SOURCE("overlay_shader_shared.h")
TYPEDEF_SOURCE("overlay_shader_shared.hh")
VERTEX_IN(0, float3, pos)
VERTEX_OUT(overlay_armature_envelope_solid_iface)
PUSH_CONSTANT(bool, isDistance)
@@ -227,7 +227,7 @@ FLAT(float4, finalInnerColor)
GPU_SHADER_INTERFACE_END()
GPU_SHADER_CREATE_INFO(overlay_armature_stick_base)
TYPEDEF_SOURCE("overlay_shader_shared.h")
TYPEDEF_SOURCE("overlay_shader_shared.hh")
/* Bone aligned screen space. */
VERTEX_IN(0, float2, pos)
VERTEX_IN(1, int, vclass)
@@ -250,7 +250,7 @@ OVERLAY_INFO_VARIATIONS_MODELMAT(overlay_armature_stick, overlay_armature_stick_
GPU_SHADER_CREATE_INFO(overlay_armature_dof)
DO_STATIC_COMPILATION()
TYPEDEF_SOURCE("overlay_shader_shared.h")
TYPEDEF_SOURCE("overlay_shader_shared.hh")
VERTEX_IN(0, float2, pos)
VERTEX_OUT(overlay_armature_wire_iface)
VERTEX_SOURCE("overlay_armature_dof_vert.glsl")
@@ -270,7 +270,7 @@ OVERLAY_INFO_CLIP_VARIATION(overlay_armature_dof)
* \{ */
GPU_SHADER_CREATE_INFO(overlay_armature_wire_base)
TYPEDEF_SOURCE("overlay_shader_shared.h")
TYPEDEF_SOURCE("overlay_shader_shared.hh")
PUSH_CONSTANT(float, alpha)
VERTEX_OUT(overlay_armature_wire_iface)
VERTEX_SOURCE("overlay_armature_wire_vert.glsl")

4
source/blender/draw/engines/overlay/shaders/infos/overlay_background_info.hh
View File

@@ -11,14 +11,14 @@
# include "gpu_shader_fullscreen_info.hh"
# include "overlay_common_info.hh"
# include "overlay_shader_shared.h"
# include "overlay_shader_shared.hh"
#endif
#include "gpu_shader_create_info.hh"
GPU_SHADER_CREATE_INFO(overlay_background)
DO_STATIC_COMPILATION()
TYPEDEF_SOURCE("overlay_shader_shared.h")
TYPEDEF_SOURCE("overlay_shader_shared.hh")
SAMPLER(0, FLOAT_2D, colorBuffer)
SAMPLER(1, DEPTH_2D, depthBuffer)
PUSH_CONSTANT(int, bgType)

18
source/blender/draw/engines/overlay/shaders/infos/overlay_edit_mode_info.hh
View File

@@ -12,7 +12,7 @@
# include "gpu_index_load_info.hh"
# include "overlay_shader_shared.h"
# include "overlay_shader_shared.hh"
# define HAIR_SHADER
# define DRW_HAIR_INFO
@@ -481,7 +481,7 @@ GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(overlay_edit_curve_handle)
DO_STATIC_COMPILATION()
TYPEDEF_SOURCE("overlay_shader_shared.h")
TYPEDEF_SOURCE("overlay_shader_shared.hh")
STORAGE_BUF_FREQ(0, READ, float, pos[], GEOMETRY)
STORAGE_BUF_FREQ(1, READ, uint, data[], GEOMETRY)
PUSH_CONSTANT(int2, gpu_attr_0)
@@ -505,7 +505,7 @@ OVERLAY_INFO_CLIP_VARIATION(overlay_edit_curve_handle)
GPU_SHADER_CREATE_INFO(overlay_edit_curve_point)
DO_STATIC_COMPILATION()
TYPEDEF_SOURCE("overlay_shader_shared.h")
TYPEDEF_SOURCE("overlay_shader_shared.hh")
VERTEX_IN(0, float3, pos)
VERTEX_IN(1, uint, data)
VERTEX_OUT(overlay_edit_flat_color_iface)
@@ -571,7 +571,7 @@ OVERLAY_INFO_CLIP_VARIATION(overlay_edit_curve_normals)
GPU_SHADER_CREATE_INFO(overlay_edit_curves_handle)
DO_STATIC_COMPILATION()
TYPEDEF_SOURCE("overlay_shader_shared.h")
TYPEDEF_SOURCE("overlay_shader_shared.hh")
STORAGE_BUF_FREQ(0, READ, float, pos[], GEOMETRY)
STORAGE_BUF_FREQ(1, READ, uint, data[], GEOMETRY)
STORAGE_BUF_FREQ(2, READ, float, selection[], GEOMETRY)
@@ -593,13 +593,13 @@ OVERLAY_INFO_CLIP_VARIATION(overlay_edit_curves_handle)
GPU_SHADER_CREATE_INFO(overlay_edit_curves_point)
DO_STATIC_COMPILATION()
TYPEDEF_SOURCE("overlay_shader_shared.h")
TYPEDEF_SOURCE("overlay_shader_shared.hh")
DEFINE("CURVES_POINT")
VERTEX_IN(0, float3, pos)
VERTEX_IN(1, uint, data)
VERTEX_IN(2, float, selection)
#if 1 /* TODO(fclem): Required for legacy gpencil overlay. To be moved to specialized shader. */
TYPEDEF_SOURCE("gpencil_shader_shared.h")
TYPEDEF_SOURCE("gpencil_shader_shared.hh")
VERTEX_IN(3, uint, vflag)
PUSH_CONSTANT(bool, doStrokeEndpoints)
#endif
@@ -689,8 +689,8 @@ PUSH_CONSTANT(bool, useWeight)
PUSH_CONSTANT(bool, useGreasePencil)
FRAGMENT_OUT(0, float4, fragColor)
#if 1 /* TODO(fclem): Required for legacy gpencil overlay. To be moved to specialized shader. */
TYPEDEF_SOURCE("gpencil_shader_shared.h")
TYPEDEF_SOURCE("overlay_shader_shared.h")
TYPEDEF_SOURCE("gpencil_shader_shared.hh")
TYPEDEF_SOURCE("overlay_shader_shared.hh")
VERTEX_IN(3, uint, vflag)
PUSH_CONSTANT(bool, doStrokeEndpoints)
#endif
@@ -765,7 +765,7 @@ NO_PERSPECTIVE(float, hardness)
GPU_SHADER_NAMED_INTERFACE_END(gp_interp_noperspective)
GPU_SHADER_CREATE_INFO(overlay_depth_gpencil_base)
TYPEDEF_SOURCE("gpencil_shader_shared.h")
TYPEDEF_SOURCE("gpencil_shader_shared.hh")
VERTEX_OUT(overlay_depth_only_gpencil_flat_iface)
VERTEX_OUT(overlay_depth_only_gpencil_noperspective_iface)
VERTEX_SOURCE("overlay_depth_only_gpencil_vert.glsl")

16
source/blender/draw/engines/overlay/shaders/infos/overlay_extra_info.hh
View File

@@ -12,7 +12,7 @@
# include "gpu_index_load_info.hh"
# include "overlay_shader_shared.h"
# include "overlay_shader_shared.hh"
#endif
#include "overlay_common_info.hh"
@@ -29,7 +29,7 @@ GPU_SHADER_INTERFACE_END()
GPU_SHADER_CREATE_INFO(overlay_extra)
DO_STATIC_COMPILATION()
TYPEDEF_SOURCE("overlay_shader_shared.h")
TYPEDEF_SOURCE("overlay_shader_shared.hh")
VERTEX_IN(0, float3, pos)
VERTEX_IN(1, int, vclass)
VERTEX_OUT(overlay_extra_iface)
@@ -116,7 +116,7 @@ FRAGMENT_OUT(0, float4, fragColor)
FRAGMENT_OUT(1, float4, lineOutput)
VERTEX_SOURCE("overlay_extra_wire_vert.glsl")
FRAGMENT_SOURCE("overlay_extra_wire_frag.glsl")
TYPEDEF_SOURCE("overlay_shader_shared.h")
TYPEDEF_SOURCE("overlay_shader_shared.hh")
STORAGE_BUF(0, READ, VertexData, data_buf[])
PUSH_CONSTANT(int, colorid)
DEFINE_VALUE("pos", "data_buf[gl_VertexID].pos_.xyz")
@@ -165,7 +165,7 @@ VERTEX_SOURCE("overlay_extra_point_vert.glsl")
FRAGMENT_SOURCE("overlay_point_varying_color_varying_outline_aa_frag.glsl")
ADDITIONAL_INFO(draw_view)
ADDITIONAL_INFO(draw_globals)
TYPEDEF_SOURCE("overlay_shader_shared.h")
TYPEDEF_SOURCE("overlay_shader_shared.hh")
STORAGE_BUF(0, READ, VertexData, data_buf[])
GPU_SHADER_CREATE_END()
@@ -181,7 +181,7 @@ FRAGMENT_OUT(0, float4, fragColor)
FRAGMENT_OUT(1, float4, lineOutput)
VERTEX_SOURCE("overlay_extra_loose_point_vert.glsl")
FRAGMENT_SOURCE("overlay_extra_loose_point_frag.glsl")
TYPEDEF_SOURCE("overlay_shader_shared.h")
TYPEDEF_SOURCE("overlay_shader_shared.hh")
STORAGE_BUF(0, READ, VertexData, data_buf[])
ADDITIONAL_INFO(draw_view)
ADDITIONAL_INFO(draw_globals)
@@ -226,7 +226,7 @@ GPU_SHADER_INTERFACE_END()
GPU_SHADER_CREATE_INFO(overlay_motion_path_point)
DO_STATIC_COMPILATION()
TYPEDEF_SOURCE("overlay_shader_shared.h")
TYPEDEF_SOURCE("overlay_shader_shared.hh")
VERTEX_IN(0, float3, pos)
VERTEX_IN(1, int, flag)
PUSH_CONSTANT(int4, mpathPointSettings)
@@ -333,7 +333,7 @@ GPU_SHADER_CREATE_END()
OVERLAY_INFO_VARIATIONS_MODELMAT(overlay_particle_dot, overlay_particle_dot_base)
GPU_SHADER_CREATE_INFO(overlay_particle_shape_base)
TYPEDEF_SOURCE("overlay_shader_shared.h")
TYPEDEF_SOURCE("overlay_shader_shared.hh")
SAMPLER(0, FLOAT_1D, weightTex)
PUSH_CONSTANT(float4, ucolor) /* Draw-size packed in alpha. */
PUSH_CONSTANT(int, shape_type)
@@ -351,7 +351,7 @@ GPU_SHADER_CREATE_END()
OVERLAY_INFO_VARIATIONS_MODELMAT(overlay_particle_shape, overlay_particle_shape_base)
GPU_SHADER_CREATE_INFO(overlay_particle_hair_base)
TYPEDEF_SOURCE("overlay_shader_shared.h")
TYPEDEF_SOURCE("overlay_shader_shared.hh")
VERTEX_IN(0, float3, pos)
VERTEX_IN(1, float3, nor)
PUSH_CONSTANT(int, colorType)

4
source/blender/draw/engines/overlay/shaders/infos/overlay_grid_info.hh
View File

@@ -9,7 +9,7 @@
# include "draw_common_shader_shared.hh"
# include "draw_view_info.hh"
# include "overlay_shader_shared.h"
# include "overlay_shader_shared.hh"
#endif
#include "overlay_common_info.hh"
@@ -21,7 +21,7 @@ GPU_SHADER_INTERFACE_END()
GPU_SHADER_CREATE_INFO(overlay_grid_next)
DO_STATIC_COMPILATION()
TYPEDEF_SOURCE("overlay_shader_shared.h")
TYPEDEF_SOURCE("overlay_shader_shared.hh")
VERTEX_IN(0, float3, pos)
VERTEX_OUT(overlay_grid_iface)
FRAGMENT_OUT(0, float4, out_color)

4
source/blender/draw/engines/workbench/shaders/infos/workbench_composite_info.hh
View File

@@ -8,7 +8,7 @@
# include "gpu_glsl_cpp_stubs.hh"
# include "workbench_shader_shared.h"
# include "workbench_shader_shared.hh"
# include "draw_view_info.hh"
# include "gpu_shader_fullscreen_info.hh"
@@ -33,7 +33,7 @@ SAMPLER(3, DEPTH_2D, depth_tx)
SAMPLER(4, FLOAT_2D, normal_tx)
SAMPLER(5, FLOAT_2D, material_tx)
UNIFORM_BUF(WB_WORLD_SLOT, WorldData, world_data)
TYPEDEF_SOURCE("workbench_shader_shared.h")
TYPEDEF_SOURCE("workbench_shader_shared.hh")
PUSH_CONSTANT(bool, forceShadowing)
FRAGMENT_OUT(0, float4, fragColor)
FRAGMENT_SOURCE("workbench_composite_frag.glsl")

2
source/blender/draw/engines/workbench/shaders/infos/workbench_effect_dof_info.hh
View File

@@ -6,7 +6,7 @@
# pragma once
# include "gpu_glsl_cpp_stubs.hh"
# include "workbench_shader_shared.h"
# include "workbench_shader_shared.hh"
# include "draw_view_info.hh"
# include "gpu_shader_fullscreen_info.hh"

4
source/blender/draw/engines/workbench/shaders/infos/workbench_effect_outline_info.hh
View File

@@ -8,13 +8,13 @@
# include "gpu_shader_fullscreen_info.hh"
# include "workbench_shader_shared.h"
# include "workbench_shader_shared.hh"
#endif
#include "gpu_shader_create_info.hh"
GPU_SHADER_CREATE_INFO(workbench_effect_outline)
TYPEDEF_SOURCE("workbench_shader_shared.h")
TYPEDEF_SOURCE("workbench_shader_shared.hh")
FRAGMENT_SOURCE("workbench_effect_outline_frag.glsl")
SAMPLER(0, UINT_2D, objectIdBuffer)
UNIFORM_BUF(WB_WORLD_SLOT, WorldData, world_data)

6
source/blender/draw/engines/workbench/shaders/infos/workbench_prepass_info.hh
View File

@@ -12,7 +12,7 @@
# include "draw_object_infos_info.hh"
# include "draw_view_info.hh"
# include "workbench_shader_shared.h"
# include "workbench_shader_shared.hh"
# define WORKBENCH_COLOR_MATERIAL
# define WORKBENCH_COLOR_TEXTURE
# define WORKBENCH_TEXTURE_IMAGE_ARRAY
@@ -132,7 +132,7 @@ FRAGMENT_OUT(0, float4, out_transparent_accum)
FRAGMENT_OUT(1, float4, out_revealage_accum)
FRAGMENT_OUT(2, uint, out_object_id)
PUSH_CONSTANT(bool, forceShadowing)
TYPEDEF_SOURCE("workbench_shader_shared.h")
TYPEDEF_SOURCE("workbench_shader_shared.hh")
FRAGMENT_SOURCE("workbench_transparent_accum_frag.glsl")
GPU_SHADER_CREATE_END()
@@ -140,7 +140,7 @@ GPU_SHADER_CREATE_INFO(workbench_opaque)
FRAGMENT_OUT(0, float4, out_material)
FRAGMENT_OUT(1, float2, out_normal)
FRAGMENT_OUT(2, uint, out_object_id)
TYPEDEF_SOURCE("workbench_shader_shared.h")
TYPEDEF_SOURCE("workbench_shader_shared.hh")
FRAGMENT_SOURCE("workbench_prepass_frag.glsl")
GPU_SHADER_CREATE_END()

6
source/blender/draw/engines/workbench/shaders/infos/workbench_shadow_info.hh
View File

@@ -13,7 +13,7 @@
# include "draw_view_info.hh"
# include "gpu_index_load_info.hh"
# include "workbench_shader_shared.h"
# include "workbench_shader_shared.hh"
# define DYNAMIC_PASS_SELECTION
# define SHADOW_PASS
# define SHADOW_FAIL
@@ -33,7 +33,7 @@ STORAGE_BUF_FREQ(3, READ, float, pos[], GEOMETRY)
/* WORKAROUND: Needed to support OpenSubdiv vertex format. Should be removed. */
PUSH_CONSTANT(int2, gpu_attr_3)
UNIFORM_BUF(1, ShadowPassData, pass_data)
TYPEDEF_SOURCE("workbench_shader_shared.h")
TYPEDEF_SOURCE("workbench_shader_shared.hh")
ADDITIONAL_INFO(gpu_index_buffer_load)
ADDITIONAL_INFO(draw_view)
ADDITIONAL_INFO(draw_modelmat)
@@ -49,7 +49,7 @@ PUSH_CONSTANT(int, view_len)
PUSH_CONSTANT(int, visibility_word_per_draw)
PUSH_CONSTANT(bool, force_fail_method)
PUSH_CONSTANT(float3, shadow_direction)
TYPEDEF_SOURCE("workbench_shader_shared.h")
TYPEDEF_SOURCE("workbench_shader_shared.hh")
COMPUTE_SOURCE("workbench_shadow_visibility_comp.glsl")
ADDITIONAL_INFO(draw_view)
ADDITIONAL_INFO(draw_view_culling)

2
source/blender/draw/engines/workbench/shaders/infos/workbench_volume_info.hh
View File

@@ -10,7 +10,7 @@
# include "draw_object_infos_info.hh"
# include "workbench_shader_shared.h"
# include "workbench_shader_shared.hh"
# define VOLUME_SMOKE
# define VOLUME_OBJECT
# define USE_COBA

2
source/blender/draw/engines/workbench/workbench_private.hh
View File

@@ -12,7 +12,7 @@
#include "workbench_defines.hh"
#include "workbench_enums.hh"
#include "workbench_shader_shared.h"
#include "workbench_shader_shared.hh"
#include "GPU_capabilities.hh"

0
source/blender/draw/engines/workbench/workbench_shader_shared.h → source/blender/draw/engines/workbench/workbench_shader_shared.hh
View File

4
source/blender/draw/intern/draw_cache_impl_grease_pencil.cc
View File

@@ -31,8 +31,8 @@
#include "draw_cache.hh"
#include "draw_cache_impl.hh"
#include "../engines/gpencil/gpencil_defines.h"
#include "../engines/gpencil/gpencil_shader_shared.h"
#include "../engines/gpencil/gpencil_defines.hh"
#include "../engines/gpencil/gpencil_shader_shared.hh"
namespace blender::draw {

4
source/blender/draw/intern/shaders/draw_object_infos_info.hh
View File

@@ -7,7 +7,7 @@
# include "gpu_glsl_cpp_stubs.hh"
# include "draw_shader_shared.hh"
# include "gpencil_shader_shared.h"
# include "gpencil_shader_shared.hh"
# include "draw_view_info.hh"
@@ -99,7 +99,7 @@ ADDITIONAL_INFO(draw_modelmat)
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(draw_gpencil)
TYPEDEF_SOURCE("gpencil_shader_shared.h")
TYPEDEF_SOURCE("gpencil_shader_shared.hh")
DEFINE("DRW_GPENCIL_INFO")
SAMPLER(0, FLOAT_BUFFER, gp_pos_tx)
SAMPLER(1, FLOAT_BUFFER, gp_col_tx)

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

@@ -60,7 +60,7 @@ class Preprocessor {
if (filename.find(".glsl") != std::string::npos) {
return GLSL;
}
if (filename.find(".h") != std::string::npos) {
if (filename.find(".hh") != std::string::npos) {
return CPP;
}
return UNKNOWN;

2
source/blender/gpu/metal/mtl_shader.hh
View File

@@ -26,7 +26,7 @@
#include "mtl_framebuffer.hh"
#include "mtl_shader_interface.hh"
#include "mtl_shader_shared.h"
#include "mtl_shader_shared.hh"
#include "mtl_state.hh"
#include "mtl_texture.hh"

0
source/blender/gpu/metal/mtl_shader_shared.h → source/blender/gpu/metal/mtl_shader_shared.hh
View File

2
source/blender/makesrna/intern/rna_pose.cc
View File

@@ -1147,7 +1147,7 @@ static void rna_def_pose_channel(BlenderRNA *brna)
RNA_def_property_float_sdna(prop, nullptr, "custom_shape_wire_width");
RNA_def_property_ui_text(prop, "Wire Width", "Adjust the line thickness of custom shapes");
/* When changing the upper limit of the range, also adjust the WIRE_WIDTH_COMPRESSION in
* overlay_shader_shared.h */
* overlay_shader_shared.hh */
RNA_def_property_range(prop, 1.0f, 16.0f);
RNA_def_property_ui_range(prop, 1.0f, 10.0f, 1, 1);
RNA_def_property_update(prop, NC_OBJECT | ND_POSE, "rna_Pose_update");