Cleanup: Move remaining GPU headers to C++

Pull Request: https://projects.blender.org/blender/blender/pulls/119807
2026-09-29 04:37:17 +03:00 · 2024-03-23 01:24:18 +01:00 · 2024-03-23 01:24:18 +01:00 · 8b514bccd1
commit 8b514bccd1
parent f235990009
556 changed files with 1663 additions and 1923 deletions
--- a/intern/cycles/blender/display_driver.cpp
+++ b/intern/cycles/blender/display_driver.cpp
@ -2,11 +2,11 @@
 *
 * SPDX-License-Identifier: Apache-2.0 */

-#include "GPU_context.h"
-#include "GPU_immediate.h"
-#include "GPU_shader.h"
-#include "GPU_state.h"
-#include "GPU_texture.h"
+#include "GPU_context.hh"
+#include "GPU_immediate.hh"
+#include "GPU_shader.hh"
+#include "GPU_state.hh"
+#include "GPU_texture.hh"

 #include "RE_engine.h"

--- a/intern/cycles/blender/python.cpp
+++ b/intern/cycles/blender/python.cpp
@ -26,7 +26,7 @@
 #include "util/tbb.h"
 #include "util/types.h"

-#include "GPU_state.h"
+#include "GPU_state.hh"

 #ifdef WITH_OSL
 #  include "scene/osl.h"
--- a/intern/ghost/test/multitest/MultiTest.c
+++ b/intern/ghost/test/multitest/MultiTest.c
@ -40,9 +40,9 @@
 #include "WindowData.h"

 /* GPU API. */
-#include "GPU_context.h"
-#include "GPU_immediate.h"
-#include "GPU_init_exit.h"
+#include "GPU_context.hh"
+#include "GPU_immediate.hh"
+#include "GPU_init_exit.hh"

 extern int datatoc_bfont_ttf_size;
 extern char const datatoc_bfont_ttf[];
--- a/intern/opencolorio/ocio_impl_glsl.cc
+++ b/intern/opencolorio/ocio_impl_glsl.cc
@ -19,8 +19,8 @@
 #  pragma warning(pop)
 #endif

-#include "GPU_immediate.h"
-#include "GPU_shader.h"
+#include "GPU_immediate.hh"
+#include "GPU_shader.hh"
 #include "GPU_uniform_buffer.hh"

 #include "gpu_shader_create_info.hh"
--- a/intern/opencolorio/ocio_shader_shared.hh
+++ b/intern/opencolorio/ocio_shader_shared.hh
@ -3,7 +3,7 @@
 * SPDX-License-Identifier: GPL-2.0-or-later */

 #ifndef GPU_SHADER
-#  include "GPU_shader_shared_utils.h"
+#  include "GPU_shader_shared_utils.hh"
 #endif

 struct OCIO_GPUCurveMappingParameters {
--- a/release/datafiles/userdef/userdef_default.c
+++ b/release/datafiles/userdef/userdef_default.c
@ -16,7 +16,7 @@

 #include "BKE_blender_version.h"

-#include "GPU_platform.h"
+#include "GPU_platform_backend_enum.h"

 #include "BLO_userdef_default.h" /* own include */

--- a/source/blender/blenfont/intern/blf.cc
+++ b/source/blender/blenfont/intern/blf.cc
@ -32,8 +32,8 @@

 #include "IMB_colormanagement.hh"

-#include "GPU_matrix.h"
-#include "GPU_shader.h"
+#include "GPU_matrix.hh"
+#include "GPU_shader.hh"

 #include "blf_internal.hh"
 #include "blf_internal_types.hh"
--- a/source/blender/blenfont/intern/blf_font.cc
+++ b/source/blender/blenfont/intern/blf_font.cc
@ -42,8 +42,8 @@

 #include "BLF_api.hh"

-#include "GPU_batch.h"
-#include "GPU_matrix.h"
+#include "GPU_batch.hh"
+#include "GPU_matrix.hh"

 #include "blf_internal.hh"
 #include "blf_internal_types.hh"
--- a/source/blender/blenfont/intern/blf_glyph.cc
+++ b/source/blender/blenfont/intern/blf_glyph.cc
@ -32,7 +32,7 @@

 #include "DNA_curve_types.h"

-#include "GPU_capabilities.h"
+#include "GPU_capabilities.hh"

 #include "blf_internal.hh"
 #include "blf_internal_types.hh"
--- a/source/blender/blenfont/intern/blf_internal_types.hh
+++ b/source/blender/blenfont/intern/blf_internal_types.hh
@ -13,8 +13,8 @@
 #include "BLI_map.hh"
 #include "BLI_vector.hh"

-#include "GPU_texture.h"
-#include "GPU_vertex_buffer.h"
+#include "GPU_texture.hh"
+#include "GPU_vertex_buffer.hh"

 struct ColorManagedDisplay;
 struct FontBLF;
--- a/source/blender/blenkernel/intern/anim_visualization.cc
+++ b/source/blender/blenkernel/intern/anim_visualization.cc
@ -15,7 +15,7 @@
 #include "BKE_anim_visualization.h"
 #include "BKE_report.hh"

-#include "GPU_batch.h"
+#include "GPU_batch.hh"

 #include "BLO_read_write.hh"

--- a/source/blender/blenkernel/intern/image.cc
+++ b/source/blender/blenkernel/intern/image.cc
@ -88,7 +88,7 @@
 #include "SEQ_utils.hh" /* SEQ_get_topmost_sequence() */

 #include "GPU_material.hh"
-#include "GPU_texture.h"
+#include "GPU_texture.hh"

 #include "BLI_sys_types.h" /* for intptr_t support */

--- a/source/blender/blenkernel/intern/image_gpu.cc
+++ b/source/blender/blenkernel/intern/image_gpu.cc
@ -26,9 +26,9 @@
 #include "BKE_image_partial_update.hh"
 #include "BKE_main.hh"

-#include "GPU_capabilities.h"
-#include "GPU_state.h"
-#include "GPU_texture.h"
+#include "GPU_capabilities.hh"
+#include "GPU_state.hh"
+#include "GPU_texture.hh"

 using namespace blender::bke::image::partial_update;

--- a/source/blender/blenkernel/intern/movieclip.cc
+++ b/source/blender/blenkernel/intern/movieclip.cc
@ -65,7 +65,7 @@

 #include "DRW_engine.hh"

-#include "GPU_texture.h"
+#include "GPU_texture.hh"

 #include "BLO_read_write.hh"

--- a/source/blender/blenkernel/intern/preview_image.cc
+++ b/source/blender/blenkernel/intern/preview_image.cc
@ -31,7 +31,7 @@

 #include "BLO_read_write.hh"

-#include "GPU_texture.h"
+#include "GPU_texture.hh"

 #include "IMB_imbuf.hh"
 #include "IMB_thumbs.hh"
--- a/source/blender/blenkernel/intern/studiolight.cc
+++ b/source/blender/blenkernel/intern/studiolight.cc
@ -27,7 +27,7 @@
 #include "IMB_interp.hh"
 #include "IMB_openexr.hh"

-#include "GPU_texture.h"
+#include "GPU_texture.hh"

 #include "MEM_guardedalloc.h"

--- a/source/blender/blenkernel/intern/subdiv_modifier.cc
+++ b/source/blender/blenkernel/intern/subdiv_modifier.cc
@ -16,8 +16,8 @@
 #include "BKE_modifier.hh"
 #include "BKE_subdiv.hh"

-#include "GPU_capabilities.h"
-#include "GPU_context.h"
+#include "GPU_capabilities.hh"
+#include "GPU_context.hh"

 SubdivSettings BKE_subsurf_modifier_settings_init(const SubsurfModifierData *smd,
                                                  const bool use_render_params)
--- a/source/blender/blenloader/intern/versioning_userdef.cc
+++ b/source/blender/blenloader/intern/versioning_userdef.cc
@ -38,7 +38,7 @@

 #include "BLT_translation.hh"

-#include "GPU_platform.h"
+#include "GPU_platform.hh"

 #include "MEM_guardedalloc.h"

--- a/source/blender/compositor/realtime_compositor/COM_context.hh
+++ b/source/blender/compositor/realtime_compositor/COM_context.hh
@ -11,8 +11,8 @@
 #include "DNA_scene_types.h"
 #include "DNA_vec_types.h"

-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "COM_domain.hh"
 #include "COM_render_context.hh"
--- a/source/blender/compositor/realtime_compositor/COM_conversion_operation.hh
+++ b/source/blender/compositor/realtime_compositor/COM_conversion_operation.hh
@ -4,7 +4,7 @@

 #pragma once

-#include "GPU_shader.h"
+#include "GPU_shader.hh"

 #include "COM_context.hh"
 #include "COM_input_descriptor.hh"
--- a/source/blender/compositor/realtime_compositor/COM_realize_on_domain_operation.hh
+++ b/source/blender/compositor/realtime_compositor/COM_realize_on_domain_operation.hh
@ -4,7 +4,7 @@

 #pragma once

-#include "GPU_shader.h"
+#include "GPU_shader.hh"

 #include "COM_context.hh"
 #include "COM_domain.hh"
--- a/source/blender/compositor/realtime_compositor/COM_result.hh
+++ b/source/blender/compositor/realtime_compositor/COM_result.hh
@ -7,8 +7,8 @@
 #include "BLI_math_matrix_types.hh"
 #include "BLI_math_vector_types.hh"

-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "COM_domain.hh"
 #include "COM_texture_pool.hh"
--- a/source/blender/compositor/realtime_compositor/COM_shader_operation.hh
+++ b/source/blender/compositor/realtime_compositor/COM_shader_operation.hh
@ -11,7 +11,7 @@
 #include "BLI_vector_set.hh"

 #include "GPU_material.hh"
-#include "GPU_shader.h"
+#include "GPU_shader.hh"

 #include "gpu_shader_create_info.hh"

--- a/source/blender/compositor/realtime_compositor/COM_texture_pool.hh
+++ b/source/blender/compositor/realtime_compositor/COM_texture_pool.hh
@ -10,7 +10,7 @@
 #include "BLI_math_vector_types.hh"
 #include "BLI_vector.hh"

-#include "GPU_texture.h"
+#include "GPU_texture.hh"

 namespace blender::realtime_compositor {

--- a/source/blender/compositor/realtime_compositor/COM_utilities.hh
+++ b/source/blender/compositor/realtime_compositor/COM_utilities.hh
@ -9,7 +9,7 @@

 #include "NOD_derived_node_tree.hh"

-#include "GPU_shader.h"
+#include "GPU_shader.hh"

 #include "COM_input_descriptor.hh"
 #include "COM_result.hh"
--- a/source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_parallel_reduction.hh
+++ b/source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_parallel_reduction.hh
@ -6,7 +6,7 @@

 #include "BLI_math_vector_types.hh"

-#include "GPU_texture.h"
+#include "GPU_texture.hh"

 #include "COM_context.hh"

--- a/source/blender/compositor/realtime_compositor/algorithms/intern/jump_flooding.cc
+++ b/source/blender/compositor/realtime_compositor/algorithms/intern/jump_flooding.cc
@ -8,7 +8,7 @@
 #include "BLI_math_base.h"
 #include "BLI_math_base.hh"

-#include "GPU_shader.h"
+#include "GPU_shader.hh"

 #include "COM_context.hh"
 #include "COM_result.hh"
--- a/source/blender/compositor/realtime_compositor/algorithms/intern/morphological_blur.cc
+++ b/source/blender/compositor/realtime_compositor/algorithms/intern/morphological_blur.cc
@ -5,7 +5,7 @@
 #include "BLI_assert.h"
 #include "BLI_math_vector_types.hh"

-#include "GPU_shader.h"
+#include "GPU_shader.hh"

 #include "COM_context.hh"
 #include "COM_result.hh"
--- a/source/blender/compositor/realtime_compositor/algorithms/intern/morphological_distance.cc
+++ b/source/blender/compositor/realtime_compositor/algorithms/intern/morphological_distance.cc
@ -4,8 +4,8 @@

 #include "BLI_math_base.hh"

-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "COM_context.hh"
 #include "COM_result.hh"
--- a/source/blender/compositor/realtime_compositor/algorithms/intern/morphological_distance_feather.cc
+++ b/source/blender/compositor/realtime_compositor/algorithms/intern/morphological_distance_feather.cc
@ -5,8 +5,8 @@
 #include "BLI_math_base.hh"
 #include "BLI_math_vector_types.hh"

-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "COM_algorithm_morphological_distance_feather.hh" /* Own include. */
 #include "COM_context.hh"
--- a/source/blender/compositor/realtime_compositor/algorithms/intern/parallel_reduction.cc
+++ b/source/blender/compositor/realtime_compositor/algorithms/intern/parallel_reduction.cc
@ -7,9 +7,9 @@

 #include "MEM_guardedalloc.h"

-#include "GPU_compute.h"
-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_compute.hh"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "COM_context.hh"

--- a/source/blender/compositor/realtime_compositor/algorithms/intern/realize_on_domain.cc
+++ b/source/blender/compositor/realtime_compositor/algorithms/intern/realize_on_domain.cc
@ -8,9 +8,9 @@
 #include "BLI_math_vector_types.hh"
 #include "BLI_utildefines.h"

-#include "GPU_capabilities.h"
-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_capabilities.hh"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "COM_context.hh"
 #include "COM_domain.hh"
--- a/source/blender/compositor/realtime_compositor/algorithms/intern/smaa.cc
+++ b/source/blender/compositor/realtime_compositor/algorithms/intern/smaa.cc
@ -6,8 +6,8 @@

 #include "IMB_colormanagement.hh"

-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "COM_context.hh"
 #include "COM_result.hh"
--- a/source/blender/compositor/realtime_compositor/algorithms/intern/summed_area_table.cc
+++ b/source/blender/compositor/realtime_compositor/algorithms/intern/summed_area_table.cc
@ -7,9 +7,9 @@
 #include "BLI_math_vector.hh"
 #include "BLI_math_vector_types.hh"

-#include "GPU_compute.h"
-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_compute.hh"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "COM_context.hh"
 #include "COM_result.hh"
--- a/source/blender/compositor/realtime_compositor/algorithms/intern/symmetric_separable_blur.cc
+++ b/source/blender/compositor/realtime_compositor/algorithms/intern/symmetric_separable_blur.cc
@ -7,8 +7,8 @@
 #include "BLI_math_vector.hh"
 #include "BLI_math_vector_types.hh"

-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "COM_context.hh"
 #include "COM_result.hh"
--- a/source/blender/compositor/realtime_compositor/algorithms/intern/symmetric_separable_blur_variable_size.cc
+++ b/source/blender/compositor/realtime_compositor/algorithms/intern/symmetric_separable_blur_variable_size.cc
@ -7,8 +7,8 @@
 #include "BLI_math_vector.hh"
 #include "BLI_math_vector_types.hh"

-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "COM_context.hh"
 #include "COM_result.hh"
--- a/source/blender/compositor/realtime_compositor/algorithms/intern/transform.cc
+++ b/source/blender/compositor/realtime_compositor/algorithms/intern/transform.cc
@ -7,9 +7,9 @@
 #include "BLI_math_matrix_types.hh"
 #include "BLI_math_vector_types.hh"

-#include "GPU_capabilities.h"
-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_capabilities.hh"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "COM_algorithm_realize_on_domain.hh"
 #include "COM_context.hh"
--- a/source/blender/compositor/realtime_compositor/cached_resources/COM_bokeh_kernel.hh
+++ b/source/blender/compositor/realtime_compositor/cached_resources/COM_bokeh_kernel.hh
@ -10,8 +10,8 @@
 #include "BLI_map.hh"
 #include "BLI_math_vector_types.hh"

-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "COM_cached_resource.hh"

--- a/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_image.hh
+++ b/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_image.hh
@ -10,7 +10,7 @@

 #include "BLI_map.hh"

-#include "GPU_texture.h"
+#include "GPU_texture.hh"

 #include "DNA_image_types.h"

--- a/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_mask.hh
+++ b/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_mask.hh
@ -11,7 +11,7 @@
 #include "BLI_map.hh"
 #include "BLI_math_vector_types.hh"

-#include "GPU_texture.h"
+#include "GPU_texture.hh"

 #include "DNA_mask_types.h"
 #include "DNA_scene_types.h"
--- a/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_shader.hh
+++ b/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_shader.hh
@ -10,7 +10,7 @@

 #include "BLI_map.hh"

-#include "GPU_shader.h"
+#include "GPU_shader.hh"

 #include "COM_cached_resource.hh"
 #include "COM_result.hh"
--- a/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_texture.hh
+++ b/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_texture.hh
@ -11,7 +11,7 @@
 #include "BLI_map.hh"
 #include "BLI_math_vector_types.hh"

-#include "GPU_texture.h"
+#include "GPU_texture.hh"

 #include "DNA_texture_types.h"

--- a/source/blender/compositor/realtime_compositor/cached_resources/COM_distortion_grid.hh
+++ b/source/blender/compositor/realtime_compositor/cached_resources/COM_distortion_grid.hh
@ -10,8 +10,8 @@
 #include "BLI_map.hh"
 #include "BLI_math_vector_types.hh"

-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "DNA_movieclip_types.h"

--- a/source/blender/compositor/realtime_compositor/cached_resources/COM_keying_screen.hh
+++ b/source/blender/compositor/realtime_compositor/cached_resources/COM_keying_screen.hh
@ -11,8 +11,8 @@
 #include "BLI_map.hh"
 #include "BLI_math_vector_types.hh"

-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "DNA_movieclip_types.h"
 #include "DNA_tracking_types.h"
--- a/source/blender/compositor/realtime_compositor/cached_resources/COM_morphological_distance_feather_weights.hh
+++ b/source/blender/compositor/realtime_compositor/cached_resources/COM_morphological_distance_feather_weights.hh
@ -9,8 +9,8 @@

 #include "BLI_map.hh"

-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "COM_cached_resource.hh"

--- a/source/blender/compositor/realtime_compositor/cached_resources/COM_smaa_precomputed_textures.hh
+++ b/source/blender/compositor/realtime_compositor/cached_resources/COM_smaa_precomputed_textures.hh
@ -6,8 +6,8 @@

 #include <memory>

-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "COM_cached_resource.hh"

--- a/source/blender/compositor/realtime_compositor/cached_resources/COM_symmetric_blur_weights.hh
+++ b/source/blender/compositor/realtime_compositor/cached_resources/COM_symmetric_blur_weights.hh
@ -10,8 +10,8 @@
 #include "BLI_map.hh"
 #include "BLI_math_vector_types.hh"

-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "COM_cached_resource.hh"

--- a/source/blender/compositor/realtime_compositor/cached_resources/COM_symmetric_separable_blur_weights.hh
+++ b/source/blender/compositor/realtime_compositor/cached_resources/COM_symmetric_separable_blur_weights.hh
@ -10,8 +10,8 @@
 #include "BLI_map.hh"
 #include "BLI_math_vector_types.hh"

-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "COM_cached_resource.hh"

--- a/source/blender/compositor/realtime_compositor/cached_resources/intern/bokeh_kernel.cc
+++ b/source/blender/compositor/realtime_compositor/cached_resources/intern/bokeh_kernel.cc
@ -9,8 +9,8 @@
 #include "BLI_math_base.h"
 #include "BLI_math_vector_types.hh"

-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "COM_bokeh_kernel.hh"
 #include "COM_context.hh"
--- a/source/blender/compositor/realtime_compositor/cached_resources/intern/cached_image.cc
+++ b/source/blender/compositor/realtime_compositor/cached_resources/intern/cached_image.cc
@ -12,8 +12,8 @@

 #include "RE_pipeline.h"

-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "IMB_imbuf.hh"
 #include "IMB_imbuf_types.hh"
--- a/source/blender/compositor/realtime_compositor/cached_resources/intern/cached_mask.cc
+++ b/source/blender/compositor/realtime_compositor/cached_resources/intern/cached_mask.cc
@ -11,7 +11,7 @@
 #include "BLI_math_vector_types.hh"
 #include "BLI_task.hh"

-#include "GPU_texture.h"
+#include "GPU_texture.hh"

 #include "BKE_lib_id.hh"
 #include "BKE_mask.h"
--- a/source/blender/compositor/realtime_compositor/cached_resources/intern/cached_shader.cc
+++ b/source/blender/compositor/realtime_compositor/cached_resources/intern/cached_shader.cc
@ -8,8 +8,8 @@

 #include "BLI_hash.hh"

-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "COM_cached_shader.hh"
 #include "COM_result.hh"
--- a/source/blender/compositor/realtime_compositor/cached_resources/intern/cached_texture.cc
+++ b/source/blender/compositor/realtime_compositor/cached_resources/intern/cached_texture.cc
@ -12,7 +12,7 @@
 #include "BLI_math_vector_types.hh"
 #include "BLI_task.hh"

-#include "GPU_texture.h"
+#include "GPU_texture.hh"

 #include "BKE_image.h"
 #include "BKE_texture.h"
--- a/source/blender/compositor/realtime_compositor/cached_resources/intern/distortion_grid.cc
+++ b/source/blender/compositor/realtime_compositor/cached_resources/intern/distortion_grid.cc
@ -15,7 +15,7 @@
 #include "DNA_movieclip_types.h"
 #include "DNA_tracking_types.h"

-#include "GPU_texture.h"
+#include "GPU_texture.hh"

 #include "BKE_movieclip.h"
 #include "BKE_tracking.h"
--- a/source/blender/compositor/realtime_compositor/cached_resources/intern/keying_screen.cc
+++ b/source/blender/compositor/realtime_compositor/cached_resources/intern/keying_screen.cc
@ -19,9 +19,9 @@
 #include "DNA_movieclip_types.h"
 #include "DNA_tracking_types.h"

-#include "GPU_shader.h"
-#include "GPU_storage_buffer.h"
-#include "GPU_texture.h"
+#include "GPU_shader.hh"
+#include "GPU_storage_buffer.hh"
+#include "GPU_texture.hh"

 #include "BKE_movieclip.h"
 #include "BKE_tracking.h"
--- a/source/blender/compositor/realtime_compositor/cached_resources/intern/morphological_distance_feather_weights.cc
+++ b/source/blender/compositor/realtime_compositor/cached_resources/intern/morphological_distance_feather_weights.cc
@ -14,8 +14,8 @@

 #include "DNA_scene_types.h"

-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "COM_context.hh"
 #include "COM_morphological_distance_feather_weights.hh"
--- a/source/blender/compositor/realtime_compositor/cached_resources/intern/ocio_color_space_conversion_shader.cc
+++ b/source/blender/compositor/realtime_compositor/cached_resources/intern/ocio_color_space_conversion_shader.cc
@ -13,9 +13,9 @@
 #include "BLI_vector.hh"
 #include "BLI_vector_set.hh"

-#include "GPU_capabilities.h"
-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_capabilities.hh"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"
 #include "GPU_uniform_buffer.hh"

 #include "gpu_shader_create_info.hh"
--- a/source/blender/compositor/realtime_compositor/cached_resources/intern/smaa_precomputed_textures.cc
+++ b/source/blender/compositor/realtime_compositor/cached_resources/intern/smaa_precomputed_textures.cc
@ -6,8 +6,8 @@

 #include "BLI_smaa_textures.h"

-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "COM_smaa_precomputed_textures.hh"

--- a/source/blender/compositor/realtime_compositor/cached_resources/intern/symmetric_blur_weights.cc
+++ b/source/blender/compositor/realtime_compositor/cached_resources/intern/symmetric_blur_weights.cc
@ -13,8 +13,8 @@

 #include "RE_pipeline.h"

-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "COM_context.hh"
 #include "COM_result.hh"
--- a/source/blender/compositor/realtime_compositor/cached_resources/intern/symmetric_separable_blur_weights.cc
+++ b/source/blender/compositor/realtime_compositor/cached_resources/intern/symmetric_separable_blur_weights.cc
@ -12,8 +12,8 @@

 #include "RE_pipeline.h"

-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "COM_context.hh"
 #include "COM_result.hh"
--- a/source/blender/compositor/realtime_compositor/intern/context.cc
+++ b/source/blender/compositor/realtime_compositor/intern/context.cc
@ -8,7 +8,7 @@
 #include "DNA_node_types.h"
 #include "DNA_vec_types.h"

-#include "GPU_shader.h"
+#include "GPU_shader.hh"

 #include "BKE_node_runtime.hh"

--- a/source/blender/compositor/realtime_compositor/intern/conversion_operation.cc
+++ b/source/blender/compositor/realtime_compositor/intern/conversion_operation.cc
@ -4,7 +4,7 @@

 #include "BLI_math_vector_types.hh"

-#include "GPU_shader.h"
+#include "GPU_shader.hh"

 #include "COM_context.hh"
 #include "COM_conversion_operation.hh"
--- a/source/blender/compositor/realtime_compositor/intern/node_operation.cc
+++ b/source/blender/compositor/realtime_compositor/intern/node_operation.cc
@ -12,8 +12,8 @@
 #include "BLI_string_ref.hh"
 #include "BLI_vector.hh"

-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"

 #include "DNA_node_types.h"

--- a/source/blender/compositor/realtime_compositor/intern/reduce_to_single_value_operation.cc
+++ b/source/blender/compositor/realtime_compositor/intern/reduce_to_single_value_operation.cc
@ -4,8 +4,8 @@

 #include "BLI_assert.h"

-#include "GPU_state.h"
-#include "GPU_texture.h"
+#include "GPU_state.hh"
+#include "GPU_texture.hh"

 #include "MEM_guardedalloc.h"

--- a/source/blender/compositor/realtime_compositor/intern/result.cc
+++ b/source/blender/compositor/realtime_compositor/intern/result.cc
@ -6,9 +6,9 @@
 #include "BLI_math_matrix_types.hh"
 #include "BLI_math_vector_types.hh"

-#include "GPU_shader.h"
-#include "GPU_state.h"
-#include "GPU_texture.h"
+#include "GPU_shader.hh"
+#include "GPU_state.hh"
+#include "GPU_texture.hh"

 #include "COM_domain.hh"
 #include "COM_result.hh"
--- a/source/blender/compositor/realtime_compositor/intern/shader_operation.cc
+++ b/source/blender/compositor/realtime_compositor/intern/shader_operation.cc
@ -13,10 +13,10 @@

 #include "DNA_customdata_types.h"

-#include "GPU_context.h"
+#include "GPU_context.hh"
 #include "GPU_material.hh"
-#include "GPU_shader.h"
-#include "GPU_texture.h"
+#include "GPU_shader.hh"
+#include "GPU_texture.hh"
 #include "GPU_uniform_buffer.hh"

 #include "gpu_shader_create_info.hh"
--- a/source/blender/compositor/realtime_compositor/intern/texture_pool.cc
+++ b/source/blender/compositor/realtime_compositor/intern/texture_pool.cc
@ -9,7 +9,7 @@
 #include "BLI_math_vector_types.hh"
 #include "BLI_vector.hh"

-#include "GPU_texture.h"
+#include "GPU_texture.hh"

 #include "COM_texture_pool.hh"

--- a/source/blender/compositor/realtime_compositor/intern/utilities.cc
+++ b/source/blender/compositor/realtime_compositor/intern/utilities.cc
@ -19,8 +19,8 @@
 #include "NOD_derived_node_tree.hh"
 #include "NOD_node_declaration.hh"

-#include "GPU_compute.h"
-#include "GPU_shader.h"
+#include "GPU_compute.hh"
+#include "GPU_shader.hh"

 #include "COM_operation.hh"
 #include "COM_result.hh"
--- a/source/blender/draw/engines/basic/basic_engine.cc
+++ b/source/blender/draw/engines/basic/basic_engine.cc
@ -21,7 +21,7 @@

 #include "DNA_particle_types.h"

-#include "GPU_shader.h"
+#include "GPU_shader.hh"

 #include "basic_engine.h"
 #include "basic_private.h"
--- a/source/blender/draw/engines/basic/basic_shader.cc
+++ b/source/blender/draw/engines/basic/basic_shader.cc
@ -8,7 +8,7 @@

 #include "DRW_render.hh"

-#include "GPU_shader.h"
+#include "GPU_shader.hh"

 #include "basic_private.h"

--- a/source/blender/draw/engines/compositor/compositor_engine.cc
+++ b/source/blender/draw/engines/compositor/compositor_engine.cc
@ -30,8 +30,8 @@
 #include "COM_result.hh"
 #include "COM_texture_pool.hh"

-#include "GPU_context.h"
-#include "GPU_texture.h"
+#include "GPU_context.hh"
+#include "GPU_texture.hh"

 #include "compositor_engine.h" /* Own include. */

--- a/source/blender/draw/engines/eevee/eevee_bloom.cc
+++ b/source/blender/draw/engines/eevee/eevee_bloom.cc
@ -10,7 +10,7 @@

 #include "DRW_render.hh"

-#include "GPU_texture.h"
+#include "GPU_texture.hh"

 #include "DEG_depsgraph_query.hh"

--- a/source/blender/draw/engines/eevee/eevee_cryptomatte.cc
+++ b/source/blender/draw/engines/eevee/eevee_cryptomatte.cc
@ -33,7 +33,7 @@

 #include "BKE_cryptomatte.h"

-#include "GPU_batch.h"
+#include "GPU_batch.hh"

 #include "RE_pipeline.h"

--- a/source/blender/draw/engines/eevee/eevee_data.cc
+++ b/source/blender/draw/engines/eevee/eevee_data.cc
@ -19,7 +19,7 @@

 #include "DEG_depsgraph_query.hh"

-#include "GPU_vertex_buffer.h"
+#include "GPU_vertex_buffer.hh"

 #include "eevee_lightcache.h"
 #include "eevee_private.h"
--- a/source/blender/draw/engines/eevee/eevee_depth_of_field.cc
+++ b/source/blender/draw/engines/eevee/eevee_depth_of_field.cc
@ -29,8 +29,8 @@
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"

-#include "GPU_framebuffer.h"
-#include "GPU_texture.h"
+#include "GPU_framebuffer.hh"
+#include "GPU_texture.hh"
 #include "eevee_private.h"

 #define CAMERA_JITTER_RING_DENSITY 6
--- a/source/blender/draw/engines/eevee/eevee_effects.cc
+++ b/source/blender/draw/engines/eevee/eevee_effects.cc
@ -12,10 +12,10 @@

 #include "BKE_global.hh" /* for G.debug_value */

-#include "GPU_capabilities.h"
-#include "GPU_platform.h"
-#include "GPU_state.h"
-#include "GPU_texture.h"
+#include "GPU_capabilities.hh"
+#include "GPU_platform.hh"
+#include "GPU_state.hh"
+#include "GPU_texture.hh"
 #include "eevee_private.h"

 static struct {
--- a/source/blender/draw/engines/eevee/eevee_engine.cc
+++ b/source/blender/draw/engines/eevee/eevee_engine.cc
@ -20,7 +20,7 @@

 #include "DNA_world_types.h"

-#include "GPU_context.h"
+#include "GPU_context.hh"

 #include "IMB_imbuf.hh"

--- a/source/blender/draw/engines/eevee/eevee_lightcache.cc
+++ b/source/blender/draw/engines/eevee/eevee_lightcache.cc
@ -27,8 +27,8 @@
 #include "eevee_lightcache.h"
 #include "eevee_private.h"

-#include "GPU_capabilities.h"
-#include "GPU_context.h"
+#include "GPU_capabilities.hh"
+#include "GPU_context.hh"

 #include "WM_api.hh"
 #include "WM_types.hh"
--- a/source/blender/draw/engines/eevee/eevee_lightprobes.cc
+++ b/source/blender/draw/engines/eevee/eevee_lightprobes.cc
@ -22,9 +22,9 @@
 #include "BKE_object.hh"
 #include "MEM_guardedalloc.h"

-#include "GPU_capabilities.h"
+#include "GPU_capabilities.hh"
 #include "GPU_material.hh"
-#include "GPU_texture.h"
+#include "GPU_texture.hh"
 #include "GPU_uniform_buffer.hh"

 #include "DEG_depsgraph_query.hh"
--- a/source/blender/draw/engines/eevee/eevee_motion_blur.cc
+++ b/source/blender/draw/engines/eevee/eevee_motion_blur.cc
@ -32,8 +32,8 @@
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"

-#include "GPU_batch.h"
-#include "GPU_texture.h"
+#include "GPU_batch.hh"
+#include "GPU_texture.hh"
 #include "eevee_private.h"

 int EEVEE_motion_blur_init(EEVEE_ViewLayerData * /*sldata*/, EEVEE_Data *vedata)
--- a/source/blender/draw/engines/eevee/eevee_occlusion.cc
+++ b/source/blender/draw/engines/eevee/eevee_occlusion.cc
@ -18,9 +18,9 @@

 #include "eevee_private.h"

-#include "GPU_capabilities.h"
-#include "GPU_platform.h"
-#include "GPU_state.h"
+#include "GPU_capabilities.hh"
+#include "GPU_platform.hh"
+#include "GPU_state.hh"

 static struct {
  GPUTexture *dummy_horizon_tx;
--- a/source/blender/draw/engines/eevee/eevee_private.h
+++ b/source/blender/draw/engines/eevee/eevee_private.h
@ -14,7 +14,7 @@

 #include "DNA_lightprobe_types.h"

-#include "GPU_viewport.h"
+#include "GPU_viewport.hh"

 #include "BKE_camera.h"

--- a/source/blender/draw/engines/eevee/eevee_render.cc
+++ b/source/blender/draw/engines/eevee/eevee_render.cc
@ -24,10 +24,10 @@

 #include "DEG_depsgraph_query.hh"

-#include "GPU_capabilities.h"
-#include "GPU_context.h"
-#include "GPU_framebuffer.h"
-#include "GPU_state.h"
+#include "GPU_capabilities.hh"
+#include "GPU_context.hh"
+#include "GPU_framebuffer.hh"
+#include "GPU_state.hh"

 #include "RE_pipeline.h"

--- a/source/blender/draw/engines/eevee/eevee_screen_raytrace.cc
+++ b/source/blender/draw/engines/eevee/eevee_screen_raytrace.cc
@ -15,8 +15,8 @@

 #include "DEG_depsgraph_query.hh"

-#include "GPU_platform.h"
-#include "GPU_texture.h"
+#include "GPU_platform.hh"
+#include "GPU_texture.hh"
 #include "eevee_private.h"

 int EEVEE_screen_raytrace_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
--- a/source/blender/draw/engines/eevee/eevee_shaders.cc
+++ b/source/blender/draw/engines/eevee/eevee_shaders.cc
@ -18,10 +18,10 @@

 #include "MEM_guardedalloc.h"

-#include "GPU_capabilities.h"
-#include "GPU_context.h"
+#include "GPU_capabilities.hh"
+#include "GPU_context.hh"
 #include "GPU_material.hh"
-#include "GPU_shader.h"
+#include "GPU_shader.hh"

 #include "NOD_shader.h"

--- a/source/blender/draw/engines/eevee/eevee_shaders_extra.cc
+++ b/source/blender/draw/engines/eevee/eevee_shaders_extra.cc
@ -8,7 +8,7 @@
 * This file is only there to handle ShaderCreateInfos.
 */

-#include "GPU_shader.h"
+#include "GPU_shader.hh"

 #include "BLI_string_ref.hh"

--- a/source/blender/draw/engines/eevee/eevee_subsurface.cc
+++ b/source/blender/draw/engines/eevee/eevee_subsurface.cc
@ -14,9 +14,9 @@

 #include "DEG_depsgraph_query.hh"

-#include "GPU_capabilities.h"
+#include "GPU_capabilities.hh"
 #include "GPU_material.hh"
-#include "GPU_texture.h"
+#include "GPU_texture.hh"

 #include "eevee_private.h"

--- a/source/blender/draw/engines/eevee/eevee_temporal_sampling.cc
+++ b/source/blender/draw/engines/eevee/eevee_temporal_sampling.cc
@ -16,7 +16,7 @@

 #include "DEG_depsgraph_query.hh"

-#include "GPU_texture.h"
+#include "GPU_texture.hh"
 #include "eevee_private.h"

 #define FILTER_CDF_TABLE_SIZE 512
--- a/source/blender/draw/engines/eevee/eevee_volumes.cc
+++ b/source/blender/draw/engines/eevee/eevee_volumes.cc
@ -30,10 +30,10 @@

 #include "DEG_depsgraph_query.hh"

-#include "GPU_capabilities.h"
-#include "GPU_context.h"
+#include "GPU_capabilities.hh"
+#include "GPU_context.hh"
 #include "GPU_material.hh"
-#include "GPU_texture.h"
+#include "GPU_texture.hh"
 #include "eevee_private.h"

 static struct {
--- a/source/blender/draw/engines/eevee_next/eevee_ambient_occlusion.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_ambient_occlusion.cc
@ -26,7 +26,7 @@
 #include "eevee_ambient_occlusion.hh"
 #include "eevee_instance.hh"

-#include "GPU_capabilities.h"
+#include "GPU_capabilities.hh"

 namespace blender::eevee {

--- a/source/blender/draw/engines/eevee_next/eevee_depth_of_field.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_depth_of_field.cc
@ -22,8 +22,8 @@
 #include "BKE_camera.h"
 #include "DNA_camera_types.h"

-#include "GPU_platform.h"
-#include "GPU_texture.h"
+#include "GPU_platform.hh"
+#include "GPU_texture.hh"
 #include "GPU_uniform_buffer.hh"

 #include "eevee_camera.hh"
--- a/source/blender/draw/engines/eevee_next/eevee_engine.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_engine.cc
@ -5,8 +5,8 @@
 #include "BKE_global.hh"
 #include "BLI_rect.h"

-#include "GPU_capabilities.h"
-#include "GPU_framebuffer.h"
+#include "GPU_capabilities.hh"
+#include "GPU_framebuffer.hh"

 #include "ED_screen.hh"
 #include "ED_view3d.hh"
--- a/source/blender/draw/engines/eevee_next/eevee_film.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_film.cc
@ -15,8 +15,8 @@
 #include "BLI_hash.h"
 #include "BLI_rect.h"

-#include "GPU_framebuffer.h"
-#include "GPU_texture.h"
+#include "GPU_framebuffer.hh"
+#include "GPU_texture.hh"

 #include "DRW_render.hh"
 #include "RE_pipeline.h"
--- a/source/blender/draw/engines/eevee_next/eevee_gbuffer.hh
+++ b/source/blender/draw/engines/eevee_next/eevee_gbuffer.hh
@ -11,7 +11,7 @@
 #pragma once

 #include "DRW_render.hh"
-#include "GPU_capabilities.h"
+#include "GPU_capabilities.hh"

 #include "eevee_material.hh"
 #include "eevee_shader_shared.hh"
--- a/source/blender/draw/engines/eevee_next/eevee_irradiance_cache.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_irradiance_cache.cc
@ -6,8 +6,8 @@

 #include "BKE_lightprobe.h"

-#include "GPU_capabilities.h"
-#include "GPU_debug.h"
+#include "GPU_capabilities.hh"
+#include "GPU_debug.hh"

 #include "BLI_math_rotation.hh"

--- a/source/blender/draw/engines/eevee_next/eevee_lightcache.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_lightcache.cc
@ -23,8 +23,8 @@
 #include "DEG_depsgraph_build.hh"
 #include "DEG_depsgraph_query.hh"

-#include "GPU_capabilities.h"
-#include "GPU_context.h"
+#include "GPU_capabilities.hh"
+#include "GPU_context.hh"

 #include "WM_api.hh"
 #include "WM_types.hh"
--- a/source/blender/draw/engines/eevee_next/eevee_renderbuffers.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_renderbuffers.cc
@ -14,8 +14,8 @@

 #include "BLI_rect.h"

-#include "GPU_framebuffer.h"
-#include "GPU_texture.h"
+#include "GPU_framebuffer.hh"
+#include "GPU_texture.hh"

 #include "DRW_render.hh"

--- a/source/blender/draw/engines/eevee_next/eevee_shader.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_shader.cc
@ -9,7 +9,7 @@
 * and static shader usage.
 */

-#include "GPU_capabilities.h"
+#include "GPU_capabilities.hh"

 #include "gpu_shader_create_info.hh"

--- a/source/blender/draw/engines/eevee_next/eevee_shader.hh
+++ b/source/blender/draw/engines/eevee_next/eevee_shader.hh
@ -17,7 +17,7 @@
 #include "BLI_string_ref.hh"
 #include "DRW_render.hh"
 #include "GPU_material.hh"
-#include "GPU_shader.h"
+#include "GPU_shader.hh"

 #include "eevee_material.hh"
 #include "eevee_sync.hh"
--- a/source/blender/draw/engines/eevee_next/eevee_shader_shared.hh
+++ b/source/blender/draw/engines/eevee_next/eevee_shader_shared.hh
@ -19,7 +19,7 @@

 #  include "eevee_defines.hh"

-#  include "GPU_shader_shared.h"
+#  include "GPU_shader_shared.hh"

 namespace blender::eevee {

--- a/Show more
+++ b/Show more