From dccf0e869977025cebfe0cfee88fcefe47c8a4c4 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Thu, 1 Feb 2024 10:40:24 -0500 Subject: [PATCH] Cleanup: Move GPU_material.h to C++ --- source/blender/blenkernel/intern/image.cc | 2 +- source/blender/blenkernel/intern/material.cc | 2 +- source/blender/blenkernel/intern/world.cc | 2 +- .../realtime_compositor/COM_shader_node.hh | 4 +- .../COM_shader_operation.hh | 4 +- .../realtime_compositor/intern/shader_node.cc | 2 +- .../intern/shader_operation.cc | 2 +- .../draw/engines/eevee/eevee_lightprobes.cc | 2 +- .../draw/engines/eevee/eevee_lookdev.cc | 2 +- .../draw/engines/eevee/eevee_materials.cc | 2 +- .../draw/engines/eevee/eevee_shaders.cc | 2 +- .../draw/engines/eevee/eevee_subsurface.cc | 2 +- .../draw/engines/eevee/eevee_volumes.cc | 2 +- .../engines/eevee_next/eevee_cryptomatte.cc | 2 +- .../draw/engines/eevee_next/eevee_lookdev.cc | 2 +- .../draw/engines/eevee_next/eevee_material.hh | 2 +- .../draw/engines/eevee_next/eevee_shader.hh | 2 +- .../draw/engines/eevee_next/eevee_sync.hh | 2 +- source/blender/draw/intern/DRW_render.hh | 2 +- .../draw/intern/draw_cache_impl_curve.cc | 2 +- .../draw/intern/draw_cache_impl_curves.cc | 2 +- .../draw/intern/draw_cache_impl_mesh.cc | 2 +- .../draw/intern/draw_cache_impl_particles.cc | 2 +- .../draw/intern/draw_cache_impl_pointcloud.cc | 2 +- source/blender/draw/intern/draw_curves.cc | 2 +- source/blender/draw/intern/draw_hair.cc | 2 +- .../blender/draw/intern/draw_instance_data.cc | 2 +- source/blender/draw/intern/draw_manager.hh | 2 +- .../blender/draw/intern/draw_manager_data.cc | 2 +- .../draw/intern/draw_manager_shader.cc | 2 +- source/blender/draw/intern/draw_pass.hh | 2 +- source/blender/draw/intern/draw_pointcloud.cc | 2 +- source/blender/draw/intern/draw_volume.cc | 2 +- .../blender/editors/space_node/node_edit.cc | 2 +- .../editors/space_outliner/outliner_edit.cc | 2 +- .../editors/space_view3d/view3d_draw.cc | 2 +- source/blender/gpu/CMakeLists.txt | 2 +- .../gpu/{GPU_material.h => GPU_material.hh} | 137 ++++++++---------- source/blender/gpu/intern/gpu_codegen.cc | 2 +- source/blender/gpu/intern/gpu_codegen.h | 2 +- source/blender/gpu/intern/gpu_material.cc | 2 +- .../blender/gpu/intern/gpu_material_library.h | 2 +- source/blender/gpu/intern/gpu_node_graph.h | 2 +- .../gpu/intern/gpu_shader_create_info.hh | 2 +- .../blender/gpu/intern/gpu_storage_buffer.cc | 2 +- .../blender/gpu/intern/gpu_uniform_buffer.cc | 2 +- .../gpu/metal/mtl_shader_interface_type.hh | 2 +- .../blender/makesrna/intern/rna_nodetree.cc | 2 +- source/blender/makesrna/intern/rna_space.cc | 2 +- .../nodes/node_composite_alpha_over.cc | 2 +- .../nodes/node_composite_brightness.cc | 2 +- .../nodes/node_composite_channel_matte.cc | 2 +- .../nodes/node_composite_chroma_matte.cc | 2 +- .../nodes/node_composite_color_matte.cc | 2 +- .../nodes/node_composite_color_spill.cc | 2 +- .../nodes/node_composite_colorbalance.cc | 2 +- .../nodes/node_composite_colorcorrection.cc | 2 +- .../composite/nodes/node_composite_curves.cc | 2 +- .../nodes/node_composite_diff_matte.cc | 2 +- .../nodes/node_composite_distance_matte.cc | 2 +- .../nodes/node_composite_exposure.cc | 2 +- .../composite/nodes/node_composite_gamma.cc | 2 +- .../nodes/node_composite_hue_sat_val.cc | 2 +- .../nodes/node_composite_huecorrect.cc | 2 +- .../composite/nodes/node_composite_invert.cc | 2 +- .../nodes/node_composite_luma_matte.cc | 2 +- .../nodes/node_composite_map_range.cc | 2 +- .../nodes/node_composite_map_value.cc | 2 +- .../composite/nodes/node_composite_math.cc | 2 +- .../composite/nodes/node_composite_mixrgb.cc | 2 +- .../composite/nodes/node_composite_normal.cc | 2 +- .../nodes/node_composite_posterize.cc | 2 +- .../nodes/node_composite_premulkey.cc | 2 +- .../nodes/node_composite_sepcomb_color.cc | 2 +- .../nodes/node_composite_sepcomb_hsva.cc | 2 +- .../nodes/node_composite_sepcomb_rgba.cc | 2 +- .../nodes/node_composite_sepcomb_xyz.cc | 2 +- .../nodes/node_composite_sepcomb_ycca.cc | 2 +- .../nodes/node_composite_sepcomb_yuva.cc | 2 +- .../nodes/node_composite_setalpha.cc | 2 +- .../nodes/node_composite_val_to_rgb.cc | 2 +- .../blender/nodes/shader/node_shader_tree.cc | 2 +- .../blender/nodes/shader/node_shader_util.hh | 2 +- .../shader/nodes/node_shader_wireframe.cc | 2 +- .../windowmanager/intern/wm_init_exit.cc | 2 +- 85 files changed, 149 insertions(+), 160 deletions(-) rename source/blender/gpu/{GPU_material.h => GPU_material.hh} (81%) diff --git a/source/blender/blenkernel/intern/image.cc b/source/blender/blenkernel/intern/image.cc index f6722001032..73742b0633d 100644 --- a/source/blender/blenkernel/intern/image.cc +++ b/source/blender/blenkernel/intern/image.cc @@ -86,7 +86,7 @@ #include "SEQ_utils.hh" /* SEQ_get_topmost_sequence() */ -#include "GPU_material.h" +#include "GPU_material.hh" #include "GPU_texture.h" #include "BLI_sys_types.h" /* for intptr_t support */ diff --git a/source/blender/blenkernel/intern/material.cc b/source/blender/blenkernel/intern/material.cc index 3ecefead6d6..7c79cb46268 100644 --- a/source/blender/blenkernel/intern/material.cc +++ b/source/blender/blenkernel/intern/material.cc @@ -72,7 +72,7 @@ #include "DEG_depsgraph_build.hh" #include "DEG_depsgraph_query.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "NOD_shader.h" diff --git a/source/blender/blenkernel/intern/world.cc b/source/blender/blenkernel/intern/world.cc index ed403bc1997..1602dc4bb65 100644 --- a/source/blender/blenkernel/intern/world.cc +++ b/source/blender/blenkernel/intern/world.cc @@ -39,7 +39,7 @@ #include "DEG_depsgraph.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "BLO_read_write.hh" diff --git a/source/blender/compositor/realtime_compositor/COM_shader_node.hh b/source/blender/compositor/realtime_compositor/COM_shader_node.hh index d4bcf0b82f4..fd3f49d32d1 100644 --- a/source/blender/compositor/realtime_compositor/COM_shader_node.hh +++ b/source/blender/compositor/realtime_compositor/COM_shader_node.hh @@ -9,7 +9,7 @@ #include "DNA_node_types.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "NOD_derived_node_tree.hh" @@ -23,7 +23,7 @@ using namespace nodes::derived_node_tree_types; * A shader node encapsulates a compositor node tree that is capable of being used together with * other shader nodes to construct a Shader Operation using the GPU material compiler. A GPU node * stack for each of the node inputs and outputs is stored and populated during construction in - * order to represent the node as a GPU node inside the GPU material graph, see GPU_material.h for + * order to represent the node as a GPU node inside the GPU material graph, see GPU_material.hh for * more information. Derived classes should implement the compile method to add the node and link * it to the GPU material given to the method. The compiler is expected to initialize the input * links of the node before invoking the compile method. See the discussion in diff --git a/source/blender/compositor/realtime_compositor/COM_shader_operation.hh b/source/blender/compositor/realtime_compositor/COM_shader_operation.hh index a5d0921a12b..3ed6d8fd3b6 100644 --- a/source/blender/compositor/realtime_compositor/COM_shader_operation.hh +++ b/source/blender/compositor/realtime_compositor/COM_shader_operation.hh @@ -10,7 +10,7 @@ #include "BLI_string_ref.hh" #include "BLI_vector_set.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "GPU_shader.h" #include "gpu_shader_create_info.hh" @@ -33,7 +33,7 @@ using ShaderCompileUnit = VectorSet; * Shader Operation * * An operation that evaluates a shader compiled from a contiguous subset of the node execution - * schedule using the GPU material compiler, see GPU_material.h for more information. The subset + * schedule using the GPU material compiler, see GPU_material.hh for more information. The subset * of the node execution schedule is called a shader compile unit, see the discussion in * COM_compile_state.hh for more information. * diff --git a/source/blender/compositor/realtime_compositor/intern/shader_node.cc b/source/blender/compositor/realtime_compositor/intern/shader_node.cc index cfdee9dd5c7..bda659b94dd 100644 --- a/source/blender/compositor/realtime_compositor/intern/shader_node.cc +++ b/source/blender/compositor/realtime_compositor/intern/shader_node.cc @@ -10,7 +10,7 @@ #include "NOD_derived_node_tree.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" #include "COM_utilities.hh" diff --git a/source/blender/compositor/realtime_compositor/intern/shader_operation.cc b/source/blender/compositor/realtime_compositor/intern/shader_operation.cc index 2dbea8fd370..32fd75dd396 100644 --- a/source/blender/compositor/realtime_compositor/intern/shader_operation.cc +++ b/source/blender/compositor/realtime_compositor/intern/shader_operation.cc @@ -14,7 +14,7 @@ #include "DNA_customdata_types.h" #include "GPU_context.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "GPU_shader.h" #include "GPU_texture.h" #include "GPU_uniform_buffer.h" diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.cc b/source/blender/draw/engines/eevee/eevee_lightprobes.cc index 49008a8b962..19849acd0f0 100644 --- a/source/blender/draw/engines/eevee/eevee_lightprobes.cc +++ b/source/blender/draw/engines/eevee/eevee_lightprobes.cc @@ -23,7 +23,7 @@ #include "MEM_guardedalloc.h" #include "GPU_capabilities.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "GPU_texture.h" #include "GPU_uniform_buffer.h" diff --git a/source/blender/draw/engines/eevee/eevee_lookdev.cc b/source/blender/draw/engines/eevee/eevee_lookdev.cc index 6ea3b0297b0..141b07e08ce 100644 --- a/source/blender/draw/engines/eevee/eevee_lookdev.cc +++ b/source/blender/draw/engines/eevee/eevee_lookdev.cc @@ -21,7 +21,7 @@ #include "ED_screen.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "UI_resources.hh" diff --git a/source/blender/draw/engines/eevee/eevee_materials.cc b/source/blender/draw/engines/eevee/eevee_materials.cc index 25f710bb26b..e5404860f36 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.cc +++ b/source/blender/draw/engines/eevee/eevee_materials.cc @@ -25,7 +25,7 @@ #include "DNA_view3d_types.h" #include "DNA_world_types.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "DEG_depsgraph_query.hh" diff --git a/source/blender/draw/engines/eevee/eevee_shaders.cc b/source/blender/draw/engines/eevee/eevee_shaders.cc index 2eb6ff324c4..2293e2d739d 100644 --- a/source/blender/draw/engines/eevee/eevee_shaders.cc +++ b/source/blender/draw/engines/eevee/eevee_shaders.cc @@ -20,7 +20,7 @@ #include "GPU_capabilities.h" #include "GPU_context.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "GPU_shader.h" #include "NOD_shader.h" diff --git a/source/blender/draw/engines/eevee/eevee_subsurface.cc b/source/blender/draw/engines/eevee/eevee_subsurface.cc index d379dd04a4c..b3a86dcf40f 100644 --- a/source/blender/draw/engines/eevee/eevee_subsurface.cc +++ b/source/blender/draw/engines/eevee/eevee_subsurface.cc @@ -15,7 +15,7 @@ #include "DEG_depsgraph_query.hh" #include "GPU_capabilities.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "GPU_texture.h" #include "eevee_private.h" diff --git a/source/blender/draw/engines/eevee/eevee_volumes.cc b/source/blender/draw/engines/eevee/eevee_volumes.cc index 9e36cf56b66..eb42b810bfd 100644 --- a/source/blender/draw/engines/eevee/eevee_volumes.cc +++ b/source/blender/draw/engines/eevee/eevee_volumes.cc @@ -32,7 +32,7 @@ #include "GPU_capabilities.h" #include "GPU_context.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "GPU_texture.h" #include "eevee_private.h" diff --git a/source/blender/draw/engines/eevee_next/eevee_cryptomatte.cc b/source/blender/draw/engines/eevee_next/eevee_cryptomatte.cc index d488563933c..40e6afe4460 100644 --- a/source/blender/draw/engines/eevee_next/eevee_cryptomatte.cc +++ b/source/blender/draw/engines/eevee_next/eevee_cryptomatte.cc @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "BKE_cryptomatte.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "eevee_cryptomatte.hh" #include "eevee_instance.hh" diff --git a/source/blender/draw/engines/eevee_next/eevee_lookdev.cc b/source/blender/draw/engines/eevee_next/eevee_lookdev.cc index 5c421e9b8b7..4d54859402e 100644 --- a/source/blender/draw/engines/eevee_next/eevee_lookdev.cc +++ b/source/blender/draw/engines/eevee_next/eevee_lookdev.cc @@ -13,7 +13,7 @@ #include "NOD_shader.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "eevee_instance.hh" diff --git a/source/blender/draw/engines/eevee_next/eevee_material.hh b/source/blender/draw/engines/eevee_next/eevee_material.hh index 8757d7526a8..3e8ad8675d5 100644 --- a/source/blender/draw/engines/eevee_next/eevee_material.hh +++ b/source/blender/draw/engines/eevee_next/eevee_material.hh @@ -12,7 +12,7 @@ #include "BLI_map.hh" #include "BLI_vector.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "eevee_sync.hh" diff --git a/source/blender/draw/engines/eevee_next/eevee_shader.hh b/source/blender/draw/engines/eevee_next/eevee_shader.hh index 57bca5a85ef..b52efbaa379 100644 --- a/source/blender/draw/engines/eevee_next/eevee_shader.hh +++ b/source/blender/draw/engines/eevee_next/eevee_shader.hh @@ -16,7 +16,7 @@ #include "BLI_string_ref.hh" #include "DRW_render.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "GPU_shader.h" #include "eevee_material.hh" diff --git a/source/blender/draw/engines/eevee_next/eevee_sync.hh b/source/blender/draw/engines/eevee_next/eevee_sync.hh index 2873f2fce50..60e25df44ab 100644 --- a/source/blender/draw/engines/eevee_next/eevee_sync.hh +++ b/source/blender/draw/engines/eevee_next/eevee_sync.hh @@ -17,7 +17,7 @@ #include "DEG_depsgraph_query.hh" #include "DNA_object_types.h" #include "DRW_render.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "eevee_shader_shared.hh" diff --git a/source/blender/draw/intern/DRW_render.hh b/source/blender/draw/intern/DRW_render.hh index 9fc0f5e2d4e..6ac95de8866 100644 --- a/source/blender/draw/intern/DRW_render.hh +++ b/source/blender/draw/intern/DRW_render.hh @@ -30,7 +30,7 @@ #include "DNA_world_types.h" #include "GPU_framebuffer.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "GPU_primitive.h" #include "GPU_shader.h" #include "GPU_storage_buffer.h" diff --git a/source/blender/draw/intern/draw_cache_impl_curve.cc b/source/blender/draw/intern/draw_cache_impl_curve.cc index 001fed1ca47..dd1bf45dbc8 100644 --- a/source/blender/draw/intern/draw_cache_impl_curve.cc +++ b/source/blender/draw/intern/draw_cache_impl_curve.cc @@ -30,7 +30,7 @@ #include "GPU_batch.h" #include "GPU_capabilities.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "GPU_texture.h" #include "UI_resources.hh" diff --git a/source/blender/draw/intern/draw_cache_impl_curves.cc b/source/blender/draw/intern/draw_cache_impl_curves.cc index 4f055696f04..b05fec5d413 100644 --- a/source/blender/draw/intern/draw_cache_impl_curves.cc +++ b/source/blender/draw/intern/draw_cache_impl_curves.cc @@ -33,7 +33,7 @@ #include "GPU_batch.h" #include "GPU_context.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "GPU_texture.h" #include "DRW_render.hh" diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.cc b/source/blender/draw/intern/draw_cache_impl_mesh.cc index 76e5b76f3d3..d78916dc14e 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.cc +++ b/source/blender/draw/intern/draw_cache_impl_mesh.cc @@ -50,7 +50,7 @@ #include "bmesh.hh" #include "GPU_batch.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "DRW_render.hh" diff --git a/source/blender/draw/intern/draw_cache_impl_particles.cc b/source/blender/draw/intern/draw_cache_impl_particles.cc index d91a28e16be..6a990ba0509 100644 --- a/source/blender/draw/intern/draw_cache_impl_particles.cc +++ b/source/blender/draw/intern/draw_cache_impl_particles.cc @@ -36,7 +36,7 @@ #include "GPU_batch.h" #include "GPU_capabilities.h" #include "GPU_context.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "DEG_depsgraph_query.hh" diff --git a/source/blender/draw/intern/draw_cache_impl_pointcloud.cc b/source/blender/draw/intern/draw_cache_impl_pointcloud.cc index d5cd6ce20d4..c3725e86f31 100644 --- a/source/blender/draw/intern/draw_cache_impl_pointcloud.cc +++ b/source/blender/draw/intern/draw_cache_impl_pointcloud.cc @@ -26,7 +26,7 @@ #include "BKE_pointcloud.hh" #include "GPU_batch.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "draw_attributes.hh" #include "draw_cache_impl.hh" diff --git a/source/blender/draw/intern/draw_curves.cc b/source/blender/draw/intern/draw_curves.cc index 4048eee1cba..f9182ff215f 100644 --- a/source/blender/draw/intern/draw_curves.cc +++ b/source/blender/draw/intern/draw_curves.cc @@ -19,7 +19,7 @@ #include "GPU_batch.h" #include "GPU_capabilities.h" #include "GPU_compute.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "GPU_shader.h" #include "GPU_texture.h" #include "GPU_vertex_buffer.h" diff --git a/source/blender/draw/intern/draw_hair.cc b/source/blender/draw/intern/draw_hair.cc index b2cde878386..5c0539c75cb 100644 --- a/source/blender/draw/intern/draw_hair.cc +++ b/source/blender/draw/intern/draw_hair.cc @@ -24,7 +24,7 @@ #include "GPU_capabilities.h" #include "GPU_compute.h" #include "GPU_context.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "GPU_shader.h" #include "GPU_texture.h" #include "GPU_vertex_buffer.h" diff --git a/source/blender/draw/intern/draw_instance_data.cc b/source/blender/draw/intern/draw_instance_data.cc index ae7228990dc..7e94622de17 100644 --- a/source/blender/draw/intern/draw_instance_data.cc +++ b/source/blender/draw/intern/draw_instance_data.cc @@ -21,7 +21,7 @@ #include "DRW_engine.hh" #include "DRW_render.hh" /* For DRW_shgroup_get_instance_count() */ -#include "GPU_material.h" +#include "GPU_material.hh" #include "DNA_particle_types.h" diff --git a/source/blender/draw/intern/draw_manager.hh b/source/blender/draw/intern/draw_manager.hh index 01d6422fd7c..ca94ad5b67f 100644 --- a/source/blender/draw/intern/draw_manager.hh +++ b/source/blender/draw/intern/draw_manager.hh @@ -17,7 +17,7 @@ #include "BLI_map.hh" #include "BLI_sys_types.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "draw_resource.hh" #include "draw_view.hh" diff --git a/source/blender/draw/intern/draw_manager_data.cc b/source/blender/draw/intern/draw_manager_data.cc index 825f8fc390b..51cb933a5ee 100644 --- a/source/blender/draw/intern/draw_manager_data.cc +++ b/source/blender/draw/intern/draw_manager_data.cc @@ -45,7 +45,7 @@ #endif #include "GPU_capabilities.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "GPU_uniform_buffer.h" #include "intern/gpu_codegen.h" diff --git a/source/blender/draw/intern/draw_manager_shader.cc b/source/blender/draw/intern/draw_manager_shader.cc index 5dd2c53619b..769bb5c5594 100644 --- a/source/blender/draw/intern/draw_manager_shader.cc +++ b/source/blender/draw/intern/draw_manager_shader.cc @@ -23,7 +23,7 @@ #include "DEG_depsgraph_query.hh" #include "GPU_capabilities.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "GPU_shader.h" #include "WM_api.hh" diff --git a/source/blender/draw/intern/draw_pass.hh b/source/blender/draw/intern/draw_pass.hh index 8d110154218..f02e87855a9 100644 --- a/source/blender/draw/intern/draw_pass.hh +++ b/source/blender/draw/intern/draw_pass.hh @@ -46,7 +46,7 @@ #include "BKE_image.h" #include "GPU_debug.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "DRW_gpu_wrapper.hh" diff --git a/source/blender/draw/intern/draw_pointcloud.cc b/source/blender/draw/intern/draw_pointcloud.cc index 014df96ae52..4d6e2566042 100644 --- a/source/blender/draw/intern/draw_pointcloud.cc +++ b/source/blender/draw/intern/draw_pointcloud.cc @@ -14,7 +14,7 @@ #include "GPU_batch.h" #include "GPU_capabilities.h" #include "GPU_compute.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "GPU_shader.h" #include "GPU_texture.h" #include "GPU_vertex_buffer.h" diff --git a/source/blender/draw/intern/draw_volume.cc b/source/blender/draw/intern/draw_volume.cc index 29011ec6722..e9a18aa4faf 100644 --- a/source/blender/draw/intern/draw_volume.cc +++ b/source/blender/draw/intern/draw_volume.cc @@ -21,7 +21,7 @@ #include "BKE_volume.hh" #include "BKE_volume_render.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "draw_common.h" #include "draw_manager.h" diff --git a/source/blender/editors/space_node/node_edit.cc b/source/blender/editors/space_node/node_edit.cc index 89f80d5be61..2bd944f7d01 100644 --- a/source/blender/editors/space_node/node_edit.cc +++ b/source/blender/editors/space_node/node_edit.cc @@ -63,7 +63,7 @@ #include "UI_view2d.hh" #include "GPU_capabilities.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "IMB_imbuf_types.hh" diff --git a/source/blender/editors/space_outliner/outliner_edit.cc b/source/blender/editors/space_outliner/outliner_edit.cc index 9dc18553d50..a9d3d0a1bb5 100644 --- a/source/blender/editors/space_outliner/outliner_edit.cc +++ b/source/blender/editors/space_outliner/outliner_edit.cc @@ -59,7 +59,7 @@ #include "RNA_enum_types.hh" #include "RNA_path.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "outliner_intern.hh" #include "tree/tree_element_rna.hh" diff --git a/source/blender/editors/space_view3d/view3d_draw.cc b/source/blender/editors/space_view3d/view3d_draw.cc index 7ca6ca2c3bd..9f29cf18d7b 100644 --- a/source/blender/editors/space_view3d/view3d_draw.cc +++ b/source/blender/editors/space_view3d/view3d_draw.cc @@ -70,7 +70,7 @@ #include "GPU_framebuffer.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "GPU_matrix.h" #include "GPU_state.h" #include "GPU_viewport.h" diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 6b88866de4e..b265fab17b4 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -97,7 +97,7 @@ set(SRC GPU_immediate_util.h GPU_index_buffer.h GPU_init_exit.h - GPU_material.h + GPU_material.hh GPU_matrix.h GPU_platform.h GPU_primitive.h diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.hh similarity index 81% rename from source/blender/gpu/GPU_material.h rename to source/blender/gpu/GPU_material.hh index 45115bf6c95..e0d1d5ed169 100644 --- a/source/blender/gpu/GPU_material.h +++ b/source/blender/gpu/GPU_material.hh @@ -17,15 +17,12 @@ #include "GPU_shader.h" /* for GPUShaderCreateInfo */ #include "GPU_texture.h" /* for GPUSamplerState */ -#ifdef __cplusplus -extern "C" { -#endif - struct GHash; struct GPUMaterial; struct GPUNode; struct GPUNodeLink; struct GPUNodeStack; +struct GPUPass; struct GPUTexture; struct GPUUniformBuf; struct Image; @@ -37,13 +34,9 @@ struct Scene; struct bNode; struct bNodeTree; -typedef struct GPUMaterial GPUMaterial; -typedef struct GPUNode GPUNode; -typedef struct GPUNodeLink GPUNodeLink; - /* Functions to create GPU Materials nodes. */ -typedef enum eGPUType { +enum eGPUType { /* Keep in sync with GPU_DATATYPE_STR */ /* The value indicates the number of elements in each type */ GPU_NONE = 0, @@ -66,9 +59,9 @@ typedef enum eGPUType { /* Opengl Attributes */ GPU_ATTR = 3001, -} eGPUType; +}; -typedef enum eGPUMaterialFlag { +enum eGPUMaterialFlag { GPU_MATFLAG_DIFFUSE = (1 << 0), GPU_MATFLAG_SUBSURFACE = (1 << 1), GPU_MATFLAG_GLOSSY = (1 << 2), @@ -101,42 +94,42 @@ typedef enum eGPUMaterialFlag { /* HACK(fclem) Tells the environment texture node to not bail out if empty. */ GPU_MATFLAG_LOOKDEV_HACK = (1 << 30), -} eGPUMaterialFlag; +}; ENUM_OPERATORS(eGPUMaterialFlag, GPU_MATFLAG_LOOKDEV_HACK); -typedef struct GPUNodeStack { +struct GPUNodeStack { eGPUType type; float vec[4]; - struct GPUNodeLink *link; + GPUNodeLink *link; bool hasinput; bool hasoutput; short sockettype; bool end; -} GPUNodeStack; +}; -typedef enum eGPUMaterialStatus { +enum eGPUMaterialStatus { GPU_MAT_FAILED = 0, GPU_MAT_CREATED, GPU_MAT_QUEUED, GPU_MAT_SUCCESS, -} eGPUMaterialStatus; +}; /* GPU_MAT_OPTIMIZATION_SKIP for cases where we do not * plan to perform optimization on a given material. */ -typedef enum eGPUMaterialOptimizationStatus { +enum eGPUMaterialOptimizationStatus { GPU_MAT_OPTIMIZATION_SKIP = 0, GPU_MAT_OPTIMIZATION_READY, GPU_MAT_OPTIMIZATION_QUEUED, GPU_MAT_OPTIMIZATION_SUCCESS, -} eGPUMaterialOptimizationStatus; +}; -typedef enum eGPUDefaultValue { +enum eGPUDefaultValue { GPU_DEFAULT_0 = 0, GPU_DEFAULT_1, -} eGPUDefaultValue; +}; -typedef struct GPUCodegenOutput { +struct GPUCodegenOutput { char *attr_load; /* Node-tree functions calls. */ char *displacement; @@ -147,9 +140,9 @@ typedef struct GPUCodegenOutput { char *material_functions; GPUShaderCreateInfo *create_info; -} GPUCodegenOutput; +}; -typedef void (*GPUCodegenCallbackFn)(void *thunk, GPUMaterial *mat, GPUCodegenOutput *codegen); +using GPUCodegenCallbackFn = void (*)(void *thunk, GPUMaterial *mat, GPUCodegenOutput *codegen); GPUNodeLink *GPU_constant(const float *num); GPUNodeLink *GPU_uniform(const float *num); @@ -173,12 +166,12 @@ GPUNodeLink *GPU_uniform_attribute(GPUMaterial *mat, uint32_t *r_hash); GPUNodeLink *GPU_layer_attribute(GPUMaterial *mat, const char *name); GPUNodeLink *GPU_image(GPUMaterial *mat, - struct Image *ima, - struct ImageUser *iuser, + Image *ima, + ImageUser *iuser, GPUSamplerState sampler_state); void GPU_image_tiled(GPUMaterial *mat, - struct Image *ima, - struct ImageUser *iuser, + Image *ima, + ImageUser *iuser, GPUSamplerState sampler_state, GPUNodeLink **r_image_tiled_link, GPUNodeLink **r_image_tiled_mapping_link); @@ -199,7 +192,7 @@ GPUNodeLink *GPU_differentiate_float_function(const char *function_name); bool GPU_link(GPUMaterial *mat, const char *name, ...); bool GPU_stack_link(GPUMaterial *mat, - const struct bNode *node, + const bNode *node, const char *name, GPUNodeStack *in, GPUNodeStack *out, @@ -227,24 +220,24 @@ char *GPU_material_split_sub_function(GPUMaterial *material, GPUNodeLink **link); bool GPU_material_sss_profile_create(GPUMaterial *material, float radii[3]); -struct GPUUniformBuf *GPU_material_sss_profile_get(GPUMaterial *material, - int sample_len, - struct GPUTexture **tex_profile); +GPUUniformBuf *GPU_material_sss_profile_get(GPUMaterial *material, + int sample_len, + GPUTexture **tex_profile); /** * High level functions to create and use GPU materials. */ -typedef enum eGPUMaterialEngine { +enum eGPUMaterialEngine { GPU_MAT_EEVEE_LEGACY = 0, GPU_MAT_EEVEE, GPU_MAT_COMPOSITOR, -} eGPUMaterialEngine; +}; -GPUMaterial *GPU_material_from_nodetree(struct Scene *scene, - struct Material *ma, - struct bNodeTree *ntree, - struct ListBase *gpumaterials, +GPUMaterial *GPU_material_from_nodetree(Scene *scene, + Material *ma, + bNodeTree *ntree, + ListBase *gpumaterials, const char *name, eGPUMaterialEngine engine, uint64_t shader_uuid, @@ -255,19 +248,19 @@ GPUMaterial *GPU_material_from_nodetree(struct Scene *scene, void GPU_material_compile(GPUMaterial *mat); void GPU_material_free_single(GPUMaterial *material); -void GPU_material_free(struct ListBase *gpumaterial); +void GPU_material_free(ListBase *gpumaterial); void GPU_material_acquire(GPUMaterial *mat); void GPU_material_release(GPUMaterial *mat); -void GPU_materials_free(struct Main *bmain); +void GPU_materials_free(Main *bmain); -struct Scene *GPU_material_scene(GPUMaterial *material); -struct GPUPass *GPU_material_get_pass(GPUMaterial *material); +Scene *GPU_material_scene(GPUMaterial *material); +GPUPass *GPU_material_get_pass(GPUMaterial *material); /** Return the most optimal shader configuration for the given material. */ -struct GPUShader *GPU_material_get_shader(GPUMaterial *material); +GPUShader *GPU_material_get_shader(GPUMaterial *material); /** Return the base un-optimized shader. */ -struct GPUShader *GPU_material_get_shader_base(GPUMaterial *material); +GPUShader *GPU_material_get_shader_base(GPUMaterial *material); const char *GPU_material_get_name(GPUMaterial *material); /** @@ -281,7 +274,7 @@ void GPU_material_optimize(GPUMaterial *mat); /** * Return can be NULL if it's a world material. */ -struct Material *GPU_material_get_material(GPUMaterial *material); +Material *GPU_material_get_material(GPUMaterial *material); /** * Return true if the material compilation has not yet begin or begin. */ @@ -313,14 +306,14 @@ bool GPU_material_optimization_ready(GPUMaterial *mat); */ void GPU_material_set_default(GPUMaterial *material, GPUMaterial *default_material); -struct GPUUniformBuf *GPU_material_uniform_buffer_get(GPUMaterial *material); +GPUUniformBuf *GPU_material_uniform_buffer_get(GPUMaterial *material); /** * Create dynamic UBO from parameters * * \param inputs: Items are #LinkData, data is #GPUInput (`BLI_genericNodeN(GPUInput)`). */ void GPU_material_uniform_buffer_create(GPUMaterial *material, ListBase *inputs); -struct GPUUniformBuf *GPU_material_create_sss_profile_ubo(void); +GPUUniformBuf *GPU_material_create_sss_profile_ubo(); bool GPU_material_has_surface_output(GPUMaterial *mat); bool GPU_material_has_volume_output(GPUMaterial *mat); @@ -332,14 +325,14 @@ eGPUMaterialFlag GPU_material_flag(const GPUMaterial *mat); bool GPU_material_recalc_flag_get(GPUMaterial *mat); uint64_t GPU_material_uuid_get(GPUMaterial *mat); -void GPU_pass_cache_init(void); -void GPU_pass_cache_garbage_collect(void); -void GPU_pass_cache_free(void); +void GPU_pass_cache_init(); +void GPU_pass_cache_garbage_collect(); +void GPU_pass_cache_free(); /* Requested Material Attributes and Textures */ -typedef struct GPUMaterialAttribute { - struct GPUMaterialAttribute *next, *prev; +struct GPUMaterialAttribute { + GPUMaterialAttribute *next, *prev; int type; /* eCustomDataType */ char name[68]; /* MAX_CUSTOMDATA_LAYER_NAME */ char input_name[12 + 1]; /* GPU_MAX_SAFE_ATTR_NAME + 1 */ @@ -357,26 +350,26 @@ typedef struct GPUMaterialAttribute { * If true, the attribute is the length of hair particles and curves. */ bool is_hair_length; -} GPUMaterialAttribute; +}; -typedef struct GPUMaterialTexture { - struct GPUMaterialTexture *next, *prev; - struct Image *ima; - struct ImageUser iuser; +struct GPUMaterialTexture { + GPUMaterialTexture *next, *prev; + Image *ima; + ImageUser iuser; bool iuser_available; - struct GPUTexture **colorband; - struct GPUTexture **sky; + GPUTexture **colorband; + GPUTexture **sky; char sampler_name[32]; /* Name of sampler in GLSL. */ char tiled_mapping_name[32]; /* Name of tile mapping sampler in GLSL. */ int users; GPUSamplerState sampler_state; -} GPUMaterialTexture; +}; ListBase GPU_material_attributes(const GPUMaterial *material); ListBase GPU_material_textures(GPUMaterial *material); -typedef struct GPUUniformAttr { - struct GPUUniformAttr *next, *prev; +struct GPUUniformAttr { + GPUUniformAttr *next, *prev; /* Meaningful part of the attribute set key. */ char name[68]; /* MAX_CUSTOMDATA_LAYER_NAME */ @@ -387,23 +380,23 @@ typedef struct GPUUniformAttr { /* Helper fields used by code generation. */ short id; int users; -} GPUUniformAttr; +}; -typedef struct GPUUniformAttrList { +struct GPUUniformAttrList { ListBase list; /* GPUUniformAttr */ /* List length and hash code precomputed for fast lookup and comparison. */ unsigned int count, hash_code; -} GPUUniformAttrList; +}; const GPUUniformAttrList *GPU_material_uniform_attributes(const GPUMaterial *material); -struct GHash *GPU_uniform_attr_list_hash_new(const char *info); +GHash *GPU_uniform_attr_list_hash_new(const char *info); void GPU_uniform_attr_list_copy(GPUUniformAttrList *dest, const GPUUniformAttrList *src); void GPU_uniform_attr_list_free(GPUUniformAttrList *set); -typedef struct GPULayerAttr { - struct GPULayerAttr *next, *prev; +struct GPULayerAttr { + GPULayerAttr *next, *prev; /* Meaningful part of the attribute set key. */ char name[68]; /* MAX_CUSTOMDATA_LAYER_NAME */ @@ -412,13 +405,13 @@ typedef struct GPULayerAttr { /* Helper fields used by code generation. */ int users; -} GPULayerAttr; +}; const ListBase *GPU_material_layer_attributes(const GPUMaterial *material); /* A callback passed to GPU_material_from_callbacks to construct the material graph by adding and * linking the necessary GPU material nodes. */ -typedef void (*ConstructGPUMaterialFn)(void *thunk, GPUMaterial *material); +using ConstructGPUMaterialFn = void (*)(void *thunk, GPUMaterial *material); /* Construct a GPU material from a set of callbacks. See the callback types for more information. * The given thunk will be passed as the first parameter of each callback. */ @@ -426,7 +419,3 @@ GPUMaterial *GPU_material_from_callbacks(eGPUMaterialEngine engine, ConstructGPUMaterialFn construct_function_cb, GPUCodegenCallbackFn generate_code_function_cb, void *thunk); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/intern/gpu_codegen.cc b/source/blender/gpu/intern/gpu_codegen.cc index da6060a4a72..258820033f2 100644 --- a/source/blender/gpu/intern/gpu_codegen.cc +++ b/source/blender/gpu/intern/gpu_codegen.cc @@ -28,7 +28,7 @@ #include "GPU_capabilities.h" #include "GPU_context.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "GPU_shader.h" #include "GPU_uniform_buffer.h" #include "GPU_vertex_format.h" diff --git a/source/blender/gpu/intern/gpu_codegen.h b/source/blender/gpu/intern/gpu_codegen.h index c9073fb493d..38d67c01dce 100644 --- a/source/blender/gpu/intern/gpu_codegen.h +++ b/source/blender/gpu/intern/gpu_codegen.h @@ -10,7 +10,7 @@ #pragma once -#include "GPU_material.h" +#include "GPU_material.hh" #include "GPU_shader.h" #ifdef __cplusplus diff --git a/source/blender/gpu/intern/gpu_material.cc b/source/blender/gpu/intern/gpu_material.cc index 4d4c8652f75..559dadfdfa2 100644 --- a/source/blender/gpu/intern/gpu_material.cc +++ b/source/blender/gpu/intern/gpu_material.cc @@ -30,7 +30,7 @@ #include "NOD_shader.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "GPU_shader.h" #include "GPU_texture.h" #include "GPU_uniform_buffer.h" diff --git a/source/blender/gpu/intern/gpu_material_library.h b/source/blender/gpu/intern/gpu_material_library.h index d2bffb6b015..49c9d21fbfb 100644 --- a/source/blender/gpu/intern/gpu_material_library.h +++ b/source/blender/gpu/intern/gpu_material_library.h @@ -9,7 +9,7 @@ #pragma once -#include "GPU_material.h" +#include "GPU_material.hh" #ifdef __cplusplus extern "C" { diff --git a/source/blender/gpu/intern/gpu_node_graph.h b/source/blender/gpu/intern/gpu_node_graph.h index 86be486c45c..ff80da25036 100644 --- a/source/blender/gpu/intern/gpu_node_graph.h +++ b/source/blender/gpu/intern/gpu_node_graph.h @@ -15,7 +15,7 @@ #include "BLI_ghash.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "GPU_shader.h" #ifdef __cplusplus diff --git a/source/blender/gpu/intern/gpu_shader_create_info.hh b/source/blender/gpu/intern/gpu_shader_create_info.hh index d9fe7346b18..5a38b9c4dc5 100644 --- a/source/blender/gpu/intern/gpu_shader_create_info.hh +++ b/source/blender/gpu/intern/gpu_shader_create_info.hh @@ -15,7 +15,7 @@ #include "BLI_string_ref.hh" #include "BLI_vector.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "GPU_texture.h" #include diff --git a/source/blender/gpu/intern/gpu_storage_buffer.cc b/source/blender/gpu/intern/gpu_storage_buffer.cc index b0d2e550117..bdf606a25a8 100644 --- a/source/blender/gpu/intern/gpu_storage_buffer.cc +++ b/source/blender/gpu/intern/gpu_storage_buffer.cc @@ -14,7 +14,7 @@ #include "gpu_backend.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "GPU_vertex_buffer.h" /* For GPUUsageType. */ #include "GPU_storage_buffer.h" diff --git a/source/blender/gpu/intern/gpu_uniform_buffer.cc b/source/blender/gpu/intern/gpu_uniform_buffer.cc index 1e0c8938db6..01d44b7bacf 100644 --- a/source/blender/gpu/intern/gpu_uniform_buffer.cc +++ b/source/blender/gpu/intern/gpu_uniform_buffer.cc @@ -16,7 +16,7 @@ #include "gpu_node_graph.h" #include "GPU_context.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "GPU_uniform_buffer.h" #include "gpu_uniform_buffer_private.hh" diff --git a/source/blender/gpu/metal/mtl_shader_interface_type.hh b/source/blender/gpu/metal/mtl_shader_interface_type.hh index 33dca29cd2f..6d9dadf9a4e 100644 --- a/source/blender/gpu/metal/mtl_shader_interface_type.hh +++ b/source/blender/gpu/metal/mtl_shader_interface_type.hh @@ -8,7 +8,7 @@ #pragma once #include "BLI_assert.h" -#include "GPU_material.h" +#include "GPU_material.hh" enum eMTLDataType { MTL_DATATYPE_CHAR, diff --git a/source/blender/makesrna/intern/rna_nodetree.cc b/source/blender/makesrna/intern/rna_nodetree.cc index 1c1e77f4767..f18d1849f5b 100644 --- a/source/blender/makesrna/intern/rna_nodetree.cc +++ b/source/blender/makesrna/intern/rna_nodetree.cc @@ -600,7 +600,7 @@ static const EnumPropertyItem node_cryptomatte_layer_name_items[] = { # include "ED_node.hh" # include "ED_render.hh" -# include "GPU_material.h" +# include "GPU_material.hh" # include "NOD_common.h" # include "NOD_composite.hh" diff --git a/source/blender/makesrna/intern/rna_space.cc b/source/blender/makesrna/intern/rna_space.cc index cf7f76e5386..9feed634863 100644 --- a/source/blender/makesrna/intern/rna_space.cc +++ b/source/blender/makesrna/intern/rna_space.cc @@ -580,7 +580,7 @@ static const EnumPropertyItem rna_enum_curve_display_handle_items[] = { # include "ED_transform.hh" # include "ED_view3d.hh" -# include "GPU_material.h" +# include "GPU_material.hh" # include "IMB_imbuf_types.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc b/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc index 9662bfe8f67..b20754d40f1 100644 --- a/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc +++ b/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc @@ -9,7 +9,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_brightness.cc b/source/blender/nodes/composite/nodes/node_composite_brightness.cc index 8807d8ccf95..71ade01b3d1 100644 --- a/source/blender/nodes/composite/nodes/node_composite_brightness.cc +++ b/source/blender/nodes/composite/nodes/node_composite_brightness.cc @@ -9,7 +9,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc b/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc index c8b6251f3b7..cb10d29dbcc 100644 --- a/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc @@ -11,7 +11,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc b/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc index 578da61eeba..2e85eb66ed0 100644 --- a/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc @@ -13,7 +13,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_color_matte.cc b/source/blender/nodes/composite/nodes/node_composite_color_matte.cc index 5adcf81024c..b52ef4e2ee5 100644 --- a/source/blender/nodes/composite/nodes/node_composite_color_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_color_matte.cc @@ -9,7 +9,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_color_spill.cc b/source/blender/nodes/composite/nodes/node_composite_color_spill.cc index 6c912c5c93c..a92e86ce707 100644 --- a/source/blender/nodes/composite/nodes/node_composite_color_spill.cc +++ b/source/blender/nodes/composite/nodes/node_composite_color_spill.cc @@ -11,7 +11,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc b/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc index bb6c6ce1a5c..7c44d8ffbd3 100644 --- a/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc +++ b/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc @@ -11,7 +11,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc index 98cb873e749..481381f6bda 100644 --- a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc +++ b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc @@ -11,7 +11,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_curves.cc b/source/blender/nodes/composite/nodes/node_composite_curves.cc index c67425e7276..b4c99d8bbdb 100644 --- a/source/blender/nodes/composite/nodes/node_composite_curves.cc +++ b/source/blender/nodes/composite/nodes/node_composite_curves.cc @@ -13,7 +13,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_node_operation.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc b/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc index 4cb34b80f4c..f94ea8720fe 100644 --- a/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc @@ -9,7 +9,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc b/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc index 65f695c50a4..fbcc297a937 100644 --- a/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc @@ -9,7 +9,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_exposure.cc b/source/blender/nodes/composite/nodes/node_composite_exposure.cc index 7abad178f2f..9745b46a4ce 100644 --- a/source/blender/nodes/composite/nodes/node_composite_exposure.cc +++ b/source/blender/nodes/composite/nodes/node_composite_exposure.cc @@ -6,7 +6,7 @@ * \ingroup cmpnodes */ -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_gamma.cc b/source/blender/nodes/composite/nodes/node_composite_gamma.cc index 104230da9ec..549c64ed6e2 100644 --- a/source/blender/nodes/composite/nodes/node_composite_gamma.cc +++ b/source/blender/nodes/composite/nodes/node_composite_gamma.cc @@ -6,7 +6,7 @@ * \ingroup cmpnodes */ -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_hue_sat_val.cc b/source/blender/nodes/composite/nodes/node_composite_hue_sat_val.cc index 840aa0e20fb..fdf5f8e9f76 100644 --- a/source/blender/nodes/composite/nodes/node_composite_hue_sat_val.cc +++ b/source/blender/nodes/composite/nodes/node_composite_hue_sat_val.cc @@ -6,7 +6,7 @@ * \ingroup cmpnodes */ -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc b/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc index 4f6d82bdc82..1a61c76e74f 100644 --- a/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc +++ b/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc @@ -8,7 +8,7 @@ #include "BKE_colortools.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_invert.cc b/source/blender/nodes/composite/nodes/node_composite_invert.cc index 5299bd566f4..7f7b4ba0ee0 100644 --- a/source/blender/nodes/composite/nodes/node_composite_invert.cc +++ b/source/blender/nodes/composite/nodes/node_composite_invert.cc @@ -9,7 +9,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc b/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc index a004fb17675..641c5191e02 100644 --- a/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc @@ -11,7 +11,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_map_range.cc b/source/blender/nodes/composite/nodes/node_composite_map_range.cc index 66d6363a598..cb4d80e5b20 100644 --- a/source/blender/nodes/composite/nodes/node_composite_map_range.cc +++ b/source/blender/nodes/composite/nodes/node_composite_map_range.cc @@ -9,7 +9,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_map_value.cc b/source/blender/nodes/composite/nodes/node_composite_map_value.cc index dacae00fafd..fd7c2c1c32a 100644 --- a/source/blender/nodes/composite/nodes/node_composite_map_value.cc +++ b/source/blender/nodes/composite/nodes/node_composite_map_value.cc @@ -13,7 +13,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_math.cc b/source/blender/nodes/composite/nodes/node_composite_math.cc index 7b9a0b805a6..e635e155d21 100644 --- a/source/blender/nodes/composite/nodes/node_composite_math.cc +++ b/source/blender/nodes/composite/nodes/node_composite_math.cc @@ -6,7 +6,7 @@ * \ingroup cmpnodes */ -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_mixrgb.cc b/source/blender/nodes/composite/nodes/node_composite_mixrgb.cc index 71280f20735..a750aa7bece 100644 --- a/source/blender/nodes/composite/nodes/node_composite_mixrgb.cc +++ b/source/blender/nodes/composite/nodes/node_composite_mixrgb.cc @@ -10,7 +10,7 @@ #include "DNA_material_types.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_normal.cc b/source/blender/nodes/composite/nodes/node_composite_normal.cc index 6a5d1d59fae..700353b3b0c 100644 --- a/source/blender/nodes/composite/nodes/node_composite_normal.cc +++ b/source/blender/nodes/composite/nodes/node_composite_normal.cc @@ -6,7 +6,7 @@ * \ingroup cmpnodes */ -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_posterize.cc b/source/blender/nodes/composite/nodes/node_composite_posterize.cc index 55005b97fd7..9b88b08cea8 100644 --- a/source/blender/nodes/composite/nodes/node_composite_posterize.cc +++ b/source/blender/nodes/composite/nodes/node_composite_posterize.cc @@ -6,7 +6,7 @@ * \ingroup cmpnodes */ -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_premulkey.cc b/source/blender/nodes/composite/nodes/node_composite_premulkey.cc index 54f27b64eea..47462c6cf8f 100644 --- a/source/blender/nodes/composite/nodes/node_composite_premulkey.cc +++ b/source/blender/nodes/composite/nodes/node_composite_premulkey.cc @@ -9,7 +9,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcomb_color.cc b/source/blender/nodes/composite/nodes/node_composite_sepcomb_color.cc index 6d7365c1ae7..acad78f3954 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcomb_color.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sepcomb_color.cc @@ -4,7 +4,7 @@ #include "BLI_assert.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcomb_hsva.cc b/source/blender/nodes/composite/nodes/node_composite_sepcomb_hsva.cc index 67241d59bd0..b51daf10885 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcomb_hsva.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sepcomb_hsva.cc @@ -6,7 +6,7 @@ * \ingroup cmpnodes */ -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcomb_rgba.cc b/source/blender/nodes/composite/nodes/node_composite_sepcomb_rgba.cc index cb9cad6a63d..fbd02ab3dda 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcomb_rgba.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sepcomb_rgba.cc @@ -6,7 +6,7 @@ * \ingroup cmpnodes */ -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcomb_xyz.cc b/source/blender/nodes/composite/nodes/node_composite_sepcomb_xyz.cc index 398c0121860..815843f4e7e 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcomb_xyz.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sepcomb_xyz.cc @@ -6,7 +6,7 @@ * \ingroup cmpnodes */ -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcomb_ycca.cc b/source/blender/nodes/composite/nodes/node_composite_sepcomb_ycca.cc index cb53845c02a..5eefb7fbf00 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcomb_ycca.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sepcomb_ycca.cc @@ -8,7 +8,7 @@ #include "BLI_assert.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcomb_yuva.cc b/source/blender/nodes/composite/nodes/node_composite_sepcomb_yuva.cc index 501a7b22809..f8b4ec41b56 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcomb_yuva.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sepcomb_yuva.cc @@ -6,7 +6,7 @@ * \ingroup cmpnodes */ -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_setalpha.cc b/source/blender/nodes/composite/nodes/node_composite_setalpha.cc index 3cbe4cbde85..991e7a36dbd 100644 --- a/source/blender/nodes/composite/nodes/node_composite_setalpha.cc +++ b/source/blender/nodes/composite/nodes/node_composite_setalpha.cc @@ -9,7 +9,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc b/source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc index 4d844e0914f..c5d6f9eb986 100644 --- a/source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc +++ b/source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc @@ -12,7 +12,7 @@ #include "BKE_colorband.hh" -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_shader_node.hh" diff --git a/source/blender/nodes/shader/node_shader_tree.cc b/source/blender/nodes/shader/node_shader_tree.cc index 4588a2dc1f3..a406a334e2b 100644 --- a/source/blender/nodes/shader/node_shader_tree.cc +++ b/source/blender/nodes/shader/node_shader_tree.cc @@ -40,7 +40,7 @@ #include "RNA_access.hh" #include "RNA_prototypes.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "RE_texture.h" diff --git a/source/blender/nodes/shader/node_shader_util.hh b/source/blender/nodes/shader/node_shader_util.hh index d3693a06f52..928caafbe32 100644 --- a/source/blender/nodes/shader/node_shader_util.hh +++ b/source/blender/nodes/shader/node_shader_util.hh @@ -15,7 +15,7 @@ #include "DNA_node_types.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "NOD_socket_declarations.hh" diff --git a/source/blender/nodes/shader/nodes/node_shader_wireframe.cc b/source/blender/nodes/shader/nodes/node_shader_wireframe.cc index 4b8fad5a96f..1b7b475752a 100644 --- a/source/blender/nodes/shader/nodes/node_shader_wireframe.cc +++ b/source/blender/nodes/shader/nodes/node_shader_wireframe.cc @@ -6,7 +6,7 @@ #include "BKE_node.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/windowmanager/intern/wm_init_exit.cc b/source/blender/windowmanager/intern/wm_init_exit.cc index b9b00bdaead..cbd2f2cfb61 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.cc +++ b/source/blender/windowmanager/intern/wm_init_exit.cc @@ -111,7 +111,7 @@ #include "GPU_context.h" #include "GPU_init_exit.h" -#include "GPU_material.h" +#include "GPU_material.hh" #include "COM_compositor.hh"