From 8b514bccd162ed87a4024aa0a8d179f0980975f7 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Sat, 23 Mar 2024 01:24:18 +0100 Subject: [PATCH] Cleanup: Move remaining GPU headers to C++ Pull Request: https://projects.blender.org/blender/blender/pulls/119807 --- intern/cycles/blender/display_driver.cpp | 10 +-- intern/cycles/blender/python.cpp | 2 +- intern/ghost/test/multitest/MultiTest.c | 6 +- intern/opencolorio/ocio_impl_glsl.cc | 4 +- intern/opencolorio/ocio_shader_shared.hh | 2 +- release/datafiles/userdef/userdef_default.c | 2 +- source/blender/blenfont/intern/blf.cc | 4 +- source/blender/blenfont/intern/blf_font.cc | 4 +- source/blender/blenfont/intern/blf_glyph.cc | 2 +- .../blenfont/intern/blf_internal_types.hh | 4 +- .../blenkernel/intern/anim_visualization.cc | 2 +- source/blender/blenkernel/intern/image.cc | 2 +- source/blender/blenkernel/intern/image_gpu.cc | 6 +- source/blender/blenkernel/intern/movieclip.cc | 2 +- .../blenkernel/intern/preview_image.cc | 2 +- .../blender/blenkernel/intern/studiolight.cc | 2 +- .../blenkernel/intern/subdiv_modifier.cc | 4 +- .../blenloader/intern/versioning_userdef.cc | 2 +- .../realtime_compositor/COM_context.hh | 4 +- .../COM_conversion_operation.hh | 2 +- .../COM_realize_on_domain_operation.hh | 2 +- .../realtime_compositor/COM_result.hh | 4 +- .../COM_shader_operation.hh | 2 +- .../realtime_compositor/COM_texture_pool.hh | 2 +- .../realtime_compositor/COM_utilities.hh | 2 +- .../COM_algorithm_parallel_reduction.hh | 2 +- .../algorithms/intern/jump_flooding.cc | 2 +- .../algorithms/intern/morphological_blur.cc | 2 +- .../intern/morphological_distance.cc | 4 +- .../intern/morphological_distance_feather.cc | 4 +- .../algorithms/intern/parallel_reduction.cc | 6 +- .../algorithms/intern/realize_on_domain.cc | 6 +- .../algorithms/intern/smaa.cc | 4 +- .../algorithms/intern/summed_area_table.cc | 6 +- .../intern/symmetric_separable_blur.cc | 4 +- .../symmetric_separable_blur_variable_size.cc | 4 +- .../algorithms/intern/transform.cc | 6 +- .../cached_resources/COM_bokeh_kernel.hh | 4 +- .../cached_resources/COM_cached_image.hh | 2 +- .../cached_resources/COM_cached_mask.hh | 2 +- .../cached_resources/COM_cached_shader.hh | 2 +- .../cached_resources/COM_cached_texture.hh | 2 +- .../cached_resources/COM_distortion_grid.hh | 4 +- .../cached_resources/COM_keying_screen.hh | 4 +- ..._morphological_distance_feather_weights.hh | 4 +- .../COM_smaa_precomputed_textures.hh | 4 +- .../COM_symmetric_blur_weights.hh | 4 +- .../COM_symmetric_separable_blur_weights.hh | 4 +- .../cached_resources/intern/bokeh_kernel.cc | 4 +- .../cached_resources/intern/cached_image.cc | 4 +- .../cached_resources/intern/cached_mask.cc | 2 +- .../cached_resources/intern/cached_shader.cc | 4 +- .../cached_resources/intern/cached_texture.cc | 2 +- .../intern/distortion_grid.cc | 2 +- .../cached_resources/intern/keying_screen.cc | 6 +- .../morphological_distance_feather_weights.cc | 4 +- .../ocio_color_space_conversion_shader.cc | 6 +- .../intern/smaa_precomputed_textures.cc | 4 +- .../intern/symmetric_blur_weights.cc | 4 +- .../symmetric_separable_blur_weights.cc | 4 +- .../realtime_compositor/intern/context.cc | 2 +- .../intern/conversion_operation.cc | 2 +- .../intern/node_operation.cc | 4 +- .../reduce_to_single_value_operation.cc | 4 +- .../realtime_compositor/intern/result.cc | 6 +- .../intern/shader_operation.cc | 6 +- .../intern/texture_pool.cc | 2 +- .../realtime_compositor/intern/utilities.cc | 4 +- .../draw/engines/basic/basic_engine.cc | 2 +- .../draw/engines/basic/basic_shader.cc | 2 +- .../engines/compositor/compositor_engine.cc | 4 +- .../blender/draw/engines/eevee/eevee_bloom.cc | 2 +- .../draw/engines/eevee/eevee_cryptomatte.cc | 2 +- .../blender/draw/engines/eevee/eevee_data.cc | 2 +- .../engines/eevee/eevee_depth_of_field.cc | 4 +- .../draw/engines/eevee/eevee_effects.cc | 8 +- .../draw/engines/eevee/eevee_engine.cc | 2 +- .../draw/engines/eevee/eevee_lightcache.cc | 4 +- .../draw/engines/eevee/eevee_lightprobes.cc | 4 +- .../draw/engines/eevee/eevee_motion_blur.cc | 4 +- .../draw/engines/eevee/eevee_occlusion.cc | 6 +- .../draw/engines/eevee/eevee_private.h | 2 +- .../draw/engines/eevee/eevee_render.cc | 8 +- .../engines/eevee/eevee_screen_raytrace.cc | 4 +- .../draw/engines/eevee/eevee_shaders.cc | 6 +- .../draw/engines/eevee/eevee_shaders_extra.cc | 2 +- .../draw/engines/eevee/eevee_subsurface.cc | 4 +- .../engines/eevee/eevee_temporal_sampling.cc | 2 +- .../draw/engines/eevee/eevee_volumes.cc | 6 +- .../eevee_next/eevee_ambient_occlusion.cc | 2 +- .../eevee_next/eevee_depth_of_field.cc | 4 +- .../draw/engines/eevee_next/eevee_engine.cc | 4 +- .../draw/engines/eevee_next/eevee_film.cc | 4 +- .../draw/engines/eevee_next/eevee_gbuffer.hh | 2 +- .../eevee_next/eevee_irradiance_cache.cc | 4 +- .../engines/eevee_next/eevee_lightcache.cc | 4 +- .../engines/eevee_next/eevee_renderbuffers.cc | 4 +- .../draw/engines/eevee_next/eevee_shader.cc | 2 +- .../draw/engines/eevee_next/eevee_shader.hh | 2 +- .../engines/eevee_next/eevee_shader_shared.hh | 2 +- .../draw/engines/eevee_next/eevee_shadow.hh | 2 +- .../draw/engines/eevee_next/eevee_volume.cc | 2 +- .../draw/engines/external/external_engine.cc | 12 +-- .../draw/engines/gpencil/gpencil_engine.h | 2 +- .../draw/engines/gpencil/gpencil_engine_c.cc | 2 +- .../engines/gpencil/gpencil_shader_shared.h | 2 +- .../draw/engines/image/image_engine.cc | 2 +- .../draw/engines/image/image_shader.cc | 2 +- .../draw/engines/image/image_texture_info.hh | 4 +- .../draw/engines/overlay/overlay_edit_uv.cc | 2 +- .../draw/engines/overlay/overlay_engine.cc | 2 +- .../engines/overlay/overlay_motion_path.cc | 2 +- .../engines/overlay/overlay_next_engine.cc | 2 +- .../draw/engines/overlay/overlay_shader.cc | 2 +- .../engines/overlay/overlay_shader_shared.h | 2 +- .../overlay/overlay_viewer_attribute.cc | 2 +- .../draw/engines/overlay/overlay_volume.cc | 2 +- .../draw/engines/overlay/overlay_wireframe.cc | 2 +- .../draw/engines/select/select_instance.cc | 2 +- .../draw/engines/select/select_instance.hh | 2 +- .../engines/select/select_shader_shared.hh | 2 +- .../engines/workbench/workbench_engine.cc | 2 +- .../engines/workbench/workbench_private.hh | 2 +- .../workbench/workbench_shader_shared.h | 2 +- .../engines/workbench/workbench_shadow.cc | 2 +- .../draw/engines/workbench/workbench_state.cc | 2 +- source/blender/draw/intern/DRW_gpu_wrapper.hh | 6 +- source/blender/draw/intern/DRW_render.hh | 10 +-- .../blender/draw/intern/attribute_convert.cc | 2 +- .../blender/draw/intern/attribute_convert.hh | 2 +- source/blender/draw/intern/draw_attributes.hh | 2 +- source/blender/draw/intern/draw_cache.cc | 6 +- .../blender/draw/intern/draw_cache_extract.hh | 2 +- .../draw/intern/draw_cache_extract_mesh.cc | 2 +- .../draw_cache_extract_mesh_render_data.cc | 2 +- .../draw/intern/draw_cache_impl_curve.cc | 6 +- .../draw/intern/draw_cache_impl_curves.cc | 6 +- .../intern/draw_cache_impl_gpencil_legacy.cc | 2 +- .../intern/draw_cache_impl_grease_pencil.cc | 2 +- .../draw/intern/draw_cache_impl_lattice.cc | 2 +- .../draw/intern/draw_cache_impl_mesh.cc | 2 +- .../draw/intern/draw_cache_impl_particles.cc | 6 +- .../draw/intern/draw_cache_impl_pointcloud.cc | 2 +- .../intern/draw_cache_impl_subdivision.cc | 10 +-- .../draw/intern/draw_cache_impl_volume.cc | 6 +- .../blender/draw/intern/draw_cache_inline.hh | 2 +- .../draw/intern/draw_color_management.cc | 8 +- source/blender/draw/intern/draw_command.cc | 8 +- .../draw/intern/draw_command_shared.hh | 2 +- source/blender/draw/intern/draw_common.cc | 6 +- .../draw/intern/draw_common_shader_shared.h | 2 +- source/blender/draw/intern/draw_curves.cc | 12 +-- .../draw/intern/draw_curves_private.hh | 2 +- source/blender/draw/intern/draw_debug.cc | 6 +- source/blender/draw/intern/draw_fluid.cc | 2 +- source/blender/draw/intern/draw_hair.cc | 14 +-- .../blender/draw/intern/draw_instance_data.h | 2 +- source/blender/draw/intern/draw_manager.cc | 2 +- source/blender/draw/intern/draw_manager.h | 12 +-- source/blender/draw/intern/draw_manager_c.cc | 18 ++-- .../blender/draw/intern/draw_manager_data.cc | 4 +- .../blender/draw/intern/draw_manager_exec.cc | 8 +- .../draw/intern/draw_manager_profiling.cc | 4 +- .../draw/intern/draw_manager_shader.cc | 4 +- .../draw/intern/draw_manager_testing.h | 2 +- .../blender/draw/intern/draw_manager_text.cc | 4 +- source/blender/draw/intern/draw_pass.hh | 4 +- source/blender/draw/intern/draw_pbvh.cc | 4 +- source/blender/draw/intern/draw_pointcloud.cc | 12 +-- source/blender/draw/intern/draw_shader.cc | 6 +- .../blender/draw/intern/draw_shader_shared.h | 4 +- .../blender/draw/intern/draw_texture_pool.h | 2 +- source/blender/draw/intern/draw_view.cc | 4 +- source/blender/draw/intern/draw_view_c.cc | 8 +- source/blender/draw/intern/draw_view_data.cc | 4 +- .../intern/mesh_extractors/extract_mesh.hh | 4 +- .../extract_mesh_ibo_edituv.cc | 2 +- .../mesh_extractors/extract_mesh_ibo_fdots.cc | 2 +- .../mesh_extractors/extract_mesh_ibo_lines.cc | 2 +- .../extract_mesh_ibo_lines_adjacency.cc | 2 +- .../extract_mesh_ibo_lines_paint_mask.cc | 2 +- .../extract_mesh_ibo_points.cc | 2 +- .../mesh_extractors/extract_mesh_ibo_tris.cc | 2 +- .../extract_mesh_vbo_attributes.cc | 2 +- .../extract_mesh_vbo_edge_fac.cc | 2 +- .../extract_mesh_vbo_fdots_pos.cc | 2 +- source/blender/draw/tests/draw_testing.cc | 2 +- source/blender/draw/tests/eevee_test.cc | 2 +- .../animation/anim_channels_defines.cc | 4 +- source/blender/editors/animation/anim_draw.cc | 4 +- .../blender/editors/animation/anim_markers.cc | 6 +- .../editors/animation/anim_motion_paths.cc | 4 +- .../editors/animation/keyframes_draw.cc | 6 +- .../editors/animation/time_scrub_ui.cc | 6 +- .../blender/editors/curve/editcurve_paint.cc | 12 +-- .../editors/curves/intern/curves_draw.cc | 10 +-- .../editors/gizmo_library/gizmo_draw_utils.cc | 4 +- .../gizmo_library/gizmo_library_presets.cc | 2 +- .../gizmo_types/arrow3d_gizmo.cc | 8 +- .../gizmo_types/button2d_gizmo.cc | 12 +-- .../gizmo_library/gizmo_types/cage2d_gizmo.cc | 10 +-- .../gizmo_library/gizmo_types/cage3d_gizmo.cc | 10 +-- .../gizmo_library/gizmo_types/dial3d_gizmo.cc | 8 +- .../gizmo_library/gizmo_types/move3d_gizmo.cc | 8 +- .../gizmo_types/primitive3d_gizmo.cc | 6 +- .../editors/gpencil_legacy/annotate_draw.cc | 6 +- .../editors/gpencil_legacy/annotate_paint.cc | 6 +- .../editors/gpencil_legacy/drawgpencil.cc | 10 +-- .../editors/gpencil_legacy/gpencil_fill.cc | 8 +- .../editors/gpencil_legacy/gpencil_paint.cc | 6 +- .../editors/gpencil_legacy/gpencil_utils.cc | 6 +- source/blender/editors/include/BIF_glutil.hh | 4 +- source/blender/editors/interface/interface.cc | 4 +- .../interface/interface_button_sections.cc | 2 +- .../editors/interface/interface_draw.cc | 14 +-- .../editors/interface/interface_icons.cc | 14 +-- .../interface/interface_icons_event.cc | 2 +- .../editors/interface/interface_panel.cc | 8 +- .../editors/interface/interface_region_hud.cc | 2 +- .../interface/interface_region_search.cc | 2 +- .../interface/interface_region_tooltip.cc | 6 +- .../editors/interface/interface_widgets.cc | 14 +-- source/blender/editors/interface/resources.cc | 2 +- source/blender/editors/interface/view2d.cc | 6 +- .../blender/editors/interface/view2d_draw.cc | 6 +- .../editors/interface/views/tree_view.cc | 2 +- source/blender/editors/mask/mask_draw.cc | 8 +- source/blender/editors/mesh/editmesh_knife.cc | 6 +- .../mesh/editmesh_preselect_edgering.cc | 6 +- .../editors/mesh/editmesh_preselect_elem.cc | 6 +- .../blender/editors/object/object_remesh.cc | 6 +- .../blender/editors/physics/particle_edit.cc | 6 +- .../blender/editors/render/render_opengl.cc | 6 +- .../blender/editors/render/render_preview.cc | 2 +- source/blender/editors/screen/area.cc | 10 +-- source/blender/editors/screen/glutil.cc | 8 +- source/blender/editors/screen/screen_draw.cc | 8 +- source/blender/editors/screen/screen_ops.cc | 2 +- .../editors/sculpt_paint/curves_sculpt_ops.cc | 8 +- .../editors/sculpt_paint/paint_cursor.cc | 10 +-- .../sculpt_paint/paint_image_ops_paint.cc | 4 +- .../editors/sculpt_paint/paint_image_proj.cc | 4 +- .../editors/sculpt_paint/paint_stroke.cc | 4 +- .../editors/sculpt_paint/paint_utils.cc | 4 +- .../editors/sculpt_paint/sculpt_boundary.cc | 4 +- .../editors/sculpt_paint/sculpt_cloth.cc | 8 +- .../editors/sculpt_paint/sculpt_detail.cc | 8 +- .../sculpt_paint/sculpt_multiplane_scrape.cc | 4 +- .../editors/space_action/action_draw.cc | 6 +- .../editors/space_action/space_action.cc | 2 +- .../blender/editors/space_api/spacetypes.cc | 2 +- .../editors/space_clip/clip_dopesheet_draw.cc | 4 +- .../blender/editors/space_clip/clip_draw.cc | 8 +- .../editors/space_clip/clip_graph_draw.cc | 8 +- .../blender/editors/space_clip/clip_utils.cc | 4 +- .../blender/editors/space_clip/space_clip.cc | 2 +- .../editors/space_console/console_draw.cc | 2 +- .../blender/editors/space_file/file_draw.cc | 6 +- .../blender/editors/space_graph/graph_draw.cc | 6 +- .../editors/space_graph/space_graph.cc | 4 +- .../blender/editors/space_image/image_draw.cc | 10 +-- .../blender/editors/space_info/info_stats.cc | 2 +- source/blender/editors/space_info/textview.cc | 4 +- source/blender/editors/space_nla/nla_draw.cc | 6 +- source/blender/editors/space_node/drawnode.cc | 16 ++-- .../blender/editors/space_node/node_draw.cc | 14 +-- .../blender/editors/space_node/node_edit.cc | 2 +- .../editors/space_outliner/outliner_draw.cc | 4 +- .../sequencer_channels_draw.cc | 4 +- .../space_sequencer/sequencer_drag_drop.cc | 4 +- .../space_sequencer/sequencer_preview_draw.cc | 10 +-- .../space_sequencer/sequencer_quads_batch.cc | 6 +- .../sequencer_retiming_draw.cc | 6 +- .../sequencer_timeline_draw.cc | 4 +- .../space_sequencer/space_sequencer.cc | 2 +- .../space_spreadsheet/spreadsheet_draw.cc | 2 +- .../blender/editors/space_text/text_draw.cc | 4 +- .../editors/space_view3d/space_view3d.cc | 2 +- .../space_view3d/view3d_cursor_snap.cc | 4 +- .../editors/space_view3d/view3d_draw.cc | 14 +-- .../view3d_gizmo_navigate_type.cc | 8 +- .../space_view3d/view3d_gizmo_ruler.cc | 8 +- .../space_view3d/view3d_navigate_fly.cc | 2 +- .../space_view3d/view3d_navigate_walk.cc | 2 +- .../editors/space_view3d/view3d_placement.cc | 2 +- .../editors/space_view3d/view3d_project.cc | 2 +- .../editors/space_view3d/view3d_select.cc | 2 +- .../editors/space_view3d/view3d_utils.cc | 2 +- .../editors/space_view3d/view3d_view.cc | 4 +- source/blender/editors/transform/transform.cc | 2 +- .../transform/transform_constraints.cc | 6 +- .../transform/transform_draw_cursors.cc | 6 +- .../transform/transform_mode_edge_slide.cc | 4 +- .../transform/transform_mode_vert_slide.cc | 4 +- .../editors/transform/transform_snap.cc | 6 +- source/blender/editors/util/ed_draw.cc | 6 +- source/blender/editors/util/ed_util.cc | 2 +- source/blender/editors/util/ed_util_imbuf.cc | 4 +- source/blender/editors/uvedit/uvedit_draw.cc | 4 +- .../editors/uvedit/uvedit_smart_stitch.cc | 4 +- source/blender/gpu/CMakeLists.txt | 74 ++++++++-------- .../blender/gpu/{GPU_batch.h => GPU_batch.hh} | 44 ++++------ source/blender/gpu/GPU_batch_presets.h | 44 ---------- source/blender/gpu/GPU_batch_presets.hh | 38 ++++++++ .../{GPU_batch_utils.h => GPU_batch_utils.hh} | 21 ++--- source/blender/gpu/GPU_capabilities.h | 74 ---------------- source/blender/gpu/GPU_capabilities.hh | 66 ++++++++++++++ .../gpu/{GPU_common.h => GPU_common.hh} | 0 ...GPU_common_types.h => GPU_common_types.hh} | 24 ++--- .../gpu/{GPU_compute.h => GPU_compute.hh} | 16 +--- .../gpu/{GPU_context.h => GPU_context.hh} | 40 ++++----- .../blender/gpu/{GPU_debug.h => GPU_debug.hh} | 16 +--- .../gpu/{GPU_drawlist.h => GPU_drawlist.hh} | 10 +-- .../{GPU_framebuffer.h => GPU_framebuffer.hh} | 62 ++++++------- .../gpu/{GPU_immediate.h => GPU_immediate.hh} | 26 ++---- ...immediate_util.h => GPU_immediate_util.hh} | 7 -- ...GPU_index_buffer.h => GPU_index_buffer.hh} | 22 ++--- .../gpu/{GPU_init_exit.h => GPU_init_exit.hh} | 14 +-- source/blender/gpu/GPU_material.hh | 6 +- .../gpu/{GPU_matrix.h => GPU_matrix.hh} | 32 +++---- .../gpu/{GPU_platform.h => GPU_platform.hh} | 52 ++++------- .../blender/gpu/GPU_platform_backend_enum.h | 17 ++++ .../gpu/{GPU_primitive.h => GPU_primitive.hh} | 18 ++-- .../gpu/{GPU_shader.h => GPU_shader.hh} | 38 ++++---- ...shader_builtin.h => GPU_shader_builtin.hh} | 24 ++--- ...U_shader_shared.h => GPU_shader_shared.hh} | 26 +++--- ...red_utils.h => GPU_shader_shared_utils.hh} | 0 .../blender/gpu/{GPU_state.h => GPU_state.hh} | 78 ++++++++-------- ...storage_buffer.h => GPU_storage_buffer.hh} | 18 ++-- .../gpu/{GPU_texture.h => GPU_texture.hh} | 62 ++++++------- source/blender/gpu/GPU_uniform_buffer.hh | 4 +- ...U_vertex_buffer.h => GPU_vertex_buffer.hh} | 36 +++----- ...U_vertex_format.h => GPU_vertex_format.hh} | 40 ++++----- .../gpu/{GPU_viewport.h => GPU_viewport.hh} | 28 +++--- source/blender/gpu/intern/gpu_backend.hh | 2 +- source/blender/gpu/intern/gpu_batch.cc | 8 +- .../blender/gpu/intern/gpu_batch_presets.cc | 4 +- .../blender/gpu/intern/gpu_batch_private.hh | 4 +- source/blender/gpu/intern/gpu_batch_utils.cc | 4 +- source/blender/gpu/intern/gpu_capabilities.cc | 2 +- .../gpu/intern/gpu_capabilities_private.hh | 2 +- source/blender/gpu/intern/gpu_codegen.cc | 14 +-- .../intern/{gpu_codegen.h => gpu_codegen.hh} | 18 ++-- source/blender/gpu/intern/gpu_compute.cc | 2 +- source/blender/gpu/intern/gpu_context.cc | 8 +- .../blender/gpu/intern/gpu_context_private.hh | 2 +- source/blender/gpu/intern/gpu_debug.cc | 2 +- source/blender/gpu/intern/gpu_drawlist.cc | 2 +- .../gpu/intern/gpu_drawlist_private.hh | 2 +- source/blender/gpu/intern/gpu_framebuffer.cc | 8 +- .../gpu/intern/gpu_framebuffer_private.hh | 2 +- source/blender/gpu/intern/gpu_immediate.cc | 8 +- .../gpu/intern/gpu_immediate_private.hh | 8 +- .../blender/gpu/intern/gpu_immediate_util.cc | 2 +- source/blender/gpu/intern/gpu_index_buffer.cc | 6 +- .../gpu/intern/gpu_index_buffer_private.hh | 2 +- source/blender/gpu/intern/gpu_init_exit.cc | 10 +-- source/blender/gpu/intern/gpu_material.cc | 8 +- ...rial_library.h => gpu_material_library.hh} | 18 ++-- source/blender/gpu/intern/gpu_matrix.cc | 4 +- ...matrix_private.h => gpu_matrix_private.hh} | 10 +-- source/blender/gpu/intern/gpu_node_graph.cc | 8 +- .../{gpu_node_graph.h => gpu_node_graph.hh} | 88 +++++++++---------- source/blender/gpu/intern/gpu_platform.cc | 2 +- .../gpu/intern/gpu_platform_private.hh | 2 +- source/blender/gpu/intern/gpu_private.h | 26 ------ source/blender/gpu/intern/gpu_private.hh | 13 +++ source/blender/gpu/intern/gpu_select.cc | 2 +- source/blender/gpu/intern/gpu_select_next.cc | 2 +- source/blender/gpu/intern/gpu_select_pick.cc | 8 +- ...select_private.h => gpu_select_private.hh} | 26 ++---- .../gpu/intern/gpu_select_sample_query.cc | 8 +- source/blender/gpu/intern/gpu_shader.cc | 12 +-- .../blender/gpu/intern/gpu_shader_builder.cc | 4 +- .../blender/gpu/intern/gpu_shader_builtin.cc | 4 +- .../gpu/intern/gpu_shader_create_info.cc | 12 +-- .../gpu/intern/gpu_shader_create_info.hh | 2 +- .../intern/gpu_shader_create_info_private.hh | 10 +-- .../gpu/intern/gpu_shader_dependency.cc | 6 +- ...ate.h => gpu_shader_dependency_private.hh} | 22 ++--- .../gpu/intern/gpu_shader_interface.hh | 4 +- source/blender/gpu/intern/gpu_shader_log.cc | 2 +- .../blender/gpu/intern/gpu_shader_private.hh | 4 +- source/blender/gpu/intern/gpu_state.cc | 2 +- .../blender/gpu/intern/gpu_state_private.hh | 2 +- .../blender/gpu/intern/gpu_storage_buffer.cc | 4 +- source/blender/gpu/intern/gpu_texture.cc | 4 +- .../blender/gpu/intern/gpu_texture_private.hh | 2 +- .../blender/gpu/intern/gpu_uniform_buffer.cc | 4 +- .../blender/gpu/intern/gpu_vertex_buffer.cc | 2 +- .../gpu/intern/gpu_vertex_buffer_private.hh | 2 +- .../blender/gpu/intern/gpu_vertex_format.cc | 6 +- .../gpu/intern/gpu_vertex_format_private.h | 26 ------ .../gpu/intern/gpu_vertex_format_private.hh | 18 ++++ source/blender/gpu/intern/gpu_viewport.cc | 12 +-- source/blender/gpu/metal/mtl_batch.mm | 2 +- source/blender/gpu/metal/mtl_context.hh | 6 +- source/blender/gpu/metal/mtl_context.mm | 14 +-- source/blender/gpu/metal/mtl_debug.mm | 4 +- source/blender/gpu/metal/mtl_drawlist.hh | 2 +- source/blender/gpu/metal/mtl_drawlist.mm | 2 +- source/blender/gpu/metal/mtl_framebuffer.hh | 2 +- source/blender/gpu/metal/mtl_immediate.mm | 4 +- source/blender/gpu/metal/mtl_primitive.hh | 2 +- .../gpu/metal/mtl_pso_descriptor_state.hh | 2 +- source/blender/gpu/metal/mtl_shader.hh | 8 +- source/blender/gpu/metal/mtl_shader.mm | 6 +- .../blender/gpu/metal/mtl_shader_generator.mm | 6 +- .../blender/gpu/metal/mtl_shader_interface.hh | 6 +- .../blender/gpu/metal/mtl_shader_interface.mm | 2 +- source/blender/gpu/metal/mtl_shader_log.mm | 2 +- source/blender/gpu/metal/mtl_state.hh | 2 +- source/blender/gpu/metal/mtl_state.mm | 2 +- .../blender/gpu/metal/mtl_storage_buffer.mm | 2 +- source/blender/gpu/metal/mtl_texture.hh | 2 +- source/blender/gpu/metal/mtl_texture.mm | 14 +-- source/blender/gpu/metal/mtl_texture_util.mm | 12 +-- source/blender/gpu/metal/mtl_vertex_buffer.hh | 2 +- source/blender/gpu/opengl/gl_context.cc | 2 +- source/blender/gpu/opengl/gl_context.hh | 2 +- source/blender/gpu/opengl/gl_debug.cc | 4 +- source/blender/gpu/opengl/gl_drawlist.cc | 2 +- source/blender/gpu/opengl/gl_drawlist.hh | 2 +- source/blender/gpu/opengl/gl_immediate.cc | 2 +- source/blender/gpu/opengl/gl_primitive.hh | 2 +- source/blender/gpu/opengl/gl_shader.cc | 6 +- .../blender/gpu/opengl/gl_shader_interface.cc | 2 +- source/blender/gpu/opengl/gl_shader_log.cc | 2 +- source/blender/gpu/opengl/gl_state.cc | 2 +- .../blender/gpu/opengl/gl_storage_buffer.cc | 2 +- source/blender/gpu/opengl/gl_texture.cc | 6 +- source/blender/gpu/opengl/gl_vertex_array.hh | 2 +- source/blender/gpu/opengl/gl_vertex_buffer.cc | 2 +- source/blender/gpu/opengl/gl_vertex_buffer.hh | 2 +- .../gpu/shaders/infos/gpu_clip_planes_info.hh | 2 +- .../infos/gpu_shader_2D_nodelink_info.hh | 4 +- .../infos/gpu_shader_gpencil_stroke_info.hh | 2 +- .../gpu/shaders/infos/gpu_shader_icon_info.hh | 2 +- .../infos/gpu_shader_keyframe_shape_info.hh | 2 +- .../infos/gpu_shader_simple_lighting_info.hh | 2 +- .../gpu/shaders/infos/gpu_shader_test_info.hh | 2 +- .../gpu/shaders/metal/mtl_shader_defines.msl | 2 +- .../blender/gpu/tests/buffer_texture_test.cc | 8 +- source/blender/gpu/tests/compute_test.cc | 8 +- source/blender/gpu/tests/framebuffer_test.cc | 6 +- source/blender/gpu/tests/gpu_testing.cc | 6 +- source/blender/gpu/tests/gpu_testing.hh | 2 +- source/blender/gpu/tests/immediate_test.cc | 6 +- source/blender/gpu/tests/index_buffer_test.cc | 2 +- .../blender/gpu/tests/push_constants_test.cc | 8 +- source/blender/gpu/tests/shader_test.cc | 26 +++--- .../tests/specialization_constants_test.cc | 14 +-- source/blender/gpu/tests/state_blend_test.cc | 8 +- .../blender/gpu/tests/storage_buffer_test.cc | 2 +- source/blender/gpu/tests/texture_test.cc | 4 +- .../blender/gpu/tests/vertex_buffer_test.cc | 12 +-- .../blender/gpu/vulkan/vk_data_conversion.cc | 2 +- .../gpu/vulkan/vk_data_conversion_test.cc | 2 +- source/blender/gpu/vulkan/vk_device.cc | 2 +- source/blender/gpu/vulkan/vk_drawlist.cc | 2 +- source/blender/gpu/vulkan/vk_immediate.hh | 2 +- source/blender/gpu/vulkan/vk_shader.cc | 2 +- source/blender/gpu/vulkan/vk_shader_log.cc | 2 +- source/blender/gpu/vulkan/vk_state_manager.cc | 2 +- .../blender/gpu/vulkan/vk_storage_buffer.hh | 2 +- source/blender/imbuf/IMB_imbuf.hh | 2 +- source/blender/imbuf/intern/allocimbuf.cc | 2 +- .../blender/imbuf/intern/colormanagement.cc | 2 +- source/blender/imbuf/intern/util_gpu.cc | 4 +- source/blender/makesrna/intern/rna_image.cc | 2 +- source/blender/makesrna/intern/rna_render.cc | 4 +- source/blender/makesrna/intern/rna_userdef.cc | 6 +- .../blender/makesrna/intern/rna_wm_gizmo.cc | 2 +- .../nodes/node_composite_bilateralblur.cc | 2 +- .../composite/nodes/node_composite_blur.cc | 4 +- .../nodes/node_composite_bokehblur.cc | 2 +- .../nodes/node_composite_bokehimage.cc | 2 +- .../composite/nodes/node_composite_boxmask.cc | 2 +- .../nodes/node_composite_composite.cc | 4 +- .../node_composite_convert_color_space.cc | 2 +- .../nodes/node_composite_cornerpin.cc | 4 +- .../composite/nodes/node_composite_crop.cc | 4 +- .../nodes/node_composite_cryptomatte.cc | 4 +- .../composite/nodes/node_composite_denoise.cc | 4 +- .../nodes/node_composite_despeckle.cc | 2 +- .../composite/nodes/node_composite_dilate.cc | 6 +- .../nodes/node_composite_directionalblur.cc | 2 +- .../nodes/node_composite_displace.cc | 4 +- .../nodes/node_composite_ellipsemask.cc | 2 +- .../nodes/node_composite_file_output.cc | 4 +- .../composite/nodes/node_composite_flip.cc | 4 +- .../composite/nodes/node_composite_glare.cc | 6 +- .../composite/nodes/node_composite_id_mask.cc | 2 +- .../composite/nodes/node_composite_image.cc | 4 +- .../composite/nodes/node_composite_keying.cc | 4 +- .../nodes/node_composite_keyingscreen.cc | 2 +- .../nodes/node_composite_lensdist.cc | 4 +- .../composite/nodes/node_composite_map_uv.cc | 4 +- .../nodes/node_composite_movieclip.cc | 4 +- .../nodes/node_composite_moviedistortion.cc | 4 +- .../nodes/node_composite_pixelate.cc | 2 +- .../nodes/node_composite_planetrackdeform.cc | 4 +- .../composite/nodes/node_composite_split.cc | 4 +- .../nodes/node_composite_sunbeams.cc | 2 +- .../nodes/node_composite_vec_blur.cc | 8 +- .../composite/nodes/node_composite_viewer.cc | 4 +- .../nodes/node_composite_zcombine.cc | 2 +- source/blender/python/generic/bgl.cc | 4 +- source/blender/python/gpu/gpu_py.cc | 6 +- source/blender/python/gpu/gpu_py_batch.cc | 2 +- source/blender/python/gpu/gpu_py_buffer.cc | 2 +- .../blender/python/gpu/gpu_py_capabilities.cc | 2 +- source/blender/python/gpu/gpu_py_compute.cc | 6 +- source/blender/python/gpu/gpu_py_element.cc | 2 +- .../blender/python/gpu/gpu_py_framebuffer.cc | 6 +- source/blender/python/gpu/gpu_py_matrix.cc | 2 +- source/blender/python/gpu/gpu_py_offscreen.cc | 8 +- source/blender/python/gpu/gpu_py_platform.cc | 4 +- source/blender/python/gpu/gpu_py_shader.cc | 4 +- .../python/gpu/gpu_py_shader_create_info.cc | 4 +- source/blender/python/gpu/gpu_py_state.cc | 4 +- source/blender/python/gpu/gpu_py_texture.cc | 4 +- .../python/gpu/gpu_py_uniformbuffer.cc | 2 +- .../python/gpu/gpu_py_vertex_buffer.cc | 2 +- .../blender/python/gpu/gpu_py_vertex_format.h | 2 +- source/blender/python/intern/bpy.cc | 2 +- source/blender/render/hydra/engine.cc | 2 +- .../render/hydra/render_task_delegate.cc | 2 +- .../render/hydra/render_task_delegate.hh | 4 +- .../blender/render/hydra/viewport_engine.cc | 2 +- .../blender/render/hydra/viewport_engine.hh | 6 +- source/blender/render/intern/compositor.cc | 2 +- source/blender/render/intern/engine.cc | 2 +- source/blender/render/intern/pipeline.cc | 4 +- source/blender/render/intern/render_result.cc | 2 +- .../windowmanager/gizmo/intern/wm_gizmo.cc | 2 +- .../gizmo/intern/wm_gizmo_map.cc | 10 +-- .../windowmanager/intern/wm_dragdrop.cc | 6 +- .../blender/windowmanager/intern/wm_draw.cc | 20 ++--- .../windowmanager/intern/wm_event_system.cc | 2 +- .../blender/windowmanager/intern/wm_files.cc | 2 +- .../windowmanager/intern/wm_gesture.cc | 6 +- .../windowmanager/intern/wm_init_exit.cc | 4 +- .../windowmanager/intern/wm_operators.cc | 8 +- .../intern/wm_platform_support.cc | 2 +- .../windowmanager/intern/wm_playanim.cc | 14 +-- .../blender/windowmanager/intern/wm_stereo.cc | 8 +- .../windowmanager/intern/wm_subwindow.cc | 4 +- .../windowmanager/intern/wm_surface.cc | 4 +- .../blender/windowmanager/intern/wm_window.cc | 18 ++-- .../windowmanager/intern/wm_window_private.hh | 2 +- .../blender/windowmanager/xr/intern/wm_xr.cc | 2 +- .../windowmanager/xr/intern/wm_xr_draw.cc | 8 +- .../xr/intern/wm_xr_operators.cc | 2 +- .../windowmanager/xr/intern/wm_xr_session.cc | 4 +- source/creator/creator_args.cc | 2 +- 556 files changed, 1663 insertions(+), 1923 deletions(-) rename source/blender/gpu/{GPU_batch.h => GPU_batch.hh} (96%) delete mode 100644 source/blender/gpu/GPU_batch_presets.h create mode 100644 source/blender/gpu/GPU_batch_presets.hh rename source/blender/gpu/{GPU_batch_utils.h => GPU_batch_utils.hh} (60%) delete mode 100644 source/blender/gpu/GPU_capabilities.h create mode 100644 source/blender/gpu/GPU_capabilities.hh rename source/blender/gpu/{GPU_common.h => GPU_common.hh} (100%) rename source/blender/gpu/{GPU_common_types.h => GPU_common_types.hh} (89%) rename source/blender/gpu/{GPU_compute.h => GPU_compute.hh} (87%) rename source/blender/gpu/{GPU_context.h => GPU_context.hh} (80%) rename source/blender/gpu/{GPU_debug.h => GPU_debug.hh} (93%) rename source/blender/gpu/{GPU_drawlist.h => GPU_drawlist.hh} (86%) rename source/blender/gpu/{GPU_framebuffer.h => GPU_framebuffer.hh} (96%) rename source/blender/gpu/{GPU_immediate.h => GPU_immediate.hh} (93%) rename source/blender/gpu/{GPU_immediate_util.h => GPU_immediate_util.hh} (99%) rename source/blender/gpu/{GPU_index_buffer.h => GPU_index_buffer.hh} (93%) rename source/blender/gpu/{GPU_init_exit.h => GPU_init_exit.hh} (56%) rename source/blender/gpu/{GPU_matrix.h => GPU_matrix.hh} (92%) rename source/blender/gpu/{GPU_platform.h => GPU_platform.hh} (69%) create mode 100644 source/blender/gpu/GPU_platform_backend_enum.h rename source/blender/gpu/{GPU_primitive.h => GPU_primitive.hh} (94%) rename source/blender/gpu/{GPU_shader.h => GPU_shader.hh} (95%) rename source/blender/gpu/{GPU_shader_builtin.h => GPU_shader_builtin.hh} (91%) rename source/blender/gpu/{GPU_shader_shared.h => GPU_shader_shared.hh} (85%) rename source/blender/gpu/{GPU_shader_shared_utils.h => GPU_shader_shared_utils.hh} (100%) rename source/blender/gpu/{GPU_state.h => GPU_state.hh} (86%) rename source/blender/gpu/{GPU_storage_buffer.h => GPU_storage_buffer.hh} (91%) rename source/blender/gpu/{GPU_texture.h => GPU_texture.hh} (97%) rename source/blender/gpu/{GPU_vertex_buffer.h => GPU_vertex_buffer.hh} (91%) rename source/blender/gpu/{GPU_vertex_format.h => GPU_vertex_format.hh} (92%) rename source/blender/gpu/{GPU_viewport.h => GPU_viewport.hh} (85%) rename source/blender/gpu/intern/{gpu_codegen.h => gpu_codegen.hh} (75%) rename source/blender/gpu/intern/{gpu_material_library.h => gpu_material_library.hh} (71%) rename source/blender/gpu/intern/{gpu_matrix_private.h => gpu_matrix_private.hh} (62%) rename source/blender/gpu/intern/{gpu_node_graph.h => gpu_node_graph.hh} (74%) delete mode 100644 source/blender/gpu/intern/gpu_private.h create mode 100644 source/blender/gpu/intern/gpu_private.hh rename source/blender/gpu/intern/{gpu_select_private.h => gpu_select_private.hh} (69%) rename source/blender/gpu/intern/{gpu_shader_dependency_private.h => gpu_shader_dependency_private.hh} (77%) delete mode 100644 source/blender/gpu/intern/gpu_vertex_format_private.h create mode 100644 source/blender/gpu/intern/gpu_vertex_format_private.hh diff --git a/intern/cycles/blender/display_driver.cpp b/intern/cycles/blender/display_driver.cpp index 02b456bbffd..22f2d002d19 100644 --- 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" diff --git a/intern/cycles/blender/python.cpp b/intern/cycles/blender/python.cpp index ace67591250..fa930171eef 100644 --- 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" diff --git a/intern/ghost/test/multitest/MultiTest.c b/intern/ghost/test/multitest/MultiTest.c index 39a199c6b6f..9dd89fc4255 100644 --- 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[]; diff --git a/intern/opencolorio/ocio_impl_glsl.cc b/intern/opencolorio/ocio_impl_glsl.cc index eb62ddb143b..20ec79b2f9b 100644 --- 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" diff --git a/intern/opencolorio/ocio_shader_shared.hh b/intern/opencolorio/ocio_shader_shared.hh index 1479d1d02dc..3797e5842ba 100644 --- 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 { diff --git a/release/datafiles/userdef/userdef_default.c b/release/datafiles/userdef/userdef_default.c index b6234bbc587..457f3a24e0b 100644 --- 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 */ diff --git a/source/blender/blenfont/intern/blf.cc b/source/blender/blenfont/intern/blf.cc index 1f1c410b5b7..6f961630db4 100644 --- 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" diff --git a/source/blender/blenfont/intern/blf_font.cc b/source/blender/blenfont/intern/blf_font.cc index 3a1682d5e96..f92f7054051 100644 --- 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" diff --git a/source/blender/blenfont/intern/blf_glyph.cc b/source/blender/blenfont/intern/blf_glyph.cc index 2db0dd677f1..e8db9c18fe9 100644 --- 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" diff --git a/source/blender/blenfont/intern/blf_internal_types.hh b/source/blender/blenfont/intern/blf_internal_types.hh index 571cfb946d6..0a27d5bbe79 100644 --- 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; diff --git a/source/blender/blenkernel/intern/anim_visualization.cc b/source/blender/blenkernel/intern/anim_visualization.cc index 24415a7084d..2115a7318f9 100644 --- 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" diff --git a/source/blender/blenkernel/intern/image.cc b/source/blender/blenkernel/intern/image.cc index 35f265bd329..d99dcf8dfa5 100644 --- 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 */ diff --git a/source/blender/blenkernel/intern/image_gpu.cc b/source/blender/blenkernel/intern/image_gpu.cc index 2811a38c676..7b1010a636c 100644 --- 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; diff --git a/source/blender/blenkernel/intern/movieclip.cc b/source/blender/blenkernel/intern/movieclip.cc index 07ff7388d22..5d0c6592f55 100644 --- 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" diff --git a/source/blender/blenkernel/intern/preview_image.cc b/source/blender/blenkernel/intern/preview_image.cc index f31881840de..00826e9e5ed 100644 --- 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" diff --git a/source/blender/blenkernel/intern/studiolight.cc b/source/blender/blenkernel/intern/studiolight.cc index da8f5b383d7..39056723733 100644 --- 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" diff --git a/source/blender/blenkernel/intern/subdiv_modifier.cc b/source/blender/blenkernel/intern/subdiv_modifier.cc index a513b39718f..4165cf1df68 100644 --- 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) diff --git a/source/blender/blenloader/intern/versioning_userdef.cc b/source/blender/blenloader/intern/versioning_userdef.cc index 63d2a158083..3c70370ff4e 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/COM_context.hh b/source/blender/compositor/realtime_compositor/COM_context.hh index 90900e79970..296b4aae0d9 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/COM_conversion_operation.hh b/source/blender/compositor/realtime_compositor/COM_conversion_operation.hh index c75e07ed033..db61fa74724 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/COM_realize_on_domain_operation.hh b/source/blender/compositor/realtime_compositor/COM_realize_on_domain_operation.hh index eea55b9ee34..001437a86b4 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/COM_result.hh b/source/blender/compositor/realtime_compositor/COM_result.hh index 074a0ec4d2d..111a92b7a34 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/COM_shader_operation.hh b/source/blender/compositor/realtime_compositor/COM_shader_operation.hh index 0b0187c249c..035a5f67ef5 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/COM_texture_pool.hh b/source/blender/compositor/realtime_compositor/COM_texture_pool.hh index 1c03fde0c84..1c54ecd9c8d 100644 --- 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 { diff --git a/source/blender/compositor/realtime_compositor/COM_utilities.hh b/source/blender/compositor/realtime_compositor/COM_utilities.hh index 9525e7a7d33..dea6c7758f2 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_parallel_reduction.hh b/source/blender/compositor/realtime_compositor/algorithms/COM_algorithm_parallel_reduction.hh index 23b52a2894a..74ac066db79 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/jump_flooding.cc b/source/blender/compositor/realtime_compositor/algorithms/intern/jump_flooding.cc index eb1cae738e9..6d66b715395 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/morphological_blur.cc b/source/blender/compositor/realtime_compositor/algorithms/intern/morphological_blur.cc index b921849caf4..86ed315a309 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/morphological_distance.cc b/source/blender/compositor/realtime_compositor/algorithms/intern/morphological_distance.cc index 4a3997113f9..0c81a01b29c 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/morphological_distance_feather.cc b/source/blender/compositor/realtime_compositor/algorithms/intern/morphological_distance_feather.cc index 74ee0c75e3d..5b74e77f2d3 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/parallel_reduction.cc b/source/blender/compositor/realtime_compositor/algorithms/intern/parallel_reduction.cc index b62118bc3d6..ebf1c16e789 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/realize_on_domain.cc b/source/blender/compositor/realtime_compositor/algorithms/intern/realize_on_domain.cc index c295b7df9a2..02a4b111cb5 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/smaa.cc b/source/blender/compositor/realtime_compositor/algorithms/intern/smaa.cc index 877d3c4eb1e..8fb19d4baf0 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/summed_area_table.cc b/source/blender/compositor/realtime_compositor/algorithms/intern/summed_area_table.cc index fc0d304fb52..35a1e6897b9 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/symmetric_separable_blur.cc b/source/blender/compositor/realtime_compositor/algorithms/intern/symmetric_separable_blur.cc index acb5b9d181f..c97667a0e86 100644 --- 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" diff --git 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 index 607d83062d9..8adfad2daac 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/algorithms/intern/transform.cc b/source/blender/compositor/realtime_compositor/algorithms/intern/transform.cc index 1224528060d..cb648f7bbad 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_bokeh_kernel.hh b/source/blender/compositor/realtime_compositor/cached_resources/COM_bokeh_kernel.hh index 2fe2a3fcad3..08d8b5d705b 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_image.hh b/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_image.hh index 329fe4ba843..6a8732c225b 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_mask.hh b/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_mask.hh index f512b432682..34268877358 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_shader.hh b/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_shader.hh index e2cd0508ba2..0db2b381f78 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_texture.hh b/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_texture.hh index 5b6ef90f8c6..c674c01aede 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_distortion_grid.hh b/source/blender/compositor/realtime_compositor/cached_resources/COM_distortion_grid.hh index e3a322b7b62..504cdd4d697 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_keying_screen.hh b/source/blender/compositor/realtime_compositor/cached_resources/COM_keying_screen.hh index 54e8f5c9c3b..d10f0f72f21 100644 --- 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" diff --git 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 index 19440bad7fe..b8a0bc5cd06 100644 --- 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" diff --git 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 index 9afad553d32..711c7a6e686 100644 --- 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 -#include "GPU_shader.h" -#include "GPU_texture.h" +#include "GPU_shader.hh" +#include "GPU_texture.hh" #include "COM_cached_resource.hh" diff --git 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 index 1196910ded0..78b4580794d 100644 --- 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" diff --git 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 index f9d9ff4360a..3b15e1a4a06 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/cached_resources/intern/bokeh_kernel.cc b/source/blender/compositor/realtime_compositor/cached_resources/intern/bokeh_kernel.cc index c7566d06889..1703695daa6 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/cached_resources/intern/cached_image.cc b/source/blender/compositor/realtime_compositor/cached_resources/intern/cached_image.cc index 567c280a710..2121f13a1e6 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/cached_resources/intern/cached_mask.cc b/source/blender/compositor/realtime_compositor/cached_resources/intern/cached_mask.cc index 58c8daa239a..2e630a1069f 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/cached_resources/intern/cached_shader.cc b/source/blender/compositor/realtime_compositor/cached_resources/intern/cached_shader.cc index a4d14bec595..0ec891a5360 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/cached_resources/intern/cached_texture.cc b/source/blender/compositor/realtime_compositor/cached_resources/intern/cached_texture.cc index 22bf1d71e4d..93f6b44bb00 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/cached_resources/intern/distortion_grid.cc b/source/blender/compositor/realtime_compositor/cached_resources/intern/distortion_grid.cc index ca1183bf8a1..5ce66013920 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/cached_resources/intern/keying_screen.cc b/source/blender/compositor/realtime_compositor/cached_resources/intern/keying_screen.cc index f3a66e040a0..361a961bb46 100644 --- 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" diff --git 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 index 941385fc79d..818ade52586 100644 --- 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" diff --git 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 index c9eb4c36919..9734feec088 100644 --- 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" diff --git 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 index 62068992e70..466ffda5fe5 100644 --- 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" diff --git 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 index 28dcaa332b6..2a91152714f 100644 --- 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" diff --git 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 index 86711b36e3e..c08ec85346e 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/intern/context.cc b/source/blender/compositor/realtime_compositor/intern/context.cc index 2b49705b895..8421455003a 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/intern/conversion_operation.cc b/source/blender/compositor/realtime_compositor/intern/conversion_operation.cc index 7b83d809fb1..43b6cc89fe1 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/intern/node_operation.cc b/source/blender/compositor/realtime_compositor/intern/node_operation.cc index 19fb8e40630..83c9485ebec 100644 --- 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" diff --git 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 index 4283be1f283..9a5394726be 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/intern/result.cc b/source/blender/compositor/realtime_compositor/intern/result.cc index 493d4f8821b..1ec7b3dc328 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/intern/shader_operation.cc b/source/blender/compositor/realtime_compositor/intern/shader_operation.cc index 8ef4e9555fa..76fc4afbd68 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/intern/texture_pool.cc b/source/blender/compositor/realtime_compositor/intern/texture_pool.cc index ed8d37b6353..fe877474101 100644 --- 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" diff --git a/source/blender/compositor/realtime_compositor/intern/utilities.cc b/source/blender/compositor/realtime_compositor/intern/utilities.cc index 7bb20035664..632c5ac06ab 100644 --- 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" diff --git a/source/blender/draw/engines/basic/basic_engine.cc b/source/blender/draw/engines/basic/basic_engine.cc index 07c77f9c5ea..278eabe2629 100644 --- 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" diff --git a/source/blender/draw/engines/basic/basic_shader.cc b/source/blender/draw/engines/basic/basic_shader.cc index 694f30213dc..c2759c6e48a 100644 --- 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" diff --git a/source/blender/draw/engines/compositor/compositor_engine.cc b/source/blender/draw/engines/compositor/compositor_engine.cc index ffa5e0584a5..ce6b883e290 100644 --- 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. */ diff --git a/source/blender/draw/engines/eevee/eevee_bloom.cc b/source/blender/draw/engines/eevee/eevee_bloom.cc index 03be1be4550..da9d9ecf5dd 100644 --- 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" diff --git a/source/blender/draw/engines/eevee/eevee_cryptomatte.cc b/source/blender/draw/engines/eevee/eevee_cryptomatte.cc index 7d251a7abca..10f4377e357 100644 --- 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" diff --git a/source/blender/draw/engines/eevee/eevee_data.cc b/source/blender/draw/engines/eevee/eevee_data.cc index 3c31bbfbdeb..aa89cd1b95c 100644 --- 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" diff --git a/source/blender/draw/engines/eevee/eevee_depth_of_field.cc b/source/blender/draw/engines/eevee/eevee_depth_of_field.cc index fe728d8a701..a608bbb2a0b 100644 --- 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 diff --git a/source/blender/draw/engines/eevee/eevee_effects.cc b/source/blender/draw/engines/eevee/eevee_effects.cc index edfea89a4b4..e658c044f18 100644 --- 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 { diff --git a/source/blender/draw/engines/eevee/eevee_engine.cc b/source/blender/draw/engines/eevee/eevee_engine.cc index f54cecb3430..c1cd8f9b7b2 100644 --- 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" diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.cc b/source/blender/draw/engines/eevee/eevee_lightcache.cc index cdb6aaa0158..06822ffa263 100644 --- 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" diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.cc b/source/blender/draw/engines/eevee/eevee_lightprobes.cc index fb8ba406868..e0866aad7d5 100644 --- 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" diff --git a/source/blender/draw/engines/eevee/eevee_motion_blur.cc b/source/blender/draw/engines/eevee/eevee_motion_blur.cc index 43521c76b41..d6efa6bdd38 100644 --- 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) diff --git a/source/blender/draw/engines/eevee/eevee_occlusion.cc b/source/blender/draw/engines/eevee/eevee_occlusion.cc index c8691033b61..85aa5c24b2e 100644 --- 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; diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h index b9a5cd1500a..b169c00bd91 100644 --- 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" diff --git a/source/blender/draw/engines/eevee/eevee_render.cc b/source/blender/draw/engines/eevee/eevee_render.cc index d9d6ada0f61..da57a1ebe17 100644 --- 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" diff --git a/source/blender/draw/engines/eevee/eevee_screen_raytrace.cc b/source/blender/draw/engines/eevee/eevee_screen_raytrace.cc index d9657f4a963..9bbeb213509 100644 --- 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) diff --git a/source/blender/draw/engines/eevee/eevee_shaders.cc b/source/blender/draw/engines/eevee/eevee_shaders.cc index 2293e2d739d..8ca3120a323 100644 --- 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" diff --git a/source/blender/draw/engines/eevee/eevee_shaders_extra.cc b/source/blender/draw/engines/eevee/eevee_shaders_extra.cc index 4fadcb51946..8445ad6c373 100644 --- 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" diff --git a/source/blender/draw/engines/eevee/eevee_subsurface.cc b/source/blender/draw/engines/eevee/eevee_subsurface.cc index b3a86dcf40f..97f439b245a 100644 --- 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" diff --git a/source/blender/draw/engines/eevee/eevee_temporal_sampling.cc b/source/blender/draw/engines/eevee/eevee_temporal_sampling.cc index 3e126651cda..d658b032c18 100644 --- 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 diff --git a/source/blender/draw/engines/eevee/eevee_volumes.cc b/source/blender/draw/engines/eevee/eevee_volumes.cc index ef942a2e0b8..8e33680fceb 100644 --- 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 { diff --git a/source/blender/draw/engines/eevee_next/eevee_ambient_occlusion.cc b/source/blender/draw/engines/eevee_next/eevee_ambient_occlusion.cc index 6ca02087340..318b7199cc3 100644 --- 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 { diff --git a/source/blender/draw/engines/eevee_next/eevee_depth_of_field.cc b/source/blender/draw/engines/eevee_next/eevee_depth_of_field.cc index 0278fe24e5a..825f77de67d 100644 --- 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" diff --git a/source/blender/draw/engines/eevee_next/eevee_engine.cc b/source/blender/draw/engines/eevee_next/eevee_engine.cc index 039f41a1490..04916afc327 100644 --- 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" diff --git a/source/blender/draw/engines/eevee_next/eevee_film.cc b/source/blender/draw/engines/eevee_next/eevee_film.cc index 13ca615c131..0820a2fb13e 100644 --- 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" diff --git a/source/blender/draw/engines/eevee_next/eevee_gbuffer.hh b/source/blender/draw/engines/eevee_next/eevee_gbuffer.hh index cf296929107..eca996b1124 100644 --- 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" diff --git a/source/blender/draw/engines/eevee_next/eevee_irradiance_cache.cc b/source/blender/draw/engines/eevee_next/eevee_irradiance_cache.cc index c5b388c39b7..2921a9939f0 100644 --- 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" diff --git a/source/blender/draw/engines/eevee_next/eevee_lightcache.cc b/source/blender/draw/engines/eevee_next/eevee_lightcache.cc index 693e41958d1..bfdc78aa4b1 100644 --- 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" diff --git a/source/blender/draw/engines/eevee_next/eevee_renderbuffers.cc b/source/blender/draw/engines/eevee_next/eevee_renderbuffers.cc index 432c83b022b..583f95339e8 100644 --- 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" diff --git a/source/blender/draw/engines/eevee_next/eevee_shader.cc b/source/blender/draw/engines/eevee_next/eevee_shader.cc index 7f1212371cd..e605002de9e 100644 --- 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" diff --git a/source/blender/draw/engines/eevee_next/eevee_shader.hh b/source/blender/draw/engines/eevee_next/eevee_shader.hh index 75e3b51d37b..56adeed284b 100644 --- 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" diff --git a/source/blender/draw/engines/eevee_next/eevee_shader_shared.hh b/source/blender/draw/engines/eevee_next/eevee_shader_shared.hh index ae4297df2c2..55745d71530 100644 --- 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 { diff --git a/source/blender/draw/engines/eevee_next/eevee_shadow.hh b/source/blender/draw/engines/eevee_next/eevee_shadow.hh index 335369c4ee3..89a1ab5a232 100644 --- a/source/blender/draw/engines/eevee_next/eevee_shadow.hh +++ b/source/blender/draw/engines/eevee_next/eevee_shadow.hh @@ -13,7 +13,7 @@ #include "BLI_pool.hh" #include "BLI_vector.hh" -#include "GPU_batch.h" +#include "GPU_batch.hh" #include "eevee_camera.hh" #include "eevee_material.hh" diff --git a/source/blender/draw/engines/eevee_next/eevee_volume.cc b/source/blender/draw/engines/eevee_next/eevee_volume.cc index bf357b511e0..55e902a5d70 100644 --- a/source/blender/draw/engines/eevee_next/eevee_volume.cc +++ b/source/blender/draw/engines/eevee_next/eevee_volume.cc @@ -11,7 +11,7 @@ */ #include "DNA_volume_types.h" -#include "GPU_capabilities.h" +#include "GPU_capabilities.hh" #include "draw_common.hh" diff --git a/source/blender/draw/engines/external/external_engine.cc b/source/blender/draw/engines/external/external_engine.cc index f1d144159a0..db0a0a65626 100644 --- a/source/blender/draw/engines/external/external_engine.cc +++ b/source/blender/draw/engines/external/external_engine.cc @@ -22,12 +22,12 @@ #include "ED_image.hh" #include "ED_screen.hh" -#include "GPU_batch.h" -#include "GPU_debug.h" -#include "GPU_matrix.h" -#include "GPU_shader.h" -#include "GPU_state.h" -#include "GPU_viewport.h" +#include "GPU_batch.hh" +#include "GPU_debug.hh" +#include "GPU_matrix.hh" +#include "GPU_shader.hh" +#include "GPU_state.hh" +#include "GPU_viewport.hh" #include "RE_engine.h" #include "RE_pipeline.h" diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h index 71ca38b2f09..b61c50dc3e4 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.h +++ b/source/blender/draw/engines/gpencil/gpencil_engine.h @@ -17,7 +17,7 @@ #include "BKE_grease_pencil.hh" -#include "GPU_batch.h" +#include "GPU_batch.hh" #ifdef __cplusplus extern "C" { diff --git a/source/blender/draw/engines/gpencil/gpencil_engine_c.cc b/source/blender/draw/engines/gpencil/gpencil_engine_c.cc index a334e2f43af..c41ef7a5a7e 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine_c.cc +++ b/source/blender/draw/engines/gpencil/gpencil_engine_c.cc @@ -33,7 +33,7 @@ #include "DNA_screen_types.h" #include "DNA_view3d_types.h" -#include "GPU_texture.h" +#include "GPU_texture.hh" #include "GPU_uniform_buffer.hh" #include "gpencil_engine.h" diff --git a/source/blender/draw/engines/gpencil/gpencil_shader_shared.h b/source/blender/draw/engines/gpencil/gpencil_shader_shared.h index 36c5b432410..b1545401c25 100644 --- a/source/blender/draw/engines/gpencil/gpencil_shader_shared.h +++ b/source/blender/draw/engines/gpencil/gpencil_shader_shared.h @@ -5,7 +5,7 @@ #ifndef GPU_SHADER # pragma once -# include "GPU_shader_shared_utils.h" +# include "GPU_shader_shared_utils.hh" # ifndef __cplusplus typedef struct gpMaterial gpMaterial; diff --git a/source/blender/draw/engines/image/image_engine.cc b/source/blender/draw/engines/image/image_engine.cc index 6b960efbc1d..e1401ef7b24 100644 --- a/source/blender/draw/engines/image/image_engine.cc +++ b/source/blender/draw/engines/image/image_engine.cc @@ -25,7 +25,7 @@ #include "ED_image.hh" -#include "GPU_batch.h" +#include "GPU_batch.hh" #include "image_drawing_mode.hh" #include "image_engine.h" diff --git a/source/blender/draw/engines/image/image_shader.cc b/source/blender/draw/engines/image/image_shader.cc index 8874a2b74be..249f70747be 100644 --- a/source/blender/draw/engines/image/image_shader.cc +++ b/source/blender/draw/engines/image/image_shader.cc @@ -10,7 +10,7 @@ #include "BLI_dynstr.h" -#include "GPU_batch.h" +#include "GPU_batch.hh" #include "image_engine.h" #include "image_private.hh" diff --git a/source/blender/draw/engines/image/image_texture_info.hh b/source/blender/draw/engines/image/image_texture_info.hh index 9e15fbcb253..1d57ee31ca1 100644 --- a/source/blender/draw/engines/image/image_texture_info.hh +++ b/source/blender/draw/engines/image/image_texture_info.hh @@ -11,8 +11,8 @@ #include "BLI_math_matrix.hh" #include "BLI_rect.h" -#include "GPU_batch.h" -#include "GPU_texture.h" +#include "GPU_batch.hh" +#include "GPU_texture.hh" namespace blender::draw::image_engine { diff --git a/source/blender/draw/engines/overlay/overlay_edit_uv.cc b/source/blender/draw/engines/overlay/overlay_edit_uv.cc index 4b4a2299c80..8267594ecec 100644 --- a/source/blender/draw/engines/overlay/overlay_edit_uv.cc +++ b/source/blender/draw/engines/overlay/overlay_edit_uv.cc @@ -30,7 +30,7 @@ #include "IMB_imbuf_types.hh" -#include "GPU_batch.h" +#include "GPU_batch.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/draw/engines/overlay/overlay_engine.cc b/source/blender/draw/engines/overlay/overlay_engine.cc index fe180e3baa1..a658947f445 100644 --- a/source/blender/draw/engines/overlay/overlay_engine.cc +++ b/source/blender/draw/engines/overlay/overlay_engine.cc @@ -21,7 +21,7 @@ #include "BKE_object.hh" #include "BKE_paint.hh" -#include "GPU_capabilities.h" +#include "GPU_capabilities.hh" #include "DNA_space_types.h" diff --git a/source/blender/draw/engines/overlay/overlay_motion_path.cc b/source/blender/draw/engines/overlay/overlay_motion_path.cc index 67371f40235..e4a3bc09d69 100644 --- a/source/blender/draw/engines/overlay/overlay_motion_path.cc +++ b/source/blender/draw/engines/overlay/overlay_motion_path.cc @@ -16,7 +16,7 @@ #include "DEG_depsgraph_query.hh" -#include "GPU_batch.h" +#include "GPU_batch.hh" #include "UI_resources.hh" diff --git a/source/blender/draw/engines/overlay/overlay_next_engine.cc b/source/blender/draw/engines/overlay/overlay_next_engine.cc index 1e5325b1b43..c01d36a3764 100644 --- a/source/blender/draw/engines/overlay/overlay_next_engine.cc +++ b/source/blender/draw/engines/overlay/overlay_next_engine.cc @@ -21,7 +21,7 @@ #include "BKE_object.hh" #include "BKE_paint.hh" -#include "GPU_capabilities.h" +#include "GPU_capabilities.hh" #include "DNA_space_types.h" diff --git a/source/blender/draw/engines/overlay/overlay_shader.cc b/source/blender/draw/engines/overlay/overlay_shader.cc index 6d62a24ad01..ada77c376ef 100644 --- a/source/blender/draw/engines/overlay/overlay_shader.cc +++ b/source/blender/draw/engines/overlay/overlay_shader.cc @@ -8,7 +8,7 @@ #include "DRW_render.hh" -#include "GPU_shader.h" +#include "GPU_shader.hh" #include "UI_resources.hh" diff --git a/source/blender/draw/engines/overlay/overlay_shader_shared.h b/source/blender/draw/engines/overlay/overlay_shader_shared.h index a6ccccf29bd..11752d306ef 100644 --- a/source/blender/draw/engines/overlay/overlay_shader_shared.h +++ b/source/blender/draw/engines/overlay/overlay_shader_shared.h @@ -5,7 +5,7 @@ #ifndef GPU_SHADER # pragma once -# include "GPU_shader_shared_utils.h" +# include "GPU_shader_shared_utils.hh" # include "DNA_action_types.h" # include "DNA_view3d_types.h" diff --git a/source/blender/draw/engines/overlay/overlay_viewer_attribute.cc b/source/blender/draw/engines/overlay/overlay_viewer_attribute.cc index 9e67441d297..ee973c65783 100644 --- a/source/blender/draw/engines/overlay/overlay_viewer_attribute.cc +++ b/source/blender/draw/engines/overlay/overlay_viewer_attribute.cc @@ -14,7 +14,7 @@ #include "BLI_math_vector.hh" #include "BLI_span.hh" -#include "GPU_batch.h" +#include "GPU_batch.hh" #include "BKE_attribute.hh" #include "BKE_curves.hh" diff --git a/source/blender/draw/engines/overlay/overlay_volume.cc b/source/blender/draw/engines/overlay/overlay_volume.cc index 598f63ce365..afadfb714ac 100644 --- a/source/blender/draw/engines/overlay/overlay_volume.cc +++ b/source/blender/draw/engines/overlay/overlay_volume.cc @@ -9,7 +9,7 @@ #include "DNA_volume_types.h" #include "DRW_render.hh" -#include "GPU_shader.h" +#include "GPU_shader.hh" #include "overlay_private.hh" diff --git a/source/blender/draw/engines/overlay/overlay_wireframe.cc b/source/blender/draw/engines/overlay/overlay_wireframe.cc index 55be607fa64..cc075e194b1 100644 --- a/source/blender/draw/engines/overlay/overlay_wireframe.cc +++ b/source/blender/draw/engines/overlay/overlay_wireframe.cc @@ -26,7 +26,7 @@ #include "BLI_math_base.hh" #include "DRW_render.hh" -#include "GPU_shader.h" +#include "GPU_shader.hh" #include "ED_view3d.hh" diff --git a/source/blender/draw/engines/select/select_instance.cc b/source/blender/draw/engines/select/select_instance.cc index 5176bfe761b..932440f45d8 100644 --- a/source/blender/draw/engines/select/select_instance.cc +++ b/source/blender/draw/engines/select/select_instance.cc @@ -8,7 +8,7 @@ #include "DRW_render.hh" -#include "GPU_capabilities.h" +#include "GPU_capabilities.hh" #include "select_engine.hh" diff --git a/source/blender/draw/engines/select/select_instance.hh b/source/blender/draw/engines/select/select_instance.hh index d5041f65663..11121eb18fc 100644 --- a/source/blender/draw/engines/select/select_instance.hh +++ b/source/blender/draw/engines/select/select_instance.hh @@ -14,7 +14,7 @@ #include "GPU_select.hh" -#include "../intern/gpu_select_private.h" +#include "../intern/gpu_select_private.hh" #include "draw_manager.hh" #include "draw_pass.hh" diff --git a/source/blender/draw/engines/select/select_shader_shared.hh b/source/blender/draw/engines/select/select_shader_shared.hh index f5536c4d7d8..ed44cd03d00 100644 --- a/source/blender/draw/engines/select/select_shader_shared.hh +++ b/source/blender/draw/engines/select/select_shader_shared.hh @@ -5,7 +5,7 @@ #ifndef GPU_SHADER # pragma once -# include "GPU_shader_shared_utils.h" +# include "GPU_shader_shared_utils.hh" namespace blender::draw::select { diff --git a/source/blender/draw/engines/workbench/workbench_engine.cc b/source/blender/draw/engines/workbench/workbench_engine.cc index 17accf49052..a7ca1b3c6e5 100644 --- a/source/blender/draw/engines/workbench/workbench_engine.cc +++ b/source/blender/draw/engines/workbench/workbench_engine.cc @@ -13,7 +13,7 @@ #include "DNA_fluid_types.h" #include "ED_paint.hh" #include "ED_view3d.hh" -#include "GPU_capabilities.h" +#include "GPU_capabilities.hh" #include "IMB_imbuf_types.hh" #include "draw_common.hh" diff --git a/source/blender/draw/engines/workbench/workbench_private.hh b/source/blender/draw/engines/workbench/workbench_private.hh index 66b82046896..46e7787ad71 100644 --- a/source/blender/draw/engines/workbench/workbench_private.hh +++ b/source/blender/draw/engines/workbench/workbench_private.hh @@ -11,7 +11,7 @@ #include "workbench_enums.hh" #include "workbench_shader_shared.h" -#include "GPU_capabilities.h" +#include "GPU_capabilities.hh" extern "C" DrawEngineType draw_engine_workbench; diff --git a/source/blender/draw/engines/workbench/workbench_shader_shared.h b/source/blender/draw/engines/workbench/workbench_shader_shared.h index ef6507e616a..d94801032cc 100644 --- a/source/blender/draw/engines/workbench/workbench_shader_shared.h +++ b/source/blender/draw/engines/workbench/workbench_shader_shared.h @@ -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 #define WORKBENCH_SHADER_SHARED_H diff --git a/source/blender/draw/engines/workbench/workbench_shadow.cc b/source/blender/draw/engines/workbench/workbench_shadow.cc index a46d1f697e7..ff8e3f4b0d0 100644 --- a/source/blender/draw/engines/workbench/workbench_shadow.cc +++ b/source/blender/draw/engines/workbench/workbench_shadow.cc @@ -17,7 +17,7 @@ #include "BKE_object.hh" #include "DRW_render.hh" -#include "GPU_compute.h" +#include "GPU_compute.hh" #include "workbench_private.hh" diff --git a/source/blender/draw/engines/workbench/workbench_state.cc b/source/blender/draw/engines/workbench/workbench_state.cc index db52e5ed822..da57432563c 100644 --- a/source/blender/draw/engines/workbench/workbench_state.cc +++ b/source/blender/draw/engines/workbench/workbench_state.cc @@ -16,7 +16,7 @@ #include "DNA_fluid_types.h" #include "ED_paint.hh" #include "ED_view3d.hh" -#include "GPU_capabilities.h" +#include "GPU_capabilities.hh" namespace blender::workbench { diff --git a/source/blender/draw/intern/DRW_gpu_wrapper.hh b/source/blender/draw/intern/DRW_gpu_wrapper.hh index e6c20e49e53..24b0b6417ae 100644 --- a/source/blender/draw/intern/DRW_gpu_wrapper.hh +++ b/source/blender/draw/intern/DRW_gpu_wrapper.hh @@ -72,9 +72,9 @@ #include "BLI_utility_mixins.hh" #include "BLI_vector.hh" -#include "GPU_framebuffer.h" -#include "GPU_storage_buffer.h" -#include "GPU_texture.h" +#include "GPU_framebuffer.hh" +#include "GPU_storage_buffer.hh" +#include "GPU_texture.hh" #include "GPU_uniform_buffer.hh" namespace blender::draw { diff --git a/source/blender/draw/intern/DRW_render.hh b/source/blender/draw/intern/DRW_render.hh index 48ba694fdf4..d075acbba5b 100644 --- a/source/blender/draw/intern/DRW_render.hh +++ b/source/blender/draw/intern/DRW_render.hh @@ -29,12 +29,12 @@ #include "DNA_scene_types.h" #include "DNA_world_types.h" -#include "GPU_framebuffer.h" +#include "GPU_framebuffer.hh" #include "GPU_material.hh" -#include "GPU_primitive.h" -#include "GPU_shader.h" -#include "GPU_storage_buffer.h" -#include "GPU_texture.h" +#include "GPU_primitive.hh" +#include "GPU_shader.hh" +#include "GPU_storage_buffer.hh" +#include "GPU_texture.hh" #include "GPU_uniform_buffer.hh" #include "draw_cache.hh" diff --git a/source/blender/draw/intern/attribute_convert.cc b/source/blender/draw/intern/attribute_convert.cc index b6adb38a9c5..1da1faead42 100644 --- a/source/blender/draw/intern/attribute_convert.cc +++ b/source/blender/draw/intern/attribute_convert.cc @@ -10,7 +10,7 @@ #include "BKE_attribute_math.hh" -#include "GPU_vertex_buffer.h" +#include "GPU_vertex_buffer.hh" #include "attribute_convert.hh" diff --git a/source/blender/draw/intern/attribute_convert.hh b/source/blender/draw/intern/attribute_convert.hh index f7cfe15bf02..ae592c26026 100644 --- a/source/blender/draw/intern/attribute_convert.hh +++ b/source/blender/draw/intern/attribute_convert.hh @@ -14,7 +14,7 @@ #include "DNA_customdata_types.h" /* #eCustomDataType. */ -#include "GPU_vertex_format.h" +#include "GPU_vertex_format.hh" struct GPUVertBuf; diff --git a/source/blender/draw/intern/draw_attributes.hh b/source/blender/draw/intern/draw_attributes.hh index 6fdf090bd35..e99fd0f1a49 100644 --- a/source/blender/draw/intern/draw_attributes.hh +++ b/source/blender/draw/intern/draw_attributes.hh @@ -16,7 +16,7 @@ #include "BLI_sys_types.h" -#include "GPU_shader.h" +#include "GPU_shader.hh" namespace blender::bke { enum class AttrDomain : int8_t; diff --git a/source/blender/draw/intern/draw_cache.cc b/source/blender/draw/intern/draw_cache.cc index efffd312636..b18d22b565a 100644 --- a/source/blender/draw/intern/draw_cache.cc +++ b/source/blender/draw/intern/draw_cache.cc @@ -26,9 +26,9 @@ #include "BKE_object.hh" #include "BKE_paint.hh" -#include "GPU_batch.h" -#include "GPU_batch_utils.h" -#include "GPU_capabilities.h" +#include "GPU_batch.hh" +#include "GPU_batch_utils.hh" +#include "GPU_capabilities.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/draw/intern/draw_cache_extract.hh b/source/blender/draw/intern/draw_cache_extract.hh index adecf90cb1c..4647a7dd61e 100644 --- a/source/blender/draw/intern/draw_cache_extract.hh +++ b/source/blender/draw/intern/draw_cache_extract.hh @@ -11,7 +11,7 @@ #include "BLI_math_matrix_types.hh" #include "BLI_utildefines.h" -#include "GPU_shader.h" +#include "GPU_shader.hh" #include "draw_attributes.hh" diff --git a/source/blender/draw/intern/draw_cache_extract_mesh.cc b/source/blender/draw/intern/draw_cache_extract_mesh.cc index 0f150454083..edad7317d27 100644 --- a/source/blender/draw/intern/draw_cache_extract_mesh.cc +++ b/source/blender/draw/intern/draw_cache_extract_mesh.cc @@ -24,7 +24,7 @@ #include "BKE_editmesh.hh" #include "BKE_object.hh" -#include "GPU_capabilities.h" +#include "GPU_capabilities.hh" #include "draw_cache_extract.hh" #include "draw_cache_inline.hh" diff --git a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc index 203b3117512..cd8d7d103cc 100644 --- a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc +++ b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc @@ -25,7 +25,7 @@ #include "BKE_mesh_runtime.hh" #include "BKE_object.hh" -#include "GPU_batch.h" +#include "GPU_batch.hh" #include "ED_mesh.hh" diff --git a/source/blender/draw/intern/draw_cache_impl_curve.cc b/source/blender/draw/intern/draw_cache_impl_curve.cc index dd1bf45dbc8..d2bab1c8403 100644 --- a/source/blender/draw/intern/draw_cache_impl_curve.cc +++ b/source/blender/draw/intern/draw_cache_impl_curve.cc @@ -28,10 +28,10 @@ #include "BKE_object_types.hh" #include "BKE_vfont.hh" -#include "GPU_batch.h" -#include "GPU_capabilities.h" +#include "GPU_batch.hh" +#include "GPU_capabilities.hh" #include "GPU_material.hh" -#include "GPU_texture.h" +#include "GPU_texture.hh" #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 9b82d0d328c..288184ca934 100644 --- a/source/blender/draw/intern/draw_cache_impl_curves.cc +++ b/source/blender/draw/intern/draw_cache_impl_curves.cc @@ -34,10 +34,10 @@ #include "BKE_customdata.hh" #include "BKE_geometry_set.hh" -#include "GPU_batch.h" -#include "GPU_context.h" +#include "GPU_batch.hh" +#include "GPU_context.hh" #include "GPU_material.hh" -#include "GPU_texture.h" +#include "GPU_texture.hh" #include "DRW_render.hh" diff --git a/source/blender/draw/intern/draw_cache_impl_gpencil_legacy.cc b/source/blender/draw/intern/draw_cache_impl_gpencil_legacy.cc index 01b9bf378a7..6be7306dfcd 100644 --- a/source/blender/draw/intern/draw_cache_impl_gpencil_legacy.cc +++ b/source/blender/draw/intern/draw_cache_impl_gpencil_legacy.cc @@ -19,7 +19,7 @@ #include "DRW_render.hh" #include "ED_gpencil_legacy.hh" -#include "GPU_batch.h" +#include "GPU_batch.hh" #include "DEG_depsgraph_query.hh" diff --git a/source/blender/draw/intern/draw_cache_impl_grease_pencil.cc b/source/blender/draw/intern/draw_cache_impl_grease_pencil.cc index d1aa385e4a8..f69318325b5 100644 --- a/source/blender/draw/intern/draw_cache_impl_grease_pencil.cc +++ b/source/blender/draw/intern/draw_cache_impl_grease_pencil.cc @@ -23,7 +23,7 @@ #include "ED_curves.hh" #include "ED_grease_pencil.hh" -#include "GPU_batch.h" +#include "GPU_batch.hh" #include "draw_cache_impl.hh" diff --git a/source/blender/draw/intern/draw_cache_impl_lattice.cc b/source/blender/draw/intern/draw_cache_impl_lattice.cc index cea3ebc3b4a..825a2e0dbd6 100644 --- a/source/blender/draw/intern/draw_cache_impl_lattice.cc +++ b/source/blender/draw/intern/draw_cache_impl_lattice.cc @@ -21,7 +21,7 @@ #include "BKE_deform.hh" #include "BKE_lattice.hh" -#include "GPU_batch.h" +#include "GPU_batch.hh" #include "draw_cache_impl.hh" /* own include */ diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.cc b/source/blender/draw/intern/draw_cache_impl_mesh.cc index 507edc17351..d24682c01b7 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.cc +++ b/source/blender/draw/intern/draw_cache_impl_mesh.cc @@ -49,7 +49,7 @@ #include "bmesh.hh" -#include "GPU_batch.h" +#include "GPU_batch.hh" #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 6a990ba0509..edb66dbb827 100644 --- a/source/blender/draw/intern/draw_cache_impl_particles.cc +++ b/source/blender/draw/intern/draw_cache_impl_particles.cc @@ -33,9 +33,9 @@ #include "ED_particle.hh" -#include "GPU_batch.h" -#include "GPU_capabilities.h" -#include "GPU_context.h" +#include "GPU_batch.hh" +#include "GPU_capabilities.hh" +#include "GPU_context.hh" #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 c3725e86f31..8e798d6a3b2 100644 --- a/source/blender/draw/intern/draw_cache_impl_pointcloud.cc +++ b/source/blender/draw/intern/draw_cache_impl_pointcloud.cc @@ -25,7 +25,7 @@ #include "BKE_attribute.hh" #include "BKE_pointcloud.hh" -#include "GPU_batch.h" +#include "GPU_batch.hh" #include "GPU_material.hh" #include "draw_attributes.hh" diff --git a/source/blender/draw/intern/draw_cache_impl_subdivision.cc b/source/blender/draw/intern/draw_cache_impl_subdivision.cc index 6208238a936..249890c15b4 100644 --- a/source/blender/draw/intern/draw_cache_impl_subdivision.cc +++ b/source/blender/draw/intern/draw_cache_impl_subdivision.cc @@ -30,11 +30,11 @@ #include "DRW_engine.hh" #include "DRW_render.hh" -#include "GPU_capabilities.h" -#include "GPU_compute.h" -#include "GPU_index_buffer.h" -#include "GPU_state.h" -#include "GPU_vertex_buffer.h" +#include "GPU_capabilities.hh" +#include "GPU_compute.hh" +#include "GPU_index_buffer.hh" +#include "GPU_state.hh" +#include "GPU_vertex_buffer.hh" #include "opensubdiv_capi.hh" #include "opensubdiv_capi_type.hh" diff --git a/source/blender/draw/intern/draw_cache_impl_volume.cc b/source/blender/draw/intern/draw_cache_impl_volume.cc index b6f937e4756..25cb093dba1 100644 --- a/source/blender/draw/intern/draw_cache_impl_volume.cc +++ b/source/blender/draw/intern/draw_cache_impl_volume.cc @@ -25,9 +25,9 @@ #include "BKE_volume_grid_fwd.hh" #include "BKE_volume_render.hh" -#include "GPU_batch.h" -#include "GPU_capabilities.h" -#include "GPU_texture.h" +#include "GPU_batch.hh" +#include "GPU_capabilities.hh" +#include "GPU_texture.hh" #include "DEG_depsgraph_query.hh" diff --git a/source/blender/draw/intern/draw_cache_inline.hh b/source/blender/draw/intern/draw_cache_inline.hh index e5bf119b538..b5ae9bcc8f3 100644 --- a/source/blender/draw/intern/draw_cache_inline.hh +++ b/source/blender/draw/intern/draw_cache_inline.hh @@ -8,7 +8,7 @@ #pragma once -#include "GPU_batch.h" +#include "GPU_batch.hh" #include "MEM_guardedalloc.h" /* Common */ diff --git a/source/blender/draw/intern/draw_color_management.cc b/source/blender/draw/intern/draw_color_management.cc index fd1a16a1da7..1fe0a70fe95 100644 --- a/source/blender/draw/intern/draw_color_management.cc +++ b/source/blender/draw/intern/draw_color_management.cc @@ -10,10 +10,10 @@ #include "DRW_render.hh" -#include "GPU_batch.h" -#include "GPU_framebuffer.h" -#include "GPU_matrix.h" -#include "GPU_texture.h" +#include "GPU_batch.hh" +#include "GPU_framebuffer.hh" +#include "GPU_matrix.hh" +#include "GPU_texture.hh" #include "DNA_space_types.h" #include "DNA_view3d_types.h" diff --git a/source/blender/draw/intern/draw_command.cc b/source/blender/draw/intern/draw_command.cc index 52a57ad8b10..65360791f9a 100644 --- a/source/blender/draw/intern/draw_command.cc +++ b/source/blender/draw/intern/draw_command.cc @@ -6,10 +6,10 @@ * \ingroup draw */ -#include "GPU_batch.h" -#include "GPU_capabilities.h" -#include "GPU_compute.h" -#include "GPU_debug.h" +#include "GPU_batch.hh" +#include "GPU_capabilities.hh" +#include "GPU_compute.hh" +#include "GPU_debug.hh" #include "draw_command.hh" #include "draw_pass.hh" diff --git a/source/blender/draw/intern/draw_command_shared.hh b/source/blender/draw/intern/draw_command_shared.hh index 23a7975f68e..e66073128b8 100644 --- a/source/blender/draw/intern/draw_command_shared.hh +++ b/source/blender/draw/intern/draw_command_shared.hh @@ -8,7 +8,7 @@ #ifndef GPU_SHADER # include "BLI_span.hh" -# include "GPU_shader_shared_utils.h" +# include "GPU_shader_shared_utils.hh" namespace blender::draw::command { diff --git a/source/blender/draw/intern/draw_common.cc b/source/blender/draw/intern/draw_common.cc index c0b5374af38..ad5939f8d38 100644 --- a/source/blender/draw/intern/draw_common.cc +++ b/source/blender/draw/intern/draw_common.cc @@ -8,9 +8,9 @@ #include "DRW_render.hh" -#include "GPU_matrix.h" -#include "GPU_shader.h" -#include "GPU_texture.h" +#include "GPU_matrix.hh" +#include "GPU_shader.hh" +#include "GPU_texture.hh" #include "UI_resources.hh" diff --git a/source/blender/draw/intern/draw_common_shader_shared.h b/source/blender/draw/intern/draw_common_shader_shared.h index e2c31712ac9..af0f437fd0e 100644 --- a/source/blender/draw/intern/draw_common_shader_shared.h +++ b/source/blender/draw/intern/draw_common_shader_shared.h @@ -7,7 +7,7 @@ */ #ifndef GPU_SHADER -# include "GPU_shader_shared_utils.h" +# include "GPU_shader_shared_utils.hh" typedef struct GlobalsUboStorage GlobalsUboStorage; #endif diff --git a/source/blender/draw/intern/draw_curves.cc b/source/blender/draw/intern/draw_curves.cc index ccd2392cbd0..0edb1967091 100644 --- a/source/blender/draw/intern/draw_curves.cc +++ b/source/blender/draw/intern/draw_curves.cc @@ -16,13 +16,13 @@ #include "BKE_attribute.hh" #include "BKE_curves.hh" -#include "GPU_batch.h" -#include "GPU_capabilities.h" -#include "GPU_compute.h" +#include "GPU_batch.hh" +#include "GPU_capabilities.hh" +#include "GPU_compute.hh" #include "GPU_material.hh" -#include "GPU_shader.h" -#include "GPU_texture.h" -#include "GPU_vertex_buffer.h" +#include "GPU_shader.hh" +#include "GPU_texture.hh" +#include "GPU_vertex_buffer.hh" #include "DRW_gpu_wrapper.hh" #include "DRW_render.hh" diff --git a/source/blender/draw/intern/draw_curves_private.hh b/source/blender/draw/intern/draw_curves_private.hh index 8498164c99d..fb0f626acd2 100644 --- a/source/blender/draw/intern/draw_curves_private.hh +++ b/source/blender/draw/intern/draw_curves_private.hh @@ -8,7 +8,7 @@ #pragma once -#include "GPU_shader.h" +#include "GPU_shader.hh" #include "draw_attributes.hh" diff --git a/source/blender/draw/intern/draw_debug.cc b/source/blender/draw/intern/draw_debug.cc index d8de62f606f..159954bf54e 100644 --- a/source/blender/draw/intern/draw_debug.cc +++ b/source/blender/draw/intern/draw_debug.cc @@ -11,9 +11,9 @@ #include "BKE_object.hh" #include "BLI_link_utils.h" #include "BLI_math_matrix.hh" -#include "GPU_batch.h" -#include "GPU_capabilities.h" -#include "GPU_debug.h" +#include "GPU_batch.hh" +#include "GPU_capabilities.hh" +#include "GPU_debug.hh" #include "draw_debug.h" #include "draw_debug.hh" diff --git a/source/blender/draw/intern/draw_fluid.cc b/source/blender/draw/intern/draw_fluid.cc index 596465c37fc..8a8cf984d5d 100644 --- a/source/blender/draw/intern/draw_fluid.cc +++ b/source/blender/draw/intern/draw_fluid.cc @@ -22,7 +22,7 @@ #include "IMB_colormanagement.hh" -#include "GPU_texture.h" +#include "GPU_texture.hh" #include "draw_manager.h" diff --git a/source/blender/draw/intern/draw_hair.cc b/source/blender/draw/intern/draw_hair.cc index 71870adad11..6d3279170e5 100644 --- a/source/blender/draw/intern/draw_hair.cc +++ b/source/blender/draw/intern/draw_hair.cc @@ -20,14 +20,14 @@ #include "BKE_duplilist.hh" -#include "GPU_batch.h" -#include "GPU_capabilities.h" -#include "GPU_compute.h" -#include "GPU_context.h" +#include "GPU_batch.hh" +#include "GPU_capabilities.hh" +#include "GPU_compute.hh" +#include "GPU_context.hh" #include "GPU_material.hh" -#include "GPU_shader.h" -#include "GPU_texture.h" -#include "GPU_vertex_buffer.h" +#include "GPU_shader.hh" +#include "GPU_texture.hh" +#include "GPU_vertex_buffer.hh" #include "DRW_gpu_wrapper.hh" diff --git a/source/blender/draw/intern/draw_instance_data.h b/source/blender/draw/intern/draw_instance_data.h index 3c8dbbaf21b..f07e9446951 100644 --- a/source/blender/draw/intern/draw_instance_data.h +++ b/source/blender/draw/intern/draw_instance_data.h @@ -11,7 +11,7 @@ #include "BLI_compiler_attrs.h" #include "BLI_sys_types.h" -#include "GPU_batch.h" +#include "GPU_batch.hh" #define MAX_INSTANCE_DATA_SIZE 64 /* Can be adjusted for more */ diff --git a/source/blender/draw/intern/draw_manager.cc b/source/blender/draw/intern/draw_manager.cc index d5868a39b1d..54a6b1e447d 100644 --- a/source/blender/draw/intern/draw_manager.cc +++ b/source/blender/draw/intern/draw_manager.cc @@ -7,7 +7,7 @@ */ #include "BKE_global.hh" -#include "GPU_compute.h" +#include "GPU_compute.hh" #include "draw_debug.hh" #include "draw_defines.h" diff --git a/source/blender/draw/intern/draw_manager.h b/source/blender/draw/intern/draw_manager.h index 53958b3f1b7..fe4359f92b3 100644 --- a/source/blender/draw/intern/draw_manager.h +++ b/source/blender/draw/intern/draw_manager.h @@ -19,13 +19,13 @@ #include "BLI_task.h" #include "BLI_threads.h" -#include "GPU_batch.h" -#include "GPU_context.h" -#include "GPU_drawlist.h" -#include "GPU_framebuffer.h" -#include "GPU_shader.h" +#include "GPU_batch.hh" +#include "GPU_context.hh" +#include "GPU_drawlist.hh" +#include "GPU_framebuffer.hh" +#include "GPU_shader.hh" #include "GPU_uniform_buffer.hh" -#include "GPU_viewport.h" +#include "GPU_viewport.hh" #include "draw_instance_data.h" #include "draw_shader_shared.h" diff --git a/source/blender/draw/intern/draw_manager_c.cc b/source/blender/draw/intern/draw_manager_c.cc index 1dd2e7be3f6..e7f1cbd7008 100644 --- a/source/blender/draw/intern/draw_manager_c.cc +++ b/source/blender/draw/intern/draw_manager_c.cc @@ -55,15 +55,15 @@ #include "ED_space_api.hh" #include "ED_view3d.hh" -#include "GPU_capabilities.h" -#include "GPU_framebuffer.h" -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_platform.h" -#include "GPU_shader_shared.h" -#include "GPU_state.h" +#include "GPU_capabilities.hh" +#include "GPU_framebuffer.hh" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_platform.hh" +#include "GPU_shader_shared.hh" +#include "GPU_state.hh" #include "GPU_uniform_buffer.hh" -#include "GPU_viewport.h" +#include "GPU_viewport.hh" #include "RE_engine.h" #include "RE_pipeline.h" @@ -97,7 +97,7 @@ #include "engines/select/select_engine.hh" #include "engines/workbench/workbench_engine.h" -#include "GPU_context.h" +#include "GPU_context.hh" #include "DEG_depsgraph.hh" #include "DEG_depsgraph_query.hh" diff --git a/source/blender/draw/intern/draw_manager_data.cc b/source/blender/draw/intern/draw_manager_data.cc index 0266d1fe3d5..38cd73be4c9 100644 --- a/source/blender/draw/intern/draw_manager_data.cc +++ b/source/blender/draw/intern/draw_manager_data.cc @@ -44,11 +44,11 @@ # include "BLI_math_bits.h" #endif -#include "GPU_capabilities.h" +#include "GPU_capabilities.hh" #include "GPU_material.hh" #include "GPU_uniform_buffer.hh" -#include "intern/gpu_codegen.h" +#include "intern/gpu_codegen.hh" /** * IMPORTANT: diff --git a/source/blender/draw/intern/draw_manager_exec.cc b/source/blender/draw/intern/draw_manager_exec.cc index aa8dc9c835d..44f8a9253a5 100644 --- a/source/blender/draw/intern/draw_manager_exec.cc +++ b/source/blender/draw/intern/draw_manager_exec.cc @@ -14,10 +14,10 @@ #include "BKE_global.hh" -#include "GPU_compute.h" -#include "GPU_platform.h" -#include "GPU_shader.h" -#include "GPU_state.h" +#include "GPU_compute.hh" +#include "GPU_platform.hh" +#include "GPU_shader.hh" +#include "GPU_state.hh" #ifdef USE_GPU_SELECT # include "GPU_select.hh" diff --git a/source/blender/draw/intern/draw_manager_profiling.cc b/source/blender/draw/intern/draw_manager_profiling.cc index 54d560610a4..2d79b09b88e 100644 --- a/source/blender/draw/intern/draw_manager_profiling.cc +++ b/source/blender/draw/intern/draw_manager_profiling.cc @@ -20,8 +20,8 @@ #include "draw_manager.h" -#include "GPU_debug.h" -#include "GPU_texture.h" +#include "GPU_debug.hh" +#include "GPU_texture.hh" #include "UI_resources.hh" diff --git a/source/blender/draw/intern/draw_manager_shader.cc b/source/blender/draw/intern/draw_manager_shader.cc index a7a53498c6d..5137bb29633 100644 --- a/source/blender/draw/intern/draw_manager_shader.cc +++ b/source/blender/draw/intern/draw_manager_shader.cc @@ -22,9 +22,9 @@ #include "DEG_depsgraph_query.hh" -#include "GPU_capabilities.h" +#include "GPU_capabilities.hh" #include "GPU_material.hh" -#include "GPU_shader.h" +#include "GPU_shader.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/draw/intern/draw_manager_testing.h b/source/blender/draw/intern/draw_manager_testing.h index faa45cc7d59..3a92130bae1 100644 --- a/source/blender/draw/intern/draw_manager_testing.h +++ b/source/blender/draw/intern/draw_manager_testing.h @@ -10,7 +10,7 @@ #pragma once -#include "GPU_shader.h" +#include "GPU_shader.hh" #ifdef __cplusplus extern "C" { diff --git a/source/blender/draw/intern/draw_manager_text.cc b/source/blender/draw/intern/draw_manager_text.cc index dc633c06628..318aa1238b3 100644 --- a/source/blender/draw/intern/draw_manager_text.cc +++ b/source/blender/draw/intern/draw_manager_text.cc @@ -31,8 +31,8 @@ #include "DNA_screen_types.h" #include "DNA_view3d_types.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "ED_screen.hh" #include "ED_view3d.hh" diff --git a/source/blender/draw/intern/draw_pass.hh b/source/blender/draw/intern/draw_pass.hh index 1467b75a30f..2476f6a80c5 100644 --- a/source/blender/draw/intern/draw_pass.hh +++ b/source/blender/draw/intern/draw_pass.hh @@ -45,7 +45,7 @@ #include "BKE_image.h" -#include "GPU_debug.h" +#include "GPU_debug.hh" #include "GPU_material.hh" #include "DRW_gpu_wrapper.hh" @@ -57,7 +57,7 @@ #include "draw_shader_shared.h" #include "draw_state.h" -#include "intern/gpu_codegen.h" +#include "intern/gpu_codegen.hh" #include diff --git a/source/blender/draw/intern/draw_pbvh.cc b/source/blender/draw/intern/draw_pbvh.cc index 138ca2cf50b..e9e3ac47a16 100644 --- a/source/blender/draw/intern/draw_pbvh.cc +++ b/source/blender/draw/intern/draw_pbvh.cc @@ -44,7 +44,7 @@ #include "BKE_pbvh_api.hh" #include "BKE_subdiv_ccg.hh" -#include "GPU_batch.h" +#include "GPU_batch.hh" #include "DRW_engine.hh" #include "DRW_pbvh.hh" @@ -52,7 +52,7 @@ #include "attribute_convert.hh" #include "bmesh.hh" #include "draw_pbvh.hh" -#include "gpu_private.h" +#include "gpu_private.hh" #define MAX_PBVH_BATCH_KEY 512 #define MAX_PBVH_VBOS 16 diff --git a/source/blender/draw/intern/draw_pointcloud.cc b/source/blender/draw/intern/draw_pointcloud.cc index 911e9c1a9a3..e61ff5adf0a 100644 --- a/source/blender/draw/intern/draw_pointcloud.cc +++ b/source/blender/draw/intern/draw_pointcloud.cc @@ -11,13 +11,13 @@ #include "DNA_pointcloud_types.h" -#include "GPU_batch.h" -#include "GPU_capabilities.h" -#include "GPU_compute.h" +#include "GPU_batch.hh" +#include "GPU_capabilities.hh" +#include "GPU_compute.hh" #include "GPU_material.hh" -#include "GPU_shader.h" -#include "GPU_texture.h" -#include "GPU_vertex_buffer.h" +#include "GPU_shader.hh" +#include "GPU_texture.hh" +#include "GPU_vertex_buffer.hh" #include "DRW_gpu_wrapper.hh" #include "DRW_render.hh" diff --git a/source/blender/draw/intern/draw_shader.cc b/source/blender/draw/intern/draw_shader.cc index 7186bd3464c..62d254fed8a 100644 --- a/source/blender/draw/intern/draw_shader.cc +++ b/source/blender/draw/intern/draw_shader.cc @@ -11,9 +11,9 @@ #include "BLI_dynstr.h" #include "BLI_string_utils.hh" -#include "GPU_batch.h" -#include "GPU_index_buffer.h" -#include "GPU_vertex_buffer.h" +#include "GPU_batch.hh" +#include "GPU_index_buffer.hh" +#include "GPU_vertex_buffer.hh" #include "draw_shader.hh" diff --git a/source/blender/draw/intern/draw_shader_shared.h b/source/blender/draw/intern/draw_shader_shared.h index 754a38a5f16..c6479762cfd 100644 --- a/source/blender/draw/intern/draw_shader_shared.h +++ b/source/blender/draw/intern/draw_shader_shared.h @@ -5,8 +5,8 @@ #ifndef GPU_SHADER # pragma once -# include "GPU_shader.h" -# include "GPU_shader_shared_utils.h" +# include "GPU_shader.hh" +# include "GPU_shader_shared_utils.hh" # include "draw_defines.h" typedef struct ViewCullingData ViewCullingData; diff --git a/source/blender/draw/intern/draw_texture_pool.h b/source/blender/draw/intern/draw_texture_pool.h index 1e1ff078a1f..6a299971c2c 100644 --- a/source/blender/draw/intern/draw_texture_pool.h +++ b/source/blender/draw/intern/draw_texture_pool.h @@ -13,7 +13,7 @@ #pragma once -#include "GPU_texture.h" +#include "GPU_texture.hh" typedef struct DRWTexturePool DRWTexturePool; diff --git a/source/blender/draw/intern/draw_view.cc b/source/blender/draw/intern/draw_view.cc index e86420a55f8..015e5186e7f 100644 --- a/source/blender/draw/intern/draw_view.cc +++ b/source/blender/draw/intern/draw_view.cc @@ -8,8 +8,8 @@ #include "BLI_math_geom.h" #include "BLI_math_matrix.hh" -#include "GPU_compute.h" -#include "GPU_debug.h" +#include "GPU_compute.hh" +#include "GPU_debug.hh" #include "draw_debug.hh" #include "draw_shader.hh" diff --git a/source/blender/draw/intern/draw_view_c.cc b/source/blender/draw/intern/draw_view_c.cc index 4e0882d4fca..32de4f39d9a 100644 --- a/source/blender/draw/intern/draw_view_c.cc +++ b/source/blender/draw/intern/draw_view_c.cc @@ -17,10 +17,10 @@ #include "ED_util.hh" #include "ED_view3d.hh" -#include "GPU_debug.h" -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_shader.h" +#include "GPU_debug.hh" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_shader.hh" #include "UI_resources.hh" #include "UI_view2d.hh" diff --git a/source/blender/draw/intern/draw_view_data.cc b/source/blender/draw/intern/draw_view_data.cc index db0df23a5a0..cc0986af1c8 100644 --- a/source/blender/draw/intern/draw_view_data.cc +++ b/source/blender/draw/intern/draw_view_data.cc @@ -8,8 +8,8 @@ #include "BLI_vector.hh" -#include "GPU_capabilities.h" -#include "GPU_viewport.h" +#include "GPU_capabilities.hh" +#include "GPU_viewport.hh" #include "DRW_render.hh" diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh.hh b/source/blender/draw/intern/mesh_extractors/extract_mesh.hh index acfe1bbc572..6ceafe69f98 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh.hh +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh.hh @@ -20,8 +20,8 @@ #include "bmesh.hh" -#include "GPU_vertex_buffer.h" -#include "GPU_vertex_format.h" +#include "GPU_vertex_buffer.hh" +#include "GPU_vertex_format.hh" #include "draw_cache_extract.hh" diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc index 583b4843acc..72c4b6b3485 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc @@ -8,7 +8,7 @@ #include "extract_mesh.hh" -#include "GPU_index_buffer.h" +#include "GPU_index_buffer.hh" #include "draw_subdivision.hh" diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_fdots.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_fdots.cc index d9182330aab..bfa7b625098 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_fdots.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_fdots.cc @@ -6,7 +6,7 @@ * \ingroup draw */ -#include "GPU_index_buffer.h" +#include "GPU_index_buffer.hh" #include "extract_mesh.hh" diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc index a00097e4810..26c0d7e12df 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc @@ -6,7 +6,7 @@ * \ingroup draw */ -#include "GPU_index_buffer.h" +#include "GPU_index_buffer.hh" #include "extract_mesh.hh" diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc index a88496be70c..9a282dace92 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc @@ -12,7 +12,7 @@ #include "MEM_guardedalloc.h" -#include "GPU_index_buffer.h" +#include "GPU_index_buffer.hh" #include "draw_subdivision.hh" #include "extract_mesh.hh" diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_paint_mask.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_paint_mask.cc index d7bd2979cbe..3779d3d42b6 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_paint_mask.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_paint_mask.cc @@ -11,7 +11,7 @@ #include "MEM_guardedalloc.h" -#include "GPU_index_buffer.h" +#include "GPU_index_buffer.hh" #include "draw_subdivision.hh" #include "extract_mesh.hh" diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc index ed5c32d7b42..90b47a4b3ed 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc @@ -6,7 +6,7 @@ * \ingroup draw */ -#include "GPU_index_buffer.h" +#include "GPU_index_buffer.hh" #include "draw_subdivision.hh" #include "extract_mesh.hh" diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_tris.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_tris.cc index 5b3557e1ec0..3f3f3517453 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_tris.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_tris.cc @@ -8,7 +8,7 @@ #include "BKE_editmesh.hh" -#include "GPU_index_buffer.h" +#include "GPU_index_buffer.hh" #include "extract_mesh.hh" diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc index 66f5803e43d..8d713f325f9 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc @@ -21,7 +21,7 @@ #include "draw_subdivision.hh" #include "extract_mesh.hh" -#include "GPU_vertex_buffer.h" +#include "GPU_vertex_buffer.hh" namespace blender::draw { diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edge_fac.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edge_fac.cc index 1117accb663..17628a04302 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edge_fac.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edge_fac.cc @@ -10,7 +10,7 @@ #include "BLI_math_vector.hh" -#include "GPU_capabilities.h" +#include "GPU_capabilities.hh" #include "draw_subdivision.hh" #include "extract_mesh.hh" diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_pos.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_pos.cc index fec1408d9fe..770a7952827 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_pos.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_pos.cc @@ -6,7 +6,7 @@ * \ingroup draw */ -#include "GPU_index_buffer.h" +#include "GPU_index_buffer.hh" #include "extract_mesh.hh" diff --git a/source/blender/draw/tests/draw_testing.cc b/source/blender/draw/tests/draw_testing.cc index d88f6670f02..60a0155514c 100644 --- a/source/blender/draw/tests/draw_testing.cc +++ b/source/blender/draw/tests/draw_testing.cc @@ -4,7 +4,7 @@ #include "draw_testing.hh" -#include "GPU_shader.h" +#include "GPU_shader.hh" #include "draw_manager_testing.h" diff --git a/source/blender/draw/tests/eevee_test.cc b/source/blender/draw/tests/eevee_test.cc index c61c7a09164..b237755ad6b 100644 --- a/source/blender/draw/tests/eevee_test.cc +++ b/source/blender/draw/tests/eevee_test.cc @@ -14,7 +14,7 @@ #include "RNA_define.hh" -#include "GPU_batch.h" +#include "GPU_batch.hh" #include "draw_shader.hh" #include "draw_testing.hh" #include "engines/eevee_next/eevee_instance.hh" diff --git a/source/blender/editors/animation/anim_channels_defines.cc b/source/blender/editors/animation/anim_channels_defines.cc index 98b0ff323bb..3dec1d0dc98 100644 --- a/source/blender/editors/animation/anim_channels_defines.cc +++ b/source/blender/editors/animation/anim_channels_defines.cc @@ -60,8 +60,8 @@ #include "BKE_lib_id.hh" #include "BKE_nla.h" -#include "GPU_immediate.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_state.hh" #include "DEG_depsgraph.hh" diff --git a/source/blender/editors/animation/anim_draw.cc b/source/blender/editors/animation/anim_draw.cc index e6ffd637fbe..14672936322 100644 --- a/source/blender/editors/animation/anim_draw.cc +++ b/source/blender/editors/animation/anim_draw.cc @@ -36,8 +36,8 @@ #include "UI_resources.hh" #include "UI_view2d.hh" -#include "GPU_immediate.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_state.hh" /* *************************************************** */ /* CURRENT FRAME DRAWING */ diff --git a/source/blender/editors/animation/anim_markers.cc b/source/blender/editors/animation/anim_markers.cc index 5be085743bc..93dd252f39c 100644 --- a/source/blender/editors/animation/anim_markers.cc +++ b/source/blender/editors/animation/anim_markers.cc @@ -34,9 +34,9 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "UI_interface.hh" #include "UI_interface_icons.hh" diff --git a/source/blender/editors/animation/anim_motion_paths.cc b/source/blender/editors/animation/anim_motion_paths.cc index 9cf8a4f65fb..b70b38ed6d9 100644 --- a/source/blender/editors/animation/anim_motion_paths.cc +++ b/source/blender/editors/animation/anim_motion_paths.cc @@ -28,8 +28,8 @@ #include "DEG_depsgraph_build.hh" #include "DEG_depsgraph_query.hh" -#include "GPU_batch.h" -#include "GPU_vertex_buffer.h" +#include "GPU_batch.hh" +#include "GPU_vertex_buffer.hh" #include "ED_anim_api.hh" #include "ED_keyframes_keylist.hh" diff --git a/source/blender/editors/animation/keyframes_draw.cc b/source/blender/editors/animation/keyframes_draw.cc index 38a8ad8dbc6..55a7e36e12b 100644 --- a/source/blender/editors/animation/keyframes_draw.cc +++ b/source/blender/editors/animation/keyframes_draw.cc @@ -22,9 +22,9 @@ #include "DNA_grease_pencil_types.h" #include "DNA_mask_types.h" -#include "GPU_immediate.h" -#include "GPU_shader_shared.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_shader_shared.hh" +#include "GPU_state.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/editors/animation/time_scrub_ui.cc b/source/blender/editors/animation/time_scrub_ui.cc index 9e78feda81a..ea2d2359d7e 100644 --- a/source/blender/editors/animation/time_scrub_ui.cc +++ b/source/blender/editors/animation/time_scrub_ui.cc @@ -9,9 +9,9 @@ #include "BKE_context.hh" #include "BKE_scene.hh" -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "ED_time_scrub_ui.hh" diff --git a/source/blender/editors/curve/editcurve_paint.cc b/source/blender/editors/curve/editcurve_paint.cc index deedeaeb1a6..8676cae7304 100644 --- a/source/blender/editors/curve/editcurve_paint.cc +++ b/source/blender/editors/curve/editcurve_paint.cc @@ -31,12 +31,12 @@ #include "ED_space_api.hh" #include "ED_view3d.hh" -#include "GPU_batch.h" -#include "GPU_batch_presets.h" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_batch.hh" +#include "GPU_batch_presets.hh" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "curve_intern.h" diff --git a/source/blender/editors/curves/intern/curves_draw.cc b/source/blender/editors/curves/intern/curves_draw.cc index db010aecd55..10485eeed6c 100644 --- a/source/blender/editors/curves/intern/curves_draw.cc +++ b/source/blender/editors/curves/intern/curves_draw.cc @@ -24,11 +24,11 @@ #include "ED_space_api.hh" #include "ED_view3d.hh" -#include "GPU_batch.h" -#include "GPU_batch_presets.h" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_matrix.h" +#include "GPU_batch.hh" +#include "GPU_batch_presets.hh" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_matrix.hh" #include "UI_resources.hh" diff --git a/source/blender/editors/gizmo_library/gizmo_draw_utils.cc b/source/blender/editors/gizmo_library/gizmo_draw_utils.cc index 09b0d89b679..d87588f8157 100644 --- a/source/blender/editors/gizmo_library/gizmo_draw_utils.cc +++ b/source/blender/editors/gizmo_library/gizmo_draw_utils.cc @@ -6,8 +6,8 @@ * \ingroup edgizmolib */ -#include "GPU_batch.h" -#include "GPU_immediate.h" +#include "GPU_batch.hh" +#include "GPU_immediate.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/gizmo_library/gizmo_library_presets.cc b/source/blender/editors/gizmo_library/gizmo_library_presets.cc index 22953a49ce2..bc5c9ab58c2 100644 --- a/source/blender/editors/gizmo_library/gizmo_library_presets.cc +++ b/source/blender/editors/gizmo_library/gizmo_library_presets.cc @@ -15,7 +15,7 @@ #include "BLI_math_matrix.h" #include "BLI_math_rotation.h" -#include "GPU_matrix.h" +#include "GPU_matrix.hh" #include "GPU_select.hh" #include "WM_types.hh" diff --git a/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.cc index c5f244ed45d..5b1b965d67a 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.cc @@ -26,11 +26,11 @@ #include "BKE_context.hh" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_matrix.h" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_matrix.hh" #include "GPU_select.hh" -#include "GPU_state.h" +#include "GPU_state.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.cc index 99f9e258a07..11d945d5709 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.cc @@ -22,13 +22,13 @@ #include "BKE_context.hh" -#include "GPU_batch.h" -#include "GPU_batch_utils.h" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_matrix.h" +#include "GPU_batch.hh" +#include "GPU_batch_utils.hh" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_matrix.hh" #include "GPU_select.hh" -#include "GPU_state.h" +#include "GPU_state.hh" #include "RNA_access.hh" #include "RNA_define.hh" diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.cc index 544cb92296e..cdeda5d9cbb 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.cc @@ -23,12 +23,12 @@ #include "BKE_context.hh" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_matrix.h" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_matrix.hh" #include "GPU_select.hh" -#include "GPU_shader.h" -#include "GPU_state.h" +#include "GPU_shader.hh" +#include "GPU_state.hh" #include "RNA_access.hh" #include "RNA_define.hh" diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.cc index 76e7af5ff88..b6169d4b5a9 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.cc @@ -20,12 +20,12 @@ #include "BKE_context.hh" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_matrix.h" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_matrix.hh" #include "GPU_select.hh" -#include "GPU_shader.h" -#include "GPU_state.h" +#include "GPU_shader.hh" +#include "GPU_state.hh" #include "RNA_access.hh" #include "RNA_define.hh" diff --git a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.cc index 94b360e517e..f911f6b91ac 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.cc @@ -24,11 +24,11 @@ #include "BKE_context.hh" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_matrix.h" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_matrix.hh" #include "GPU_select.hh" -#include "GPU_state.h" +#include "GPU_state.hh" #include "RNA_access.hh" #include "RNA_define.hh" diff --git a/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.cc index 61ea403cd70..8e353804c64 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.cc @@ -23,11 +23,11 @@ #include "BKE_context.hh" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_matrix.h" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_matrix.hh" #include "GPU_select.hh" -#include "GPU_state.h" +#include "GPU_state.hh" #include "RNA_access.hh" #include "RNA_define.hh" diff --git a/source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.cc index dc710623b60..5dd96ec4525 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.cc @@ -19,10 +19,10 @@ #include "DNA_space_types.h" #include "DNA_view3d_types.h" -#include "GPU_immediate.h" -#include "GPU_matrix.h" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" #include "GPU_select.hh" -#include "GPU_state.h" +#include "GPU_state.hh" #include "RNA_define.hh" diff --git a/source/blender/editors/gpencil_legacy/annotate_draw.cc b/source/blender/editors/gpencil_legacy/annotate_draw.cc index 700a1c80edd..edc9ea7aede 100644 --- a/source/blender/editors/gpencil_legacy/annotate_draw.cc +++ b/source/blender/editors/gpencil_legacy/annotate_draw.cc @@ -33,9 +33,9 @@ #include "WM_api.hh" -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "ED_gpencil_legacy.hh" #include "ED_screen.hh" diff --git a/source/blender/editors/gpencil_legacy/annotate_paint.cc b/source/blender/editors/gpencil_legacy/annotate_paint.cc index 8831ed7608f..815e0c341be 100644 --- a/source/blender/editors/gpencil_legacy/annotate_paint.cc +++ b/source/blender/editors/gpencil_legacy/annotate_paint.cc @@ -40,9 +40,9 @@ #include "ED_screen.hh" #include "ED_view3d.hh" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_state.hh" #include "RNA_access.hh" #include "RNA_define.hh" diff --git a/source/blender/editors/gpencil_legacy/drawgpencil.cc b/source/blender/editors/gpencil_legacy/drawgpencil.cc index dceab19d750..9de97464022 100644 --- a/source/blender/editors/gpencil_legacy/drawgpencil.cc +++ b/source/blender/editors/gpencil_legacy/drawgpencil.cc @@ -30,11 +30,11 @@ #include "BKE_gpencil_legacy.h" #include "BKE_material.h" -#include "GPU_batch.h" -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_shader_shared.h" -#include "GPU_state.h" +#include "GPU_batch.hh" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_shader_shared.hh" +#include "GPU_state.hh" #include "GPU_uniform_buffer.hh" #include "ED_gpencil_legacy.hh" diff --git a/source/blender/editors/gpencil_legacy/gpencil_fill.cc b/source/blender/editors/gpencil_legacy/gpencil_fill.cc index ca8d6fcd961..29fd58e7c93 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_fill.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_fill.cc @@ -50,10 +50,10 @@ #include "IMB_imbuf.hh" #include "IMB_imbuf_types.hh" -#include "GPU_framebuffer.h" -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_framebuffer.hh" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "UI_interface.hh" diff --git a/source/blender/editors/gpencil_legacy/gpencil_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_paint.cc index 7ac52ddec39..03e3b9d9699 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_paint.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_paint.cc @@ -54,9 +54,9 @@ #include "ANIM_keyframing.hh" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_state.hh" #include "RNA_access.hh" #include "RNA_define.hh" diff --git a/source/blender/editors/gpencil_legacy/gpencil_utils.cc b/source/blender/editors/gpencil_legacy/gpencil_utils.cc index 1d3e4de3d95..45d1287a95b 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_utils.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_utils.cc @@ -71,9 +71,9 @@ #include "ED_transform_snap_object_context.hh" #include "ED_view3d.hh" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_state.hh" #include "DEG_depsgraph.hh" #include "DEG_depsgraph_query.hh" diff --git a/source/blender/editors/include/BIF_glutil.hh b/source/blender/editors/include/BIF_glutil.hh index 10c66315a14..6c0a0623df9 100644 --- a/source/blender/editors/include/BIF_glutil.hh +++ b/source/blender/editors/include/BIF_glutil.hh @@ -8,7 +8,7 @@ #pragma once -#include "GPU_texture.h" +#include "GPU_texture.hh" struct rcti; @@ -200,6 +200,6 @@ void ED_draw_imbuf_ctx_clipping(const bContext *C, int ED_draw_imbuf_method(const ImBuf *ibuf); /** - * Don't move to `GPU_immediate_util.h` because this uses user-prefs and isn't very low level. + * Don't move to `GPU_immediate_util.hh` because this uses user-prefs and isn't very low level. */ void immDrawBorderCorners(unsigned int pos, const rcti *border, float zoomx, float zoomy); diff --git a/source/blender/editors/interface/interface.cc b/source/blender/editors/interface/interface.cc index 853cf97ed81..ba3fb62e142 100644 --- a/source/blender/editors/interface/interface.cc +++ b/source/blender/editors/interface/interface.cc @@ -39,8 +39,8 @@ #include "BKE_screen.hh" #include "BKE_unit.hh" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "BLF_api.hh" #include "BLT_translation.hh" diff --git a/source/blender/editors/interface/interface_button_sections.cc b/source/blender/editors/interface/interface_button_sections.cc index a5787d85973..0c7a024fe90 100644 --- a/source/blender/editors/interface/interface_button_sections.cc +++ b/source/blender/editors/interface/interface_button_sections.cc @@ -15,7 +15,7 @@ #include "DNA_screen_types.h" -#include "GPU_immediate.h" +#include "GPU_immediate.hh" #include "interface_intern.hh" diff --git a/source/blender/editors/interface/interface_draw.cc b/source/blender/editors/interface/interface_draw.cc index 864d4e1bde0..81113aff052 100644 --- a/source/blender/editors/interface/interface_draw.cc +++ b/source/blender/editors/interface/interface_draw.cc @@ -36,13 +36,13 @@ #include "BLF_api.hh" -#include "GPU_batch.h" -#include "GPU_batch_presets.h" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_matrix.h" -#include "GPU_shader_shared.h" -#include "GPU_state.h" +#include "GPU_batch.hh" +#include "GPU_batch_presets.hh" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_matrix.hh" +#include "GPU_shader_shared.hh" +#include "GPU_state.hh" #include "UI_interface.hh" diff --git a/source/blender/editors/interface/interface_icons.cc b/source/blender/editors/interface/interface_icons.cc index 64cad98d53b..809fb0f1b89 100644 --- a/source/blender/editors/interface/interface_icons.cc +++ b/source/blender/editors/interface/interface_icons.cc @@ -13,13 +13,13 @@ #include "MEM_guardedalloc.h" -#include "GPU_batch.h" -#include "GPU_batch_presets.h" -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_shader_shared.h" -#include "GPU_state.h" -#include "GPU_texture.h" +#include "GPU_batch.hh" +#include "GPU_batch_presets.hh" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_shader_shared.hh" +#include "GPU_state.hh" +#include "GPU_texture.hh" #include "BLI_blenlib.h" #include "BLI_fileops_types.h" diff --git a/source/blender/editors/interface/interface_icons_event.cc b/source/blender/editors/interface/interface_icons_event.cc index 90769a8cf2c..9fbf3440b77 100644 --- a/source/blender/editors/interface/interface_icons_event.cc +++ b/source/blender/editors/interface/interface_icons_event.cc @@ -11,7 +11,7 @@ * Event codes are used as identifiers. */ -#include "GPU_state.h" +#include "GPU_state.hh" #include "BLI_string.h" diff --git a/source/blender/editors/interface/interface_panel.cc b/source/blender/editors/interface/interface_panel.cc index d3d11c24fdc..3e105c9e7d4 100644 --- a/source/blender/editors/interface/interface_panel.cc +++ b/source/blender/editors/interface/interface_panel.cc @@ -43,10 +43,10 @@ #include "UI_resources.hh" #include "UI_view2d.hh" -#include "GPU_batch_presets.h" -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_batch_presets.hh" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "interface_intern.hh" diff --git a/source/blender/editors/interface/interface_region_hud.cc b/source/blender/editors/interface/interface_region_hud.cc index 5a2978263fd..2fcb113bb2c 100644 --- a/source/blender/editors/interface/interface_region_hud.cc +++ b/source/blender/editors/interface/interface_region_hud.cc @@ -33,7 +33,7 @@ #include "ED_screen.hh" -#include "GPU_framebuffer.h" +#include "GPU_framebuffer.hh" #include "interface_intern.hh" /* -------------------------------------------------------------------- */ diff --git a/source/blender/editors/interface/interface_region_search.cc b/source/blender/editors/interface/interface_region_search.cc index c6393f87cc6..42b9cb8f791 100644 --- a/source/blender/editors/interface/interface_region_search.cc +++ b/source/blender/editors/interface/interface_region_search.cc @@ -39,7 +39,7 @@ #include "ED_screen.hh" -#include "GPU_state.h" +#include "GPU_state.hh" #include "interface_intern.hh" #include "interface_regions_intern.hh" diff --git a/source/blender/editors/interface/interface_region_tooltip.cc b/source/blender/editors/interface/interface_region_tooltip.cc index d81113a0574..e6d8ea13c47 100644 --- a/source/blender/editors/interface/interface_region_tooltip.cc +++ b/source/blender/editors/interface/interface_region_tooltip.cc @@ -41,9 +41,9 @@ #include "BIF_glutil.hh" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_state.hh" #include "IMB_imbuf.hh" #include "IMB_imbuf_types.hh" diff --git a/source/blender/editors/interface/interface_widgets.cc b/source/blender/editors/interface/interface_widgets.cc index 439dc89ab2f..fe75ef6fbfc 100644 --- a/source/blender/editors/interface/interface_widgets.cc +++ b/source/blender/editors/interface/interface_widgets.cc @@ -36,13 +36,13 @@ #include "interface_intern.hh" -#include "GPU_batch.h" -#include "GPU_batch_presets.h" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_matrix.h" -#include "GPU_platform.h" -#include "GPU_state.h" +#include "GPU_batch.hh" +#include "GPU_batch_presets.hh" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_matrix.hh" +#include "GPU_platform.hh" +#include "GPU_state.hh" #ifdef WITH_INPUT_IME # include "WM_types.hh" diff --git a/source/blender/editors/interface/resources.cc b/source/blender/editors/interface/resources.cc index 390eff0c935..a77258e024c 100644 --- a/source/blender/editors/interface/resources.cc +++ b/source/blender/editors/interface/resources.cc @@ -34,7 +34,7 @@ #include "UI_interface.hh" #include "UI_interface_icons.hh" -#include "GPU_framebuffer.h" +#include "GPU_framebuffer.hh" #include "interface_intern.hh" /* be sure to keep 'bThemeState' in sync */ diff --git a/source/blender/editors/interface/view2d.cc b/source/blender/editors/interface/view2d.cc index b86907b685d..8aaf633feb4 100644 --- a/source/blender/editors/interface/view2d.cc +++ b/source/blender/editors/interface/view2d.cc @@ -27,9 +27,9 @@ #include "BKE_global.hh" #include "BKE_screen.hh" -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "WM_api.hh" diff --git a/source/blender/editors/interface/view2d_draw.cc b/source/blender/editors/interface/view2d_draw.cc index 1d4e730ab5b..d3e6409df83 100644 --- a/source/blender/editors/interface/view2d_draw.cc +++ b/source/blender/editors/interface/view2d_draw.cc @@ -23,9 +23,9 @@ #include "BLI_utildefines.h" #include "BLI_vector.hh" -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "WM_api.hh" diff --git a/source/blender/editors/interface/views/tree_view.cc b/source/blender/editors/interface/views/tree_view.cc index 56d062d6bf9..3ead9a5ee78 100644 --- a/source/blender/editors/interface/views/tree_view.cc +++ b/source/blender/editors/interface/views/tree_view.cc @@ -13,7 +13,7 @@ #include "BLT_translation.hh" -#include "GPU_immediate.h" +#include "GPU_immediate.hh" #include "interface_intern.hh" diff --git a/source/blender/editors/mask/mask_draw.cc b/source/blender/editors/mask/mask_draw.cc index 136d62c786b..df667be7663 100644 --- a/source/blender/editors/mask/mask_draw.cc +++ b/source/blender/editors/mask/mask_draw.cc @@ -28,10 +28,10 @@ #include "BIF_glutil.hh" -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_shader.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_shader.hh" +#include "GPU_state.hh" #include "UI_resources.hh" #include "UI_view2d.hh" diff --git a/source/blender/editors/mesh/editmesh_knife.cc b/source/blender/editors/mesh/editmesh_knife.cc index 0d57afeee22..c7d575924cb 100644 --- a/source/blender/editors/mesh/editmesh_knife.cc +++ b/source/blender/editors/mesh/editmesh_knife.cc @@ -42,9 +42,9 @@ #include "BKE_scene.hh" #include "BKE_unit.hh" -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "ED_mesh.hh" #include "ED_numinput.hh" diff --git a/source/blender/editors/mesh/editmesh_preselect_edgering.cc b/source/blender/editors/mesh/editmesh_preselect_edgering.cc index 31709ed3f05..67145e01bb9 100644 --- a/source/blender/editors/mesh/editmesh_preselect_edgering.cc +++ b/source/blender/editors/mesh/editmesh_preselect_edgering.cc @@ -14,9 +14,9 @@ #include "BKE_editmesh.hh" -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "ED_mesh.hh" diff --git a/source/blender/editors/mesh/editmesh_preselect_elem.cc b/source/blender/editors/mesh/editmesh_preselect_elem.cc index 651c2052f2a..27af1138e35 100644 --- a/source/blender/editors/mesh/editmesh_preselect_elem.cc +++ b/source/blender/editors/mesh/editmesh_preselect_elem.cc @@ -12,9 +12,9 @@ #include "BKE_editmesh.hh" -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "DNA_object_types.h" diff --git a/source/blender/editors/object/object_remesh.cc b/source/blender/editors/object/object_remesh.cc index e8d003b1e96..5635603caa1 100644 --- a/source/blender/editors/object/object_remesh.cc +++ b/source/blender/editors/object/object_remesh.cc @@ -49,9 +49,9 @@ #include "RNA_access.hh" #include "RNA_define.hh" -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/physics/particle_edit.cc b/source/blender/editors/physics/particle_edit.cc index d6b95248a61..ca470da5eba 100644 --- a/source/blender/editors/physics/particle_edit.cc +++ b/source/blender/editors/physics/particle_edit.cc @@ -56,9 +56,9 @@ #include "ED_select_utils.hh" #include "ED_view3d.hh" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_state.hh" #include "UI_resources.hh" diff --git a/source/blender/editors/render/render_opengl.cc b/source/blender/editors/render/render_opengl.cc index 7f635608f86..d143800e267 100644 --- a/source/blender/editors/render/render_opengl.cc +++ b/source/blender/editors/render/render_opengl.cc @@ -67,9 +67,9 @@ #include "SEQ_render.hh" -#include "GPU_framebuffer.h" -#include "GPU_matrix.h" -#include "GPU_viewport.h" +#include "GPU_framebuffer.hh" +#include "GPU_matrix.hh" +#include "GPU_viewport.hh" #include "render_intern.hh" diff --git a/source/blender/editors/render/render_preview.cc b/source/blender/editors/render/render_preview.cc index aada0c80c49..cddcc49150e 100644 --- a/source/blender/editors/render/render_preview.cc +++ b/source/blender/editors/render/render_preview.cc @@ -78,7 +78,7 @@ #include "BIF_glutil.hh" -#include "GPU_shader.h" +#include "GPU_shader.hh" #include "RE_engine.h" #include "RE_pipeline.h" diff --git a/source/blender/editors/screen/area.cc b/source/blender/editors/screen/area.cc index 302d88d8df6..b1f306271bb 100644 --- a/source/blender/editors/screen/area.cc +++ b/source/blender/editors/screen/area.cc @@ -38,11 +38,11 @@ #include "ED_space_api.hh" #include "ED_time_scrub_ui.hh" -#include "GPU_framebuffer.h" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_framebuffer.hh" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "BLF_api.hh" diff --git a/source/blender/editors/screen/glutil.cc b/source/blender/editors/screen/glutil.cc index 33e4aeee62a..dbcb9b8ce2e 100644 --- a/source/blender/editors/screen/glutil.cc +++ b/source/blender/editors/screen/glutil.cc @@ -19,12 +19,12 @@ #include "IMB_colormanagement.hh" #include "IMB_imbuf_types.hh" -#include "GPU_context.h" -#include "GPU_immediate.h" -#include "GPU_texture.h" +#include "GPU_context.hh" +#include "GPU_immediate.hh" +#include "GPU_texture.hh" #ifdef __APPLE__ -# include "GPU_state.h" +# include "GPU_state.hh" #endif /* ******************************************** */ diff --git a/source/blender/editors/screen/screen_draw.cc b/source/blender/editors/screen/screen_draw.cc index 922914b67cb..129242fdb0b 100644 --- a/source/blender/editors/screen/screen_draw.cc +++ b/source/blender/editors/screen/screen_draw.cc @@ -8,10 +8,10 @@ #include "ED_screen.hh" -#include "GPU_batch_presets.h" -#include "GPU_immediate.h" -#include "GPU_platform.h" -#include "GPU_state.h" +#include "GPU_batch_presets.hh" +#include "GPU_immediate.hh" +#include "GPU_platform.hh" +#include "GPU_state.hh" #include "BLI_listbase.h" #include "BLI_math_vector.hh" diff --git a/source/blender/editors/screen/screen_ops.cc b/source/blender/editors/screen/screen_ops.cc index 96bd0d7a9c4..a85db53b583 100644 --- a/source/blender/editors/screen/screen_ops.cc +++ b/source/blender/editors/screen/screen_ops.cc @@ -72,7 +72,7 @@ #include "UI_resources.hh" #include "UI_view2d.hh" -#include "GPU_capabilities.h" +#include "GPU_capabilities.hh" #include "screen_intern.h" /* own module include */ diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc b/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc index bb10caaeb3e..f45d17c4b60 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc @@ -46,10 +46,10 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" namespace blender::ed::sculpt_paint { diff --git a/source/blender/editors/sculpt_paint/paint_cursor.cc b/source/blender/editors/sculpt_paint/paint_cursor.cc index ca9db0a0c16..e3ff8e61664 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.cc +++ b/source/blender/editors/sculpt_paint/paint_cursor.cc @@ -49,11 +49,11 @@ #include "DEG_depsgraph.hh" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_matrix.h" -#include "GPU_state.h" -#include "GPU_texture.h" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" +#include "GPU_texture.hh" #include "UI_resources.hh" diff --git a/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc b/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc index 90221c3ea22..b7fccfb12f4 100644 --- a/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc +++ b/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc @@ -23,8 +23,8 @@ #include "ED_paint.hh" #include "ED_view3d.hh" -#include "GPU_immediate.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_state.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.cc b/source/blender/editors/sculpt_paint/paint_image_proj.cc index 4dca4c5793d..fb5978e6a03 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.cc +++ b/source/blender/editors/sculpt_paint/paint_image_proj.cc @@ -89,8 +89,8 @@ #include "ED_view3d.hh" #include "ED_view3d_offscreen.hh" -#include "GPU_capabilities.h" -#include "GPU_init_exit.h" +#include "GPU_capabilities.hh" +#include "GPU_init_exit.hh" #include "NOD_shader.h" diff --git a/source/blender/editors/sculpt_paint/paint_stroke.cc b/source/blender/editors/sculpt_paint/paint_stroke.cc index 6bde9707c8b..ccf325c20ba 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.cc +++ b/source/blender/editors/sculpt_paint/paint_stroke.cc @@ -33,8 +33,8 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "GPU_immediate.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_state.hh" #include "ED_screen.hh" #include "ED_view3d.hh" diff --git a/source/blender/editors/sculpt_paint/paint_utils.cc b/source/blender/editors/sculpt_paint/paint_utils.cc index dfaac319397..6243b0c4ade 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.cc +++ b/source/blender/editors/sculpt_paint/paint_utils.cc @@ -44,8 +44,8 @@ #include "RNA_define.hh" #include "RNA_prototypes.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "IMB_imbuf_types.hh" #include "IMB_interp.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_boundary.cc b/source/blender/editors/sculpt_paint/sculpt_boundary.cc index 161f8cc43f3..25fce361da1 100644 --- a/source/blender/editors/sculpt_paint/sculpt_boundary.cc +++ b/source/blender/editors/sculpt_paint/sculpt_boundary.cc @@ -22,8 +22,8 @@ #include "paint_intern.hh" #include "sculpt_intern.hh" -#include "GPU_immediate.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_state.hh" #include #include diff --git a/source/blender/editors/sculpt_paint/sculpt_cloth.cc b/source/blender/editors/sculpt_paint/sculpt_cloth.cc index 052319187fe..b7b36cc339a 100644 --- a/source/blender/editors/sculpt_paint/sculpt_cloth.cc +++ b/source/blender/editors/sculpt_paint/sculpt_cloth.cc @@ -44,10 +44,10 @@ #include "RNA_access.hh" #include "RNA_define.hh" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "UI_interface.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_detail.cc b/source/blender/editors/sculpt_paint/sculpt_detail.cc index bcdf6000bfc..5742cf8f4e5 100644 --- a/source/blender/editors/sculpt_paint/sculpt_detail.cc +++ b/source/blender/editors/sculpt_paint/sculpt_detail.cc @@ -28,10 +28,10 @@ #include "DEG_depsgraph.hh" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.cc b/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.cc index cb198a77aa6..eb4e3a6e001 100644 --- a/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.cc +++ b/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.cc @@ -22,8 +22,8 @@ #include "sculpt_intern.hh" -#include "GPU_immediate.h" -#include "GPU_matrix.h" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" #include "bmesh.hh" diff --git a/source/blender/editors/space_action/action_draw.cc b/source/blender/editors/space_action/action_draw.cc index e88deb4fafc..fd053686af8 100644 --- a/source/blender/editors/space_action/action_draw.cc +++ b/source/blender/editors/space_action/action_draw.cc @@ -29,9 +29,9 @@ /* Everything from source (BIF, BDR, BSE) ------------------------------ */ -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/editors/space_action/space_action.cc b/source/blender/editors/space_action/space_action.cc index 81cda5b337e..78c1dc4f778 100644 --- a/source/blender/editors/space_action/space_action.cc +++ b/source/blender/editors/space_action/space_action.cc @@ -43,7 +43,7 @@ #include "BLO_read_write.hh" -#include "GPU_matrix.h" +#include "GPU_matrix.hh" #include "action_intern.hh" /* own include */ diff --git a/source/blender/editors/space_api/spacetypes.cc b/source/blender/editors/space_api/spacetypes.cc index 5b8994b8c21..75c20d1da6b 100644 --- a/source/blender/editors/space_api/spacetypes.cc +++ b/source/blender/editors/space_api/spacetypes.cc @@ -18,7 +18,7 @@ #include "BKE_context.hh" #include "BKE_screen.hh" -#include "GPU_state.h" +#include "GPU_state.hh" #include "UI_interface.hh" #include "UI_view2d.hh" diff --git a/source/blender/editors/space_clip/clip_dopesheet_draw.cc b/source/blender/editors/space_clip/clip_dopesheet_draw.cc index 969115ae857..b451c453ec6 100644 --- a/source/blender/editors/space_clip/clip_dopesheet_draw.cc +++ b/source/blender/editors/space_clip/clip_dopesheet_draw.cc @@ -29,8 +29,8 @@ #include "RNA_access.hh" #include "RNA_prototypes.h" -#include "GPU_immediate.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_state.hh" #include "clip_intern.h" /* own include */ diff --git a/source/blender/editors/space_clip/clip_draw.cc b/source/blender/editors/space_clip/clip_draw.cc index 7061c4136dd..44c0bf0dc70 100644 --- a/source/blender/editors/space_clip/clip_draw.cc +++ b/source/blender/editors/space_clip/clip_draw.cc @@ -34,10 +34,10 @@ #include "BIF_glutil.hh" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "WM_types.hh" diff --git a/source/blender/editors/space_clip/clip_graph_draw.cc b/source/blender/editors/space_clip/clip_graph_draw.cc index 56e8c268ec4..2d4bef308f9 100644 --- a/source/blender/editors/space_clip/clip_graph_draw.cc +++ b/source/blender/editors/space_clip/clip_graph_draw.cc @@ -17,10 +17,10 @@ #include "ED_clip.hh" #include "ED_screen.hh" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "WM_types.hh" diff --git a/source/blender/editors/space_clip/clip_utils.cc b/source/blender/editors/space_clip/clip_utils.cc index 86ea1f7bd2f..afd1ac86e8f 100644 --- a/source/blender/editors/space_clip/clip_utils.cc +++ b/source/blender/editors/space_clip/clip_utils.cc @@ -24,8 +24,8 @@ #include "DEG_depsgraph.hh" #include "DEG_depsgraph_build.hh" -#include "GPU_immediate.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_state.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/space_clip/space_clip.cc b/source/blender/editors/space_clip/space_clip.cc index 340fad221e7..d1b5a2a0441 100644 --- a/source/blender/editors/space_clip/space_clip.cc +++ b/source/blender/editors/space_clip/space_clip.cc @@ -40,7 +40,7 @@ #include "IMB_imbuf.hh" -#include "GPU_matrix.h" +#include "GPU_matrix.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/space_console/console_draw.cc b/source/blender/editors/space_console/console_draw.cc index 0c6a706eedc..f08e0c9ed5a 100644 --- a/source/blender/editors/space_console/console_draw.cc +++ b/source/blender/editors/space_console/console_draw.cc @@ -16,7 +16,7 @@ #include "MEM_guardedalloc.h" -#include "GPU_immediate.h" +#include "GPU_immediate.hh" #include "UI_resources.hh" #include "UI_view2d.hh" diff --git a/source/blender/editors/space_file/file_draw.cc b/source/blender/editors/space_file/file_draw.cc index d8683c75081..5f1276750e6 100644 --- a/source/blender/editors/space_file/file_draw.cc +++ b/source/blender/editors/space_file/file_draw.cc @@ -60,9 +60,9 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_state.hh" #include "filelist.hh" diff --git a/source/blender/editors/space_graph/graph_draw.cc b/source/blender/editors/space_graph/graph_draw.cc index af480138b9f..0685802435c 100644 --- a/source/blender/editors/space_graph/graph_draw.cc +++ b/source/blender/editors/space_graph/graph_draw.cc @@ -25,9 +25,9 @@ #include "BKE_fcurve.hh" #include "BKE_nla.h" -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "ED_anim_api.hh" diff --git a/source/blender/editors/space_graph/space_graph.cc b/source/blender/editors/space_graph/space_graph.cc index efdb71072af..187f9e1001b 100644 --- a/source/blender/editors/space_graph/space_graph.cc +++ b/source/blender/editors/space_graph/space_graph.cc @@ -31,8 +31,8 @@ #include "ED_space_api.hh" #include "ED_time_scrub_ui.hh" -#include "GPU_immediate.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_state.hh" #include "WM_api.hh" #include "WM_message.hh" diff --git a/source/blender/editors/space_image/image_draw.cc b/source/blender/editors/space_image/image_draw.cc index 156f54a6253..6026490e621 100644 --- a/source/blender/editors/space_image/image_draw.cc +++ b/source/blender/editors/space_image/image_draw.cc @@ -39,11 +39,11 @@ #include "BIF_glutil.hh" -#include "GPU_framebuffer.h" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_framebuffer.hh" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "BLF_api.hh" diff --git a/source/blender/editors/space_info/info_stats.cc b/source/blender/editors/space_info/info_stats.cc index de8aecbc98e..21fe20fcb0e 100644 --- a/source/blender/editors/space_info/info_stats.cc +++ b/source/blender/editors/space_info/info_stats.cc @@ -61,7 +61,7 @@ #include "UI_resources.hh" -#include "GPU_capabilities.h" +#include "GPU_capabilities.hh" ENUM_OPERATORS(eUserpref_StatusBar_Flag, STATUSBAR_SHOW_VERSION) diff --git a/source/blender/editors/space_info/textview.cc b/source/blender/editors/space_info/textview.cc index 2ab17da3cbc..9121b4f8bcd 100644 --- a/source/blender/editors/space_info/textview.cc +++ b/source/blender/editors/space_info/textview.cc @@ -16,8 +16,8 @@ #include "BLI_string_utf8.h" #include "BLI_utildefines.h" -#include "GPU_immediate.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_state.hh" #include "DNA_userdef_types.h" /* For 'UI_SCALE_FAC' */ diff --git a/source/blender/editors/space_nla/nla_draw.cc b/source/blender/editors/space_nla/nla_draw.cc index 133fd346431..eaf40917147 100644 --- a/source/blender/editors/space_nla/nla_draw.cc +++ b/source/blender/editors/space_nla/nla_draw.cc @@ -29,9 +29,9 @@ #include "ED_keyframes_draw.hh" #include "ED_keyframes_keylist.hh" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_state.hh" #include "WM_types.hh" diff --git a/source/blender/editors/space_node/drawnode.cc b/source/blender/editors/space_node/drawnode.cc index 40df073ee2f..55423c2ecb1 100644 --- a/source/blender/editors/space_node/drawnode.cc +++ b/source/blender/editors/space_node/drawnode.cc @@ -34,14 +34,14 @@ #include "BIF_glutil.hh" -#include "GPU_batch.h" -#include "GPU_batch_presets.h" -#include "GPU_framebuffer.h" -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_platform.h" -#include "GPU_shader_shared.h" -#include "GPU_state.h" +#include "GPU_batch.hh" +#include "GPU_batch_presets.hh" +#include "GPU_framebuffer.hh" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_platform.hh" +#include "GPU_shader_shared.hh" +#include "GPU_state.hh" #include "GPU_uniform_buffer.hh" #include "DRW_engine.hh" diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc index c0168aa5c91..245c1094825 100644 --- a/source/blender/editors/space_node/node_draw.cc +++ b/source/blender/editors/space_node/node_draw.cc @@ -58,13 +58,13 @@ #include "BIF_glutil.hh" -#include "GPU_framebuffer.h" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_matrix.h" -#include "GPU_shader_shared.h" -#include "GPU_state.h" -#include "GPU_viewport.h" +#include "GPU_framebuffer.hh" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_matrix.hh" +#include "GPU_shader_shared.hh" +#include "GPU_state.hh" +#include "GPU_viewport.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/space_node/node_edit.cc b/source/blender/editors/space_node/node_edit.cc index fb2858a7ac4..13e8da69bae 100644 --- a/source/blender/editors/space_node/node_edit.cc +++ b/source/blender/editors/space_node/node_edit.cc @@ -57,7 +57,7 @@ #include "UI_view2d.hh" -#include "GPU_capabilities.h" +#include "GPU_capabilities.hh" #include "GPU_material.hh" #include "IMB_imbuf_types.hh" diff --git a/source/blender/editors/space_outliner/outliner_draw.cc b/source/blender/editors/space_outliner/outliner_draw.cc index 07e4e5214bd..77802d06086 100644 --- a/source/blender/editors/space_outliner/outliner_draw.cc +++ b/source/blender/editors/space_outliner/outliner_draw.cc @@ -58,8 +58,8 @@ #include "WM_message.hh" #include "WM_types.hh" -#include "GPU_immediate.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_state.hh" #include "UI_interface.hh" #include "UI_interface_icons.hh" diff --git a/source/blender/editors/space_sequencer/sequencer_channels_draw.cc b/source/blender/editors/space_sequencer/sequencer_channels_draw.cc index 9f1def17c3a..a81d369f25b 100644 --- a/source/blender/editors/space_sequencer/sequencer_channels_draw.cc +++ b/source/blender/editors/space_sequencer/sequencer_channels_draw.cc @@ -19,8 +19,8 @@ #include "ED_screen.hh" -#include "GPU_matrix.h" -#include "GPU_vertex_buffer.h" +#include "GPU_matrix.hh" +#include "GPU_vertex_buffer.hh" #include "RNA_prototypes.h" diff --git a/source/blender/editors/space_sequencer/sequencer_drag_drop.cc b/source/blender/editors/space_sequencer/sequencer_drag_drop.cc index 570f6576278..7a5e9fda7f1 100644 --- a/source/blender/editors/space_sequencer/sequencer_drag_drop.cc +++ b/source/blender/editors/space_sequencer/sequencer_drag_drop.cc @@ -26,8 +26,8 @@ #include "UI_resources.hh" #include "UI_view2d.hh" -#include "GPU_immediate.h" -#include "GPU_matrix.h" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" #include "ED_screen.hh" #include "ED_transform.hh" diff --git a/source/blender/editors/space_sequencer/sequencer_preview_draw.cc b/source/blender/editors/space_sequencer/sequencer_preview_draw.cc index c9806639eda..0314f12736c 100644 --- a/source/blender/editors/space_sequencer/sequencer_preview_draw.cc +++ b/source/blender/editors/space_sequencer/sequencer_preview_draw.cc @@ -28,11 +28,11 @@ #include "IMB_colormanagement.hh" #include "IMB_imbuf.hh" -#include "GPU_framebuffer.h" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_matrix.h" -#include "GPU_viewport.h" +#include "GPU_framebuffer.hh" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_matrix.hh" +#include "GPU_viewport.hh" #include "ED_gpencil_legacy.hh" #include "ED_screen.hh" diff --git a/source/blender/editors/space_sequencer/sequencer_quads_batch.cc b/source/blender/editors/space_sequencer/sequencer_quads_batch.cc index eae6452cd48..10770b994f9 100644 --- a/source/blender/editors/space_sequencer/sequencer_quads_batch.cc +++ b/source/blender/editors/space_sequencer/sequencer_quads_batch.cc @@ -11,9 +11,9 @@ #include "BLI_color.hh" #include "BLI_math_vector_types.hh" -#include "GPU_batch.h" -#include "GPU_index_buffer.h" -#include "GPU_vertex_buffer.h" +#include "GPU_batch.hh" +#include "GPU_index_buffer.hh" +#include "GPU_vertex_buffer.hh" struct ColorVertex { blender::float2 pos; diff --git a/source/blender/editors/space_sequencer/sequencer_retiming_draw.cc b/source/blender/editors/space_sequencer/sequencer_retiming_draw.cc index 9069bb64583..574ac69e732 100644 --- a/source/blender/editors/space_sequencer/sequencer_retiming_draw.cc +++ b/source/blender/editors/space_sequencer/sequencer_retiming_draw.cc @@ -18,9 +18,9 @@ #include "BLF_api.hh" -#include "GPU_batch.h" -#include "GPU_immediate.h" -#include "GPU_state.h" +#include "GPU_batch.hh" +#include "GPU_immediate.hh" +#include "GPU_state.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc b/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc index 01a7bb69d52..f0488a013e1 100644 --- a/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc +++ b/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc @@ -25,8 +25,8 @@ #include "BKE_global.hh" #include "BKE_sound.h" -#include "GPU_immediate.h" -#include "GPU_viewport.h" +#include "GPU_immediate.hh" +#include "GPU_viewport.hh" #include "ED_anim_api.hh" #include "ED_markers.hh" diff --git a/source/blender/editors/space_sequencer/space_sequencer.cc b/source/blender/editors/space_sequencer/space_sequencer.cc index 001ba2d0038..3c1105da221 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.cc +++ b/source/blender/editors/space_sequencer/space_sequencer.cc @@ -26,7 +26,7 @@ #include "BKE_screen.hh" #include "BKE_sequencer_offscreen.h" -#include "GPU_state.h" +#include "GPU_state.hh" #include "ED_markers.hh" #include "ED_screen.hh" diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_draw.cc b/source/blender/editors/space_spreadsheet/spreadsheet_draw.cc index 23b92b8cc1f..2e1e085d99e 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_draw.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_draw.cc @@ -6,7 +6,7 @@ #include "UI_resources.hh" #include "UI_view2d.hh" -#include "GPU_immediate.h" +#include "GPU_immediate.hh" #include "DNA_screen_types.h" #include "DNA_userdef_types.h" diff --git a/source/blender/editors/space_text/text_draw.cc b/source/blender/editors/space_text/text_draw.cc index effaa9954be..a2cc8d0e230 100644 --- a/source/blender/editors/space_text/text_draw.cc +++ b/source/blender/editors/space_text/text_draw.cc @@ -25,8 +25,8 @@ #include "ED_text.hh" -#include "GPU_immediate.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_state.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/editors/space_view3d/space_view3d.cc b/source/blender/editors/space_view3d/space_view3d.cc index 249419cfeb8..636dbd818a5 100644 --- a/source/blender/editors/space_view3d/space_view3d.cc +++ b/source/blender/editors/space_view3d/space_view3d.cc @@ -57,7 +57,7 @@ #include "ED_transform.hh" #include "ED_undo.hh" -#include "GPU_matrix.h" +#include "GPU_matrix.hh" #include "DRW_engine.hh" diff --git a/source/blender/editors/space_view3d/view3d_cursor_snap.cc b/source/blender/editors/space_view3d/view3d_cursor_snap.cc index 2a1909978cf..f16e97d8229 100644 --- a/source/blender/editors/space_view3d/view3d_cursor_snap.cc +++ b/source/blender/editors/space_view3d/view3d_cursor_snap.cc @@ -25,8 +25,8 @@ #include "BKE_scene.hh" #include "BKE_screen.hh" -#include "GPU_immediate.h" -#include "GPU_matrix.h" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" #include "ED_screen.hh" #include "ED_transform.hh" diff --git a/source/blender/editors/space_view3d/view3d_draw.cc b/source/blender/editors/space_view3d/view3d_draw.cc index 076954f9046..39972dbac91 100644 --- a/source/blender/editors/space_view3d/view3d_draw.cc +++ b/source/blender/editors/space_view3d/view3d_draw.cc @@ -57,14 +57,14 @@ #include "DEG_depsgraph_query.hh" -#include "GPU_batch.h" -#include "GPU_framebuffer.h" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" +#include "GPU_batch.hh" +#include "GPU_framebuffer.hh" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" #include "GPU_material.hh" -#include "GPU_matrix.h" -#include "GPU_state.h" -#include "GPU_viewport.h" +#include "GPU_matrix.hh" +#include "GPU_state.hh" +#include "GPU_viewport.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.cc b/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.cc index 62f6970f520..e7e5141ebc4 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.cc @@ -24,10 +24,10 @@ #include "BKE_context.hh" -#include "GPU_batch.h" -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_batch.hh" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "BLF_api.hh" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc b/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc index da1992d25c0..f0f59459492 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc @@ -48,10 +48,10 @@ #include "view3d_intern.h" /* own include */ -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "BLF_api.hh" diff --git a/source/blender/editors/space_view3d/view3d_navigate_fly.cc b/source/blender/editors/space_view3d/view3d_navigate_fly.cc index 2c8785f2084..06592b829b5 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_fly.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_fly.cc @@ -39,7 +39,7 @@ #include "UI_resources.hh" -#include "GPU_immediate.h" +#include "GPU_immediate.hh" #include "view3d_intern.h" /* own include */ #include "view3d_navigate.hh" diff --git a/source/blender/editors/space_view3d/view3d_navigate_walk.cc b/source/blender/editors/space_view3d/view3d_navigate_walk.cc index e71b8afb952..f51c61ecd93 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_walk.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_walk.cc @@ -38,7 +38,7 @@ #include "UI_resources.hh" -#include "GPU_immediate.h" +#include "GPU_immediate.hh" #include "view3d_intern.h" /* own include */ #include "view3d_navigate.hh" diff --git a/source/blender/editors/space_view3d/view3d_placement.cc b/source/blender/editors/space_view3d/view3d_placement.cc index df725272984..8fe2f6094d2 100644 --- a/source/blender/editors/space_view3d/view3d_placement.cc +++ b/source/blender/editors/space_view3d/view3d_placement.cc @@ -31,7 +31,7 @@ #include "UI_resources.hh" -#include "GPU_immediate.h" +#include "GPU_immediate.hh" #include "view3d_intern.h" diff --git a/source/blender/editors/space_view3d/view3d_project.cc b/source/blender/editors/space_view3d/view3d_project.cc index d0d29f0e7e8..1ca3cce8ab7 100644 --- a/source/blender/editors/space_view3d/view3d_project.cc +++ b/source/blender/editors/space_view3d/view3d_project.cc @@ -22,7 +22,7 @@ #include "BKE_camera.h" #include "BKE_screen.hh" -#include "GPU_matrix.h" +#include "GPU_matrix.hh" #include "ED_view3d.hh" /* own include */ diff --git a/source/blender/editors/space_view3d/view3d_select.cc b/source/blender/editors/space_view3d/view3d_select.cc index 304f089d15e..41f4dc886a7 100644 --- a/source/blender/editors/space_view3d/view3d_select.cc +++ b/source/blender/editors/space_view3d/view3d_select.cc @@ -91,7 +91,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_matrix.h" +#include "GPU_matrix.hh" #include "GPU_select.hh" #include "DEG_depsgraph.hh" diff --git a/source/blender/editors/space_view3d/view3d_utils.cc b/source/blender/editors/space_view3d/view3d_utils.cc index 521ef1f8c6c..ef64c57af39 100644 --- a/source/blender/editors/space_view3d/view3d_utils.cc +++ b/source/blender/editors/space_view3d/view3d_utils.cc @@ -38,7 +38,7 @@ #include "DEG_depsgraph.hh" #include "DEG_depsgraph_query.hh" -#include "GPU_matrix.h" +#include "GPU_matrix.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/space_view3d/view3d_view.cc b/source/blender/editors/space_view3d/view3d_view.cc index 7fcb9485364..fd0c2c9b7b7 100644 --- a/source/blender/editors/space_view3d/view3d_view.cc +++ b/source/blender/editors/space_view3d/view3d_view.cc @@ -32,9 +32,9 @@ #include "UI_resources.hh" -#include "GPU_matrix.h" +#include "GPU_matrix.hh" #include "GPU_select.hh" -#include "GPU_state.h" +#include "GPU_state.hh" #include "WM_api.hh" diff --git a/source/blender/editors/transform/transform.cc b/source/blender/editors/transform/transform.cc index d6bab6913fd..6793c9fdf9f 100644 --- a/source/blender/editors/transform/transform.cc +++ b/source/blender/editors/transform/transform.cc @@ -22,7 +22,7 @@ #include "BKE_layer.hh" #include "BKE_mask.h" -#include "GPU_state.h" +#include "GPU_state.hh" #include "ED_clip.hh" #include "ED_gpencil_legacy.hh" diff --git a/source/blender/editors/transform/transform_constraints.cc b/source/blender/editors/transform/transform_constraints.cc index ec6f144c25e..3031a8cc481 100644 --- a/source/blender/editors/transform/transform_constraints.cc +++ b/source/blender/editors/transform/transform_constraints.cc @@ -17,9 +17,9 @@ #include "DNA_space_types.h" #include "DNA_view3d_types.h" -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "BLI_math_matrix.h" #include "BLI_math_rotation.h" diff --git a/source/blender/editors/transform/transform_draw_cursors.cc b/source/blender/editors/transform/transform_draw_cursors.cc index c9f6bf49745..ea9bab39656 100644 --- a/source/blender/editors/transform/transform_draw_cursors.cc +++ b/source/blender/editors/transform/transform_draw_cursors.cc @@ -6,9 +6,9 @@ * \ingroup edtransform */ -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "BLI_math_rotation.h" diff --git a/source/blender/editors/transform/transform_mode_edge_slide.cc b/source/blender/editors/transform/transform_mode_edge_slide.cc index 08da69567af..7f5364324f0 100644 --- a/source/blender/editors/transform/transform_mode_edge_slide.cc +++ b/source/blender/editors/transform/transform_mode_edge_slide.cc @@ -11,8 +11,8 @@ #include "BKE_unit.hh" -#include "GPU_immediate.h" -#include "GPU_matrix.h" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" #include "ED_screen.hh" #include "ED_transform_snap_object_context.hh" diff --git a/source/blender/editors/transform/transform_mode_vert_slide.cc b/source/blender/editors/transform/transform_mode_vert_slide.cc index ade2e33d130..5635a71387a 100644 --- a/source/blender/editors/transform/transform_mode_vert_slide.cc +++ b/source/blender/editors/transform/transform_mode_vert_slide.cc @@ -11,8 +11,8 @@ #include "BKE_unit.hh" -#include "GPU_immediate.h" -#include "GPU_matrix.h" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" #include "ED_screen.hh" diff --git a/source/blender/editors/transform/transform_snap.cc b/source/blender/editors/transform/transform_snap.cc index 5e9693d3c93..ca8999f0b45 100644 --- a/source/blender/editors/transform/transform_snap.cc +++ b/source/blender/editors/transform/transform_snap.cc @@ -15,9 +15,9 @@ #include "BLI_time.h" #include "BLI_utildefines.h" -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "BKE_editmesh.hh" #include "BKE_layer.hh" diff --git a/source/blender/editors/util/ed_draw.cc b/source/blender/editors/util/ed_draw.cc index 7b7b69fa4a9..28cdfdaee4e 100644 --- a/source/blender/editors/util/ed_draw.cc +++ b/source/blender/editors/util/ed_draw.cc @@ -31,9 +31,9 @@ #include "ED_space_api.hh" #include "ED_util.hh" -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/editors/util/ed_util.cc b/source/blender/editors/util/ed_util.cc index 337594a7191..45a91603569 100644 --- a/source/blender/editors/util/ed_util.cc +++ b/source/blender/editors/util/ed_util.cc @@ -47,7 +47,7 @@ #include "ED_space_api.hh" #include "ED_util.hh" -#include "GPU_immediate.h" +#include "GPU_immediate.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/editors/util/ed_util_imbuf.cc b/source/blender/editors/util/ed_util_imbuf.cc index 6466ee93ff0..294b4492d23 100644 --- a/source/blender/editors/util/ed_util_imbuf.cc +++ b/source/blender/editors/util/ed_util_imbuf.cc @@ -21,8 +21,8 @@ #include "ED_screen.hh" #include "ED_space_api.hh" -#include "GPU_immediate.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_state.hh" #include "IMB_colormanagement.hh" #include "IMB_imbuf.hh" diff --git a/source/blender/editors/uvedit/uvedit_draw.cc b/source/blender/editors/uvedit/uvedit_draw.cc index f229f8a20e7..3ea8881f156 100644 --- a/source/blender/editors/uvedit/uvedit_draw.cc +++ b/source/blender/editors/uvedit/uvedit_draw.cc @@ -11,8 +11,8 @@ #include "DNA_screen_types.h" #include "DNA_userdef_types.h" -#include "GPU_immediate.h" -#include "GPU_matrix.h" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" #include "UI_view2d.hh" diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.cc b/source/blender/editors/uvedit/uvedit_smart_stitch.cc index 165eab2cb67..0f03cdb2428 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.cc +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.cc @@ -41,8 +41,8 @@ #include "ED_space_api.hh" #include "ED_uvedit.hh" -#include "GPU_batch.h" -#include "GPU_state.h" +#include "GPU_batch.hh" +#include "GPU_state.hh" #include "RNA_access.hh" #include "RNA_define.hh" diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index c6d0f299436..0855235596f 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -82,57 +82,57 @@ set(SRC intern/gpu_vertex_format.cc intern/gpu_viewport.cc - GPU_batch.h - GPU_batch_presets.h - GPU_batch_utils.h - GPU_capabilities.h - GPU_common.h - GPU_common_types.h - GPU_compute.h - GPU_context.h - GPU_debug.h - GPU_drawlist.h - GPU_framebuffer.h - GPU_immediate.h - GPU_immediate_util.h - GPU_index_buffer.h - GPU_init_exit.h + GPU_batch.hh + GPU_batch_presets.hh + GPU_batch_utils.hh + GPU_capabilities.hh + GPU_common.hh + GPU_common_types.hh + GPU_compute.hh + GPU_context.hh + GPU_debug.hh + GPU_drawlist.hh + GPU_framebuffer.hh + GPU_immediate.hh + GPU_immediate_util.hh + GPU_index_buffer.hh + GPU_init_exit.hh GPU_material.hh - GPU_matrix.h - GPU_platform.h - GPU_primitive.h + GPU_matrix.hh + GPU_platform.hh + GPU_primitive.hh GPU_select.hh - GPU_shader.h - GPU_shader_builtin.h - GPU_shader_shared.h - GPU_state.h - GPU_storage_buffer.h - GPU_texture.h + GPU_shader.hh + GPU_shader_builtin.hh + GPU_shader_shared.hh + GPU_state.hh + GPU_storage_buffer.hh + GPU_texture.hh GPU_uniform_buffer.hh - GPU_vertex_buffer.h - GPU_vertex_format.h - GPU_viewport.h + GPU_vertex_buffer.hh + GPU_vertex_format.hh + GPU_viewport.hh intern/gpu_backend.hh intern/gpu_batch_private.hh intern/gpu_capabilities_private.hh - intern/gpu_codegen.h + intern/gpu_codegen.hh intern/gpu_context_private.hh intern/gpu_debug_private.hh intern/gpu_drawlist_private.hh intern/gpu_framebuffer_private.hh intern/gpu_immediate_private.hh intern/gpu_index_buffer_private.hh - intern/gpu_material_library.h - intern/gpu_matrix_private.h - intern/gpu_node_graph.h + intern/gpu_material_library.hh + intern/gpu_matrix_private.hh + intern/gpu_node_graph.hh intern/gpu_platform_private.hh - intern/gpu_private.h + intern/gpu_private.hh intern/gpu_query.hh - intern/gpu_select_private.h + intern/gpu_select_private.hh intern/gpu_shader_create_info.hh intern/gpu_shader_create_info_private.hh - intern/gpu_shader_dependency_private.h + intern/gpu_shader_dependency_private.hh intern/gpu_shader_interface.hh intern/gpu_shader_private.hh intern/gpu_state_private.hh @@ -140,7 +140,7 @@ set(SRC intern/gpu_texture_private.hh intern/gpu_uniform_buffer_private.hh intern/gpu_vertex_buffer_private.hh - intern/gpu_vertex_format_private.h + intern/gpu_vertex_format_private.hh dummy/dummy_backend.hh dummy/dummy_batch.hh @@ -408,7 +408,7 @@ set(MSL_SRC ) set(GLSL_SRC - GPU_shader_shared.h + GPU_shader_shared.hh shaders/opengl/glsl_shader_defines.glsl shaders/gpu_shader_depth_only_frag.glsl @@ -594,7 +594,7 @@ set(GLSL_SRC shaders/gpu_shader_index_2d_array_lines.glsl shaders/gpu_shader_index_2d_array_tris.glsl - GPU_shader_shared_utils.h + GPU_shader_shared_utils.hh ) set(GLSL_SRC_TEST diff --git a/source/blender/gpu/GPU_batch.h b/source/blender/gpu/GPU_batch.hh similarity index 96% rename from source/blender/gpu/GPU_batch.h rename to source/blender/gpu/GPU_batch.hh index 1c8d79637f9..0435c6371d1 100644 --- a/source/blender/gpu/GPU_batch.h +++ b/source/blender/gpu/GPU_batch.hh @@ -20,18 +20,20 @@ #include "BLI_utildefines.h" -#include "GPU_index_buffer.h" -#include "GPU_shader.h" -#include "GPU_storage_buffer.h" +#include "GPU_index_buffer.hh" +#include "GPU_shader.hh" +#include "GPU_storage_buffer.hh" #include "GPU_uniform_buffer.hh" -#include "GPU_vertex_buffer.h" +#include "GPU_vertex_buffer.hh" + +struct GPUShader; #define GPU_BATCH_VBO_MAX_LEN 16 #define GPU_BATCH_INST_VBO_MAX_LEN 2 #define GPU_BATCH_VAO_STATIC_LEN 3 #define GPU_BATCH_VAO_DYN_ALLOC_COUNT 16 -typedef enum eGPUBatchFlag { +enum eGPUBatchFlag { /** Invalid default state. */ GPU_BATCH_INVALID = 0, @@ -53,7 +55,7 @@ typedef enum eGPUBatchFlag { GPU_BATCH_BUILDING = (1 << 26), /** Cached data need to be rebuild. (VAO, PSO, ...) */ GPU_BATCH_DIRTY = (1 << 27), -} eGPUBatchFlag; +}; #define GPU_BATCH_OWNS_NONE GPU_BATCH_INVALID @@ -62,22 +64,18 @@ BLI_STATIC_ASSERT(GPU_BATCH_OWNS_INDEX < GPU_BATCH_INIT, ENUM_OPERATORS(eGPUBatchFlag, GPU_BATCH_DIRTY) -#ifdef __cplusplus -extern "C" { -#endif - /** * IMPORTANT: Do not allocate manually as the real struct is bigger (i.e: GLBatch). This is only * the common and "public" part of the struct. Use `GPU_batch_calloc()` and `GPU_batch_create()` * instead. * TODO(fclem): Make the content of this struct hidden and expose getters/setters. */ -typedef struct GPUBatch { - /** verts[0] is required, others can be NULL */ +struct GPUBatch { + /** verts[0] is required, others can be nullptr */ GPUVertBuf *verts[GPU_BATCH_VBO_MAX_LEN]; /** Instance attributes. */ GPUVertBuf *inst[GPU_BATCH_INST_VBO_MAX_LEN]; - /** NULL if element list not needed */ + /** nullptr if element list not needed */ GPUIndexBuf *elem; /** Resource ID attribute workaround. */ GPUStorageBuf *resource_id_buf; @@ -86,8 +84,8 @@ typedef struct GPUBatch { /** Type of geometry to draw. */ GPUPrimType prim_type; /** Current assigned shader. DEPRECATED. Here only for uniform binding. */ - struct GPUShader *shader; -} GPUBatch; + GPUShader *shader; +}; /* -------------------------------------------------------------------- */ /** \name Creation @@ -97,7 +95,7 @@ typedef struct GPUBatch { * Allocate a #GPUBatch with a cleared state. * The returned #GPUBatch needs to be passed to `GPU_batch_init` before being usable. */ -GPUBatch *GPU_batch_calloc(void); +GPUBatch *GPU_batch_calloc(); /** * Creates a #GPUBatch with explicit buffer ownership. @@ -151,7 +149,7 @@ void GPU_batch_clear(GPUBatch *batch); #define GPU_BATCH_CLEAR_SAFE(batch) \ do { \ - if (batch != NULL) { \ + if (batch != nullptr) { \ GPU_batch_clear(batch); \ memset(batch, 0, sizeof(*(batch))); \ } \ @@ -165,9 +163,9 @@ void GPU_batch_discard(GPUBatch *batch); #define GPU_BATCH_DISCARD_SAFE(batch) \ do { \ - if (batch != NULL) { \ + if (batch != nullptr) { \ GPU_batch_discard(batch); \ - batch = NULL; \ + batch = nullptr; \ } \ } while (0) @@ -365,11 +363,7 @@ void GPU_batch_draw_parameter_get(GPUBatch *batch, /** \name Module init/exit * \{ */ -void gpu_batch_init(void); -void gpu_batch_exit(void); +void gpu_batch_init(); +void gpu_batch_exit(); /** \} */ - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/GPU_batch_presets.h b/source/blender/gpu/GPU_batch_presets.h deleted file mode 100644 index 2dde74b1620..00000000000 --- a/source/blender/gpu/GPU_batch_presets.h +++ /dev/null @@ -1,44 +0,0 @@ -/* SPDX-FileCopyrightText: 2016 Blender Authors - * - * SPDX-License-Identifier: GPL-2.0-or-later */ - -/** \file - * \ingroup gpu - * - * Batched geometry rendering is powered by the GPU library. - * This file contains any additions or modifications specific to Blender. - */ - -#pragma once - -#include "BLI_compiler_attrs.h" -#include "BLI_sys_types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/* `gpu_batch_presets.cc` */ - -/* Replacement for #gluSphere */ - -struct GPUBatch *GPU_batch_preset_sphere(int lod) ATTR_WARN_UNUSED_RESULT; -struct GPUBatch *GPU_batch_preset_sphere_wire(int lod) ATTR_WARN_UNUSED_RESULT; -struct GPUBatch *GPU_batch_preset_panel_drag_widget(float pixelsize, - const float col_high[4], - const float col_dark[4], - float width) ATTR_WARN_UNUSED_RESULT; - -/** - * To be used with procedural placement inside shader. - */ -struct GPUBatch *GPU_batch_preset_quad(void); - -void gpu_batch_presets_init(void); -void gpu_batch_presets_register(struct GPUBatch *preset_batch); -bool gpu_batch_presets_unregister(struct GPUBatch *preset_batch); -void gpu_batch_presets_exit(void); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/GPU_batch_presets.hh b/source/blender/gpu/GPU_batch_presets.hh new file mode 100644 index 00000000000..b3652973102 --- /dev/null +++ b/source/blender/gpu/GPU_batch_presets.hh @@ -0,0 +1,38 @@ +/* SPDX-FileCopyrightText: 2016 Blender Authors + * + * SPDX-License-Identifier: GPL-2.0-or-later */ + +/** \file + * \ingroup gpu + * + * Batched geometry rendering is powered by the GPU library. + * This file contains any additions or modifications specific to Blender. + */ + +#pragma once + +#include "BLI_compiler_attrs.h" +#include "BLI_sys_types.h" + +struct GPUBatch; + +/* `gpu_batch_presets.cc` */ + +/* Replacement for #gluSphere */ + +GPUBatch *GPU_batch_preset_sphere(int lod) ATTR_WARN_UNUSED_RESULT; +GPUBatch *GPU_batch_preset_sphere_wire(int lod) ATTR_WARN_UNUSED_RESULT; +GPUBatch *GPU_batch_preset_panel_drag_widget(float pixelsize, + const float col_high[4], + const float col_dark[4], + float width) ATTR_WARN_UNUSED_RESULT; + +/** + * To be used with procedural placement inside shader. + */ +GPUBatch *GPU_batch_preset_quad(); + +void gpu_batch_presets_init(); +void gpu_batch_presets_register(GPUBatch *preset_batch); +bool gpu_batch_presets_unregister(GPUBatch *preset_batch); +void gpu_batch_presets_exit(); diff --git a/source/blender/gpu/GPU_batch_utils.h b/source/blender/gpu/GPU_batch_utils.hh similarity index 60% rename from source/blender/gpu/GPU_batch_utils.h rename to source/blender/gpu/GPU_batch_utils.hh index 04005c385e6..d3d9fe6088f 100644 --- a/source/blender/gpu/GPU_batch_utils.h +++ b/source/blender/gpu/GPU_batch_utils.hh @@ -11,11 +11,8 @@ #include "BLI_compiler_attrs.h" #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - struct rctf; +struct GPUBatch; /* `gpu_batch_utils.cc` */ @@ -28,11 +25,13 @@ struct rctf; * \param polys_flat_len: Length of the array (must be an even number). * \param rect: Optional region to map the byte 0..255 coords to. When not set use -1..1. */ -struct GPUBatch *GPU_batch_tris_from_poly_2d_encoded( - const uchar *polys_flat, uint polys_flat_len, const struct rctf *rect) ATTR_WARN_UNUSED_RESULT +GPUBatch *GPU_batch_tris_from_poly_2d_encoded(const uchar *polys_flat, + uint polys_flat_len, + const rctf *rect) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); -struct GPUBatch *GPU_batch_wire_from_poly_2d_encoded( - const uchar *polys_flat, uint polys_flat_len, const struct rctf *rect) ATTR_WARN_UNUSED_RESULT +GPUBatch *GPU_batch_wire_from_poly_2d_encoded(const uchar *polys_flat, + uint polys_flat_len, + const rctf *rect) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); /** @@ -40,8 +39,4 @@ struct GPUBatch *GPU_batch_wire_from_poly_2d_encoded( * * \note Only use by draw manager. Use the presets function instead for interface. */ -struct GPUBatch *gpu_batch_sphere(int lat_res, int lon_res) ATTR_WARN_UNUSED_RESULT; - -#ifdef __cplusplus -} -#endif +GPUBatch *gpu_batch_sphere(int lat_res, int lon_res) ATTR_WARN_UNUSED_RESULT; diff --git a/source/blender/gpu/GPU_capabilities.h b/source/blender/gpu/GPU_capabilities.h deleted file mode 100644 index dd56b0a34a6..00000000000 --- a/source/blender/gpu/GPU_capabilities.h +++ /dev/null @@ -1,74 +0,0 @@ -/* SPDX-FileCopyrightText: 2005 Blender Authors - * - * SPDX-License-Identifier: GPL-2.0-or-later */ - -/** \file - * \ingroup gpu - * - * GPU Capabilities & workarounds - * This module expose the reported implementation limits & enabled - * workaround for drivers that needs specific code-paths. - */ - -#pragma once - -#include "BLI_sys_types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -int GPU_max_texture_size(void); -int GPU_max_texture_3d_size(void); -int GPU_max_texture_layers(void); -int GPU_max_textures(void); -int GPU_max_textures_vert(void); -int GPU_max_textures_geom(void); -int GPU_max_textures_frag(void); -int GPU_max_images(void); -int GPU_max_work_group_count(int index); -int GPU_max_work_group_size(int index); -int GPU_max_uniforms_vert(void); -int GPU_max_uniforms_frag(void); -int GPU_max_batch_indices(void); -int GPU_max_batch_vertices(void); -int GPU_max_vertex_attribs(void); -int GPU_max_varying_floats(void); -int GPU_max_shader_storage_buffer_bindings(void); -int GPU_max_compute_shader_storage_blocks(void); -int GPU_max_samplers(void); -size_t GPU_max_storage_buffer_size(void); - -int GPU_extensions_len(void); -const char *GPU_extension_get(int i); - -int GPU_texture_size_with_limit(int res); - -bool GPU_mip_render_workaround(void); -bool GPU_depth_blitting_workaround(void); -bool GPU_use_main_context_workaround(void); -bool GPU_use_hq_normals_workaround(void); -bool GPU_clear_viewport_workaround(void); -bool GPU_crappy_amd_driver(void); - -bool GPU_geometry_shader_support(void); -bool GPU_compute_shader_support(void); -bool GPU_shader_draw_parameters_support(void); -bool GPU_hdr_support(void); -bool GPU_texture_view_support(); -bool GPU_stencil_export_support(); - -bool GPU_mem_stats_supported(void); -void GPU_mem_stats_get(int *totalmem, int *freemem); - -/** - * Return support for the active context + window. - */ -bool GPU_stereo_quadbuffer_support(void); - -int GPU_minimum_per_vertex_stride(void); -bool GPU_transform_feedback_support(void); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/GPU_capabilities.hh b/source/blender/gpu/GPU_capabilities.hh new file mode 100644 index 00000000000..add43d33470 --- /dev/null +++ b/source/blender/gpu/GPU_capabilities.hh @@ -0,0 +1,66 @@ +/* SPDX-FileCopyrightText: 2005 Blender Authors + * + * SPDX-License-Identifier: GPL-2.0-or-later */ + +/** \file + * \ingroup gpu + * + * GPU Capabilities & workarounds + * This module expose the reported implementation limits & enabled + * workaround for drivers that needs specific code-paths. + */ + +#pragma once + +#include "BLI_sys_types.h" + +int GPU_max_texture_size(); +int GPU_max_texture_3d_size(); +int GPU_max_texture_layers(); +int GPU_max_textures(); +int GPU_max_textures_vert(); +int GPU_max_textures_geom(); +int GPU_max_textures_frag(); +int GPU_max_images(); +int GPU_max_work_group_count(int index); +int GPU_max_work_group_size(int index); +int GPU_max_uniforms_vert(); +int GPU_max_uniforms_frag(); +int GPU_max_batch_indices(); +int GPU_max_batch_vertices(); +int GPU_max_vertex_attribs(); +int GPU_max_varying_floats(); +int GPU_max_shader_storage_buffer_bindings(); +int GPU_max_compute_shader_storage_blocks(); +int GPU_max_samplers(); +size_t GPU_max_storage_buffer_size(); + +int GPU_extensions_len(); +const char *GPU_extension_get(int i); + +int GPU_texture_size_with_limit(int res); + +bool GPU_mip_render_workaround(); +bool GPU_depth_blitting_workaround(); +bool GPU_use_main_context_workaround(); +bool GPU_use_hq_normals_workaround(); +bool GPU_clear_viewport_workaround(); +bool GPU_crappy_amd_driver(); + +bool GPU_geometry_shader_support(); +bool GPU_compute_shader_support(); +bool GPU_shader_draw_parameters_support(); +bool GPU_hdr_support(); +bool GPU_texture_view_support(); +bool GPU_stencil_export_support(); + +bool GPU_mem_stats_supported(); +void GPU_mem_stats_get(int *totalmem, int *freemem); + +/** + * Return support for the active context + window. + */ +bool GPU_stereo_quadbuffer_support(); + +int GPU_minimum_per_vertex_stride(); +bool GPU_transform_feedback_support(); diff --git a/source/blender/gpu/GPU_common.h b/source/blender/gpu/GPU_common.hh similarity index 100% rename from source/blender/gpu/GPU_common.h rename to source/blender/gpu/GPU_common.hh diff --git a/source/blender/gpu/GPU_common_types.h b/source/blender/gpu/GPU_common_types.hh similarity index 89% rename from source/blender/gpu/GPU_common_types.h rename to source/blender/gpu/GPU_common_types.hh index 85c19d3c884..decad05a10c 100644 --- a/source/blender/gpu/GPU_common_types.h +++ b/source/blender/gpu/GPU_common_types.hh @@ -8,14 +8,10 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - /** * Describes the load operation of a frame-buffer attachment at the start of a render pass. */ -typedef enum eGPULoadOp { +enum eGPULoadOp { /** * Clear the frame-buffer attachment using the clear value. */ @@ -32,12 +28,12 @@ typedef enum eGPULoadOp { * Faster than `GPU_LOADACTION_CLEAR`. */ GPU_LOADACTION_DONT_CARE, -} eGPULoadOp; +}; /** * Describes the store operation of a frame-buffer attachment at the end of a render pass. */ -typedef enum eGPUStoreOp { +enum eGPUStoreOp { /** * Do not care about the content of the attachment when the render pass ends. * Useful if only the values being written are important. @@ -53,7 +49,7 @@ typedef enum eGPUStoreOp { * a render pass (ex.: Unneeded depth buffer result). */ GPU_STOREACTION_DONT_CARE, -} eGPUStoreOp; +}; /** * Describes the state of a frame-buffer attachment during a sub-pass. @@ -61,20 +57,16 @@ typedef enum eGPUStoreOp { * NOTE: Until this is correctly implemented in all backend, reading and writing from the * same attachment will not work. Although there is no case where it would currently be useful. */ -typedef enum GPUAttachmentState { +enum GPUAttachmentState { /** Attachment will not be written during rendering. */ GPU_ATTACHEMENT_IGNORE = 0, /** Attachment will be written during render sub-pass. This also works with blending. */ GPU_ATTACHEMENT_WRITE, /** Attachment is used as input in the fragment shader. Incompatible with depth on Metal. */ GPU_ATTACHEMENT_READ, -} GPUAttachmentState; +}; -typedef enum eGPUFrontFace { +enum eGPUFrontFace { GPU_CLOCKWISE, GPU_COUNTERCLOCKWISE, -} eGPUFrontFace; - -#ifdef __cplusplus -} -#endif +}; diff --git a/source/blender/gpu/GPU_compute.h b/source/blender/gpu/GPU_compute.hh similarity index 87% rename from source/blender/gpu/GPU_compute.h rename to source/blender/gpu/GPU_compute.hh index a1d974b9d6a..3e6c3104eb5 100644 --- a/source/blender/gpu/GPU_compute.h +++ b/source/blender/gpu/GPU_compute.hh @@ -15,12 +15,8 @@ #include "BLI_sys_types.h" -#include "GPU_shader.h" -#include "GPU_storage_buffer.h" - -#ifdef __cplusplus -extern "C" { -#endif +#include "GPU_shader.hh" +#include "GPU_storage_buffer.hh" /** * Dispatch a compute shader task. @@ -36,11 +32,11 @@ void GPU_compute_dispatch(GPUShader *shader, * Dispatch a compute shader task. The size of the dispatch is sourced from a \a indirect_buf * which must follow this layout: * \code{.c} - * typedef struct { + * struct DispatchIndirectCommand { * uint groups_x_len; * uint groups_y_len; * uint groups_z_len; - * } DispatchIndirectCommand; + * }; * \encode * * \note The writes to the \a indirect_buf do not need to be synchronized as a memory barrier is @@ -50,7 +46,3 @@ void GPU_compute_dispatch(GPUShader *shader, * might be different in each of the 3 dimensions. */ void GPU_compute_dispatch_indirect(GPUShader *shader, GPUStorageBuf *indirect_buf); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/GPU_context.h b/source/blender/gpu/GPU_context.hh similarity index 80% rename from source/blender/gpu/GPU_context.h rename to source/blender/gpu/GPU_context.hh index fd8bf191fac..5f997155691 100644 --- a/source/blender/gpu/GPU_context.h +++ b/source/blender/gpu/GPU_context.hh @@ -10,21 +10,17 @@ #pragma once -#include "GPU_batch.h" -#include "GPU_common.h" -#include "GPU_platform.h" - -#ifdef __cplusplus -extern "C" { -#endif +#include "GPU_batch.hh" +#include "GPU_common.hh" +#include "GPU_platform.hh" /* GPU back-ends abstract the differences between different APIs. #GPU_context_create * automatically initializes the back-end, and #GPU_context_discard frees it when there * are no more contexts. */ -bool GPU_backend_supported(void); +bool GPU_backend_supported(); void GPU_backend_type_selection_set(const eGPUBackendType backend); -eGPUBackendType GPU_backend_type_selection_get(void); -eGPUBackendType GPU_backend_get_type(void); +eGPUBackendType GPU_backend_type_selection_get(); +eGPUBackendType GPU_backend_get_type(); /** * Detect the most suited eGPUBackendType. @@ -38,7 +34,7 @@ eGPUBackendType GPU_backend_get_type(void); * When no supported backend is found GPU_backend_type_selection_set is called with * GPU_BACKEND_NONE. */ -bool GPU_backend_type_selection_detect(void); +bool GPU_backend_type_selection_detect(); /** * Alter the GPU_backend_type_selection_detect to only test a specific backend @@ -48,10 +44,10 @@ void GPU_backend_type_selection_set_override(eGPUBackendType backend_type); /** * Check if the GPU_backend_type_selection_detect is overridden to only test a specific backend. */ -bool GPU_backend_type_selection_is_overridden(void); +bool GPU_backend_type_selection_is_overridden(); /** Opaque type hiding blender::gpu::Context. */ -typedef struct GPUContext GPUContext; +struct GPUContext; GPUContext *GPU_context_create(void *ghost_window, void *ghost_context); /** @@ -60,10 +56,10 @@ GPUContext *GPU_context_create(void *ghost_window, void *ghost_context); void GPU_context_discard(GPUContext *); /** - * Ctx can be NULL. + * Ctx can be null. */ void GPU_context_active_set(GPUContext *); -GPUContext *GPU_context_active_get(void); +GPUContext *GPU_context_active_get(); /* Begin and end frame are used to mark the singular boundary representing the lifetime of a whole * frame. This also acts as a divisor for ensuring workload submission and flushing, especially for @@ -77,17 +73,13 @@ void GPU_context_end_frame(GPUContext *ctx); * compiling. When a legacy GPU is detected (`GPU_use_main_context_workaround()`) any worker * threads should use the draw manager opengl context and make sure that they are the only one * using it by locking the main context using these two functions. */ -void GPU_context_main_lock(void); -void GPU_context_main_unlock(void); +void GPU_context_main_lock(); +void GPU_context_main_unlock(); /* GPU Begin/end work blocks */ -void GPU_render_begin(void); -void GPU_render_end(void); +void GPU_render_begin(); +void GPU_render_end(); /* For operations which need to run exactly once per frame -- even if there are no render updates. */ -void GPU_render_step(void); - -#ifdef __cplusplus -} -#endif +void GPU_render_step(); diff --git a/source/blender/gpu/GPU_debug.h b/source/blender/gpu/GPU_debug.hh similarity index 93% rename from source/blender/gpu/GPU_debug.h rename to source/blender/gpu/GPU_debug.hh index 04da14ff595..3d2fd525e5b 100644 --- a/source/blender/gpu/GPU_debug.h +++ b/source/blender/gpu/GPU_debug.hh @@ -13,7 +13,7 @@ ** Instant frame capture. ** * * \code - * #include "GPU_debug.h" + * #include "GPU_debug.hh" * static void do_render_engine(Render *re) * { * GPU_debug_capture_begin(__func__); @@ -25,7 +25,7 @@ ** Capture scopes. ** * * \code - * #include "GPU_debug.h" + * #include "GPU_debug.hh" * void *capture_scope = nullptr; * static void do_render_engine(Render *re) * { @@ -46,14 +46,10 @@ #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - #define GPU_DEBUG_SHADER_COMPILATION_GROUP "Shader Compilation" void GPU_debug_group_begin(const char *name); -void GPU_debug_group_end(void); +void GPU_debug_group_end(); /** * Return a formatted string showing the current group hierarchy in this format: * "Group1 > Group 2 > Group3 > ... > GroupN : " @@ -72,7 +68,7 @@ bool GPU_debug_group_match(const char *ref); * \param title: Optional title to set for the frame capture. */ void GPU_debug_capture_begin(const char *title); -void GPU_debug_capture_end(void); +void GPU_debug_capture_end(); /** * GPU debug frame capture scopes. @@ -96,7 +92,3 @@ void *GPU_debug_capture_scope_create(const char *name); */ bool GPU_debug_capture_scope_begin(void *scope); void GPU_debug_capture_scope_end(void *scope); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/GPU_drawlist.h b/source/blender/gpu/GPU_drawlist.hh similarity index 86% rename from source/blender/gpu/GPU_drawlist.h rename to source/blender/gpu/GPU_drawlist.hh index f078e740ff7..62259969e68 100644 --- a/source/blender/gpu/GPU_drawlist.h +++ b/source/blender/gpu/GPU_drawlist.hh @@ -11,14 +11,10 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct GPUBatch; /** Opaque type hiding blender::gpu::DrawList. */ -typedef struct GPUDrawList GPUDrawList; +struct GPUDrawList; /* Create a list with at least length drawcalls. Length can affect performance. */ GPUDrawList *GPU_draw_list_create(int length); @@ -26,7 +22,3 @@ void GPU_draw_list_discard(GPUDrawList *list); void GPU_draw_list_append(GPUDrawList *list, GPUBatch *batch, int i_first, int i_count); void GPU_draw_list_submit(GPUDrawList *list); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/GPU_framebuffer.h b/source/blender/gpu/GPU_framebuffer.hh similarity index 96% rename from source/blender/gpu/GPU_framebuffer.h rename to source/blender/gpu/GPU_framebuffer.hh index abdef0358e9..8e50d494415 100644 --- a/source/blender/gpu/GPU_framebuffer.h +++ b/source/blender/gpu/GPU_framebuffer.hh @@ -24,31 +24,29 @@ #pragma once -#include "GPU_common_types.h" -#include "GPU_texture.h" +#include "GPU_common_types.hh" +#include "GPU_texture.hh" -typedef enum eGPUFrameBufferBits { +struct GPUTexture; + +enum eGPUFrameBufferBits { GPU_COLOR_BIT = (1 << 0), GPU_DEPTH_BIT = (1 << 1), GPU_STENCIL_BIT = (1 << 2), -} eGPUFrameBufferBits; +}; ENUM_OPERATORS(eGPUFrameBufferBits, GPU_STENCIL_BIT) /* Guaranteed by the spec and is never greater than 16 on any hardware or implementation. */ #define GPU_MAX_VIEWPORTS 16 -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct GPUAttachment { +struct GPUAttachment { GPUTexture *tex; int layer, mip; -} GPUAttachment; +}; /** Opaque type hiding blender::gpu::FrameBuffer. */ -typedef struct GPUFrameBuffer GPUFrameBuffer; +struct GPUFrameBuffer; /* -------------------------------------------------------------------- */ /** \name Creation @@ -64,13 +62,13 @@ GPUFrameBuffer *GPU_framebuffer_create(const char *name); * Returns the current context active framebuffer. * Return nullptr if no context is active. */ -GPUFrameBuffer *GPU_framebuffer_active_get(void); +GPUFrameBuffer *GPU_framebuffer_active_get(); /** * Returns the default (back-left) frame-buffer. It will always exists even if it's just a dummy. * Return nullptr if no context is active. */ -GPUFrameBuffer *GPU_framebuffer_back_get(void); +GPUFrameBuffer *GPU_framebuffer_back_get(); /** \} */ @@ -86,9 +84,9 @@ void GPU_framebuffer_free(GPUFrameBuffer *framebuffer); #define GPU_FRAMEBUFFER_FREE_SAFE(fb) \ do { \ - if (fb != NULL) { \ + if (fb != nullptr) { \ GPU_framebuffer_free(fb); \ - fb = NULL; \ + fb = nullptr; \ } \ } while (0) @@ -98,12 +96,12 @@ void GPU_framebuffer_free(GPUFrameBuffer *framebuffer); /** \name Binding * \{ */ -typedef enum eGPUBackBuffer { +enum eGPUBackBuffer { /** Default framebuffer of a window. Always available. */ GPU_BACKBUFFER_LEFT = 0, /** Right buffer of a window. Only available if window was created using stereo-view. */ GPU_BACKBUFFER_RIGHT, -} eGPUBackBuffer; +}; /** * Binds the active context's window frame-buffer. @@ -125,7 +123,7 @@ void GPU_framebuffer_bind_no_srgb(GPUFrameBuffer *framebuffer); * Binds back the active context's default frame-buffer. * Equivalent to `GPU_backbuffer_bind(GPU_BACKBUFFER_LEFT)`. */ -void GPU_framebuffer_restore(void); +void GPU_framebuffer_restore(); /** \} */ @@ -133,11 +131,11 @@ void GPU_framebuffer_restore(void); /** \name Advanced binding control * \{ */ -typedef struct GPULoadStore { +struct GPULoadStore { eGPULoadOp load_action; eGPUStoreOp store_action; float clear_value[4]; -} GPULoadStore; +}; /* Empty bind point. */ #define NULL_ATTACHMENT_COLOR \ @@ -244,7 +242,7 @@ void GPU_framebuffer_subpass_transition_array(GPUFrameBuffer *framebuffer, */ #define GPU_framebuffer_ensure_config(_fb, ...) \ do { \ - if (*(_fb) == NULL) { \ + if (*(_fb) == nullptr) { \ *(_fb) = GPU_framebuffer_create(#_fb); \ } \ GPUAttachment config[] = __VA_ARGS__; \ @@ -255,7 +253,7 @@ void GPU_framebuffer_subpass_transition_array(GPUFrameBuffer *framebuffer, * First #GPUAttachment in *config is always the depth/depth_stencil buffer. * Following #GPUAttachments are color buffers. * Setting #GPUAttachment.mip to -1 will leave the texture in this slot. - * Setting #GPUAttachment.tex to NULL will detach the texture in this slot. + * Setting #GPUAttachment.tex to nullptr will detach the texture in this slot. */ void GPU_framebuffer_config_array(GPUFrameBuffer *framebuffer, const GPUAttachment *config, @@ -264,12 +262,12 @@ void GPU_framebuffer_config_array(GPUFrameBuffer *framebuffer, /** Empty bind point. */ #define GPU_ATTACHMENT_NONE \ { \ - NULL, -1, 0, \ + nullptr, -1, 0, \ } /** Leave currently bound texture in this slot. DEPRECATED: Specify all textures for clarity. */ #define GPU_ATTACHMENT_LEAVE \ { \ - NULL, -1, -1, \ + nullptr, -1, -1, \ } /** Bind the first mip level of a texture (all layers). */ #define GPU_ATTACHMENT_TEXTURE(_texture) \ @@ -550,8 +548,8 @@ void GPU_framebuffer_py_reference_set(GPUFrameBuffer *framebuffer, void **py_ref /* TODO(fclem): This has nothing to do with the GPU module and should be move to the pyGPU module. */ void GPU_framebuffer_push(GPUFrameBuffer *framebuffer); -GPUFrameBuffer *GPU_framebuffer_pop(void); -uint GPU_framebuffer_stack_level_get(void); +GPUFrameBuffer *GPU_framebuffer_pop(); +uint GPU_framebuffer_stack_level_get(); /** \} */ @@ -642,7 +640,7 @@ void GPU_framebuffer_recursive_downsample(GPUFrameBuffer *framebuffer, * NOTE: They are still limited by the same single context limitation as #GPUFrameBuffer. * \{ */ -typedef struct GPUOffScreen GPUOffScreen; +struct GPUOffScreen; /** * Create a #GPUOffScreen with attachment size of \a width by \a height pixels. @@ -711,7 +709,7 @@ int GPU_offscreen_height(const GPUOffScreen *offscreen); * Return the color texture of a #GPUOffScreen. Does not give ownership. * \note only to be used by viewport code! */ -struct GPUTexture *GPU_offscreen_color_texture(const GPUOffScreen *offscreen); +GPUTexture *GPU_offscreen_color_texture(const GPUOffScreen *offscreen); /** * Return the texture format of a #GPUOffScreen. @@ -724,11 +722,7 @@ eGPUTextureFormat GPU_offscreen_format(const GPUOffScreen *offscreen); */ void GPU_offscreen_viewport_data_get(GPUOffScreen *offscreen, GPUFrameBuffer **r_fb, - struct GPUTexture **r_color, - struct GPUTexture **r_depth); + GPUTexture **r_color, + GPUTexture **r_depth); /** \} */ - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/GPU_immediate.h b/source/blender/gpu/GPU_immediate.hh similarity index 93% rename from source/blender/gpu/GPU_immediate.h rename to source/blender/gpu/GPU_immediate.hh index 61f8d503a35..9e063527492 100644 --- a/source/blender/gpu/GPU_immediate.h +++ b/source/blender/gpu/GPU_immediate.hh @@ -10,30 +10,26 @@ #pragma once -#include "GPU_batch.h" -#include "GPU_immediate_util.h" -#include "GPU_primitive.h" -#include "GPU_shader.h" -#include "GPU_texture.h" -#include "GPU_vertex_format.h" - -#ifdef __cplusplus -extern "C" { -#endif +#include "GPU_batch.hh" +#include "GPU_immediate_util.hh" +#include "GPU_primitive.hh" +#include "GPU_shader.hh" +#include "GPU_texture.hh" +#include "GPU_vertex_format.hh" /** Returns a cleared vertex format, ready for #add_attr. */ -GPUVertFormat *immVertexFormat(void); +GPUVertFormat *immVertexFormat(); /** Every #immBegin must have a program bound first. */ void immBindShader(GPUShader *shader); /** Call after your last immEnd, or before binding another program. */ -void immUnbindProgram(void); +void immUnbindProgram(); /** Must supply exactly vertex_len vertices. */ void immBegin(GPUPrimType, uint vertex_len); /** Can supply fewer vertices. */ void immBeginAtMost(GPUPrimType, uint max_vertex_len); -void immEnd(void); /* finishes and draws. */ +void immEnd(); /* finishes and draws. */ /* - #immBegin a batch, then use standard `imm*` functions as usual. * - #immEnd will finalize the batch instead of drawing. @@ -139,7 +135,3 @@ void immUniformThemeColorShadeAlpha(int color_id, int color_offset, int alpha_of void immUniformThemeColorBlendShade(int color_id1, int color_id2, float fac, int offset); void immUniformThemeColorBlend(int color_id1, int color_id2, float fac); void immThemeColorShadeAlpha(int colorid, int coloffset, int alphaoffset); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/GPU_immediate_util.h b/source/blender/gpu/GPU_immediate_util.hh similarity index 99% rename from source/blender/gpu/GPU_immediate_util.h rename to source/blender/gpu/GPU_immediate_util.hh index bb066a1a78b..4c6ef1dd607 100644 --- a/source/blender/gpu/GPU_immediate_util.h +++ b/source/blender/gpu/GPU_immediate_util.hh @@ -10,10 +10,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - /* Draw 2D rectangles (replaces glRect functions) */ /* caller is responsible for vertex format & shader */ void immRectf(uint pos, float x1, float y1, float x2, float y2); @@ -173,6 +169,3 @@ void imm_draw_cylinder_fill_3d( uint pos, float base, float top, float height, int slices, int stacks); void imm_drawcircball(const float cent[3], float radius, const float tmat[4][4], uint pos); -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/GPU_index_buffer.h b/source/blender/gpu/GPU_index_buffer.hh similarity index 93% rename from source/blender/gpu/GPU_index_buffer.h rename to source/blender/gpu/GPU_index_buffer.hh index d8d33ddc841..8a69dc50ad5 100644 --- a/source/blender/gpu/GPU_index_buffer.h +++ b/source/blender/gpu/GPU_index_buffer.hh @@ -10,18 +10,14 @@ #pragma once -#include "GPU_primitive.h" - -#ifdef __cplusplus -extern "C" { -#endif +#include "GPU_primitive.hh" /** Opaque type hiding blender::gpu::IndexBuf. */ -typedef struct GPUIndexBuf GPUIndexBuf; +struct GPUIndexBuf; -GPUIndexBuf *GPU_indexbuf_calloc(void); +GPUIndexBuf *GPU_indexbuf_calloc(); -typedef struct GPUIndexBufBuilder { +struct GPUIndexBufBuilder { uint max_allowed_index; uint max_index_len; uint index_len; @@ -32,7 +28,7 @@ typedef struct GPUIndexBufBuilder { GPUPrimType prim_type; uint32_t *data; -} GPUIndexBufBuilder; +}; /** Supports all primitive types. */ void GPU_indexbuf_init_ex(GPUIndexBufBuilder *, GPUPrimType, uint index_len, uint vertex_len); @@ -110,12 +106,8 @@ int GPU_indexbuf_primitive_len(GPUPrimType prim_type); #define GPU_INDEXBUF_DISCARD_SAFE(elem) \ do { \ - if (elem != NULL) { \ + if (elem != nullptr) { \ GPU_indexbuf_discard(elem); \ - elem = NULL; \ + elem = nullptr; \ } \ } while (0) - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/GPU_init_exit.h b/source/blender/gpu/GPU_init_exit.hh similarity index 56% rename from source/blender/gpu/GPU_init_exit.h rename to source/blender/gpu/GPU_init_exit.hh index c0c6cf78a85..9668c25ccc4 100644 --- a/source/blender/gpu/GPU_init_exit.h +++ b/source/blender/gpu/GPU_init_exit.hh @@ -10,14 +10,6 @@ #include "BLI_utildefines.h" -#ifdef __cplusplus -extern "C" { -#endif - -void GPU_init(void); -void GPU_exit(void); -bool GPU_is_init(void); - -#ifdef __cplusplus -} -#endif +void GPU_init(); +void GPU_exit(); +bool GPU_is_init(); diff --git a/source/blender/gpu/GPU_material.hh b/source/blender/gpu/GPU_material.hh index e6f9ad01bab..62fe6dcf323 100644 --- a/source/blender/gpu/GPU_material.hh +++ b/source/blender/gpu/GPU_material.hh @@ -16,8 +16,8 @@ #include "BLI_sys_types.h" /* for bool */ -#include "GPU_shader.h" /* for GPUShaderCreateInfo */ -#include "GPU_texture.h" /* for GPUSamplerState */ +#include "GPU_shader.hh" /* for GPUShaderCreateInfo */ +#include "GPU_texture.hh" /* for GPUSamplerState */ struct GHash; struct GPUMaterial; @@ -275,7 +275,7 @@ const char *GPU_material_get_name(GPUMaterial *material); void GPU_material_optimize(GPUMaterial *mat); /** - * Return can be NULL if it's a world material. + * Return can be null if it's a world material. */ Material *GPU_material_get_material(GPUMaterial *material); /** diff --git a/source/blender/gpu/GPU_matrix.h b/source/blender/gpu/GPU_matrix.hh similarity index 92% rename from source/blender/gpu/GPU_matrix.h rename to source/blender/gpu/GPU_matrix.hh index 7bd1c0df4ad..37efe541991 100644 --- a/source/blender/gpu/GPU_matrix.h +++ b/source/blender/gpu/GPU_matrix.hh @@ -10,16 +10,12 @@ #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - struct GPUShader; /** * To Identity transform & empty stack. */ -void GPU_matrix_reset(void); +void GPU_matrix_reset(); /* ModelView Matrix (2D or 3D) */ @@ -29,13 +25,13 @@ void GPU_matrix_reset(void); * \note A function `GPU_matrix_push_identity` could be added * instead of calling #GPU_matrix_identity_set after pushing. */ -void GPU_matrix_push(void); -void GPU_matrix_pop(void); +void GPU_matrix_push(); +void GPU_matrix_pop(); /** * Set the model-view to an identity matrix. */ -void GPU_matrix_identity_set(void); +void GPU_matrix_identity_set(); /** * Scale the model-view matrix. @@ -84,12 +80,12 @@ void GPU_matrix_rotate_2d(float deg); /* Projection Matrix (2D or 3D). */ -void GPU_matrix_push_projection(void); -void GPU_matrix_pop_projection(void); +void GPU_matrix_push_projection(); +void GPU_matrix_pop_projection(); /* 3D Projection Matrix. */ -void GPU_matrix_identity_projection_set(void); +void GPU_matrix_identity_projection_set(); void GPU_matrix_projection_set(const float m[4][4]); void GPU_matrix_ortho_set(float left, float right, float bottom, float top, float near, float far); @@ -117,7 +113,7 @@ struct GPUMatrixUnproject_Precalc { } dims; }; -bool GPU_matrix_unproject_precalc(struct GPUMatrixUnproject_Precalc *unproj_precalc, +bool GPU_matrix_unproject_precalc(GPUMatrixUnproject_Precalc *unproj_precalc, const float model[4][4], const float proj[4][4], const int view[4]); @@ -156,8 +152,8 @@ const float (*GPU_matrix_normal_inverse_get(float m[3][3]))[3]; /** * Set uniform values for currently bound shader. */ -void GPU_matrix_bind(struct GPUShader *shader); -bool GPU_matrix_dirty_get(void); /* since last bind */ +void GPU_matrix_bind(GPUShader *shader); +bool GPU_matrix_dirty_get(); /* since last bind */ /** * Own working polygon offset. @@ -171,16 +167,12 @@ void GPU_polygon_offset(float viewdist, float dist); /* Python API needs to be able to inspect the stack so errors raise exceptions * instead of crashing. */ #ifdef USE_GPU_PY_MATRIX_API -int GPU_matrix_stack_level_get_model_view(void); -int GPU_matrix_stack_level_get_projection(void); +int GPU_matrix_stack_level_get_model_view(); +int GPU_matrix_stack_level_get_projection(); /* static assert ensures this doesn't change! */ # define GPU_PY_MATRIX_STACK_LEN 31 #endif /* USE_GPU_PY_MATRIX_API */ -#ifdef __cplusplus -} -#endif - #ifndef SUPPRESS_GENERIC_MATRIX_API # if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) diff --git a/source/blender/gpu/GPU_platform.h b/source/blender/gpu/GPU_platform.hh similarity index 69% rename from source/blender/gpu/GPU_platform.h rename to source/blender/gpu/GPU_platform.hh index 6507dbb281c..49875f5da4a 100644 --- a/source/blender/gpu/GPU_platform.h +++ b/source/blender/gpu/GPU_platform.hh @@ -11,18 +11,12 @@ #include "BLI_sys_types.h" #include "BLI_utildefines.h" +#include "GPU_platform_backend_enum.h" + /* GPU platform support */ -typedef enum eGPUBackendType { - GPU_BACKEND_NONE = 0, - GPU_BACKEND_OPENGL = 1 << 0, - GPU_BACKEND_METAL = 1 << 1, - GPU_BACKEND_VULKAN = 1 << 3, - GPU_BACKEND_ANY = 0xFFFFFFFFu -} eGPUBackendType; - /* GPU Types */ -typedef enum eGPUDeviceType { +enum eGPUDeviceType { GPU_DEVICE_NVIDIA = (1 << 0), GPU_DEVICE_ATI = (1 << 1), GPU_DEVICE_INTEL = (1 << 2), @@ -32,31 +26,31 @@ typedef enum eGPUDeviceType { GPU_DEVICE_QUALCOMM = (1 << 6), GPU_DEVICE_UNKNOWN = (1 << 7), GPU_DEVICE_ANY = (0xff), -} eGPUDeviceType; +}; ENUM_OPERATORS(eGPUDeviceType, GPU_DEVICE_ANY) -typedef enum eGPUOSType { +enum eGPUOSType { GPU_OS_WIN = (1 << 8), GPU_OS_MAC = (1 << 9), GPU_OS_UNIX = (1 << 10), GPU_OS_ANY = (0xff00), -} eGPUOSType; +}; -typedef enum eGPUDriverType { +enum eGPUDriverType { GPU_DRIVER_OFFICIAL = (1 << 16), GPU_DRIVER_OPENSOURCE = (1 << 17), GPU_DRIVER_SOFTWARE = (1 << 18), GPU_DRIVER_ANY = (0xff0000), -} eGPUDriverType; +}; -typedef enum eGPUSupportLevel { +enum eGPUSupportLevel { GPU_SUPPORT_LEVEL_SUPPORTED, GPU_SUPPORT_LEVEL_LIMITED, GPU_SUPPORT_LEVEL_UNSUPPORTED, -} eGPUSupportLevel; +}; -typedef enum GPUArchitectureType { +enum GPUArchitectureType { /* Immediate Mode Renderer (IMR). * Typically, an IMR architecture will execute GPU work in sequence, rasterizing primitives in * order. */ @@ -67,11 +61,7 @@ typedef enum GPUArchitectureType { * binning geometry into distinct tiled regions. Fragments will then be rasterized within * the bounds of one tile at a time. */ GPU_ARCHITECTURE_TBDR = 1, -} GPUArchitectureType; - -#ifdef __cplusplus -extern "C" { -#endif +}; /* GPU Types */ /* TODO: Verify all use-cases of GPU_type_matches to determine which graphics API it should apply @@ -82,14 +72,10 @@ bool GPU_type_matches_ex(eGPUDeviceType device, eGPUDriverType driver, eGPUBackendType backend); -eGPUSupportLevel GPU_platform_support_level(void); -const char *GPU_platform_vendor(void); -const char *GPU_platform_renderer(void); -const char *GPU_platform_version(void); -const char *GPU_platform_support_level_key(void); -const char *GPU_platform_gpu_name(void); -GPUArchitectureType GPU_platform_architecture(void); - -#ifdef __cplusplus -} -#endif +eGPUSupportLevel GPU_platform_support_level(); +const char *GPU_platform_vendor(); +const char *GPU_platform_renderer(); +const char *GPU_platform_version(); +const char *GPU_platform_support_level_key(); +const char *GPU_platform_gpu_name(); +GPUArchitectureType GPU_platform_architecture(); diff --git a/source/blender/gpu/GPU_platform_backend_enum.h b/source/blender/gpu/GPU_platform_backend_enum.h new file mode 100644 index 00000000000..3c7bffdc39e --- /dev/null +++ b/source/blender/gpu/GPU_platform_backend_enum.h @@ -0,0 +1,17 @@ +/* SPDX-FileCopyrightText: 2024 Blender Authors + * + * SPDX-License-Identifier: GPL-2.0-or-later */ + +/** \file + * \ingroup gpu + */ + +#pragma once + +typedef enum eGPUBackendType { + GPU_BACKEND_NONE = 0, + GPU_BACKEND_OPENGL = 1 << 0, + GPU_BACKEND_METAL = 1 << 1, + GPU_BACKEND_VULKAN = 1 << 3, + GPU_BACKEND_ANY = 0xFFFFFFFFu +} eGPUBackendType; diff --git a/source/blender/gpu/GPU_primitive.h b/source/blender/gpu/GPU_primitive.hh similarity index 94% rename from source/blender/gpu/GPU_primitive.h rename to source/blender/gpu/GPU_primitive.hh index 45f656789af..abd6eb63664 100644 --- a/source/blender/gpu/GPU_primitive.h +++ b/source/blender/gpu/GPU_primitive.hh @@ -11,13 +11,9 @@ #pragma once #include "BLI_assert.h" -#include "GPU_common.h" +#include "GPU_common.hh" -#ifdef __cplusplus -extern "C" { -#endif - -typedef enum { +enum GPUPrimType { GPU_PRIM_POINTS, GPU_PRIM_LINES, GPU_PRIM_TRIS, @@ -33,16 +29,16 @@ typedef enum { GPU_PRIM_LINE_STRIP_ADJ, GPU_PRIM_NONE, -} GPUPrimType; +}; /* what types of primitives does each shader expect? */ -typedef enum { +enum GPUPimClass { GPU_PRIM_CLASS_NONE = 0, GPU_PRIM_CLASS_POINT = (1 << 0), GPU_PRIM_CLASS_LINE = (1 << 1), GPU_PRIM_CLASS_SURFACE = (1 << 2), GPU_PRIM_CLASS_ANY = GPU_PRIM_CLASS_POINT | GPU_PRIM_CLASS_LINE | GPU_PRIM_CLASS_SURFACE, -} GPUPrimClass; +}; inline int gpu_get_prim_count_from_type(uint vertex_len, GPUPrimType prim_type) { @@ -122,7 +118,3 @@ inline bool is_restart_compatible(GPUPrimType type) * GPUPrimClass GPU_primtype_class(GPUPrimType); * bool GPU_primtype_belongs_to_class(GPUPrimType, GPUPrimClass); */ - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.hh similarity index 95% rename from source/blender/gpu/GPU_shader.h rename to source/blender/gpu/GPU_shader.hh index 556513c25fa..f0103541812 100644 --- a/source/blender/gpu/GPU_shader.h +++ b/source/blender/gpu/GPU_shader.hh @@ -10,18 +10,14 @@ #pragma once -#include "GPU_shader_builtin.h" - -#ifdef __cplusplus -extern "C" { -#endif +#include "GPU_shader_builtin.hh" struct GPUVertBuf; /** Opaque type hiding #blender::gpu::shader::ShaderCreateInfo */ -typedef struct GPUShaderCreateInfo GPUShaderCreateInfo; +struct GPUShaderCreateInfo; /** Opaque type hiding #blender::gpu::Shader */ -typedef struct GPUShader GPUShader; +struct GPUShader; /* Hardware limit is 16. Position attribute is always needed so we reduce to 15. * This makes sure the GPUVertexFormat name buffer does not overflow. */ @@ -36,7 +32,7 @@ typedef struct GPUShader GPUShader; /** * Create a shader using the given #GPUShaderCreateInfo. - * Can return a NULL pointer if compilation fails. + * Can return a null pointer if compilation fails. */ GPUShader *GPU_shader_create_from_info(const GPUShaderCreateInfo *_info); @@ -44,14 +40,14 @@ GPUShader *GPU_shader_create_from_info(const GPUShaderCreateInfo *_info); * Create a shader using a named #GPUShaderCreateInfo registered at startup. * These are declared inside `*_info.hh` files using the `GPU_SHADER_CREATE_INFO()` macro. * They are also expected to have been flagged using `do_static_compilation`. - * Can return a NULL pointer if compilation fails. + * Can return a null pointer if compilation fails. */ GPUShader *GPU_shader_create_from_info_name(const char *info_name); /** * Fetch a named #GPUShaderCreateInfo registered at startup. * These are declared inside `*_info.hh` files using the `GPU_SHADER_CREATE_INFO()` macro. - * Can return a NULL pointer if no match is found. + * Can return a null pointer if no match is found. */ const GPUShaderCreateInfo *GPU_shader_create_info_get(const char *info_name); @@ -89,13 +85,13 @@ void GPU_shader_bind(GPUShader *shader); * \note this is a no-op in release builds. But it make sense to actually do it in user land code * to detect incorrect API usage. */ -void GPU_shader_unbind(void); +void GPU_shader_unbind(); /** * Return the currently bound shader to the active GPU context. - * \return NULL pointer if no shader is bound of if no context is active. + * \return null pointer if no shader is bound of if no context is active. */ -GPUShader *GPU_shader_get_bound(void); +GPUShader *GPU_shader_get_bound(); /** \} */ @@ -204,12 +200,12 @@ void GPU_shader_constant_bool(GPUShader *sh, const char *name, bool value); * All of this section is deprecated and should be ported to use the API described above. * \{ */ -typedef enum eGPUShaderTFBType { +enum eGPUShaderTFBType { GPU_SHADER_TFB_NONE = 0, /* Transform feedback unsupported. */ GPU_SHADER_TFB_POINTS = 1, GPU_SHADER_TFB_LINES = 2, GPU_SHADER_TFB_TRIANGLES = 3, -} eGPUShaderTFBType; +}; GPUShader *GPU_shader_create(const char *vertcode, const char *fragcode, @@ -300,7 +296,7 @@ int GPU_shader_get_program(GPUShader *shader); /** * Indexed commonly used uniform name for faster lookup into the uniform cache. */ -typedef enum { +enum GPUUniformBuiltin { GPU_UNIFORM_MODEL = 0, /* mat4 ModelMatrix */ GPU_UNIFORM_VIEW, /* mat4 ViewMatrix */ GPU_UNIFORM_MODELVIEW, /* mat4 ModelViewMatrix */ @@ -323,7 +319,7 @@ typedef enum { GPU_UNIFORM_RESOURCE_CHUNK, /* int resourceChunk */ GPU_UNIFORM_RESOURCE_ID, /* int resourceId */ GPU_UNIFORM_SRGB_TRANSFORM, /* bool srgbTarget */ -} GPUUniformBuiltin; +}; #define GPU_NUM_UNIFORMS (GPU_UNIFORM_SRGB_TRANSFORM + 1) /** @@ -340,7 +336,7 @@ int GPU_shader_get_builtin_uniform(GPUShader *shader, int builtin); void GPU_shader_compile_static(); /** DEPRECATED: Use hard-coded buffer location instead. */ -typedef enum { +enum GPUUniformBlockBuiltin { GPU_UNIFORM_BLOCK_VIEW = 0, /* viewBlock */ GPU_UNIFORM_BLOCK_MODEL, /* modelBlock */ GPU_UNIFORM_BLOCK_INFO, /* infoBlock */ @@ -351,7 +347,7 @@ typedef enum { GPU_UNIFORM_BLOCK_DRW_CLIPPING, GPU_NUM_UNIFORM_BLOCKS, /* Special value, denotes number of builtin uniforms block. */ -} GPUUniformBlockBuiltin; +}; /** DEPRECATED: Use hard-coded buffer location instead. */ int GPU_shader_get_builtin_block(GPUShader *shader, int builtin); @@ -360,7 +356,3 @@ int GPU_shader_get_builtin_block(GPUShader *shader, int builtin); int GPU_shader_get_uniform_block(GPUShader *shader, const char *name); /** \} */ - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/GPU_shader_builtin.h b/source/blender/gpu/GPU_shader_builtin.hh similarity index 91% rename from source/blender/gpu/GPU_shader_builtin.h rename to source/blender/gpu/GPU_shader_builtin.hh index 2b3cfbe7e1e..43935ec4ce8 100644 --- a/source/blender/gpu/GPU_shader_builtin.h +++ b/source/blender/gpu/GPU_shader_builtin.hh @@ -20,13 +20,9 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct GPUShader; -typedef enum eGPUBuiltinShader { +enum eGPUBuiltinShader { /** Glyph drawing shader used by the BLF module. */ GPU_SHADER_TEXT, /** Draws keyframe markers. All markers shapes are supported through a single shader. */ @@ -132,22 +128,18 @@ typedef enum eGPUBuiltinShader { * \param pos: in vec3 */ GPU_SHADER_3D_IMAGE_COLOR, -} eGPUBuiltinShader; +}; #define GPU_SHADER_BUILTIN_LEN (GPU_SHADER_3D_IMAGE_COLOR + 1) /** Support multiple configurations. */ -typedef enum eGPUShaderConfig { +enum eGPUShaderConfig { GPU_SHADER_CFG_DEFAULT = 0, GPU_SHADER_CFG_CLIPPED = 1, -} eGPUShaderConfig; +}; #define GPU_SHADER_CFG_LEN (GPU_SHADER_CFG_CLIPPED + 1) -struct GPUShader *GPU_shader_get_builtin_shader_with_config(eGPUBuiltinShader shader, - eGPUShaderConfig sh_cfg); -struct GPUShader *GPU_shader_get_builtin_shader(eGPUBuiltinShader shader); +GPUShader *GPU_shader_get_builtin_shader_with_config(eGPUBuiltinShader shader, + eGPUShaderConfig sh_cfg); +GPUShader *GPU_shader_get_builtin_shader(eGPUBuiltinShader shader); -void GPU_shader_free_builtin_shaders(void); - -#ifdef __cplusplus -} -#endif +void GPU_shader_free_builtin_shaders(); diff --git a/source/blender/gpu/GPU_shader_shared.h b/source/blender/gpu/GPU_shader_shared.hh similarity index 85% rename from source/blender/gpu/GPU_shader_shared.h rename to source/blender/gpu/GPU_shader_shared.hh index 3524e8e35af..55fa10e78f2 100644 --- a/source/blender/gpu/GPU_shader_shared.h +++ b/source/blender/gpu/GPU_shader_shared.hh @@ -9,9 +9,9 @@ #ifndef USE_GPU_SHADER_CREATE_INFO # pragma once -# include "GPU_shader_shared_utils.h" +# include "GPU_shader_shared_utils.hh" -typedef struct TestOutputRawData TestOutputRawData; +struct TestOutputRawData; #endif /* NOTE: float3 has differing stride and alignment rules across different GPU back-ends. If 12 byte @@ -19,7 +19,7 @@ typedef struct TestOutputRawData TestOutputRawData; * required in the common use-case where a float3 and an int/float are paired together for optimal * data transfer. */ -enum eGPUKeyframeShapes { +enum eGPUKeyframeShapes : uint32_t { GPU_KEYFRAME_SHAPE_DIAMOND = (1u << 0u), GPU_KEYFRAME_SHAPE_CIRCLE = (1u << 1u), GPU_KEYFRAME_SHAPE_CLIPPED_VERTICAL = (1u << 2u), @@ -46,7 +46,7 @@ struct NodeLinkData { float arrowSize; float2 _pad; }; -BLI_STATIC_ASSERT_ALIGN(struct NodeLinkData, 16) +BLI_STATIC_ASSERT_ALIGN(NodeLinkData, 16) struct NodeLinkInstanceData { float4 colors[6]; @@ -54,7 +54,7 @@ struct NodeLinkInstanceData { float arrowSize; float2 _pad; }; -BLI_STATIC_ASSERT_ALIGN(struct NodeLinkInstanceData, 16) +BLI_STATIC_ASSERT_ALIGN(NodeLinkInstanceData, 16) struct GPencilStrokeData { float2 viewport; @@ -68,34 +68,34 @@ struct GPencilStrokeData { bool32_t fill_stroke; float2 _pad; }; -BLI_STATIC_ASSERT_ALIGN(struct GPencilStrokeData, 16) +BLI_STATIC_ASSERT_ALIGN(GPencilStrokeData, 16) struct GPUClipPlanes { float4x4 ClipModelMatrix; float4 world[6]; }; -BLI_STATIC_ASSERT_ALIGN(struct GPUClipPlanes, 16) +BLI_STATIC_ASSERT_ALIGN(GPUClipPlanes, 16) struct SimpleLightingData { float4 l_color; packed_float3 light; float _pad; }; -BLI_STATIC_ASSERT_ALIGN(struct SimpleLightingData, 16) +BLI_STATIC_ASSERT_ALIGN(SimpleLightingData, 16) #define MAX_CALLS 16 struct MultiIconCallData { float4 calls_data[MAX_CALLS * 3]; }; -BLI_STATIC_ASSERT_ALIGN(struct MultiIconCallData, 16) +BLI_STATIC_ASSERT_ALIGN(MultiIconCallData, 16) -enum TestStatus { +enum TestStatus : uint32_t { TEST_STATUS_NONE = 0u, TEST_STATUS_PASSED = 1u, TEST_STATUS_FAILED = 2u, }; -enum TestType { +enum TestType : uint32_t { TEST_TYPE_BOOL = 0u, TEST_TYPE_UINT = 1u, TEST_TYPE_INT = 2u, @@ -124,7 +124,7 @@ enum TestType { struct TestOutputRawData { uint data[16]; }; -BLI_STATIC_ASSERT_ALIGN(struct TestOutputRawData, 16) +BLI_STATIC_ASSERT_ALIGN(TestOutputRawData, 16) struct TestOutput { TestOutputRawData expect; @@ -137,7 +137,7 @@ struct TestOutput { uint type; int _pad0; }; -BLI_STATIC_ASSERT_ALIGN(struct TestOutput, 16) +BLI_STATIC_ASSERT_ALIGN(TestOutput, 16) #ifdef GPU_SHADER TestOutput test_output( diff --git a/source/blender/gpu/GPU_shader_shared_utils.h b/source/blender/gpu/GPU_shader_shared_utils.hh similarity index 100% rename from source/blender/gpu/GPU_shader_shared_utils.h rename to source/blender/gpu/GPU_shader_shared_utils.hh diff --git a/source/blender/gpu/GPU_state.h b/source/blender/gpu/GPU_state.hh similarity index 86% rename from source/blender/gpu/GPU_state.h rename to source/blender/gpu/GPU_state.hh index 63c22540610..7cd935b2077 100644 --- a/source/blender/gpu/GPU_state.h +++ b/source/blender/gpu/GPU_state.hh @@ -11,9 +11,9 @@ #include "BLI_utildefines.h" /** Opaque type hiding blender::gpu::Fence. */ -typedef struct GPUFence GPUFence; +struct GPUFence; -typedef enum eGPUWriteMask { +enum eGPUWriteMask { GPU_WRITE_NONE = 0, GPU_WRITE_RED = (1 << 0), GPU_WRITE_GREEN = (1 << 1), @@ -22,11 +22,11 @@ typedef enum eGPUWriteMask { GPU_WRITE_DEPTH = (1 << 4), GPU_WRITE_STENCIL = (1 << 5), GPU_WRITE_COLOR = (GPU_WRITE_RED | GPU_WRITE_GREEN | GPU_WRITE_BLUE | GPU_WRITE_ALPHA), -} eGPUWriteMask; +}; ENUM_OPERATORS(eGPUWriteMask, GPU_WRITE_COLOR) -typedef enum eGPUBarrier { +enum eGPUBarrier { /* Texture Barrier. */ /** All written texture prior to this barrier can be bound as frame-buffer attachment. */ @@ -56,20 +56,20 @@ typedef enum eGPUBarrier { GPU_BARRIER_BUFFER_UPDATE = (1 << 15), /** All written persistent mapped buffer prior to this barrier can be read or updated. */ // GPU_BARRIER_CLIENT_MAPPED_BUFFER = (1 << 15), /* Not implemented yet. */ -} eGPUBarrier; +}; ENUM_OPERATORS(eGPUBarrier, GPU_BARRIER_UNIFORM) /* NOTE: For Metal and Vulkan only. * TODO(Metal): Update barrier calls to use stage flags. */ -typedef enum eGPUStageBarrierBits { +enum eGPUStageBarrierBits { GPU_BARRIER_STAGE_VERTEX = (1 << 0), GPU_BARRIER_STAGE_FRAGMENT = (1 << 1), GPU_BARRIER_STAGE_COMPUTE = (1 << 2), GPU_BARRIER_STAGE_ANY_GRAPHICS = (GPU_BARRIER_STAGE_VERTEX | GPU_BARRIER_STAGE_FRAGMENT), GPU_BARRIER_STAGE_ANY = (GPU_BARRIER_STAGE_VERTEX | GPU_BARRIER_STAGE_FRAGMENT | GPU_BARRIER_STAGE_COMPUTE), -} eGPUStageBarrierBits; +}; ENUM_OPERATORS(eGPUStageBarrierBits, GPU_BARRIER_STAGE_COMPUTE) @@ -81,7 +81,7 @@ ENUM_OPERATORS(eGPUStageBarrierBits, GPU_BARRIER_STAGE_COMPUTE) * `(SRC * A) + (DST * B)`. * The blend mode will modify the A and B parameters. */ -typedef enum eGPUBlend { +enum eGPUBlend { GPU_BLEND_NONE = 0, /** Pre-multiply variants will _NOT_ multiply rgb output by alpha. */ GPU_BLEND_ALPHA, @@ -102,9 +102,9 @@ typedef enum eGPUBlend { * NOTE: Can only be used with _ONE_ Draw Buffer and shader needs to be specialized. */ GPU_BLEND_CUSTOM, GPU_BLEND_ALPHA_UNDER_PREMUL, -} eGPUBlend; +}; -typedef enum eGPUDepthTest { +enum eGPUDepthTest { GPU_DEPTH_NONE = 0, GPU_DEPTH_ALWAYS, /* Used to draw to the depth buffer without really testing. */ GPU_DEPTH_LESS, @@ -112,37 +112,33 @@ typedef enum eGPUDepthTest { GPU_DEPTH_EQUAL, GPU_DEPTH_GREATER, GPU_DEPTH_GREATER_EQUAL, -} eGPUDepthTest; +}; -typedef enum eGPUStencilTest { +enum eGPUStencilTest { GPU_STENCIL_NONE = 0, GPU_STENCIL_ALWAYS, GPU_STENCIL_EQUAL, GPU_STENCIL_NEQUAL, -} eGPUStencilTest; +}; -typedef enum eGPUStencilOp { +enum eGPUStencilOp { GPU_STENCIL_OP_NONE = 0, GPU_STENCIL_OP_REPLACE, /** Special values for stencil shadows. */ GPU_STENCIL_OP_COUNT_DEPTH_PASS, GPU_STENCIL_OP_COUNT_DEPTH_FAIL, -} eGPUStencilOp; +}; -typedef enum eGPUFaceCullTest { +enum eGPUFaceCullTest { GPU_CULL_NONE = 0, /* Culling disabled. */ GPU_CULL_FRONT, GPU_CULL_BACK, -} eGPUFaceCullTest; +}; -typedef enum eGPUProvokingVertex { +enum eGPUProvokingVertex { GPU_VERTEX_LAST = 0, /* Default. */ GPU_VERTEX_FIRST = 1, /* Follow Blender loop order. */ -} eGPUProvokingVertex; - -#ifdef __cplusplus -extern "C" { -#endif +}; void GPU_blend(eGPUBlend blend); void GPU_face_culling(eGPUFaceCullTest culling); @@ -179,10 +175,10 @@ void GPU_viewport_size_get_i(int coords[4]); void GPU_write_mask(eGPUWriteMask mask); void GPU_color_mask(bool r, bool g, bool b, bool a); void GPU_depth_mask(bool depth); -bool GPU_depth_mask_get(void); +bool GPU_depth_mask_get(); void GPU_shadow_offset(bool enable); void GPU_clip_distances(int distances_enabled); -bool GPU_mipmap_enabled(void); +bool GPU_mipmap_enabled(); void GPU_state_set(eGPUWriteMask write_mask, eGPUBlend blend, eGPUFaceCullTest culling_test, @@ -195,28 +191,28 @@ void GPU_stencil_reference_set(uint reference); void GPU_stencil_write_mask_set(uint write_mask); void GPU_stencil_compare_mask_set(uint compare_mask); -eGPUFaceCullTest GPU_face_culling_get(void); -eGPUBlend GPU_blend_get(void); -eGPUDepthTest GPU_depth_test_get(void); -eGPUWriteMask GPU_write_mask_get(void); -uint GPU_stencil_mask_get(void); -eGPUStencilTest GPU_stencil_test_get(void); +eGPUFaceCullTest GPU_face_culling_get(); +eGPUBlend GPU_blend_get(); +eGPUDepthTest GPU_depth_test_get(); +eGPUWriteMask GPU_write_mask_get(); +uint GPU_stencil_mask_get(); +eGPUStencilTest GPU_stencil_test_get(); /** * \note Already pre-multiplied by `U.pixelsize`. */ -float GPU_line_width_get(void); +float GPU_line_width_get(); -void GPU_flush(void); -void GPU_finish(void); -void GPU_apply_state(void); +void GPU_flush(); +void GPU_finish(); +void GPU_apply_state(); -void GPU_bgl_start(void); +void GPU_bgl_start(); /** * Just turn off the `bgl` safeguard system. Can be called even without #GPU_bgl_start. */ -void GPU_bgl_end(void); -bool GPU_bgl_get(void); +void GPU_bgl_end(); +bool GPU_bgl_get(); /** * A barrier _must_ be issued _after_ a shader arbitrary write to a buffer or a @@ -228,11 +224,7 @@ bool GPU_bgl_get(void); */ void GPU_memory_barrier(eGPUBarrier barrier); -GPUFence *GPU_fence_create(void); +GPUFence *GPU_fence_create(); void GPU_fence_free(GPUFence *fence); void GPU_fence_signal(GPUFence *fence); void GPU_fence_wait(GPUFence *fence); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/GPU_storage_buffer.h b/source/blender/gpu/GPU_storage_buffer.hh similarity index 91% rename from source/blender/gpu/GPU_storage_buffer.h rename to source/blender/gpu/GPU_storage_buffer.hh index 2f29333e45d..e91f29bdf6c 100644 --- a/source/blender/gpu/GPU_storage_buffer.h +++ b/source/blender/gpu/GPU_storage_buffer.hh @@ -14,15 +14,11 @@ #pragma once -#include "GPU_texture.h" -#include "GPU_vertex_buffer.h" - -#ifdef __cplusplus -extern "C" { -#endif +#include "GPU_texture.hh" +#include "GPU_vertex_buffer.hh" /** Opaque type hiding blender::gpu::StorageBuf. */ -typedef struct GPUStorageBuf GPUStorageBuf; +struct GPUStorageBuf; GPUStorageBuf *GPU_storagebuf_create_ex(size_t size, const void *data, @@ -30,7 +26,7 @@ GPUStorageBuf *GPU_storagebuf_create_ex(size_t size, const char *name); #define GPU_storagebuf_create(size) \ - GPU_storagebuf_create_ex(size, NULL, GPU_USAGE_DYNAMIC, __func__); + GPU_storagebuf_create_ex(size, nullptr, GPU_USAGE_DYNAMIC, __func__); void GPU_storagebuf_free(GPUStorageBuf *ssbo); @@ -38,7 +34,7 @@ void GPU_storagebuf_update(GPUStorageBuf *ssbo, const void *data); void GPU_storagebuf_bind(GPUStorageBuf *ssbo, int slot); void GPU_storagebuf_unbind(GPUStorageBuf *ssbo); -void GPU_storagebuf_unbind_all(void); +void GPU_storagebuf_unbind_all(); void GPU_storagebuf_clear_to_zero(GPUStorageBuf *ssbo); @@ -85,7 +81,3 @@ void GPU_storagebuf_copy_sub_from_vertbuf( * NOTE: Internally, this is only required for the OpenGL backend. */ void GPU_storagebuf_sync_as_indirect_buffer(GPUStorageBuf *ssbo); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/GPU_texture.h b/source/blender/gpu/GPU_texture.hh similarity index 97% rename from source/blender/gpu/GPU_texture.h rename to source/blender/gpu/GPU_texture.hh index a35d24ac6a0..8f0df534915 100644 --- a/source/blender/gpu/GPU_texture.h +++ b/source/blender/gpu/GPU_texture.hh @@ -19,14 +19,10 @@ #include "BLI_assert.h" #include "BLI_utildefines.h" -#include "GPU_state.h" +#include "GPU_state.hh" struct GPUVertBuf; -#ifdef __cplusplus -extern "C" { -#endif - /* -------------------------------------------------------------------- */ /** \name Sampler State * \{ */ @@ -35,7 +31,7 @@ extern "C" { * The `GPUSamplerFiltering` bit flag specifies the enabled filtering options of a texture * sampler. */ -typedef enum GPUSamplerFiltering { +enum GPUSamplerFiltering { /** * Default sampler filtering with all options off. * It means no linear filtering, no mipmapping, and no anisotropic filtering. @@ -65,7 +61,7 @@ typedef enum GPUSamplerFiltering { * changed, except by the user through the user preferences, see the use of U.anisotropic_filter. */ GPU_SAMPLER_FILTERING_ANISOTROPIC = (1 << 2), -} GPUSamplerFiltering; +}; ENUM_OPERATORS(GPUSamplerFiltering, GPU_SAMPLER_FILTERING_ANISOTROPIC) @@ -79,7 +75,7 @@ static const int GPU_SAMPLER_FILTERING_TYPES_COUNT = (GPU_SAMPLER_FILTERING_LINE * The `GPUSamplerExtendMode` specifies how the texture will be extrapolated for out-of-bound * texture sampling. */ -typedef enum GPUSamplerExtendMode { +enum GPUSamplerExtendMode { /** * Extrapolate by extending the edge pixels of the texture, in other words, the texture * coordinates are clamped. @@ -94,7 +90,7 @@ typedef enum GPUSamplerExtendMode { * black color (0, 0, 0, 0) and can't be changed. */ GPU_SAMPLER_EXTEND_MODE_CLAMP_TO_BORDER, -} GPUSamplerExtendMode; +}; #define GPU_SAMPLER_EXTEND_MODES_COUNT (GPU_SAMPLER_EXTEND_MODE_CLAMP_TO_BORDER + 1) @@ -109,7 +105,7 @@ typedef enum GPUSamplerExtendMode { * multiply the number of configurations that needs to be cached, which is not worth it due to the * limited use of the parameters needed to setup those custom samplers. */ -typedef enum GPUSamplerCustomType { +enum GPUSamplerCustomType { /** * Enable compare mode for depth texture. The depth texture must then be bound to a shadow * sampler. This is equivalent to: @@ -131,7 +127,7 @@ typedef enum GPUSamplerCustomType { * - TEXTURE_LOD_BIAS -> -0.5. */ GPU_SAMPLER_CUSTOM_ICON, -} GPUSamplerCustomType; +}; #define GPU_SAMPLER_CUSTOM_TYPES_COUNT (GPU_SAMPLER_CUSTOM_ICON + 1) @@ -140,7 +136,7 @@ typedef enum GPUSamplerCustomType { * when passed around due to it being an overloaded type, see the documentation of each of the * types for more information. */ -typedef enum GPUSamplerStateType { +enum GPUSamplerStateType { /** * The filtering, extend_x, and extend_yz members of the GPUSamplerState structure will be used * in setting up the sampler state for the texture. The custom_type member will be ignored in @@ -159,7 +155,7 @@ typedef enum GPUSamplerStateType { * actual data. */ GPU_SAMPLER_STATE_TYPE_INTERNAL, -} GPUSamplerStateType; +}; /** * The `GPUSamplerState` specifies the sampler state to bind a texture with. @@ -175,7 +171,7 @@ typedef enum GPUSamplerStateType { * // Use the texture ... * GPU_texture_compare_mode(texture, false); */ -typedef struct GPUSamplerState { +struct GPUSamplerState { /** Specifies the enabled filtering options for the sampler. */ GPUSamplerFiltering filtering : 8; /** @@ -390,7 +386,7 @@ typedef struct GPUSamplerState { this->type == rhs.type; } #endif -} GPUSamplerState; +}; #ifndef __cplusplus /** Identical to GPUSamplerState::default_sampler for non C++ users. */ @@ -411,7 +407,7 @@ static const GPUSamplerState GPU_SAMPLER_DEFAULT = {GPU_SAMPLER_FILTERING_DEFAUL * Types of texture internal storage. Defines how the data is stored inside the video memory. * Be aware that some formats are not supported by render-buffers. */ -typedef enum eGPUTextureFormat { +enum eGPUTextureFormat { /* Formats texture & render-buffer. */ GPU_RGBA8UI, @@ -500,7 +496,7 @@ typedef enum eGPUTextureFormat { GPU_DEPTH_COMPONENT32F, GPU_DEPTH_COMPONENT24, GPU_DEPTH_COMPONENT16, -} eGPUTextureFormat; +}; /** * Types of data for data specification. @@ -508,7 +504,7 @@ typedef enum eGPUTextureFormat { * When used with textures, they need to match or be compatible with the `eGPUTextureFormat` used. * Check `validate_data_format` for compatibility list. */ -typedef enum eGPUDataFormat { +enum eGPUDataFormat { GPU_DATA_FLOAT, GPU_DATA_HALF_FLOAT, GPU_DATA_INT, @@ -519,7 +515,7 @@ typedef enum eGPUDataFormat { /** Special type used for packed 32bit per pixel textures. Data is stored in reverse order. */ GPU_DATA_10_11_11_REV, GPU_DATA_2_10_10_10_REV, -} eGPUDataFormat; +}; /** * Texture usage flags allow backend implementations to contextually optimize texture resources. @@ -532,7 +528,7 @@ typedef enum eGPUDataFormat { * explicit usage can ensure that hardware features such as render target/texture compression can * be used. For explicit APIs such as Metal/Vulkan, texture usage needs to be specified up-front. */ -typedef enum eGPUTextureUsage { +enum eGPUTextureUsage { /* Whether texture is sampled or read during a shader. */ GPU_TEXTURE_USAGE_SHADER_READ = (1 << 0), /* Whether the texture is written to by a shader using imageStore. */ @@ -553,7 +549,7 @@ typedef enum eGPUTextureUsage { * This is unoptimized and should not be used. */ GPU_TEXTURE_USAGE_GENERAL = (0xFF & (~(GPU_TEXTURE_USAGE_MEMORYLESS | GPU_TEXTURE_USAGE_ATOMIC))), -} eGPUTextureUsage; +}; ENUM_OPERATORS(eGPUTextureUsage, GPU_TEXTURE_USAGE_GENERAL); @@ -564,7 +560,7 @@ ENUM_OPERATORS(eGPUTextureUsage, GPU_TEXTURE_USAGE_GENERAL); * \{ */ /** Opaque type hiding blender::gpu::Texture. */ -typedef struct GPUTexture GPUTexture; +struct GPUTexture; /** * \note \a data is expected to be float. If the \a format is not compatible with float data or if @@ -626,7 +622,7 @@ GPUTexture *GPU_texture_create_cube_array(const char *name, eGPUTextureUsage usage, const float *data); /** - * DDS texture loading. Return NULL if compressed texture support is not available. + * DDS texture loading. Return nullptr if compressed texture support is not available. * \a data should hold all the data for \a mip_len mipmaps. * The data is expected to be in compressed form. This isn't going to compress un-compress data. */ @@ -642,7 +638,7 @@ GPUTexture *GPU_texture_create_compressed_2d(const char *name, * Create a buffer texture that allow access to a buffer \a vertex_buf through a sampler of type * `(FLOAT/INT/UINT)_BUFFER`. */ -GPUTexture *GPU_texture_create_from_vertbuf(const char *name, struct GPUVertBuf *vertex_buf); +GPUTexture *GPU_texture_create_from_vertbuf(const char *name, GPUVertBuf *vertex_buf); /** * Create an error texture that will bind an pink texture at draw time. @@ -673,9 +669,9 @@ void GPU_texture_free(GPUTexture *texture); #define GPU_TEXTURE_FREE_SAFE(texture) \ do { \ - if (texture != NULL) { \ + if (texture != nullptr) { \ GPU_texture_free(texture); \ - texture = NULL; \ + texture = nullptr; \ } \ } while (0) @@ -828,7 +824,7 @@ void GPU_texture_unbind(GPUTexture *texture); /** * Unbind all texture from all texture sampling image units. */ -void GPU_texture_unbind_all(void); +void GPU_texture_unbind_all(); /** * Bind \a tex to an arbitrary load/store image unit. @@ -844,7 +840,7 @@ void GPU_texture_image_unbind(GPUTexture *texture); /** * Unbind all texture from all arbitrary load/store image units. */ -void GPU_texture_image_unbind_all(void); +void GPU_texture_image_unbind_all(); /** \} */ @@ -1072,12 +1068,12 @@ const char *GPU_texture_format_name(eGPUTextureFormat format); * \note that does not mean all of the textures are inside VRAM. Drivers can swap the texture * memory back and forth depending on usage. */ -unsigned int GPU_texture_memory_usage_get(void); +unsigned int GPU_texture_memory_usage_get(); /** * Update sampler states depending on user settings. */ -void GPU_samplers_update(void); +void GPU_samplers_update(); /** \} */ @@ -1089,7 +1085,7 @@ void GPU_samplers_update(void); * \{ */ /** Opaque type hiding blender::gpu::PixelBuffer. */ -typedef struct GPUPixelBuffer GPUPixelBuffer; +struct GPUPixelBuffer; /** * Creates a #GPUPixelBuffer object with \a byte_size worth of storage. @@ -1141,7 +1137,3 @@ void GPU_texture_update_sub_from_pixel_buffer(GPUTexture *texture, int height, int depth); /** \} */ - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/GPU_uniform_buffer.hh b/source/blender/gpu/GPU_uniform_buffer.hh index 2d691ee0046..836f611fd73 100644 --- a/source/blender/gpu/GPU_uniform_buffer.hh +++ b/source/blender/gpu/GPU_uniform_buffer.hh @@ -23,13 +23,13 @@ struct GPUUniformBuf; GPUUniformBuf *GPU_uniformbuf_create_ex(size_t size, const void *data, const char *name); /** * Create UBO from inputs list. - * Return NULL if failed to create or if \param inputs: is empty. + * Return nullptr if failed to create or if \param inputs: is empty. * * \param inputs: ListBase of #BLI_genericNodeN(#GPUInput). */ GPUUniformBuf *GPU_uniformbuf_create_from_list(ListBase *inputs, const char *name); -#define GPU_uniformbuf_create(size) GPU_uniformbuf_create_ex(size, NULL, __func__); +#define GPU_uniformbuf_create(size) GPU_uniformbuf_create_ex(size, nullptr, __func__); void GPU_uniformbuf_free(GPUUniformBuf *ubo); diff --git a/source/blender/gpu/GPU_vertex_buffer.h b/source/blender/gpu/GPU_vertex_buffer.hh similarity index 91% rename from source/blender/gpu/GPU_vertex_buffer.h rename to source/blender/gpu/GPU_vertex_buffer.hh index e3f70bf27ab..54eb649447d 100644 --- a/source/blender/gpu/GPU_vertex_buffer.h +++ b/source/blender/gpu/GPU_vertex_buffer.hh @@ -12,9 +12,9 @@ #include "BLI_utildefines.h" -#include "GPU_vertex_format.h" +#include "GPU_vertex_format.hh" -typedef enum { +enum GPUVertBufStatus { /** Initial state. */ GPU_VERTBUF_INVALID = 0, /** Was init with a vertex format. */ @@ -23,14 +23,10 @@ typedef enum { GPU_VERTBUF_DATA_DIRTY = (1 << 1), /** The buffer has been created inside GPU memory. */ GPU_VERTBUF_DATA_UPLOADED = (1 << 2), -} GPUVertBufStatus; +}; ENUM_OPERATORS(GPUVertBufStatus, GPU_VERTBUF_DATA_UPLOADED) -#ifdef __cplusplus -extern "C" { -#endif - /** * How to create a #GPUVertBuf: * 1) verts = GPU_vertbuf_calloc() @@ -39,7 +35,7 @@ extern "C" { * 4) GPU_vertbuf_attr_fill(verts, pos, application_pos_buffer) */ -typedef enum { +enum GPUUsageType { /* can be extended to support more types */ GPU_USAGE_STREAM = 0, GPU_USAGE_STATIC = 1, /* do not keep data in memory */ @@ -51,14 +47,14 @@ typedef enum { * format matches the texture exactly. Can be masked with other properties, and is stripped * during VertBuf::init. */ GPU_USAGE_FLAG_BUFFER_TEXTURE_ONLY = 1 << 3, -} GPUUsageType; +}; ENUM_OPERATORS(GPUUsageType, GPU_USAGE_FLAG_BUFFER_TEXTURE_ONLY); /** Opaque type hiding blender::gpu::VertBuf. */ -typedef struct GPUVertBuf GPUVertBuf; +struct GPUVertBuf; -GPUVertBuf *GPU_vertbuf_calloc(void); +GPUVertBuf *GPU_vertbuf_calloc(); GPUVertBuf *GPU_vertbuf_create_with_format_ex(const GPUVertFormat *, GPUUsageType); #define GPU_vertbuf_create_with_format(format) \ @@ -124,7 +120,7 @@ void GPU_vertbuf_attr_fill_stride(GPUVertBuf *, uint a_idx, uint stride, const v /** * For low level access only. */ -typedef struct GPUVertBufRaw { +struct GPUVertBufRaw { uint size; uint stride; unsigned char *data; @@ -133,7 +129,7 @@ typedef struct GPUVertBufRaw { /* Only for overflow check */ unsigned char *_data_end; #endif -} GPUVertBufRaw; +}; GPU_INLINE void *GPU_vertbuf_raw_step(GPUVertBufRaw *a) { @@ -172,8 +168,8 @@ void GPU_vertbuf_tag_dirty(GPUVertBuf *verts); * Should be rename to #GPU_vertbuf_data_upload. */ void GPU_vertbuf_use(GPUVertBuf *); -void GPU_vertbuf_bind_as_ssbo(struct GPUVertBuf *verts, int binding); -void GPU_vertbuf_bind_as_texture(struct GPUVertBuf *verts, int binding); +void GPU_vertbuf_bind_as_ssbo(GPUVertBuf *verts, int binding); +void GPU_vertbuf_bind_as_texture(GPUVertBuf *verts, int binding); void GPU_vertbuf_wrap_handle(GPUVertBuf *verts, uint64_t handle); @@ -185,17 +181,13 @@ void GPU_vertbuf_wrap_handle(GPUVertBuf *verts, uint64_t handle); void GPU_vertbuf_update_sub(GPUVertBuf *verts, uint start, uint len, const void *data); /* Metrics */ -uint GPU_vertbuf_get_memory_usage(void); +uint GPU_vertbuf_get_memory_usage(); /* Macros */ #define GPU_VERTBUF_DISCARD_SAFE(verts) \ do { \ - if (verts != NULL) { \ + if (verts != nullptr) { \ GPU_vertbuf_discard(verts); \ - verts = NULL; \ + verts = nullptr; \ } \ } while (0) - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/GPU_vertex_format.h b/source/blender/gpu/GPU_vertex_format.hh similarity index 92% rename from source/blender/gpu/GPU_vertex_format.h rename to source/blender/gpu/GPU_vertex_format.hh index 76891f5e1a1..cde2fd24dc5 100644 --- a/source/blender/gpu/GPU_vertex_format.h +++ b/source/blender/gpu/GPU_vertex_format.hh @@ -13,11 +13,9 @@ #include "BLI_assert.h" #include "BLI_compiler_compat.h" #include "BLI_math_geom.h" -#include "GPU_common.h" +#include "GPU_common.hh" -#ifdef __cplusplus -extern "C" { -#endif +struct GPUShader; #define GPU_VERT_ATTR_MAX_LEN 16 #define GPU_VERT_ATTR_MAX_NAMES 6 @@ -26,7 +24,7 @@ extern "C" { /* Computed as GPU_VERT_ATTR_NAMES_BUF_LEN / 30 (actual max format name). */ #define GPU_MAX_SAFE_ATTR_NAME 12 -typedef enum { +enum GPUVertCompType { GPU_COMP_I8 = 0, GPU_COMP_U8, GPU_COMP_I16, @@ -40,17 +38,17 @@ typedef enum { /* Warning! adjust GPUVertAttr if changing. */ GPU_COMP_MAX -} GPUVertCompType; +}; -typedef enum { +enum GPUVertFetchMode { GPU_FETCH_FLOAT = 0, GPU_FETCH_INT, GPU_FETCH_INT_TO_FLOAT_UNIT, /* 127 (ubyte) -> 0.5 (and so on for other int types) */ GPU_FETCH_INT_TO_FLOAT, /* 127 (any int type) -> 127.0 */ /* Warning! adjust GPUVertAttr if changing. */ -} GPUVertFetchMode; +}; -typedef struct GPUVertAttr { +struct GPUVertAttr { /* GPUVertFetchMode */ uint fetch_mode : 2; /* GPUVertCompType */ @@ -64,7 +62,7 @@ typedef struct GPUVertAttr { /* up to GPU_VERT_ATTR_MAX_NAMES */ uint name_len : 3; uchar names[GPU_VERT_ATTR_MAX_NAMES]; -} GPUVertAttr; +}; BLI_STATIC_ASSERT(GPU_VERT_ATTR_NAMES_BUF_LEN <= 256, "We use uchar as index inside the name buffer " @@ -72,7 +70,7 @@ BLI_STATIC_ASSERT(GPU_VERT_ATTR_NAMES_BUF_LEN <= 256, "smaller than GPUVertFormat->name_offset and " "GPUVertAttr->names maximum value"); -typedef struct GPUVertFormat { +struct GPUVertFormat { /** 0 to 16 (GPU_VERT_ATTR_MAX_LEN). */ uint attr_len : 5; /** Total count of active vertex attribute names. (max GPU_VERT_FORMAT_MAX_NAMES) */ @@ -88,13 +86,11 @@ typedef struct GPUVertFormat { GPUVertAttr attrs[GPU_VERT_ATTR_MAX_LEN]; char names[GPU_VERT_ATTR_NAMES_BUF_LEN]; -} GPUVertFormat; - -struct GPUShader; +}; void GPU_vertformat_clear(GPUVertFormat *); void GPU_vertformat_copy(GPUVertFormat *dest, const GPUVertFormat *src); -void GPU_vertformat_from_shader(GPUVertFormat *format, const struct GPUShader *shader); +void GPU_vertformat_from_shader(GPUVertFormat *format, const GPUShader *shader); uint GPU_vertformat_attr_add( GPUVertFormat *, const char *name, GPUVertCompType, uint comp_len, GPUVertFetchMode); @@ -152,22 +148,22 @@ void GPU_vertformat_safe_attr_name(const char *attr_name, char *r_safe_name, uin /* format conversion */ -typedef struct GPUPackedNormal { +struct GPUPackedNormal { int x : 10; int y : 10; int z : 10; int w : 2; /* 0 by default, can manually set to { -2, -1, 0, 1 } */ -} GPUPackedNormal; +}; -typedef struct GPUNormal { +struct GPUNormal { union { GPUPackedNormal low; short high[3]; }; -} GPUNormal; +}; /* OpenGL ES packs in a different order as desktop GL but component conversion is the same. - * Of the code here, only struct GPUPackedNormal needs to change. */ + * Of the code here, only GPUPackedNormal needs to change. */ #define SIGNED_INT_10_MAX 511 #define SIGNED_INT_10_MIN -512 @@ -232,7 +228,3 @@ BLI_INLINE void GPU_normal_convert_v3(GPUNormal *gpu_normal, gpu_normal->low = GPU_normal_convert_i10_v3(data); } } - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/GPU_viewport.h b/source/blender/gpu/GPU_viewport.hh similarity index 85% rename from source/blender/gpu/GPU_viewport.h rename to source/blender/gpu/GPU_viewport.hh index 01d977271bf..9177409178d 100644 --- a/source/blender/gpu/GPU_viewport.h +++ b/source/blender/gpu/GPU_viewport.hh @@ -13,23 +13,19 @@ #include "DNA_scene_types.h" #include "DNA_vec_types.h" -#include "GPU_framebuffer.h" -#include "GPU_texture.h" - -#ifdef __cplusplus -extern "C" { -#endif +#include "GPU_framebuffer.hh" +#include "GPU_texture.hh" #define GLA_PIXEL_OFS 0.375f -typedef struct GHash GHash; -typedef struct GPUViewport GPUViewport; - struct DRWData; +struct GHash; +struct GPUViewport; struct GPUFrameBuffer; +struct GPUOffScreen; -GPUViewport *GPU_viewport_create(void); -GPUViewport *GPU_viewport_stereo_create(void); +GPUViewport *GPU_viewport_create(); +GPUViewport *GPU_viewport_stereo_create(); void GPU_viewport_bind(GPUViewport *viewport, int view, const rcti *rect); void GPU_viewport_unbind(GPUViewport *viewport); /** @@ -63,17 +59,17 @@ void GPU_viewport_colorspace_set(GPUViewport *viewport, * Should be called from DRW after DRW_gpu_context_enable. */ void GPU_viewport_bind_from_offscreen(GPUViewport *viewport, - struct GPUOffScreen *ofs, + GPUOffScreen *ofs, bool is_xr_surface); /** * Clear vars assigned from offscreen, so we don't free data owned by `GPUOffScreen`. */ void GPU_viewport_unbind_from_offscreen(GPUViewport *viewport, - struct GPUOffScreen *ofs, + GPUOffScreen *ofs, bool display_colorspace, bool do_overlay_merge); -struct DRWData **GPU_viewport_data_get(GPUViewport *viewport); +DRWData **GPU_viewport_data_get(GPUViewport *viewport); /** * Merge the stereo textures. `color` and `overlay` texture will be modified. @@ -94,7 +90,3 @@ GPUTexture *GPU_viewport_depth_texture(GPUViewport *viewport); * Overlay frame-buffer for drawing outside of DRW module. */ GPUFrameBuffer *GPU_viewport_framebuffer_overlay_get(GPUViewport *viewport); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/intern/gpu_backend.hh b/source/blender/gpu/intern/gpu_backend.hh index e95513e7596..d9c824cf01e 100644 --- a/source/blender/gpu/intern/gpu_backend.hh +++ b/source/blender/gpu/intern/gpu_backend.hh @@ -10,7 +10,7 @@ #pragma once -#include "GPU_vertex_buffer.h" +#include "GPU_vertex_buffer.hh" namespace blender { namespace gpu { diff --git a/source/blender/gpu/intern/gpu_batch.cc b/source/blender/gpu/intern/gpu_batch.cc index 873f4b35cbd..65170e2e03e 100644 --- a/source/blender/gpu/intern/gpu_batch.cc +++ b/source/blender/gpu/intern/gpu_batch.cc @@ -13,10 +13,10 @@ #include "BLI_math_base.h" -#include "GPU_batch.h" -#include "GPU_batch_presets.h" -#include "GPU_platform.h" -#include "GPU_shader.h" +#include "GPU_batch.hh" +#include "GPU_batch_presets.hh" +#include "GPU_platform.hh" +#include "GPU_shader.hh" #include "gpu_backend.hh" #include "gpu_context_private.hh" diff --git a/source/blender/gpu/intern/gpu_batch_presets.cc b/source/blender/gpu/intern/gpu_batch_presets.cc index 6352d8bf347..5ca0b82c6de 100644 --- a/source/blender/gpu/intern/gpu_batch_presets.cc +++ b/source/blender/gpu/intern/gpu_batch_presets.cc @@ -13,8 +13,8 @@ #include "MEM_guardedalloc.h" -#include "GPU_batch.h" -#include "GPU_batch_presets.h" /* Own include. */ +#include "GPU_batch.hh" +#include "GPU_batch_presets.hh" /* Own include. */ /* -------------------------------------------------------------------- */ /** \name Local Structures diff --git a/source/blender/gpu/intern/gpu_batch_private.hh b/source/blender/gpu/intern/gpu_batch_private.hh index d181f08d954..55393ccac35 100644 --- a/source/blender/gpu/intern/gpu_batch_private.hh +++ b/source/blender/gpu/intern/gpu_batch_private.hh @@ -11,8 +11,8 @@ #pragma once -#include "GPU_batch.h" -#include "GPU_context.h" +#include "GPU_batch.hh" +#include "GPU_context.hh" #include "gpu_index_buffer_private.hh" #include "gpu_vertex_buffer_private.hh" diff --git a/source/blender/gpu/intern/gpu_batch_utils.cc b/source/blender/gpu/intern/gpu_batch_utils.cc index 213634fdbec..6b14f7b6c84 100644 --- a/source/blender/gpu/intern/gpu_batch_utils.cc +++ b/source/blender/gpu/intern/gpu_batch_utils.cc @@ -14,8 +14,8 @@ #include "BLI_sort_utils.h" #include "BLI_utildefines.h" -#include "GPU_batch.h" -#include "GPU_batch_utils.h" /* own include */ +#include "GPU_batch.hh" +#include "GPU_batch_utils.hh" /* own include */ /* -------------------------------------------------------------------- */ /** \name Polygon Creation (2D) diff --git a/source/blender/gpu/intern/gpu_capabilities.cc b/source/blender/gpu/intern/gpu_capabilities.cc index dfcc2cf584a..cfa08bac315 100644 --- a/source/blender/gpu/intern/gpu_capabilities.cc +++ b/source/blender/gpu/intern/gpu_capabilities.cc @@ -11,7 +11,7 @@ #include "DNA_userdef_types.h" /* For `U.glreslimit`. */ -#include "GPU_capabilities.h" +#include "GPU_capabilities.hh" #include "gpu_context_private.hh" diff --git a/source/blender/gpu/intern/gpu_capabilities_private.hh b/source/blender/gpu/intern/gpu_capabilities_private.hh index 315953ab08a..c532d78b725 100644 --- a/source/blender/gpu/intern/gpu_capabilities_private.hh +++ b/source/blender/gpu/intern/gpu_capabilities_private.hh @@ -8,7 +8,7 @@ #pragma once -#include "GPU_platform.h" +#include "GPU_platform.hh" namespace blender::gpu { diff --git a/source/blender/gpu/intern/gpu_codegen.cc b/source/blender/gpu/intern/gpu_codegen.cc index 1ed14559d90..c296ea9a26f 100644 --- a/source/blender/gpu/intern/gpu_codegen.cc +++ b/source/blender/gpu/intern/gpu_codegen.cc @@ -26,20 +26,20 @@ #include "BKE_cryptomatte.hh" #include "BKE_material.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 "GPU_uniform_buffer.hh" -#include "GPU_vertex_format.h" +#include "GPU_vertex_format.hh" #include "BLI_sys_types.h" /* for intptr_t support */ #include "BLI_vector.hh" -#include "gpu_codegen.h" -#include "gpu_node_graph.h" +#include "gpu_codegen.hh" +#include "gpu_node_graph.hh" #include "gpu_shader_create_info.hh" -#include "gpu_shader_dependency_private.h" +#include "gpu_shader_dependency_private.hh" #include #include diff --git a/source/blender/gpu/intern/gpu_codegen.h b/source/blender/gpu/intern/gpu_codegen.hh similarity index 75% rename from source/blender/gpu/intern/gpu_codegen.h rename to source/blender/gpu/intern/gpu_codegen.hh index 38d67c01dce..0f0b2b779a4 100644 --- a/source/blender/gpu/intern/gpu_codegen.h +++ b/source/blender/gpu/intern/gpu_codegen.hh @@ -11,20 +11,16 @@ #pragma once #include "GPU_material.hh" -#include "GPU_shader.h" - -#ifdef __cplusplus -extern "C" { -#endif +#include "GPU_shader.hh" struct GPUNodeGraph; -typedef struct GPUPass GPUPass; +struct GPUPass; /* Pass */ GPUPass *GPU_generate_pass(GPUMaterial *material, - struct GPUNodeGraph *graph, + GPUNodeGraph *graph, eGPUMaterialEngine engine, GPUCodegenCallbackFn finalize_source_cb, void *thunk, @@ -36,9 +32,5 @@ bool GPU_pass_should_optimize(GPUPass *pass); /* Module */ -void gpu_codegen_init(void); -void gpu_codegen_exit(void); - -#ifdef __cplusplus -} -#endif +void gpu_codegen_init(); +void gpu_codegen_exit(); diff --git a/source/blender/gpu/intern/gpu_compute.cc b/source/blender/gpu/intern/gpu_compute.cc index 3a3d5595dd5..adad76079d5 100644 --- a/source/blender/gpu/intern/gpu_compute.cc +++ b/source/blender/gpu/intern/gpu_compute.cc @@ -6,7 +6,7 @@ * \ingroup gpu */ -#include "GPU_compute.h" +#include "GPU_compute.hh" #include "gpu_backend.hh" diff --git a/source/blender/gpu/intern/gpu_context.cc b/source/blender/gpu/intern/gpu_context.cc index f98f0378f4e..73d57f379ea 100644 --- a/source/blender/gpu/intern/gpu_context.cc +++ b/source/blender/gpu/intern/gpu_context.cc @@ -16,14 +16,14 @@ #include "BLI_assert.h" #include "BLI_utildefines.h" -#include "GPU_context.h" -#include "GPU_framebuffer.h" +#include "GPU_context.hh" +#include "GPU_framebuffer.hh" #include "gpu_backend.hh" #include "gpu_batch_private.hh" #include "gpu_context_private.hh" -#include "gpu_matrix_private.h" -#include "gpu_private.h" +#include "gpu_matrix_private.hh" +#include "gpu_private.hh" #ifdef WITH_OPENGL_BACKEND # include "gl_backend.hh" diff --git a/source/blender/gpu/intern/gpu_context_private.hh b/source/blender/gpu/intern/gpu_context_private.hh index 0ca2fc42fb2..728d29824b7 100644 --- a/source/blender/gpu/intern/gpu_context_private.hh +++ b/source/blender/gpu/intern/gpu_context_private.hh @@ -12,7 +12,7 @@ #include "MEM_guardedalloc.h" -#include "GPU_context.h" +#include "GPU_context.hh" #include "gpu_debug_private.hh" #include "gpu_framebuffer_private.hh" diff --git a/source/blender/gpu/intern/gpu_debug.cc b/source/blender/gpu/intern/gpu_debug.cc index c26df4157c2..16122d6234a 100644 --- a/source/blender/gpu/intern/gpu_debug.cc +++ b/source/blender/gpu/intern/gpu_debug.cc @@ -14,7 +14,7 @@ #include "gpu_context_private.hh" -#include "GPU_debug.h" +#include "GPU_debug.hh" using namespace blender; using namespace blender::gpu; diff --git a/source/blender/gpu/intern/gpu_drawlist.cc b/source/blender/gpu/intern/gpu_drawlist.cc index 3b415b6670d..aa965d86edd 100644 --- a/source/blender/gpu/intern/gpu_drawlist.cc +++ b/source/blender/gpu/intern/gpu_drawlist.cc @@ -8,7 +8,7 @@ * Implementation of Multi Draw Indirect. */ -#include "GPU_drawlist.h" +#include "GPU_drawlist.hh" #include "gpu_backend.hh" diff --git a/source/blender/gpu/intern/gpu_drawlist_private.hh b/source/blender/gpu/intern/gpu_drawlist_private.hh index 5947dfd990a..bfa4e46a20f 100644 --- a/source/blender/gpu/intern/gpu_drawlist_private.hh +++ b/source/blender/gpu/intern/gpu_drawlist_private.hh @@ -10,7 +10,7 @@ #include "MEM_guardedalloc.h" -#include "GPU_drawlist.h" +#include "GPU_drawlist.hh" namespace blender { namespace gpu { diff --git a/source/blender/gpu/intern/gpu_framebuffer.cc b/source/blender/gpu/intern/gpu_framebuffer.cc index f74f7d674fa..2403d15dd5d 100644 --- a/source/blender/gpu/intern/gpu_framebuffer.cc +++ b/source/blender/gpu/intern/gpu_framebuffer.cc @@ -12,10 +12,10 @@ #include "BLI_string.h" #include "BLI_utildefines.h" -#include "GPU_batch.h" -#include "GPU_capabilities.h" -#include "GPU_shader.h" -#include "GPU_texture.h" +#include "GPU_batch.hh" +#include "GPU_capabilities.hh" +#include "GPU_shader.hh" +#include "GPU_texture.hh" #include "gpu_backend.hh" #include "gpu_context_private.hh" diff --git a/source/blender/gpu/intern/gpu_framebuffer_private.hh b/source/blender/gpu/intern/gpu_framebuffer_private.hh index 0fcad169308..dee6d884029 100644 --- a/source/blender/gpu/intern/gpu_framebuffer_private.hh +++ b/source/blender/gpu/intern/gpu_framebuffer_private.hh @@ -15,7 +15,7 @@ #include "MEM_guardedalloc.h" -#include "GPU_framebuffer.h" +#include "GPU_framebuffer.hh" struct GPUTexture; diff --git a/source/blender/gpu/intern/gpu_immediate.cc b/source/blender/gpu/intern/gpu_immediate.cc index a343cc4f5b3..26506b31e93 100644 --- a/source/blender/gpu/intern/gpu_immediate.cc +++ b/source/blender/gpu/intern/gpu_immediate.cc @@ -12,14 +12,14 @@ # include "UI_resources.hh" #endif -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_texture.h" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_texture.hh" #include "gpu_context_private.hh" #include "gpu_immediate_private.hh" #include "gpu_shader_private.hh" -#include "gpu_vertex_format_private.h" +#include "gpu_vertex_format_private.hh" using namespace blender::gpu; diff --git a/source/blender/gpu/intern/gpu_immediate_private.hh b/source/blender/gpu/intern/gpu_immediate_private.hh index 20ec2c16f7d..465c4266062 100644 --- a/source/blender/gpu/intern/gpu_immediate_private.hh +++ b/source/blender/gpu/intern/gpu_immediate_private.hh @@ -12,10 +12,10 @@ #include -#include "GPU_batch.h" -#include "GPU_primitive.h" -#include "GPU_shader.h" -#include "GPU_vertex_format.h" +#include "GPU_batch.hh" +#include "GPU_primitive.hh" +#include "GPU_shader.hh" +#include "GPU_vertex_format.hh" namespace blender::gpu { diff --git a/source/blender/gpu/intern/gpu_immediate_util.cc b/source/blender/gpu/intern/gpu_immediate_util.cc index 11851d28728..eb84ea0af20 100644 --- a/source/blender/gpu/intern/gpu_immediate_util.cc +++ b/source/blender/gpu/intern/gpu_immediate_util.cc @@ -14,7 +14,7 @@ #include "BLI_math_rotation.h" #include "BLI_utildefines.h" -#include "GPU_immediate.h" +#include "GPU_immediate.hh" #include "UI_resources.hh" diff --git a/source/blender/gpu/intern/gpu_index_buffer.cc b/source/blender/gpu/intern/gpu_index_buffer.cc index 2b8070770df..b37fa5ccf1f 100644 --- a/source/blender/gpu/intern/gpu_index_buffer.cc +++ b/source/blender/gpu/intern/gpu_index_buffer.cc @@ -17,9 +17,9 @@ #include "gpu_index_buffer_private.hh" -#include "GPU_capabilities.h" -#include "GPU_compute.h" -#include "GPU_platform.h" +#include "GPU_capabilities.hh" +#include "GPU_compute.hh" +#include "GPU_platform.hh" #include /* For `min/max`. */ #include diff --git a/source/blender/gpu/intern/gpu_index_buffer_private.hh b/source/blender/gpu/intern/gpu_index_buffer_private.hh index 1e92d3e2534..1eb8fc84a40 100644 --- a/source/blender/gpu/intern/gpu_index_buffer_private.hh +++ b/source/blender/gpu/intern/gpu_index_buffer_private.hh @@ -10,7 +10,7 @@ #include "BLI_assert.h" -#include "GPU_index_buffer.h" +#include "GPU_index_buffer.hh" #define GPU_TRACK_INDEX_RANGE 1 diff --git a/source/blender/gpu/intern/gpu_init_exit.cc b/source/blender/gpu/intern/gpu_init_exit.cc index dcf44b2c06b..71a541cb6e2 100644 --- a/source/blender/gpu/intern/gpu_init_exit.cc +++ b/source/blender/gpu/intern/gpu_init_exit.cc @@ -6,14 +6,14 @@ * \ingroup gpu */ -#include "GPU_init_exit.h" /* interface */ +#include "GPU_init_exit.hh" /* interface */ #include "BLI_sys_types.h" -#include "GPU_batch.h" +#include "GPU_batch.hh" -#include "intern/gpu_codegen.h" -#include "intern/gpu_private.h" +#include "intern/gpu_codegen.hh" +#include "intern/gpu_private.hh" #include "intern/gpu_shader_create_info_private.hh" -#include "intern/gpu_shader_dependency_private.h" +#include "intern/gpu_shader_dependency_private.hh" /** * although the order of initialization and shutdown should not matter diff --git a/source/blender/gpu/intern/gpu_material.cc b/source/blender/gpu/intern/gpu_material.cc index 1f6f106ec0a..1c6cc7ad218 100644 --- a/source/blender/gpu/intern/gpu_material.cc +++ b/source/blender/gpu/intern/gpu_material.cc @@ -31,14 +31,14 @@ #include "NOD_shader.h" #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 "DRW_engine.hh" -#include "gpu_codegen.h" -#include "gpu_node_graph.h" +#include "gpu_codegen.hh" +#include "gpu_node_graph.hh" #include "atomic_ops.h" diff --git a/source/blender/gpu/intern/gpu_material_library.h b/source/blender/gpu/intern/gpu_material_library.hh similarity index 71% rename from source/blender/gpu/intern/gpu_material_library.h rename to source/blender/gpu/intern/gpu_material_library.hh index 49c9d21fbfb..7ac0610460d 100644 --- a/source/blender/gpu/intern/gpu_material_library.h +++ b/source/blender/gpu/intern/gpu_material_library.hh @@ -11,32 +11,24 @@ #include "GPU_material.hh" -#ifdef __cplusplus -extern "C" { -#endif - #define MAX_FUNCTION_NAME 64 #define MAX_PARAMETER 36 struct GSet; -typedef enum { +enum GPUFunctionQual { FUNCTION_QUAL_IN, FUNCTION_QUAL_OUT, FUNCTION_QUAL_INOUT, -} GPUFunctionQual; +}; -typedef struct GPUFunction { +struct GPUFunction { char name[MAX_FUNCTION_NAME]; eGPUType paramtype[MAX_PARAMETER]; GPUFunctionQual paramqual[MAX_PARAMETER]; int totparam; /* TODO(@fclem): Clean that void pointer. */ void *source; /* GPUSource */ -} GPUFunction; +}; -GPUFunction *gpu_material_library_use_function(struct GSet *used_libraries, const char *name); - -#ifdef __cplusplus -} -#endif +GPUFunction *gpu_material_library_use_function(GSet *used_libraries, const char *name); diff --git a/source/blender/gpu/intern/gpu_matrix.cc b/source/blender/gpu/intern/gpu_matrix.cc index 5729fd16830..984557ddb8e 100644 --- a/source/blender/gpu/intern/gpu_matrix.cc +++ b/source/blender/gpu/intern/gpu_matrix.cc @@ -7,11 +7,11 @@ */ #include "gpu_context_private.hh" -#include "gpu_matrix_private.h" +#include "gpu_matrix_private.hh" #define SUPPRESS_GENERIC_MATRIX_API #define USE_GPU_PY_MATRIX_API /* only so values are declared */ -#include "GPU_matrix.h" +#include "GPU_matrix.hh" #undef USE_GPU_PY_MATRIX_API #include "BLI_math_matrix.h" diff --git a/source/blender/gpu/intern/gpu_matrix_private.h b/source/blender/gpu/intern/gpu_matrix_private.hh similarity index 62% rename from source/blender/gpu/intern/gpu_matrix_private.h rename to source/blender/gpu/intern/gpu_matrix_private.hh index 8b3b6545fce..390955be311 100644 --- a/source/blender/gpu/intern/gpu_matrix_private.h +++ b/source/blender/gpu/intern/gpu_matrix_private.hh @@ -8,13 +8,5 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - -struct GPUMatrixState *GPU_matrix_state_create(void); +struct GPUMatrixState *GPU_matrix_state_create(); void GPU_matrix_state_discard(struct GPUMatrixState *state); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/intern/gpu_node_graph.cc b/source/blender/gpu/intern/gpu_node_graph.cc index fde22d049bf..d30ba438867 100644 --- a/source/blender/gpu/intern/gpu_node_graph.cc +++ b/source/blender/gpu/intern/gpu_node_graph.cc @@ -20,11 +20,11 @@ #include "BLI_string.h" #include "BLI_utildefines.h" -#include "GPU_texture.h" -#include "GPU_vertex_format.h" +#include "GPU_texture.hh" +#include "GPU_vertex_format.hh" -#include "gpu_material_library.h" -#include "gpu_node_graph.h" +#include "gpu_material_library.hh" +#include "gpu_node_graph.hh" /* Node Link Functions */ diff --git a/source/blender/gpu/intern/gpu_node_graph.h b/source/blender/gpu/intern/gpu_node_graph.hh similarity index 74% rename from source/blender/gpu/intern/gpu_node_graph.h rename to source/blender/gpu/intern/gpu_node_graph.hh index ff80da25036..0367f594f04 100644 --- a/source/blender/gpu/intern/gpu_node_graph.h +++ b/source/blender/gpu/intern/gpu_node_graph.hh @@ -16,17 +16,13 @@ #include "BLI_ghash.h" #include "GPU_material.hh" -#include "GPU_shader.h" - -#ifdef __cplusplus -extern "C" { -#endif +#include "GPU_shader.hh" struct GPUNode; struct GPUOutput; struct ListBase; -typedef enum eGPUDataSource { +enum eGPUDataSource { GPU_SOURCE_OUTPUT, GPU_SOURCE_CONSTANT, GPU_SOURCE_UNIFORM, @@ -38,9 +34,9 @@ typedef enum eGPUDataSource { GPU_SOURCE_TEX_TILED_MAPPING, GPU_SOURCE_FUNCTION_CALL, GPU_SOURCE_CRYPTOMATTE, -} eGPUDataSource; +}; -typedef enum { +enum GPUNodeLinkType { GPU_NODE_LINK_NONE = 0, GPU_NODE_LINK_ATTR, GPU_NODE_LINK_UNIFORM_ATTR, @@ -54,9 +50,9 @@ typedef enum { GPU_NODE_LINK_OUTPUT, GPU_NODE_LINK_UNIFORM, GPU_NODE_LINK_DIFFERENTIATE_FLOAT_FN, -} GPUNodeLinkType; +}; -typedef enum { +enum eGPUNodeTag { GPU_NODE_TAG_NONE = 0, GPU_NODE_TAG_SURFACE = (1 << 0), GPU_NODE_TAG_VOLUME = (1 << 1), @@ -65,12 +61,12 @@ typedef enum { GPU_NODE_TAG_AOV = (1 << 4), GPU_NODE_TAG_FUNCTION = (1 << 5), GPU_NODE_TAG_COMPOSITOR = (1 << 6), -} eGPUNodeTag; +}; ENUM_OPERATORS(eGPUNodeTag, GPU_NODE_TAG_COMPOSITOR) struct GPUNode { - struct GPUNode *next, *prev; + GPUNode *next, *prev; const char *name; @@ -91,33 +87,33 @@ struct GPUNodeLink { /* GPU_NODE_LINK_CONSTANT | GPU_NODE_LINK_UNIFORM */ const float *data; /* GPU_NODE_LINK_COLORBAND */ - struct GPUTexture **colorband; + GPUTexture **colorband; /* GPU_NODE_LINK_OUTPUT */ - struct GPUOutput *output; + GPUOutput *output; /* GPU_NODE_LINK_ATTR */ - struct GPUMaterialAttribute *attr; + GPUMaterialAttribute *attr; /* GPU_NODE_LINK_UNIFORM_ATTR */ - struct GPUUniformAttr *uniform_attr; + GPUUniformAttr *uniform_attr; /* GPU_NODE_LINK_LAYER_ATTR */ - struct GPULayerAttr *layer_attr; + GPULayerAttr *layer_attr; /* GPU_NODE_LINK_IMAGE_BLENDER */ - struct GPUMaterialTexture *texture; + GPUMaterialTexture *texture; /* GPU_NODE_LINK_DIFFERENTIATE_FLOAT_FN */ const char *function_name; }; }; -typedef struct GPUOutput { - struct GPUOutput *next, *prev; +struct GPUOutput { + GPUOutput *next, *prev; GPUNode *node; eGPUType type; /* data type = length of vector/matrix */ GPUNodeLink *link; /* output link */ int id; /* unique id as created by code generator */ -} GPUOutput; +}; -typedef struct GPUInput { - struct GPUInput *next, *prev; +struct GPUInput { + GPUInput *next, *prev; GPUNode *node; eGPUType type; /* data-type. */ @@ -130,32 +126,32 @@ typedef struct GPUInput { union { /* GPU_SOURCE_CONSTANT | GPU_SOURCE_UNIFORM */ float vec[16]; /* vector data */ - /* GPU_SOURCE_TEX | GPU_SOURCE_TEX_TILED_MAPPING */ - struct GPUMaterialTexture *texture; + /* GPU_SOURCE_TEX | GPU_SOURCE_TEX_TILED_MAPPING */ + GPUMaterialTexture *texture; /* GPU_SOURCE_ATTR */ - struct GPUMaterialAttribute *attr; + GPUMaterialAttribute *attr; /* GPU_SOURCE_UNIFORM_ATTR */ - struct GPUUniformAttr *uniform_attr; + GPUUniformAttr *uniform_attr; /* GPU_SOURCE_LAYER_ATTR */ - struct GPULayerAttr *layer_attr; + GPULayerAttr *layer_attr; /* GPU_SOURCE_FUNCTION_CALL */ char function_call[64]; }; -} GPUInput; +}; -typedef struct GPUNodeGraphOutputLink { - struct GPUNodeGraphOutputLink *next, *prev; +struct GPUNodeGraphOutputLink { + GPUNodeGraphOutputLink *next, *prev; int hash; GPUNodeLink *outlink; -} GPUNodeGraphOutputLink; +}; -typedef struct GPUNodeGraphFunctionLink { - struct GPUNodeGraphFunctionLink *next, *prev; +struct GPUNodeGraphFunctionLink { + GPUNodeGraphFunctionLink *next, *prev; char name[16]; GPUNodeLink *outlink; -} GPUNodeGraphFunctionLink; +}; -typedef struct GPUNodeGraph { +struct GPUNodeGraph { /* Nodes */ ListBase nodes; @@ -183,7 +179,7 @@ typedef struct GPUNodeGraph { /** Set of all the GLSL lib code blocks. */ GSet *used_libraries; -} GPUNodeGraph; +}; /* Node Graph */ @@ -215,20 +211,16 @@ void gpu_node_graph_free(GPUNodeGraph *graph); /* Material calls */ -struct GPUNodeGraph *gpu_material_node_graph(struct GPUMaterial *material); +GPUNodeGraph *gpu_material_node_graph(GPUMaterial *material); /** * Returns the address of the future pointer to coba_tex. */ -struct GPUTexture **gpu_material_ramp_texture_row_set(struct GPUMaterial *mat, - int size, - float *pixels, - float *row); +GPUTexture **gpu_material_ramp_texture_row_set(GPUMaterial *mat, + int size, + float *pixels, + float *row); /** * Returns the address of the future pointer to sky_tex */ -struct GPUTexture **gpu_material_sky_texture_layer_set( - struct GPUMaterial *mat, int width, int height, const float *pixels, float *row); - -#ifdef __cplusplus -} -#endif +GPUTexture **gpu_material_sky_texture_layer_set( + GPUMaterial *mat, int width, int height, const float *pixels, float *row); diff --git a/source/blender/gpu/intern/gpu_platform.cc b/source/blender/gpu/intern/gpu_platform.cc index d6ba3cdf6df..af0f85d5ce8 100644 --- a/source/blender/gpu/intern/gpu_platform.cc +++ b/source/blender/gpu/intern/gpu_platform.cc @@ -15,7 +15,7 @@ #include "BLI_string.h" #include "BLI_string_utils.hh" -#include "GPU_platform.h" +#include "GPU_platform.hh" #include "gpu_platform_private.hh" diff --git a/source/blender/gpu/intern/gpu_platform_private.hh b/source/blender/gpu/intern/gpu_platform_private.hh index 3d2efc06a22..d4b410bb4ed 100644 --- a/source/blender/gpu/intern/gpu_platform_private.hh +++ b/source/blender/gpu/intern/gpu_platform_private.hh @@ -8,7 +8,7 @@ #pragma once -#include "GPU_platform.h" +#include "GPU_platform.hh" namespace blender::gpu { diff --git a/source/blender/gpu/intern/gpu_private.h b/source/blender/gpu/intern/gpu_private.h deleted file mode 100644 index 75b3cbcf479..00000000000 --- a/source/blender/gpu/intern/gpu_private.h +++ /dev/null @@ -1,26 +0,0 @@ -/* SPDX-FileCopyrightText: 2023 Blender Authors - * - * SPDX-License-Identifier: GPL-2.0-or-later */ - -/** \file - * \ingroup gpu - */ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -/* gpu_backend.cc */ - -void gpu_backend_delete_resources(void); - -/* gpu_pbvh.c */ - -void gpu_pbvh_init(void); -void gpu_pbvh_exit(void); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/intern/gpu_private.hh b/source/blender/gpu/intern/gpu_private.hh new file mode 100644 index 00000000000..040c3286c71 --- /dev/null +++ b/source/blender/gpu/intern/gpu_private.hh @@ -0,0 +1,13 @@ +/* SPDX-FileCopyrightText: 2023 Blender Authors + * + * SPDX-License-Identifier: GPL-2.0-or-later */ + +/** \file + * \ingroup gpu + */ + +#pragma once + +/* gpu_backend.cc */ + +void gpu_backend_delete_resources(); diff --git a/source/blender/gpu/intern/gpu_select.cc b/source/blender/gpu/intern/gpu_select.cc index a048f9ece39..df47bee2388 100644 --- a/source/blender/gpu/intern/gpu_select.cc +++ b/source/blender/gpu/intern/gpu_select.cc @@ -19,7 +19,7 @@ #include "BLI_utildefines.h" -#include "gpu_select_private.h" +#include "gpu_select_private.hh" /* -------------------------------------------------------------------- */ /** \name Internal Types diff --git a/source/blender/gpu/intern/gpu_select_next.cc b/source/blender/gpu/intern/gpu_select_next.cc index 0a4e60c86bf..cc70b3c99f5 100644 --- a/source/blender/gpu/intern/gpu_select_next.cc +++ b/source/blender/gpu/intern/gpu_select_next.cc @@ -14,7 +14,7 @@ #include "GPU_select.hh" -#include "gpu_select_private.h" +#include "gpu_select_private.hh" struct GPUSelectNextState { /** Result buffer set on initialization. */ diff --git a/source/blender/gpu/intern/gpu_select_pick.cc b/source/blender/gpu/intern/gpu_select_pick.cc index 8fe7b7649d2..95d0863f2b7 100644 --- a/source/blender/gpu/intern/gpu_select_pick.cc +++ b/source/blender/gpu/intern/gpu_select_pick.cc @@ -12,10 +12,10 @@ #include #include -#include "GPU_debug.h" -#include "GPU_framebuffer.h" +#include "GPU_debug.hh" +#include "GPU_framebuffer.hh" #include "GPU_select.hh" -#include "GPU_state.h" +#include "GPU_state.hh" #include "MEM_guardedalloc.h" @@ -23,7 +23,7 @@ #include "BLI_rect.h" #include "BLI_utildefines.h" -#include "gpu_select_private.h" +#include "gpu_select_private.hh" #include "BLI_strict_flags.h" /* Keep last. */ diff --git a/source/blender/gpu/intern/gpu_select_private.h b/source/blender/gpu/intern/gpu_select_private.hh similarity index 69% rename from source/blender/gpu/intern/gpu_select_private.h rename to source/blender/gpu/intern/gpu_select_private.hh index 6761e1595ec..b1576d391b4 100644 --- a/source/blender/gpu/intern/gpu_select_private.h +++ b/source/blender/gpu/intern/gpu_select_private.hh @@ -10,23 +10,19 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - /* gpu_select_pick */ void gpu_select_pick_begin(GPUSelectBuffer *buffer, const rcti *input, eGPUSelectMode mode); bool gpu_select_pick_load_id(uint id, bool end); -uint gpu_select_pick_end(void); +uint gpu_select_pick_end(); -void gpu_select_pick_cache_begin(void); -void gpu_select_pick_cache_end(void); +void gpu_select_pick_cache_begin(); +void gpu_select_pick_cache_end(); /** * \return true if drawing is not needed. */ -bool gpu_select_pick_is_cached(void); -void gpu_select_pick_cache_load_id(void); +bool gpu_select_pick_is_cached(); +void gpu_select_pick_cache_load_id(); /* gpu_select_sample_query */ @@ -35,20 +31,16 @@ void gpu_select_query_begin(GPUSelectBuffer *buffer, eGPUSelectMode mode, int oldhits); bool gpu_select_query_load_id(uint id); -uint gpu_select_query_end(void); +uint gpu_select_query_end(); /* gpu_select_next */ void gpu_select_next_begin(GPUSelectBuffer *buffer, const rcti *input, eGPUSelectMode mode); -uint gpu_select_next_end(void); +uint gpu_select_next_end(); /* Return a single offset since picking uses squared viewport. */ -int gpu_select_next_get_pick_area_center(void); -eGPUSelectMode gpu_select_next_get_mode(void); +int gpu_select_next_get_pick_area_center(); +eGPUSelectMode gpu_select_next_get_mode(); void gpu_select_next_set_result(GPUSelectResult *buffer, uint buffer_len); #define SELECT_ID_NONE ((uint)0xffffffff) - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/intern/gpu_select_sample_query.cc b/source/blender/gpu/intern/gpu_select_sample_query.cc index 46e5651f881..e5629d44a5c 100644 --- a/source/blender/gpu/intern/gpu_select_sample_query.cc +++ b/source/blender/gpu/intern/gpu_select_sample_query.cc @@ -11,10 +11,10 @@ #include -#include "GPU_debug.h" -#include "GPU_framebuffer.h" +#include "GPU_debug.hh" +#include "GPU_framebuffer.hh" #include "GPU_select.hh" -#include "GPU_state.h" +#include "GPU_state.hh" #include "MEM_guardedalloc.h" @@ -26,7 +26,7 @@ #include "gpu_backend.hh" #include "gpu_query.hh" -#include "gpu_select_private.h" +#include "gpu_select_private.hh" using namespace blender; using namespace blender::gpu; diff --git a/source/blender/gpu/intern/gpu_shader.cc b/source/blender/gpu/intern/gpu_shader.cc index 392151db39e..7bade1d70e6 100644 --- a/source/blender/gpu/intern/gpu_shader.cc +++ b/source/blender/gpu/intern/gpu_shader.cc @@ -12,16 +12,16 @@ #include "BLI_string.h" #include "BLI_string_utils.hh" -#include "GPU_capabilities.h" -#include "GPU_debug.h" -#include "GPU_matrix.h" -#include "GPU_platform.h" +#include "GPU_capabilities.hh" +#include "GPU_debug.hh" +#include "GPU_matrix.hh" +#include "GPU_platform.hh" #include "gpu_backend.hh" #include "gpu_context_private.hh" #include "gpu_shader_create_info.hh" #include "gpu_shader_create_info_private.hh" -#include "gpu_shader_dependency_private.h" +#include "gpu_shader_dependency_private.hh" #include "gpu_shader_private.hh" #include @@ -311,7 +311,7 @@ GPUShader *GPU_shader_create_from_info(const GPUShaderCreateInfo *_info) Vector typedefs; if (!info.typedef_sources_.is_empty() || !info.typedef_source_generated.empty()) { - typedefs.append(gpu_shader_dependency_get_source("GPU_shader_shared_utils.h").c_str()); + typedefs.append(gpu_shader_dependency_get_source("GPU_shader_shared_utils.hh").c_str()); } if (!info.typedef_source_generated.empty()) { typedefs.append(info.typedef_source_generated.c_str()); diff --git a/source/blender/gpu/intern/gpu_shader_builder.cc b/source/blender/gpu/intern/gpu_shader_builder.cc index b0f8b99efb2..74897477e3b 100644 --- a/source/blender/gpu/intern/gpu_shader_builder.cc +++ b/source/blender/gpu/intern/gpu_shader_builder.cc @@ -12,8 +12,8 @@ #include "GHOST_C-api.h" -#include "GPU_context.h" -#include "GPU_init_exit.h" +#include "GPU_context.hh" +#include "GPU_init_exit.hh" #include "gpu_shader_create_info_private.hh" #include "BLI_string_ref.hh" diff --git a/source/blender/gpu/intern/gpu_shader_builtin.cc b/source/blender/gpu/intern/gpu_shader_builtin.cc index 442fa484582..1b40caff978 100644 --- a/source/blender/gpu/intern/gpu_shader_builtin.cc +++ b/source/blender/gpu/intern/gpu_shader_builtin.cc @@ -8,8 +8,8 @@ #include "BLI_utildefines.h" -#include "GPU_capabilities.h" -#include "GPU_shader.h" +#include "GPU_capabilities.hh" +#include "GPU_shader.hh" /* Cache of built-in shaders (each is created on first use). */ static GPUShader *builtin_shaders[GPU_SHADER_CFG_LEN][GPU_SHADER_BUILTIN_LEN] = {{nullptr}}; diff --git a/source/blender/gpu/intern/gpu_shader_create_info.cc b/source/blender/gpu/intern/gpu_shader_create_info.cc index cab6f60225f..f523b82ba66 100644 --- a/source/blender/gpu/intern/gpu_shader_create_info.cc +++ b/source/blender/gpu/intern/gpu_shader_create_info.cc @@ -14,15 +14,15 @@ #include "BKE_global.hh" -#include "GPU_capabilities.h" -#include "GPU_context.h" -#include "GPU_platform.h" -#include "GPU_shader.h" -#include "GPU_texture.h" +#include "GPU_capabilities.hh" +#include "GPU_context.hh" +#include "GPU_platform.hh" +#include "GPU_shader.hh" +#include "GPU_texture.hh" #include "gpu_shader_create_info.hh" #include "gpu_shader_create_info_private.hh" -#include "gpu_shader_dependency_private.h" +#include "gpu_shader_dependency_private.hh" #undef GPU_SHADER_INTERFACE_INFO #undef GPU_SHADER_CREATE_INFO diff --git a/source/blender/gpu/intern/gpu_shader_create_info.hh b/source/blender/gpu/intern/gpu_shader_create_info.hh index 95dacd65956..9d421b1e388 100644 --- a/source/blender/gpu/intern/gpu_shader_create_info.hh +++ b/source/blender/gpu/intern/gpu_shader_create_info.hh @@ -16,7 +16,7 @@ #include "BLI_string_ref.hh" #include "BLI_vector.hh" #include "GPU_material.hh" -#include "GPU_texture.h" +#include "GPU_texture.hh" #include diff --git a/source/blender/gpu/intern/gpu_shader_create_info_private.hh b/source/blender/gpu/intern/gpu_shader_create_info_private.hh index 22c772919c2..b022d9b774e 100644 --- a/source/blender/gpu/intern/gpu_shader_create_info_private.hh +++ b/source/blender/gpu/intern/gpu_shader_create_info_private.hh @@ -13,11 +13,7 @@ #pragma once -#include "GPU_shader.h" - -#ifdef __cplusplus -extern "C" { -#endif +#include "GPU_shader.hh" void gpu_shader_create_info_init(); void gpu_shader_create_info_exit(); @@ -26,7 +22,3 @@ bool gpu_shader_create_info_compile(const char *name_starts_with_filter); /** Runtime create infos are not registered in the dictionary and cannot be searched. */ const GPUShaderCreateInfo *gpu_shader_create_info_get(const char *info_name); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/intern/gpu_shader_dependency.cc b/source/blender/gpu/intern/gpu_shader_dependency.cc index 2583b66247d..254c291fb25 100644 --- a/source/blender/gpu/intern/gpu_shader_dependency.cc +++ b/source/blender/gpu/intern/gpu_shader_dependency.cc @@ -20,11 +20,11 @@ #include "BLI_string.h" #include "BLI_string_ref.hh" -#include "gpu_material_library.h" +#include "gpu_material_library.hh" #include "gpu_shader_create_info.hh" -#include "gpu_shader_dependency_private.h" +#include "gpu_shader_dependency_private.hh" -#include "GPU_context.h" +#include "GPU_context.hh" extern "C" { #define SHADER_SOURCE(datatoc, filename, filepath) extern char datatoc[]; diff --git a/source/blender/gpu/intern/gpu_shader_dependency_private.h b/source/blender/gpu/intern/gpu_shader_dependency_private.hh similarity index 77% rename from source/blender/gpu/intern/gpu_shader_dependency_private.h rename to source/blender/gpu/intern/gpu_shader_dependency_private.hh index 9e8a69562c0..e6f3a312c3c 100644 --- a/source/blender/gpu/intern/gpu_shader_dependency_private.h +++ b/source/blender/gpu/intern/gpu_shader_dependency_private.hh @@ -11,24 +11,14 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif +#include "BLI_string_ref.hh" +#include "BLI_vector.hh" -void gpu_shader_dependency_init(void); +#include "gpu_shader_create_info.hh" -void gpu_shader_dependency_exit(void); +void gpu_shader_dependency_init(); -#ifdef __cplusplus -} -#endif - -#ifdef __cplusplus - -# include "BLI_string_ref.hh" -# include "BLI_vector.hh" - -# include "gpu_shader_create_info.hh" +void gpu_shader_dependency_exit(); namespace blender::gpu::shader { @@ -46,5 +36,3 @@ StringRefNull gpu_shader_dependency_get_filename_from_source_string( const StringRefNull source_string); } // namespace blender::gpu::shader - -#endif diff --git a/source/blender/gpu/intern/gpu_shader_interface.hh b/source/blender/gpu/intern/gpu_shader_interface.hh index baae7047ed0..27641ea2fe0 100644 --- a/source/blender/gpu/intern/gpu_shader_interface.hh +++ b/source/blender/gpu/intern/gpu_shader_interface.hh @@ -18,8 +18,8 @@ #include "BLI_hash.h" #include "BLI_utildefines.h" -#include "GPU_shader.h" -#include "GPU_vertex_format.h" /* GPU_VERT_ATTR_MAX_LEN */ +#include "GPU_shader.hh" +#include "GPU_vertex_format.hh" /* GPU_VERT_ATTR_MAX_LEN */ #include "gpu_shader_create_info.hh" namespace blender::gpu { diff --git a/source/blender/gpu/intern/gpu_shader_log.cc b/source/blender/gpu/intern/gpu_shader_log.cc index a7bf05e56de..1ea5f855072 100644 --- a/source/blender/gpu/intern/gpu_shader_log.cc +++ b/source/blender/gpu/intern/gpu_shader_log.cc @@ -13,7 +13,7 @@ #include "BLI_string_utils.hh" #include "BLI_vector.hh" -#include "gpu_shader_dependency_private.h" +#include "gpu_shader_dependency_private.hh" #include "gpu_shader_private.hh" #include "CLG_log.h" diff --git a/source/blender/gpu/intern/gpu_shader_private.hh b/source/blender/gpu/intern/gpu_shader_private.hh index ba7b976c28c..199735b5a7b 100644 --- a/source/blender/gpu/intern/gpu_shader_private.hh +++ b/source/blender/gpu/intern/gpu_shader_private.hh @@ -11,7 +11,7 @@ #include "BLI_span.hh" #include "BLI_string_ref.hh" -#include "GPU_shader.h" +#include "GPU_shader.hh" #include "gpu_shader_create_info.hh" #include "gpu_shader_interface.hh" #include "gpu_vertex_buffer_private.hh" @@ -88,7 +88,7 @@ class Shader { /* Pre-warms PSOs using parent shader's cached PSO descriptors. Limit specifies maximum PSOs to * warm. If -1, compiles all PSO permutations in parent shader. * - * See `GPU_shader_warm_cache(..)` in `GPU_shader.h` for more information. */ + * See `GPU_shader_warm_cache(..)` in `GPU_shader.hh` for more information. */ virtual void warm_cache(int limit) = 0; virtual void transform_feedback_names_set(Span name_list, diff --git a/source/blender/gpu/intern/gpu_state.cc b/source/blender/gpu/intern/gpu_state.cc index 5217c595ba2..ee3efb82087 100644 --- a/source/blender/gpu/intern/gpu_state.cc +++ b/source/blender/gpu/intern/gpu_state.cc @@ -16,7 +16,7 @@ #include "BLI_math_vector.h" #include "BLI_utildefines.h" -#include "GPU_state.h" +#include "GPU_state.hh" #include "gpu_backend.hh" #include "gpu_context_private.hh" diff --git a/source/blender/gpu/intern/gpu_state_private.hh b/source/blender/gpu/intern/gpu_state_private.hh index b57ddd6bebf..e0c631b61f4 100644 --- a/source/blender/gpu/intern/gpu_state_private.hh +++ b/source/blender/gpu/intern/gpu_state_private.hh @@ -10,7 +10,7 @@ #include "BLI_utildefines.h" -#include "GPU_state.h" +#include "GPU_state.hh" #include "gpu_texture_private.hh" diff --git a/source/blender/gpu/intern/gpu_storage_buffer.cc b/source/blender/gpu/intern/gpu_storage_buffer.cc index 1dc99088c81..f8dd4337d86 100644 --- a/source/blender/gpu/intern/gpu_storage_buffer.cc +++ b/source/blender/gpu/intern/gpu_storage_buffer.cc @@ -15,9 +15,9 @@ #include "gpu_backend.hh" #include "GPU_material.hh" -#include "GPU_vertex_buffer.h" /* For GPUUsageType. */ +#include "GPU_vertex_buffer.hh" /* For GPUUsageType. */ -#include "GPU_storage_buffer.h" +#include "GPU_storage_buffer.hh" #include "gpu_storage_buffer_private.hh" #include "gpu_vertex_buffer_private.hh" diff --git a/source/blender/gpu/intern/gpu_texture.cc b/source/blender/gpu/intern/gpu_texture.cc index 6cfa228772b..7fd63f870fd 100644 --- a/source/blender/gpu/intern/gpu_texture.cc +++ b/source/blender/gpu/intern/gpu_texture.cc @@ -8,8 +8,8 @@ #include "BLI_string.h" -#include "GPU_framebuffer.h" -#include "GPU_texture.h" +#include "GPU_framebuffer.hh" +#include "GPU_texture.hh" #include "gpu_backend.hh" #include "gpu_context_private.hh" diff --git a/source/blender/gpu/intern/gpu_texture_private.hh b/source/blender/gpu/intern/gpu_texture_private.hh index 1fdd7aea071..c81103ea235 100644 --- a/source/blender/gpu/intern/gpu_texture_private.hh +++ b/source/blender/gpu/intern/gpu_texture_private.hh @@ -10,7 +10,7 @@ #include "BLI_assert.h" -#include "GPU_vertex_buffer.h" +#include "GPU_vertex_buffer.hh" #include "gpu_framebuffer_private.hh" diff --git a/source/blender/gpu/intern/gpu_uniform_buffer.cc b/source/blender/gpu/intern/gpu_uniform_buffer.cc index 605b5b07f16..eca4740c11e 100644 --- a/source/blender/gpu/intern/gpu_uniform_buffer.cc +++ b/source/blender/gpu/intern/gpu_uniform_buffer.cc @@ -13,9 +13,9 @@ #include "BLI_math_base.h" #include "gpu_backend.hh" -#include "gpu_node_graph.h" +#include "gpu_node_graph.hh" -#include "GPU_context.h" +#include "GPU_context.hh" #include "GPU_material.hh" #include "GPU_uniform_buffer.hh" diff --git a/source/blender/gpu/intern/gpu_vertex_buffer.cc b/source/blender/gpu/intern/gpu_vertex_buffer.cc index 06deee83fea..3e2030b8f54 100644 --- a/source/blender/gpu/intern/gpu_vertex_buffer.cc +++ b/source/blender/gpu/intern/gpu_vertex_buffer.cc @@ -11,7 +11,7 @@ #include "MEM_guardedalloc.h" #include "gpu_backend.hh" -#include "gpu_vertex_format_private.h" +#include "gpu_vertex_format_private.hh" #include "gpu_context_private.hh" /* TODO: remove. */ diff --git a/source/blender/gpu/intern/gpu_vertex_buffer_private.hh b/source/blender/gpu/intern/gpu_vertex_buffer_private.hh index d10eea8fd4c..173a62cbdd6 100644 --- a/source/blender/gpu/intern/gpu_vertex_buffer_private.hh +++ b/source/blender/gpu/intern/gpu_vertex_buffer_private.hh @@ -10,7 +10,7 @@ #pragma once -#include "GPU_vertex_buffer.h" +#include "GPU_vertex_buffer.hh" namespace blender::gpu { diff --git a/source/blender/gpu/intern/gpu_vertex_format.cc b/source/blender/gpu/intern/gpu_vertex_format.cc index 2b0116ff0ca..8898395dac0 100644 --- a/source/blender/gpu/intern/gpu_vertex_format.cc +++ b/source/blender/gpu/intern/gpu_vertex_format.cc @@ -8,12 +8,12 @@ * GPU vertex format */ -#include "GPU_vertex_format.h" -#include "GPU_capabilities.h" +#include "GPU_vertex_format.hh" +#include "GPU_capabilities.hh" #include "gpu_shader_create_info.hh" #include "gpu_shader_private.hh" -#include "gpu_vertex_format_private.h" +#include "gpu_vertex_format_private.hh" #include #include diff --git a/source/blender/gpu/intern/gpu_vertex_format_private.h b/source/blender/gpu/intern/gpu_vertex_format_private.h deleted file mode 100644 index 25dc7e0b6b2..00000000000 --- a/source/blender/gpu/intern/gpu_vertex_format_private.h +++ /dev/null @@ -1,26 +0,0 @@ -/* SPDX-FileCopyrightText: 2016 by Mike Erwin. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0-or-later */ - -/** \file - * \ingroup gpu - * - * GPU vertex format - */ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -struct GPUVertFormat; - -void VertexFormat_pack(struct GPUVertFormat *format); -void VertexFormat_texture_buffer_pack(struct GPUVertFormat *format); -uint padding(uint offset, uint alignment); -uint vertex_buffer_size(const struct GPUVertFormat *format, uint vertex_len); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/intern/gpu_vertex_format_private.hh b/source/blender/gpu/intern/gpu_vertex_format_private.hh new file mode 100644 index 00000000000..f081a856bbf --- /dev/null +++ b/source/blender/gpu/intern/gpu_vertex_format_private.hh @@ -0,0 +1,18 @@ +/* SPDX-FileCopyrightText: 2016 by Mike Erwin. All rights reserved. + * + * SPDX-License-Identifier: GPL-2.0-or-later */ + +/** \file + * \ingroup gpu + * + * GPU vertex format + */ + +#pragma once + +struct GPUVertFormat; + +void VertexFormat_pack(GPUVertFormat *format); +void VertexFormat_texture_buffer_pack(GPUVertFormat *format); +uint padding(uint offset, uint alignment); +uint vertex_buffer_size(const GPUVertFormat *format, uint vertex_len); diff --git a/source/blender/gpu/intern/gpu_viewport.cc b/source/blender/gpu/intern/gpu_viewport.cc index 7a90fe88a0b..7c3e3c25ed7 100644 --- a/source/blender/gpu/intern/gpu_viewport.cc +++ b/source/blender/gpu/intern/gpu_viewport.cc @@ -19,13 +19,13 @@ #include "DNA_vec_types.h" -#include "GPU_capabilities.h" -#include "GPU_framebuffer.h" -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_texture.h" +#include "GPU_capabilities.hh" +#include "GPU_framebuffer.hh" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_texture.hh" #include "GPU_uniform_buffer.hh" -#include "GPU_viewport.h" +#include "GPU_viewport.hh" #include "DRW_engine.hh" diff --git a/source/blender/gpu/metal/mtl_batch.mm b/source/blender/gpu/metal/mtl_batch.mm index 0d1f0c40e9b..e8a3fa8a5ff 100644 --- a/source/blender/gpu/metal/mtl_batch.mm +++ b/source/blender/gpu/metal/mtl_batch.mm @@ -13,7 +13,7 @@ #include "BKE_global.hh" -#include "GPU_common.h" +#include "GPU_common.hh" #include "gpu_batch_private.hh" #include "gpu_shader_private.hh" diff --git a/source/blender/gpu/metal/mtl_context.hh b/source/blender/gpu/metal/mtl_context.hh index 9e65088fd2c..71633c65a77 100644 --- a/source/blender/gpu/metal/mtl_context.hh +++ b/source/blender/gpu/metal/mtl_context.hh @@ -11,8 +11,8 @@ #include "gpu_context_private.hh" -#include "GPU_common_types.h" -#include "GPU_context.h" +#include "GPU_common_types.hh" +#include "GPU_context.hh" /* Don't generate OpenGL deprecation warning. This is a known thing, and is not something easily * solvable in a short term. */ @@ -488,7 +488,7 @@ struct MTLContextGlobalShaderPipelineState { MTLTextureBinding image_bindings[MTL_MAX_TEXTURE_SLOTS]; /*** --- Render Pipeline State --- ***/ - /* Track global render pipeline state for the current context. The functions in GPU_state.h + /* Track global render pipeline state for the current context. The functions in GPU_state.hh * modify these parameters. Certain values, tagged [PSO], are parameters which are required to be * passed into PSO creation, rather than dynamic state functions on the RenderCommandEncoder. */ diff --git a/source/blender/gpu/metal/mtl_context.mm b/source/blender/gpu/metal/mtl_context.mm index 92bd091b92f..0f3ca1d296b 100644 --- a/source/blender/gpu/metal/mtl_context.mm +++ b/source/blender/gpu/metal/mtl_context.mm @@ -20,14 +20,14 @@ #include "DNA_userdef_types.h" -#include "GPU_capabilities.h" -#include "GPU_matrix.h" -#include "GPU_shader.h" -#include "GPU_storage_buffer.h" -#include "GPU_texture.h" +#include "GPU_capabilities.hh" +#include "GPU_matrix.hh" +#include "GPU_shader.hh" +#include "GPU_storage_buffer.hh" +#include "GPU_texture.hh" #include "GPU_uniform_buffer.hh" -#include "GPU_vertex_buffer.h" -#include "intern/gpu_matrix_private.h" +#include "GPU_vertex_buffer.hh" +#include "intern/gpu_matrix_private.hh" #include "BLI_time.h" diff --git a/source/blender/gpu/metal/mtl_debug.mm b/source/blender/gpu/metal/mtl_debug.mm index f522c2ae17c..c9b929c770d 100644 --- a/source/blender/gpu/metal/mtl_debug.mm +++ b/source/blender/gpu/metal/mtl_debug.mm @@ -15,8 +15,8 @@ #include "BKE_global.hh" -#include "GPU_debug.h" -#include "GPU_platform.h" +#include "GPU_debug.hh" +#include "GPU_platform.hh" #include "mtl_context.hh" #include "mtl_debug.hh" diff --git a/source/blender/gpu/metal/mtl_drawlist.hh b/source/blender/gpu/metal/mtl_drawlist.hh index faefefb71d2..821625db9e4 100644 --- a/source/blender/gpu/metal/mtl_drawlist.hh +++ b/source/blender/gpu/metal/mtl_drawlist.hh @@ -12,7 +12,7 @@ #pragma once #include "BLI_sys_types.h" -#include "GPU_batch.h" +#include "GPU_batch.hh" #include "MEM_guardedalloc.h" #include "gpu_drawlist_private.hh" diff --git a/source/blender/gpu/metal/mtl_drawlist.mm b/source/blender/gpu/metal/mtl_drawlist.mm index 40e7288de69..e3e5e38da86 100644 --- a/source/blender/gpu/metal/mtl_drawlist.mm +++ b/source/blender/gpu/metal/mtl_drawlist.mm @@ -11,7 +11,7 @@ #include "BLI_assert.h" -#include "GPU_batch.h" +#include "GPU_batch.hh" #include "mtl_common.hh" #include "mtl_drawlist.hh" #include "mtl_primitive.hh" diff --git a/source/blender/gpu/metal/mtl_framebuffer.hh b/source/blender/gpu/metal/mtl_framebuffer.hh index 1a16c63fb53..7d423fc163a 100644 --- a/source/blender/gpu/metal/mtl_framebuffer.hh +++ b/source/blender/gpu/metal/mtl_framebuffer.hh @@ -10,7 +10,7 @@ #pragma once -#include "GPU_common_types.h" +#include "GPU_common_types.hh" #include "MEM_guardedalloc.h" #include "gpu_framebuffer_private.hh" diff --git a/source/blender/gpu/metal/mtl_immediate.mm b/source/blender/gpu/metal/mtl_immediate.mm index b2baaa6ef01..a07bbcaa80d 100644 --- a/source/blender/gpu/metal/mtl_immediate.mm +++ b/source/blender/gpu/metal/mtl_immediate.mm @@ -10,10 +10,10 @@ #include "BKE_global.hh" -#include "GPU_vertex_format.h" +#include "GPU_vertex_format.hh" #include "gpu_context_private.hh" #include "gpu_shader_private.hh" -#include "gpu_vertex_format_private.h" +#include "gpu_vertex_format_private.hh" #include "mtl_context.hh" #include "mtl_debug.hh" diff --git a/source/blender/gpu/metal/mtl_primitive.hh b/source/blender/gpu/metal/mtl_primitive.hh index 4674c0dc05e..4b222597581 100644 --- a/source/blender/gpu/metal/mtl_primitive.hh +++ b/source/blender/gpu/metal/mtl_primitive.hh @@ -12,7 +12,7 @@ #include "BLI_assert.h" -#include "GPU_primitive.h" +#include "GPU_primitive.hh" #include diff --git a/source/blender/gpu/metal/mtl_pso_descriptor_state.hh b/source/blender/gpu/metal/mtl_pso_descriptor_state.hh index 62c8fccbeec..066e6252f0e 100644 --- a/source/blender/gpu/metal/mtl_pso_descriptor_state.hh +++ b/source/blender/gpu/metal/mtl_pso_descriptor_state.hh @@ -7,7 +7,7 @@ */ #pragma once -#include "GPU_vertex_format.h" +#include "GPU_vertex_format.hh" #include diff --git a/source/blender/gpu/metal/mtl_shader.hh b/source/blender/gpu/metal/mtl_shader.hh index 221c2b5075d..43c87edfd33 100644 --- a/source/blender/gpu/metal/mtl_shader.hh +++ b/source/blender/gpu/metal/mtl_shader.hh @@ -10,10 +10,10 @@ #include "MEM_guardedalloc.h" -#include "GPU_batch.h" -#include "GPU_capabilities.h" -#include "GPU_shader.h" -#include "GPU_vertex_format.h" +#include "GPU_batch.hh" +#include "GPU_capabilities.hh" +#include "GPU_shader.hh" +#include "GPU_vertex_format.hh" #include #include diff --git a/source/blender/gpu/metal/mtl_shader.mm b/source/blender/gpu/metal/mtl_shader.mm index af6a423e3a9..70ac6d9b0b3 100644 --- a/source/blender/gpu/metal/mtl_shader.mm +++ b/source/blender/gpu/metal/mtl_shader.mm @@ -22,10 +22,10 @@ #include -#include "GPU_platform.h" -#include "GPU_vertex_format.h" +#include "GPU_platform.hh" +#include "GPU_vertex_format.hh" -#include "gpu_shader_dependency_private.h" +#include "gpu_shader_dependency_private.hh" #include "mtl_common.hh" #include "mtl_context.hh" #include "mtl_debug.hh" diff --git a/source/blender/gpu/metal/mtl_shader_generator.mm b/source/blender/gpu/metal/mtl_shader_generator.mm index d9b17597364..111caff40af 100644 --- a/source/blender/gpu/metal/mtl_shader_generator.mm +++ b/source/blender/gpu/metal/mtl_shader_generator.mm @@ -22,10 +22,10 @@ #include -#include "GPU_platform.h" -#include "GPU_vertex_format.h" +#include "GPU_platform.hh" +#include "GPU_vertex_format.hh" -#include "gpu_shader_dependency_private.h" +#include "gpu_shader_dependency_private.hh" #include "mtl_common.hh" #include "mtl_context.hh" diff --git a/source/blender/gpu/metal/mtl_shader_interface.hh b/source/blender/gpu/metal/mtl_shader_interface.hh index ca39dc26bc0..ac09a46c021 100644 --- a/source/blender/gpu/metal/mtl_shader_interface.hh +++ b/source/blender/gpu/metal/mtl_shader_interface.hh @@ -16,9 +16,9 @@ #include "mtl_capabilities.hh" #include "mtl_shader_interface_type.hh" -#include "GPU_common.h" -#include "GPU_common_types.h" -#include "GPU_texture.h" +#include "GPU_common.hh" +#include "GPU_common_types.hh" +#include "GPU_texture.hh" #include "gpu_texture_private.hh" #include #include diff --git a/source/blender/gpu/metal/mtl_shader_interface.mm b/source/blender/gpu/metal/mtl_shader_interface.mm index 368bd6f3014..9984367e76b 100644 --- a/source/blender/gpu/metal/mtl_shader_interface.mm +++ b/source/blender/gpu/metal/mtl_shader_interface.mm @@ -10,7 +10,7 @@ #include "BLI_bitmap.h" -#include "GPU_capabilities.h" +#include "GPU_capabilities.hh" #include "mtl_common.hh" #include "mtl_debug.hh" diff --git a/source/blender/gpu/metal/mtl_shader_log.mm b/source/blender/gpu/metal/mtl_shader_log.mm index 87f1288ce7b..becd50ef33c 100644 --- a/source/blender/gpu/metal/mtl_shader_log.mm +++ b/source/blender/gpu/metal/mtl_shader_log.mm @@ -8,7 +8,7 @@ #include "BLI_string_ref.hh" -#include "GPU_platform.h" +#include "GPU_platform.hh" #include "mtl_shader_log.hh" diff --git a/source/blender/gpu/metal/mtl_state.hh b/source/blender/gpu/metal/mtl_state.hh index ff2b06b965c..5e123066846 100644 --- a/source/blender/gpu/metal/mtl_state.hh +++ b/source/blender/gpu/metal/mtl_state.hh @@ -11,7 +11,7 @@ #include "BLI_utildefines.h" -#include "GPU_state.h" +#include "GPU_state.hh" #include "gpu_state_private.hh" #include "mtl_pso_descriptor_state.hh" diff --git a/source/blender/gpu/metal/mtl_state.mm b/source/blender/gpu/metal/mtl_state.mm index 6af21be0889..5dfe6e9777c 100644 --- a/source/blender/gpu/metal/mtl_state.mm +++ b/source/blender/gpu/metal/mtl_state.mm @@ -9,7 +9,7 @@ #include "BLI_math_base.h" #include "BLI_math_bits.h" -#include "GPU_framebuffer.h" +#include "GPU_framebuffer.hh" #include "mtl_context.hh" #include "mtl_framebuffer.hh" diff --git a/source/blender/gpu/metal/mtl_storage_buffer.mm b/source/blender/gpu/metal/mtl_storage_buffer.mm index eff1630f05e..74beaff3510 100644 --- a/source/blender/gpu/metal/mtl_storage_buffer.mm +++ b/source/blender/gpu/metal/mtl_storage_buffer.mm @@ -9,7 +9,7 @@ #include "BLI_string.h" #include "BLI_time.h" -#include "GPU_state.h" +#include "GPU_state.hh" #include "gpu_backend.hh" #include "gpu_context_private.hh" diff --git a/source/blender/gpu/metal/mtl_texture.hh b/source/blender/gpu/metal/mtl_texture.hh index 24080f81614..a63a5ecf669 100644 --- a/source/blender/gpu/metal/mtl_texture.hh +++ b/source/blender/gpu/metal/mtl_texture.hh @@ -17,7 +17,7 @@ #include "gpu_texture_private.hh" #include "BLI_map.hh" -#include "GPU_texture.h" +#include "GPU_texture.hh" #include #include diff --git a/source/blender/gpu/metal/mtl_texture.mm b/source/blender/gpu/metal/mtl_texture.mm index 6f67e30a7b4..b593cc7bbc9 100644 --- a/source/blender/gpu/metal/mtl_texture.mm +++ b/source/blender/gpu/metal/mtl_texture.mm @@ -10,13 +10,13 @@ #include "DNA_userdef_types.h" -#include "GPU_batch.h" -#include "GPU_batch_presets.h" -#include "GPU_capabilities.h" -#include "GPU_framebuffer.h" -#include "GPU_immediate.h" -#include "GPU_platform.h" -#include "GPU_state.h" +#include "GPU_batch.hh" +#include "GPU_batch_presets.hh" +#include "GPU_capabilities.hh" +#include "GPU_framebuffer.hh" +#include "GPU_immediate.hh" +#include "GPU_platform.hh" +#include "GPU_state.hh" #include "mtl_backend.hh" #include "mtl_common.hh" diff --git a/source/blender/gpu/metal/mtl_texture_util.mm b/source/blender/gpu/metal/mtl_texture_util.mm index a1d41b64e00..86773f048b7 100644 --- a/source/blender/gpu/metal/mtl_texture_util.mm +++ b/source/blender/gpu/metal/mtl_texture_util.mm @@ -10,12 +10,12 @@ #include "DNA_userdef_types.h" -#include "GPU_batch.h" -#include "GPU_batch_presets.h" -#include "GPU_capabilities.h" -#include "GPU_framebuffer.h" -#include "GPU_platform.h" -#include "GPU_state.h" +#include "GPU_batch.hh" +#include "GPU_batch_presets.hh" +#include "GPU_capabilities.hh" +#include "GPU_framebuffer.hh" +#include "GPU_platform.hh" +#include "GPU_state.hh" #include "mtl_backend.hh" #include "mtl_context.hh" diff --git a/source/blender/gpu/metal/mtl_vertex_buffer.hh b/source/blender/gpu/metal/mtl_vertex_buffer.hh index 6f53980ac9b..64735bade74 100644 --- a/source/blender/gpu/metal/mtl_vertex_buffer.hh +++ b/source/blender/gpu/metal/mtl_vertex_buffer.hh @@ -14,7 +14,7 @@ #include "MEM_guardedalloc.h" -#include "GPU_vertex_buffer.h" +#include "GPU_vertex_buffer.hh" #include "gpu_vertex_buffer_private.hh" #include "mtl_context.hh" diff --git a/source/blender/gpu/opengl/gl_context.cc b/source/blender/gpu/opengl/gl_context.cc index ab4cf35b222..cc58d7084d4 100644 --- a/source/blender/gpu/opengl/gl_context.cc +++ b/source/blender/gpu/opengl/gl_context.cc @@ -11,7 +11,7 @@ #include "BKE_global.hh" -#include "GPU_framebuffer.h" +#include "GPU_framebuffer.hh" #include "GHOST_C-api.h" diff --git a/source/blender/gpu/opengl/gl_context.hh b/source/blender/gpu/opengl/gl_context.hh index ab15d19d25c..bdcef7925b3 100644 --- a/source/blender/gpu/opengl/gl_context.hh +++ b/source/blender/gpu/opengl/gl_context.hh @@ -10,7 +10,7 @@ #include "gpu_context_private.hh" -#include "GPU_framebuffer.h" +#include "GPU_framebuffer.hh" #include "BLI_set.hh" #include "BLI_vector.hh" diff --git a/source/blender/gpu/opengl/gl_debug.cc b/source/blender/gpu/opengl/gl_debug.cc index 3a150cae13e..71c09e7e356 100644 --- a/source/blender/gpu/opengl/gl_debug.cc +++ b/source/blender/gpu/opengl/gl_debug.cc @@ -15,8 +15,8 @@ #include "BKE_global.hh" -#include "GPU_debug.h" -#include "GPU_platform.h" +#include "GPU_debug.hh" +#include "GPU_platform.hh" #include "CLG_log.h" diff --git a/source/blender/gpu/opengl/gl_drawlist.cc b/source/blender/gpu/opengl/gl_drawlist.cc index 2aa0ccf3dfb..8c8f2e08263 100644 --- a/source/blender/gpu/opengl/gl_drawlist.cc +++ b/source/blender/gpu/opengl/gl_drawlist.cc @@ -11,7 +11,7 @@ #include "BLI_assert.h" -#include "GPU_batch.h" +#include "GPU_batch.hh" #include "gpu_context_private.hh" #include "gpu_drawlist_private.hh" diff --git a/source/blender/gpu/opengl/gl_drawlist.hh b/source/blender/gpu/opengl/gl_drawlist.hh index da8d2b481cd..3cb5512fbb6 100644 --- a/source/blender/gpu/opengl/gl_drawlist.hh +++ b/source/blender/gpu/opengl/gl_drawlist.hh @@ -15,7 +15,7 @@ #include "BLI_sys_types.h" -#include "GPU_batch.h" +#include "GPU_batch.hh" #include "gpu_drawlist_private.hh" diff --git a/source/blender/gpu/opengl/gl_immediate.cc b/source/blender/gpu/opengl/gl_immediate.cc index 0f6ee4e4327..26a5cda778f 100644 --- a/source/blender/gpu/opengl/gl_immediate.cc +++ b/source/blender/gpu/opengl/gl_immediate.cc @@ -10,7 +10,7 @@ #include "gpu_context_private.hh" #include "gpu_shader_private.hh" -#include "gpu_vertex_format_private.h" +#include "gpu_vertex_format_private.hh" #include "gl_context.hh" #include "gl_debug.hh" diff --git a/source/blender/gpu/opengl/gl_primitive.hh b/source/blender/gpu/opengl/gl_primitive.hh index 4e3cbd8016d..8b562ebf074 100644 --- a/source/blender/gpu/opengl/gl_primitive.hh +++ b/source/blender/gpu/opengl/gl_primitive.hh @@ -12,7 +12,7 @@ #include "BLI_assert.h" -#include "GPU_primitive.h" +#include "GPU_primitive.hh" namespace blender::gpu { diff --git a/source/blender/gpu/opengl/gl_shader.cc b/source/blender/gpu/opengl/gl_shader.cc index 83d9c519c30..a215985d078 100644 --- a/source/blender/gpu/opengl/gl_shader.cc +++ b/source/blender/gpu/opengl/gl_shader.cc @@ -13,9 +13,9 @@ #include "BLI_string.h" #include "BLI_vector.hh" -#include "GPU_capabilities.h" -#include "GPU_platform.h" -#include "gpu_shader_dependency_private.h" +#include "GPU_capabilities.hh" +#include "GPU_platform.hh" +#include "gpu_shader_dependency_private.hh" #include "gl_debug.hh" #include "gl_vertex_buffer.hh" diff --git a/source/blender/gpu/opengl/gl_shader_interface.cc b/source/blender/gpu/opengl/gl_shader_interface.cc index ac2572c2d21..fbe2eb90b60 100644 --- a/source/blender/gpu/opengl/gl_shader_interface.cc +++ b/source/blender/gpu/opengl/gl_shader_interface.cc @@ -15,7 +15,7 @@ #include "gl_shader_interface.hh" -#include "GPU_capabilities.h" +#include "GPU_capabilities.hh" using namespace blender::gpu::shader; namespace blender::gpu { diff --git a/source/blender/gpu/opengl/gl_shader_log.cc b/source/blender/gpu/opengl/gl_shader_log.cc index 2203e8c7b8a..c0626752e3e 100644 --- a/source/blender/gpu/opengl/gl_shader_log.cc +++ b/source/blender/gpu/opengl/gl_shader_log.cc @@ -8,7 +8,7 @@ #include "gl_shader.hh" -#include "GPU_platform.h" +#include "GPU_platform.hh" namespace blender::gpu { diff --git a/source/blender/gpu/opengl/gl_state.cc b/source/blender/gpu/opengl/gl_state.cc index 4e1ee86f97c..b9becf6c1d8 100644 --- a/source/blender/gpu/opengl/gl_state.cc +++ b/source/blender/gpu/opengl/gl_state.cc @@ -11,7 +11,7 @@ #include "BLI_math_base.h" #include "BLI_math_bits.h" -#include "GPU_capabilities.h" +#include "GPU_capabilities.hh" #include "gl_context.hh" #include "gl_framebuffer.hh" diff --git a/source/blender/gpu/opengl/gl_storage_buffer.cc b/source/blender/gpu/opengl/gl_storage_buffer.cc index 75958f9c153..049d6e8d8cd 100644 --- a/source/blender/gpu/opengl/gl_storage_buffer.cc +++ b/source/blender/gpu/opengl/gl_storage_buffer.cc @@ -8,7 +8,7 @@ #include "BLI_string.h" -#include "GPU_capabilities.h" +#include "GPU_capabilities.hh" #include "gpu_backend.hh" #include "gpu_context_private.hh" diff --git a/source/blender/gpu/opengl/gl_texture.cc b/source/blender/gpu/opengl/gl_texture.cc index 64782a4e81a..eb6d5d60de8 100644 --- a/source/blender/gpu/opengl/gl_texture.cc +++ b/source/blender/gpu/opengl/gl_texture.cc @@ -13,9 +13,9 @@ #include "DNA_userdef_types.h" -#include "GPU_capabilities.h" -#include "GPU_framebuffer.h" -#include "GPU_platform.h" +#include "GPU_capabilities.hh" +#include "GPU_framebuffer.hh" +#include "GPU_platform.hh" #include "gl_backend.hh" #include "gl_debug.hh" diff --git a/source/blender/gpu/opengl/gl_vertex_array.hh b/source/blender/gpu/opengl/gl_vertex_array.hh index 7e0d671da32..bb04adbee29 100644 --- a/source/blender/gpu/opengl/gl_vertex_array.hh +++ b/source/blender/gpu/opengl/gl_vertex_array.hh @@ -8,7 +8,7 @@ #pragma once -#include "GPU_batch.h" +#include "GPU_batch.hh" #include "gl_shader_interface.hh" namespace blender { diff --git a/source/blender/gpu/opengl/gl_vertex_buffer.cc b/source/blender/gpu/opengl/gl_vertex_buffer.cc index 7fa25613968..52337d64909 100644 --- a/source/blender/gpu/opengl/gl_vertex_buffer.cc +++ b/source/blender/gpu/opengl/gl_vertex_buffer.cc @@ -6,7 +6,7 @@ * \ingroup gpu */ -#include "GPU_texture.h" +#include "GPU_texture.hh" #include "gl_context.hh" diff --git a/source/blender/gpu/opengl/gl_vertex_buffer.hh b/source/blender/gpu/opengl/gl_vertex_buffer.hh index 7c0a604111f..64b48222904 100644 --- a/source/blender/gpu/opengl/gl_vertex_buffer.hh +++ b/source/blender/gpu/opengl/gl_vertex_buffer.hh @@ -10,7 +10,7 @@ #include "MEM_guardedalloc.h" -#include "GPU_texture.h" +#include "GPU_texture.hh" #include "gpu_vertex_buffer_private.hh" diff --git a/source/blender/gpu/shaders/infos/gpu_clip_planes_info.hh b/source/blender/gpu/shaders/infos/gpu_clip_planes_info.hh index 979ef5858a8..ef116419f45 100644 --- a/source/blender/gpu/shaders/infos/gpu_clip_planes_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_clip_planes_info.hh @@ -10,5 +10,5 @@ GPU_SHADER_CREATE_INFO(gpu_clip_planes) .uniform_buf(1, "GPUClipPlanes", "clipPlanes", Frequency::PASS) - .typedef_source("GPU_shader_shared.h") + .typedef_source("GPU_shader_shared.hh") .define("USE_WORLD_CLIP_PLANES"); diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_nodelink_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_nodelink_info.hh index 3dcaf6b2658..23c3d340ce5 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_2D_nodelink_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_nodelink_info.hh @@ -30,7 +30,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_nodelink) .push_constant(Type::MAT4, "ModelViewProjectionMatrix") .vertex_source("gpu_shader_2D_nodelink_vert.glsl") .fragment_source("gpu_shader_2D_nodelink_frag.glsl") - .typedef_source("GPU_shader_shared.h") + .typedef_source("GPU_shader_shared.hh") .do_static_compilation(true); GPU_SHADER_CREATE_INFO(gpu_shader_2D_nodelink_inst) @@ -54,6 +54,6 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_nodelink_inst) .push_constant(Type::MAT4, "ModelViewProjectionMatrix") .vertex_source("gpu_shader_2D_nodelink_vert.glsl") .fragment_source("gpu_shader_2D_nodelink_frag.glsl") - .typedef_source("GPU_shader_shared.h") + .typedef_source("GPU_shader_shared.hh") .define("USE_INSTANCE") .do_static_compilation(true); diff --git a/source/blender/gpu/shaders/infos/gpu_shader_gpencil_stroke_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_gpencil_stroke_info.hh index 131e2bfd45c..9e922b857f6 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_gpencil_stroke_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_gpencil_stroke_info.hh @@ -27,7 +27,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_gpencil_stroke_base) .push_constant(Type::MAT4, "ModelViewProjectionMatrix") .push_constant(Type::MAT4, "ProjectionMatrix") .fragment_source("gpu_shader_gpencil_stroke_frag.glsl") - .typedef_source("GPU_shader_shared.h"); + .typedef_source("GPU_shader_shared.hh"); GPU_SHADER_CREATE_INFO(gpu_shader_gpencil_stroke) .additional_info("gpu_shader_gpencil_stroke_base") diff --git a/source/blender/gpu/shaders/infos/gpu_shader_icon_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_icon_info.hh index 05d9ebaf5fa..a4995cc28c0 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_icon_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_icon_info.hh @@ -29,7 +29,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_icon_multi) .fragment_out(0, Type::VEC4, "fragColor") .uniform_buf(0, "MultiIconCallData", "multi_icon_data") .sampler(0, ImageType::FLOAT_2D, "image") - .typedef_source("GPU_shader_shared.h") + .typedef_source("GPU_shader_shared.hh") .vertex_source("gpu_shader_icon_multi_vert.glsl") .fragment_source("gpu_shader_icon_frag.glsl") .do_static_compilation(true); diff --git a/source/blender/gpu/shaders/infos/gpu_shader_keyframe_shape_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_keyframe_shape_info.hh index 649c1991549..96280efab44 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_keyframe_shape_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_keyframe_shape_info.hh @@ -16,7 +16,7 @@ GPU_SHADER_INTERFACE_INFO(keyframe_shape_iface, "") .flat(Type::UINT, "finalFlags"); GPU_SHADER_CREATE_INFO(gpu_shader_keyframe_shape) - .typedef_source("GPU_shader_shared.h") + .typedef_source("GPU_shader_shared.hh") .vertex_in(0, Type::VEC4, "color") .vertex_in(1, Type::VEC4, "outlineColor") .vertex_in(2, Type::VEC2, "pos") diff --git a/source/blender/gpu/shaders/infos/gpu_shader_simple_lighting_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_simple_lighting_info.hh index 34a285cb922..403f4f79ab1 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_simple_lighting_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_simple_lighting_info.hh @@ -18,7 +18,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_simple_lighting) .uniform_buf(0, "SimpleLightingData", "simple_lighting_data", Frequency::PASS) .push_constant(Type::MAT4, "ModelViewProjectionMatrix") .push_constant(Type::MAT3, "NormalMatrix") - .typedef_source("GPU_shader_shared.h") + .typedef_source("GPU_shader_shared.hh") .vertex_source("gpu_shader_3D_normal_vert.glsl") .fragment_source("gpu_shader_simple_lighting_frag.glsl") .do_static_compilation(true); diff --git a/source/blender/gpu/shaders/infos/gpu_shader_test_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_test_info.hh index 9511b4bdc6c..c731da9ec9e 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_test_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_test_info.hh @@ -10,7 +10,7 @@ #include "gpu_shader_create_info.hh" GPU_SHADER_CREATE_INFO(gpu_shader_test) - .typedef_source("GPU_shader_shared.h") + .typedef_source("GPU_shader_shared.hh") .fragment_out(0, Type::UVEC4, "out_test") .additional_info("draw_fullscreen"); diff --git a/source/blender/gpu/shaders/metal/mtl_shader_defines.msl b/source/blender/gpu/shaders/metal/mtl_shader_defines.msl index 645e5146f9a..33e106d144c 100644 --- a/source/blender/gpu/shaders/metal/mtl_shader_defines.msl +++ b/source/blender/gpu/shaders/metal/mtl_shader_defines.msl @@ -1904,7 +1904,7 @@ inline float2x2 operator-(float2x2 a) # define vertex_fetch_get_input_vert_count() UNIFORM_SSBO_INPUT_VERT_COUNT_STR # define vertex_fetch_get_attr_type(attr) PPCAT(UNIFORM_SSBO_TYPE_STR, attr) -/* Must mirror GPU_primitive.h. */ +/* Must mirror GPU_primitive.hh. */ # define GPU_PRIM_POINTS 0 # define GPU_PRIM_LINES 1 # define GPU_PRIM_TRIS 2 diff --git a/source/blender/gpu/tests/buffer_texture_test.cc b/source/blender/gpu/tests/buffer_texture_test.cc index c509ba1bfd9..8b3b769a57a 100644 --- a/source/blender/gpu/tests/buffer_texture_test.cc +++ b/source/blender/gpu/tests/buffer_texture_test.cc @@ -4,10 +4,10 @@ #include "testing/testing.h" -#include "GPU_capabilities.h" -#include "GPU_compute.h" -#include "GPU_vertex_buffer.h" -#include "GPU_vertex_format.h" +#include "GPU_capabilities.hh" +#include "GPU_compute.hh" +#include "GPU_vertex_buffer.hh" +#include "GPU_vertex_format.hh" #include "BLI_index_range.hh" #include "BLI_math_vector_types.hh" diff --git a/source/blender/gpu/tests/compute_test.cc b/source/blender/gpu/tests/compute_test.cc index 2fc1e700c57..7e4e5447878 100644 --- a/source/blender/gpu/tests/compute_test.cc +++ b/source/blender/gpu/tests/compute_test.cc @@ -8,10 +8,10 @@ #include "BLI_math_vector_types.hh" -#include "GPU_capabilities.h" -#include "GPU_compute.h" -#include "GPU_storage_buffer.h" -#include "GPU_texture.h" +#include "GPU_capabilities.hh" +#include "GPU_compute.hh" +#include "GPU_storage_buffer.hh" +#include "GPU_texture.hh" namespace blender::gpu::tests { static void test_compute_direct() diff --git a/source/blender/gpu/tests/framebuffer_test.cc b/source/blender/gpu/tests/framebuffer_test.cc index b8e882ef2be..af45df38030 100644 --- a/source/blender/gpu/tests/framebuffer_test.cc +++ b/source/blender/gpu/tests/framebuffer_test.cc @@ -4,9 +4,9 @@ #include "testing/testing.h" -#include "GPU_context.h" -#include "GPU_framebuffer.h" -#include "GPU_shader.h" +#include "GPU_context.hh" +#include "GPU_framebuffer.hh" +#include "GPU_shader.hh" #include "gpu_testing.hh" #include "BLI_math_vector.hh" diff --git a/source/blender/gpu/tests/gpu_testing.cc b/source/blender/gpu/tests/gpu_testing.cc index c5d03638160..fbe2e74c86d 100644 --- a/source/blender/gpu/tests/gpu_testing.cc +++ b/source/blender/gpu/tests/gpu_testing.cc @@ -8,9 +8,9 @@ #include "BLI_math_color.h" -#include "GPU_context.h" -#include "GPU_debug.h" -#include "GPU_init_exit.h" +#include "GPU_context.hh" +#include "GPU_debug.hh" +#include "GPU_init_exit.hh" #include "gpu_testing.hh" #include "GHOST_C-api.h" diff --git a/source/blender/gpu/tests/gpu_testing.hh b/source/blender/gpu/tests/gpu_testing.hh index 44ba0dd1398..8ae6c5506bd 100644 --- a/source/blender/gpu/tests/gpu_testing.hh +++ b/source/blender/gpu/tests/gpu_testing.hh @@ -8,7 +8,7 @@ #include "GHOST_C-api.h" -#include "GPU_platform.h" +#include "GPU_platform.hh" struct GPUContext; diff --git a/source/blender/gpu/tests/immediate_test.cc b/source/blender/gpu/tests/immediate_test.cc index 24042465411..f6d99409628 100644 --- a/source/blender/gpu/tests/immediate_test.cc +++ b/source/blender/gpu/tests/immediate_test.cc @@ -4,9 +4,9 @@ #include "testing/testing.h" -#include "GPU_framebuffer.h" -#include "GPU_immediate.h" -#include "GPU_shader_builtin.h" +#include "GPU_framebuffer.hh" +#include "GPU_immediate.hh" +#include "GPU_shader_builtin.hh" #include "gpu_testing.hh" #include "BLI_math_vector.hh" diff --git a/source/blender/gpu/tests/index_buffer_test.cc b/source/blender/gpu/tests/index_buffer_test.cc index 1285d3eec7b..b5a181693fd 100644 --- a/source/blender/gpu/tests/index_buffer_test.cc +++ b/source/blender/gpu/tests/index_buffer_test.cc @@ -6,7 +6,7 @@ #include "MEM_guardedalloc.h" -#include "GPU_index_buffer.h" +#include "GPU_index_buffer.hh" #include "gpu_testing.hh" diff --git a/source/blender/gpu/tests/push_constants_test.cc b/source/blender/gpu/tests/push_constants_test.cc index d39c6b077bc..a555d124389 100644 --- a/source/blender/gpu/tests/push_constants_test.cc +++ b/source/blender/gpu/tests/push_constants_test.cc @@ -4,10 +4,10 @@ #include "testing/testing.h" -#include "GPU_capabilities.h" -#include "GPU_compute.h" -#include "GPU_shader.h" -#include "GPU_storage_buffer.h" +#include "GPU_capabilities.hh" +#include "GPU_compute.hh" +#include "GPU_shader.hh" +#include "GPU_storage_buffer.hh" #include "BLI_math_vector.hh" #include "BLI_utility_mixins.hh" diff --git a/source/blender/gpu/tests/shader_test.cc b/source/blender/gpu/tests/shader_test.cc index ddc179a8add..9dbb1b94081 100644 --- a/source/blender/gpu/tests/shader_test.cc +++ b/source/blender/gpu/tests/shader_test.cc @@ -5,24 +5,24 @@ #include "testing/testing.h" #include "BLI_math_matrix_types.hh" -#include "GPU_batch.h" -#include "GPU_batch_presets.h" -#include "GPU_capabilities.h" -#include "GPU_compute.h" -#include "GPU_context.h" -#include "GPU_framebuffer.h" -#include "GPU_index_buffer.h" -#include "GPU_shader.h" -#include "GPU_shader_shared.h" -#include "GPU_texture.h" -#include "GPU_vertex_buffer.h" -#include "GPU_vertex_format.h" +#include "GPU_batch.hh" +#include "GPU_batch_presets.hh" +#include "GPU_capabilities.hh" +#include "GPU_compute.hh" +#include "GPU_context.hh" +#include "GPU_framebuffer.hh" +#include "GPU_index_buffer.hh" +#include "GPU_shader.hh" +#include "GPU_shader_shared.hh" +#include "GPU_texture.hh" +#include "GPU_vertex_buffer.hh" +#include "GPU_vertex_format.hh" #include "MEM_guardedalloc.h" #include "gpu_shader_create_info.hh" #include "gpu_shader_create_info_private.hh" -#include "gpu_shader_dependency_private.h" +#include "gpu_shader_dependency_private.hh" #include "gpu_testing.hh" namespace blender::gpu::tests { diff --git a/source/blender/gpu/tests/specialization_constants_test.cc b/source/blender/gpu/tests/specialization_constants_test.cc index 667acb992e6..4b01235ba01 100644 --- a/source/blender/gpu/tests/specialization_constants_test.cc +++ b/source/blender/gpu/tests/specialization_constants_test.cc @@ -4,13 +4,13 @@ #include "testing/testing.h" -#include "GPU_batch.h" -#include "GPU_capabilities.h" -#include "GPU_compute.h" -#include "GPU_context.h" -#include "GPU_framebuffer.h" -#include "GPU_shader.h" -#include "GPU_storage_buffer.h" +#include "GPU_batch.hh" +#include "GPU_capabilities.hh" +#include "GPU_compute.hh" +#include "GPU_context.hh" +#include "GPU_framebuffer.hh" +#include "GPU_shader.hh" +#include "GPU_storage_buffer.hh" #include "BLI_math_vector.hh" #include "BLI_utility_mixins.hh" diff --git a/source/blender/gpu/tests/state_blend_test.cc b/source/blender/gpu/tests/state_blend_test.cc index 0d19f42e79a..e5e50047805 100644 --- a/source/blender/gpu/tests/state_blend_test.cc +++ b/source/blender/gpu/tests/state_blend_test.cc @@ -6,10 +6,10 @@ #include "gpu_testing.hh" -#include "GPU_batch.h" -#include "GPU_batch_presets.h" -#include "GPU_framebuffer.h" -#include "GPU_matrix.h" +#include "GPU_batch.hh" +#include "GPU_batch_presets.hh" +#include "GPU_framebuffer.hh" +#include "GPU_matrix.hh" #include "BLI_math_vector.hh" diff --git a/source/blender/gpu/tests/storage_buffer_test.cc b/source/blender/gpu/tests/storage_buffer_test.cc index 6ec595468fb..e9dfeb05987 100644 --- a/source/blender/gpu/tests/storage_buffer_test.cc +++ b/source/blender/gpu/tests/storage_buffer_test.cc @@ -4,7 +4,7 @@ #include "testing/testing.h" -#include "GPU_storage_buffer.h" +#include "GPU_storage_buffer.hh" #include "BLI_vector.hh" diff --git a/source/blender/gpu/tests/texture_test.cc b/source/blender/gpu/tests/texture_test.cc index f7b1d22fa59..5556e58cce6 100644 --- a/source/blender/gpu/tests/texture_test.cc +++ b/source/blender/gpu/tests/texture_test.cc @@ -9,8 +9,8 @@ #include "BLI_math_vector.hh" #include "BLI_vector.hh" -#include "GPU_context.h" -#include "GPU_texture.h" +#include "GPU_context.hh" +#include "GPU_texture.hh" #include "gpu_texture_private.hh" diff --git a/source/blender/gpu/tests/vertex_buffer_test.cc b/source/blender/gpu/tests/vertex_buffer_test.cc index 417ea8bbdf1..c1bf192ff1c 100644 --- a/source/blender/gpu/tests/vertex_buffer_test.cc +++ b/source/blender/gpu/tests/vertex_buffer_test.cc @@ -4,12 +4,12 @@ #include "testing/testing.h" -#include "GPU_context.h" -#include "GPU_framebuffer.h" -#include "GPU_immediate.h" -#include "GPU_shader.h" -#include "GPU_vertex_buffer.h" -#include "GPU_vertex_format.h" +#include "GPU_context.hh" +#include "GPU_framebuffer.hh" +#include "GPU_immediate.hh" +#include "GPU_shader.hh" +#include "GPU_vertex_buffer.hh" +#include "GPU_vertex_format.hh" #include "BLI_index_range.hh" #include "BLI_math_vector_types.hh" diff --git a/source/blender/gpu/vulkan/vk_data_conversion.cc b/source/blender/gpu/vulkan/vk_data_conversion.cc index 31f404fac84..a8dac2e4f84 100644 --- a/source/blender/gpu/vulkan/vk_data_conversion.cc +++ b/source/blender/gpu/vulkan/vk_data_conversion.cc @@ -9,7 +9,7 @@ #include "vk_data_conversion.hh" #include "vk_device.hh" -#include "gpu_vertex_format_private.h" +#include "gpu_vertex_format_private.hh" #include "BLI_color.hh" diff --git a/source/blender/gpu/vulkan/vk_data_conversion_test.cc b/source/blender/gpu/vulkan/vk_data_conversion_test.cc index fce7d03e632..58b3b02feb3 100644 --- a/source/blender/gpu/vulkan/vk_data_conversion_test.cc +++ b/source/blender/gpu/vulkan/vk_data_conversion_test.cc @@ -7,7 +7,7 @@ #include "vk_data_conversion.hh" #include "vk_device.hh" -#include "gpu_vertex_format_private.h" +#include "gpu_vertex_format_private.hh" namespace blender::gpu::tests { static void test_f32_f16(uint32_t f32_in, uint32_t f16_expected) diff --git a/source/blender/gpu/vulkan/vk_device.cc b/source/blender/gpu/vulkan/vk_device.cc index 3a6f2a69cab..0daaa497daa 100644 --- a/source/blender/gpu/vulkan/vk_device.cc +++ b/source/blender/gpu/vulkan/vk_device.cc @@ -17,7 +17,7 @@ #include "vk_texture.hh" #include "vk_vertex_buffer.hh" -#include "GPU_capabilities.h" +#include "GPU_capabilities.hh" #include "BLI_math_matrix_types.hh" diff --git a/source/blender/gpu/vulkan/vk_drawlist.cc b/source/blender/gpu/vulkan/vk_drawlist.cc index 6437ba67b92..b6ab19cdd0c 100644 --- a/source/blender/gpu/vulkan/vk_drawlist.cc +++ b/source/blender/gpu/vulkan/vk_drawlist.cc @@ -6,7 +6,7 @@ * \ingroup gpu */ -#include "GPU_batch.h" +#include "GPU_batch.hh" #include "vk_batch.hh" #include "vk_common.hh" diff --git a/source/blender/gpu/vulkan/vk_immediate.hh b/source/blender/gpu/vulkan/vk_immediate.hh index 7ae7bb77924..efdcd3481b5 100644 --- a/source/blender/gpu/vulkan/vk_immediate.hh +++ b/source/blender/gpu/vulkan/vk_immediate.hh @@ -13,7 +13,7 @@ #include "MEM_guardedalloc.h" #include "gpu_immediate_private.hh" -#include "gpu_vertex_format_private.h" +#include "gpu_vertex_format_private.hh" #include "vk_buffer.hh" #include "vk_context.hh" diff --git a/source/blender/gpu/vulkan/vk_shader.cc b/source/blender/gpu/vulkan/vk_shader.cc index 19880b4077e..b577474436c 100644 --- a/source/blender/gpu/vulkan/vk_shader.cc +++ b/source/blender/gpu/vulkan/vk_shader.cc @@ -8,7 +8,7 @@ #include -#include "GPU_capabilities.h" +#include "GPU_capabilities.hh" #include "vk_shader.hh" diff --git a/source/blender/gpu/vulkan/vk_shader_log.cc b/source/blender/gpu/vulkan/vk_shader_log.cc index 7203a947ffb..b27078890ac 100644 --- a/source/blender/gpu/vulkan/vk_shader_log.cc +++ b/source/blender/gpu/vulkan/vk_shader_log.cc @@ -8,7 +8,7 @@ #include "vk_shader_log.hh" -#include "GPU_platform.h" +#include "GPU_platform.hh" namespace blender::gpu { diff --git a/source/blender/gpu/vulkan/vk_state_manager.cc b/source/blender/gpu/vulkan/vk_state_manager.cc index 85aaf86d9dc..deba52f1abb 100644 --- a/source/blender/gpu/vulkan/vk_state_manager.cc +++ b/source/blender/gpu/vulkan/vk_state_manager.cc @@ -15,7 +15,7 @@ #include "vk_texture.hh" #include "vk_vertex_buffer.hh" -#include "GPU_capabilities.h" +#include "GPU_capabilities.hh" namespace blender::gpu { diff --git a/source/blender/gpu/vulkan/vk_storage_buffer.hh b/source/blender/gpu/vulkan/vk_storage_buffer.hh index 111a55147df..7e30747e302 100644 --- a/source/blender/gpu/vulkan/vk_storage_buffer.hh +++ b/source/blender/gpu/vulkan/vk_storage_buffer.hh @@ -8,7 +8,7 @@ #pragma once -#include "GPU_texture.h" +#include "GPU_texture.hh" #include "gpu_storage_buffer_private.hh" #include "gpu_vertex_buffer_private.hh" diff --git a/source/blender/imbuf/IMB_imbuf.hh b/source/blender/imbuf/IMB_imbuf.hh index fb9bfdd5cc9..16377b37edd 100644 --- a/source/blender/imbuf/IMB_imbuf.hh +++ b/source/blender/imbuf/IMB_imbuf.hh @@ -40,7 +40,7 @@ #pragma once -#include "../gpu/GPU_texture.h" +#include "../gpu/GPU_texture.hh" #include "BLI_utildefines.h" diff --git a/source/blender/imbuf/intern/allocimbuf.cc b/source/blender/imbuf/intern/allocimbuf.cc index 481561fb502..5cfea171dea 100644 --- a/source/blender/imbuf/intern/allocimbuf.cc +++ b/source/blender/imbuf/intern/allocimbuf.cc @@ -26,7 +26,7 @@ #include "BLI_threads.h" #include "BLI_utildefines.h" -#include "GPU_texture.h" +#include "GPU_texture.hh" static SpinLock refcounter_spin; diff --git a/source/blender/imbuf/intern/colormanagement.cc b/source/blender/imbuf/intern/colormanagement.cc index cfff740be29..b35301ea337 100644 --- a/source/blender/imbuf/intern/colormanagement.cc +++ b/source/blender/imbuf/intern/colormanagement.cc @@ -43,7 +43,7 @@ #include "BKE_image_format.h" #include "BKE_main.hh" -#include "GPU_capabilities.h" +#include "GPU_capabilities.hh" #include "RNA_define.hh" diff --git a/source/blender/imbuf/intern/util_gpu.cc b/source/blender/imbuf/intern/util_gpu.cc index 1cba6c9026d..808b84db38b 100644 --- a/source/blender/imbuf/intern/util_gpu.cc +++ b/source/blender/imbuf/intern/util_gpu.cc @@ -9,8 +9,8 @@ #include "BLI_utildefines.h" #include "MEM_guardedalloc.h" -#include "GPU_capabilities.h" -#include "GPU_texture.h" +#include "GPU_capabilities.hh" +#include "GPU_texture.hh" #include "IMB_colormanagement.hh" #include "IMB_imbuf.hh" diff --git a/source/blender/makesrna/intern/rna_image.cc b/source/blender/makesrna/intern/rna_image.cc index f93e234de7a..2e61263f202 100644 --- a/source/blender/makesrna/intern/rna_image.cc +++ b/source/blender/makesrna/intern/rna_image.cc @@ -60,7 +60,7 @@ static const EnumPropertyItem image_source_items[] = { # include "BKE_global.hh" -# include "GPU_texture.h" +# include "GPU_texture.hh" # include "IMB_imbuf.hh" # include "IMB_imbuf_types.hh" diff --git a/source/blender/makesrna/intern/rna_render.cc b/source/blender/makesrna/intern/rna_render.cc index f76d6e7de48..4079b49d448 100644 --- a/source/blender/makesrna/intern/rna_render.cc +++ b/source/blender/makesrna/intern/rna_render.cc @@ -90,8 +90,8 @@ const EnumPropertyItem rna_enum_bake_pass_type_items[] = { # include "BKE_context.hh" # include "BKE_report.hh" -# include "GPU_capabilities.h" -# include "GPU_shader.h" +# include "GPU_capabilities.hh" +# include "GPU_shader.hh" # include "IMB_colormanagement.hh" # include "IMB_imbuf_types.hh" diff --git a/source/blender/makesrna/intern/rna_userdef.cc b/source/blender/makesrna/intern/rna_userdef.cc index 7149b31be0f..74405af6cbe 100644 --- a/source/blender/makesrna/intern/rna_userdef.cc +++ b/source/blender/makesrna/intern/rna_userdef.cc @@ -39,7 +39,7 @@ #include "RNA_define.hh" #include "RNA_enum_types.hh" -#include "GPU_platform.h" +#include "GPU_platform.hh" #include "UI_interface_icons.hh" @@ -189,9 +189,9 @@ static const EnumPropertyItem rna_enum_preference_gpu_backend_items[] = { # include "DEG_depsgraph.hh" -# include "GPU_capabilities.h" +# include "GPU_capabilities.hh" # include "GPU_select.hh" -# include "GPU_texture.h" +# include "GPU_texture.hh" # include "BLF_api.hh" diff --git a/source/blender/makesrna/intern/rna_wm_gizmo.cc b/source/blender/makesrna/intern/rna_wm_gizmo.cc index d2f49f95dd9..c124b1ce36a 100644 --- a/source/blender/makesrna/intern/rna_wm_gizmo.cc +++ b/source/blender/makesrna/intern/rna_wm_gizmo.cc @@ -49,7 +49,7 @@ # include "MEM_guardedalloc.h" -# include "GPU_state.h" +# include "GPU_state.hh" # ifdef WITH_PYTHON # include "BPY_extern.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc index b84de3ac46e..d1b0a0fad38 100644 --- a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc @@ -11,7 +11,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_shader.h" +#include "GPU_shader.hh" #include "COM_node_operation.hh" #include "COM_utilities.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_blur.cc b/source/blender/nodes/composite/nodes/node_composite_blur.cc index 6226bd5fc4e..f3a5d8aec16 100644 --- a/source/blender/nodes/composite/nodes/node_composite_blur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_blur.cc @@ -16,8 +16,8 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_shader.h" -#include "GPU_texture.h" +#include "GPU_shader.hh" +#include "GPU_texture.hh" #include "COM_algorithm_symmetric_separable_blur.hh" #include "COM_node_operation.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc b/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc index ed47c8a498b..1bfd0c535e3 100644 --- a/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc @@ -12,7 +12,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_texture.h" +#include "GPU_texture.hh" #include "COM_algorithm_parallel_reduction.hh" #include "COM_node_operation.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc b/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc index 17eb50f03d1..adbe13134ea 100644 --- a/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc +++ b/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc @@ -12,7 +12,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_shader.h" +#include "GPU_shader.hh" #include "COM_bokeh_kernel.hh" #include "COM_node_operation.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_boxmask.cc b/source/blender/nodes/composite/nodes/node_composite_boxmask.cc index 8c4973c1c8d..1c3b0cdb01a 100644 --- a/source/blender/nodes/composite/nodes/node_composite_boxmask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_boxmask.cc @@ -13,7 +13,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_shader.h" +#include "GPU_shader.hh" #include "COM_node_operation.hh" #include "COM_utilities.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_composite.cc b/source/blender/nodes/composite/nodes/node_composite_composite.cc index cac7a12e9df..787fbc18ab5 100644 --- a/source/blender/nodes/composite/nodes/node_composite_composite.cc +++ b/source/blender/nodes/composite/nodes/node_composite_composite.cc @@ -11,8 +11,8 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_shader.h" -#include "GPU_texture.h" +#include "GPU_shader.hh" +#include "GPU_texture.hh" #include "COM_node_operation.hh" #include "COM_utilities.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_convert_color_space.cc b/source/blender/nodes/composite/nodes/node_composite_convert_color_space.cc index fdbb4010913..fa0878c010f 100644 --- a/source/blender/nodes/composite/nodes/node_composite_convert_color_space.cc +++ b/source/blender/nodes/composite/nodes/node_composite_convert_color_space.cc @@ -13,7 +13,7 @@ #include "IMB_colormanagement.hh" -#include "GPU_shader.h" +#include "GPU_shader.hh" #include "COM_node_operation.hh" #include "COM_ocio_color_space_conversion_shader.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_cornerpin.cc b/source/blender/nodes/composite/nodes/node_composite_cornerpin.cc index 609d3b40336..c9e21aa763f 100644 --- a/source/blender/nodes/composite/nodes/node_composite_cornerpin.cc +++ b/source/blender/nodes/composite/nodes/node_composite_cornerpin.cc @@ -10,8 +10,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 "BKE_tracking.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_crop.cc b/source/blender/nodes/composite/nodes/node_composite_crop.cc index d1b39d56fab..a23760a9a04 100644 --- a/source/blender/nodes/composite/nodes/node_composite_crop.cc +++ b/source/blender/nodes/composite/nodes/node_composite_crop.cc @@ -16,8 +16,8 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_shader.h" -#include "GPU_texture.h" +#include "GPU_shader.hh" +#include "GPU_texture.hh" #include "COM_node_operation.hh" #include "COM_utilities.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc index e899a780275..30f103bf8e3 100644 --- a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc @@ -23,8 +23,8 @@ #include "IMB_imbuf_types.hh" -#include "GPU_shader.h" -#include "GPU_texture.h" +#include "GPU_shader.hh" +#include "GPU_texture.hh" #include "DNA_image_types.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_denoise.cc b/source/blender/nodes/composite/nodes/node_composite_denoise.cc index 7d9f689371a..3c81c00fe60 100644 --- a/source/blender/nodes/composite/nodes/node_composite_denoise.cc +++ b/source/blender/nodes/composite/nodes/node_composite_denoise.cc @@ -13,8 +13,8 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_state.h" -#include "GPU_texture.h" +#include "GPU_state.hh" +#include "GPU_texture.hh" #include "DNA_node_types.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_despeckle.cc b/source/blender/nodes/composite/nodes/node_composite_despeckle.cc index 3d2908334fa..d84f08c1b94 100644 --- a/source/blender/nodes/composite/nodes/node_composite_despeckle.cc +++ b/source/blender/nodes/composite/nodes/node_composite_despeckle.cc @@ -9,7 +9,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_shader.h" +#include "GPU_shader.hh" #include "COM_node_operation.hh" #include "COM_utilities.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_dilate.cc b/source/blender/nodes/composite/nodes/node_composite_dilate.cc index ac92052660c..980b7186eb7 100644 --- a/source/blender/nodes/composite/nodes/node_composite_dilate.cc +++ b/source/blender/nodes/composite/nodes/node_composite_dilate.cc @@ -15,9 +15,9 @@ #include "UI_interface.hh" #include "UI_resources.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_algorithm_morphological_distance.hh" #include "COM_algorithm_morphological_distance_feather.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc b/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc index aba3ceec116..021480ccc00 100644 --- a/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc @@ -12,7 +12,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_shader.h" +#include "GPU_shader.hh" #include "COM_node_operation.hh" #include "COM_utilities.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_displace.cc b/source/blender/nodes/composite/nodes/node_composite_displace.cc index 008d247f2ca..47a4842d105 100644 --- a/source/blender/nodes/composite/nodes/node_composite_displace.cc +++ b/source/blender/nodes/composite/nodes/node_composite_displace.cc @@ -8,8 +8,8 @@ #include "BLI_math_vector.hh" -#include "GPU_shader.h" -#include "GPU_texture.h" +#include "GPU_shader.hh" +#include "GPU_texture.hh" #include "COM_node_operation.hh" #include "COM_utilities.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc b/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc index 6557ccdf6f1..b4bdc704294 100644 --- a/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc @@ -13,7 +13,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_shader.h" +#include "GPU_shader.hh" #include "COM_node_operation.hh" #include "COM_utilities.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_file_output.cc b/source/blender/nodes/composite/nodes/node_composite_file_output.cc index 65eb35307c2..5a74642e028 100644 --- a/source/blender/nodes/composite/nodes/node_composite_file_output.cc +++ b/source/blender/nodes/composite/nodes/node_composite_file_output.cc @@ -41,8 +41,8 @@ #include "IMB_imbuf_types.hh" #include "IMB_openexr.hh" -#include "GPU_state.h" -#include "GPU_texture.h" +#include "GPU_state.hh" +#include "GPU_texture.hh" #include "COM_node_operation.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_flip.cc b/source/blender/nodes/composite/nodes/node_composite_flip.cc index a18b0e6a492..d635fddbf38 100644 --- a/source/blender/nodes/composite/nodes/node_composite_flip.cc +++ b/source/blender/nodes/composite/nodes/node_composite_flip.cc @@ -12,8 +12,8 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_shader.h" -#include "GPU_texture.h" +#include "GPU_shader.hh" +#include "GPU_texture.hh" #include "COM_node_operation.hh" #include "COM_utilities.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_glare.cc b/source/blender/nodes/composite/nodes/node_composite_glare.cc index 278830fc087..e4a2c93adb1 100644 --- a/source/blender/nodes/composite/nodes/node_composite_glare.cc +++ b/source/blender/nodes/composite/nodes/node_composite_glare.cc @@ -24,9 +24,9 @@ #include "IMB_colormanagement.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_algorithm_symmetric_separable_blur.hh" #include "COM_node_operation.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_id_mask.cc b/source/blender/nodes/composite/nodes/node_composite_id_mask.cc index 61bf1e9c4ad..6511d42c96c 100644 --- a/source/blender/nodes/composite/nodes/node_composite_id_mask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_id_mask.cc @@ -11,7 +11,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_shader.h" +#include "GPU_shader.hh" #include "COM_algorithm_smaa.hh" #include "COM_node_operation.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_image.cc b/source/blender/nodes/composite/nodes/node_composite_image.cc index 20971446f42..8651028b127 100644 --- a/source/blender/nodes/composite/nodes/node_composite_image.cc +++ b/source/blender/nodes/composite/nodes/node_composite_image.cc @@ -35,8 +35,8 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_shader.h" -#include "GPU_texture.h" +#include "GPU_shader.hh" +#include "GPU_texture.hh" #include "COM_node_operation.hh" #include "COM_utilities.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_keying.cc b/source/blender/nodes/composite/nodes/node_composite_keying.cc index 7d44c73d7c7..1492ce11a38 100644 --- a/source/blender/nodes/composite/nodes/node_composite_keying.cc +++ b/source/blender/nodes/composite/nodes/node_composite_keying.cc @@ -15,8 +15,8 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_shader.h" -#include "GPU_texture.h" +#include "GPU_shader.hh" +#include "GPU_texture.hh" #include "COM_algorithm_morphological_distance.hh" #include "COM_algorithm_morphological_distance_feather.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc b/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc index ba4f7709f42..ad73a0b220d 100644 --- a/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc +++ b/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc @@ -19,7 +19,7 @@ #include "BKE_movieclip.h" #include "BKE_tracking.h" -#include "GPU_texture.h" +#include "GPU_texture.hh" #include "RNA_access.hh" #include "RNA_prototypes.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_lensdist.cc b/source/blender/nodes/composite/nodes/node_composite_lensdist.cc index 073a6feac68..a334193d7a4 100644 --- a/source/blender/nodes/composite/nodes/node_composite_lensdist.cc +++ b/source/blender/nodes/composite/nodes/node_composite_lensdist.cc @@ -14,8 +14,8 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_shader.h" -#include "GPU_texture.h" +#include "GPU_shader.hh" +#include "GPU_texture.hh" #include "COM_node_operation.hh" #include "COM_utilities.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_map_uv.cc b/source/blender/nodes/composite/nodes/node_composite_map_uv.cc index 4ff1ef630a3..de4b775e6ce 100644 --- a/source/blender/nodes/composite/nodes/node_composite_map_uv.cc +++ b/source/blender/nodes/composite/nodes/node_composite_map_uv.cc @@ -6,8 +6,8 @@ * \ingroup cmpnodes */ -#include "GPU_shader.h" -#include "GPU_texture.h" +#include "GPU_shader.hh" +#include "GPU_texture.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_movieclip.cc b/source/blender/nodes/composite/nodes/node_composite_movieclip.cc index 8a1df296f19..1949d094192 100644 --- a/source/blender/nodes/composite/nodes/node_composite_movieclip.cc +++ b/source/blender/nodes/composite/nodes/node_composite_movieclip.cc @@ -20,8 +20,8 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_shader.h" -#include "GPU_texture.h" +#include "GPU_shader.hh" +#include "GPU_texture.hh" #include "COM_node_operation.hh" #include "COM_utilities.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc index a143a650bec..0af71f44af5 100644 --- a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc +++ b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc @@ -17,8 +17,8 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_shader.h" -#include "GPU_texture.h" +#include "GPU_shader.hh" +#include "GPU_texture.hh" #include "COM_distortion_grid.hh" #include "COM_node_operation.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_pixelate.cc b/source/blender/nodes/composite/nodes/node_composite_pixelate.cc index d1d9764119b..86187006225 100644 --- a/source/blender/nodes/composite/nodes/node_composite_pixelate.cc +++ b/source/blender/nodes/composite/nodes/node_composite_pixelate.cc @@ -6,7 +6,7 @@ * \ingroup cmpnodes */ -#include "GPU_shader.h" +#include "GPU_shader.hh" #include "COM_node_operation.hh" #include "COM_utilities.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc b/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc index 8f429bdeb6f..aec4c28a1a6 100644 --- a/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc +++ b/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc @@ -26,8 +26,8 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_shader.h" -#include "GPU_texture.h" +#include "GPU_shader.hh" +#include "GPU_texture.hh" #include "GPU_uniform_buffer.hh" #include "COM_algorithm_smaa.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_split.cc b/source/blender/nodes/composite/nodes/node_composite_split.cc index 126cf40e2e5..95c72db08a2 100644 --- a/source/blender/nodes/composite/nodes/node_composite_split.cc +++ b/source/blender/nodes/composite/nodes/node_composite_split.cc @@ -9,8 +9,8 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_shader.h" -#include "GPU_texture.h" +#include "GPU_shader.hh" +#include "GPU_texture.hh" #include "COM_node_operation.hh" #include "COM_utilities.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_sunbeams.cc b/source/blender/nodes/composite/nodes/node_composite_sunbeams.cc index d6f987ec7ab..5cd83a5d225 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sunbeams.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sunbeams.cc @@ -9,7 +9,7 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_shader.h" +#include "GPU_shader.hh" #include "COM_node_operation.hh" #include "COM_utilities.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_vec_blur.cc b/source/blender/nodes/composite/nodes/node_composite_vec_blur.cc index f38c984471b..69c4f55041b 100644 --- a/source/blender/nodes/composite/nodes/node_composite_vec_blur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_vec_blur.cc @@ -13,10 +13,10 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_compute.h" -#include "GPU_shader.h" -#include "GPU_storage_buffer.h" -#include "GPU_vertex_buffer.h" +#include "GPU_compute.hh" +#include "GPU_shader.hh" +#include "GPU_storage_buffer.hh" +#include "GPU_vertex_buffer.hh" #include "COM_node_operation.hh" #include "COM_result.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_viewer.cc b/source/blender/nodes/composite/nodes/node_composite_viewer.cc index c9eb30d0be2..35a0e4f9c6c 100644 --- a/source/blender/nodes/composite/nodes/node_composite_viewer.cc +++ b/source/blender/nodes/composite/nodes/node_composite_viewer.cc @@ -16,8 +16,8 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "GPU_shader.h" -#include "GPU_texture.h" +#include "GPU_shader.hh" +#include "GPU_texture.hh" #include "COM_node_operation.hh" #include "COM_utilities.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_zcombine.cc b/source/blender/nodes/composite/nodes/node_composite_zcombine.cc index f7a795b6fbc..ebc2af5f10f 100644 --- a/source/blender/nodes/composite/nodes/node_composite_zcombine.cc +++ b/source/blender/nodes/composite/nodes/node_composite_zcombine.cc @@ -17,7 +17,7 @@ #include "COM_node_operation.hh" #include "COM_utilities.hh" -#include "GPU_shader.h" +#include "GPU_shader.hh" #include "node_composite_util.hh" diff --git a/source/blender/python/generic/bgl.cc b/source/blender/python/generic/bgl.cc index b3b5be7af8c..37ecd722b12 100644 --- a/source/blender/python/generic/bgl.cc +++ b/source/blender/python/generic/bgl.cc @@ -19,8 +19,8 @@ #include "MEM_guardedalloc.h" -#include "GPU_context.h" -#include "GPU_state.h" +#include "GPU_context.hh" +#include "GPU_state.hh" #include "py_capi_utils.h" diff --git a/source/blender/python/gpu/gpu_py.cc b/source/blender/python/gpu/gpu_py.cc index 6b9bd4ee902..4b18797e529 100644 --- a/source/blender/python/gpu/gpu_py.cc +++ b/source/blender/python/gpu/gpu_py.cc @@ -11,9 +11,9 @@ #include -#include "GPU_init_exit.h" -#include "GPU_primitive.h" -#include "GPU_texture.h" +#include "GPU_init_exit.hh" +#include "GPU_primitive.hh" +#include "GPU_texture.hh" #include "../generic/py_capi_utils.h" diff --git a/source/blender/python/gpu/gpu_py_batch.cc b/source/blender/python/gpu/gpu_py_batch.cc index c45fc7f9d90..68e2d02e9e1 100644 --- a/source/blender/python/gpu/gpu_py_batch.cc +++ b/source/blender/python/gpu/gpu_py_batch.cc @@ -16,7 +16,7 @@ #include "BLI_utildefines.h" -#include "GPU_batch.h" +#include "GPU_batch.hh" #include "../generic/py_capi_utils.h" #include "../generic/python_compat.h" diff --git a/source/blender/python/gpu/gpu_py_buffer.cc b/source/blender/python/gpu/gpu_py_buffer.cc index 0e011971b12..83752bbc892 100644 --- a/source/blender/python/gpu/gpu_py_buffer.cc +++ b/source/blender/python/gpu/gpu_py_buffer.cc @@ -17,7 +17,7 @@ #include "MEM_guardedalloc.h" -#include "GPU_texture.h" +#include "GPU_texture.hh" #include "../generic/py_capi_utils.h" diff --git a/source/blender/python/gpu/gpu_py_capabilities.cc b/source/blender/python/gpu/gpu_py_capabilities.cc index 243a1efa274..d73bb3d490f 100644 --- a/source/blender/python/gpu/gpu_py_capabilities.cc +++ b/source/blender/python/gpu/gpu_py_capabilities.cc @@ -13,7 +13,7 @@ #include "BLI_utildefines.h" -#include "GPU_capabilities.h" +#include "GPU_capabilities.hh" #include "gpu_py.h" #include "gpu_py_capabilities.h" /* own include */ diff --git a/source/blender/python/gpu/gpu_py_compute.cc b/source/blender/python/gpu/gpu_py_compute.cc index 6c7d7914d09..a3d8f99ace0 100644 --- a/source/blender/python/gpu/gpu_py_compute.cc +++ b/source/blender/python/gpu/gpu_py_compute.cc @@ -13,9 +13,9 @@ #include "BLI_utildefines.h" -#include "GPU_capabilities.h" -#include "GPU_compute.h" -#include "GPU_state.h" +#include "GPU_capabilities.hh" +#include "GPU_compute.hh" +#include "GPU_state.hh" #include "../generic/python_compat.h" diff --git a/source/blender/python/gpu/gpu_py_element.cc b/source/blender/python/gpu/gpu_py_element.cc index 3ef5cae0506..aa44575ed41 100644 --- a/source/blender/python/gpu/gpu_py_element.cc +++ b/source/blender/python/gpu/gpu_py_element.cc @@ -11,7 +11,7 @@ #include -#include "GPU_index_buffer.h" +#include "GPU_index_buffer.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/python/gpu/gpu_py_framebuffer.cc b/source/blender/python/gpu/gpu_py_framebuffer.cc index 5adbd54b6af..b293cb8f158 100644 --- a/source/blender/python/gpu/gpu_py_framebuffer.cc +++ b/source/blender/python/gpu/gpu_py_framebuffer.cc @@ -14,9 +14,9 @@ #include -#include "GPU_context.h" -#include "GPU_framebuffer.h" -#include "GPU_init_exit.h" +#include "GPU_context.hh" +#include "GPU_framebuffer.hh" +#include "GPU_init_exit.hh" #include "../generic/py_capi_utils.h" #include "../generic/python_compat.h" diff --git a/source/blender/python/gpu/gpu_py_matrix.cc b/source/blender/python/gpu/gpu_py_matrix.cc index 0ead1a16ebc..5e055afb0a0 100644 --- a/source/blender/python/gpu/gpu_py_matrix.cc +++ b/source/blender/python/gpu/gpu_py_matrix.cc @@ -23,7 +23,7 @@ #include "../generic/py_capi_utils.h" #define USE_GPU_PY_MATRIX_API -#include "GPU_matrix.h" +#include "GPU_matrix.hh" #undef USE_GPU_PY_MATRIX_API #include "gpu_py.h" diff --git a/source/blender/python/gpu/gpu_py_offscreen.cc b/source/blender/python/gpu/gpu_py_offscreen.cc index b2614a9a072..2c45251212a 100644 --- a/source/blender/python/gpu/gpu_py_offscreen.cc +++ b/source/blender/python/gpu/gpu_py_offscreen.cc @@ -23,10 +23,10 @@ #include "DNA_view3d_types.h" -#include "GPU_context.h" -#include "GPU_framebuffer.h" -#include "GPU_texture.h" -#include "GPU_viewport.h" +#include "GPU_context.hh" +#include "GPU_framebuffer.hh" +#include "GPU_texture.hh" +#include "GPU_viewport.hh" #include "ED_view3d_offscreen.hh" diff --git a/source/blender/python/gpu/gpu_py_platform.cc b/source/blender/python/gpu/gpu_py_platform.cc index deb561c4676..1a057e66ec3 100644 --- a/source/blender/python/gpu/gpu_py_platform.cc +++ b/source/blender/python/gpu/gpu_py_platform.cc @@ -13,8 +13,8 @@ #include "BLI_utildefines.h" -#include "GPU_context.h" -#include "GPU_platform.h" +#include "GPU_context.hh" +#include "GPU_platform.hh" #include "gpu_py.h" #include "gpu_py_platform.h" /* Own include. */ diff --git a/source/blender/python/gpu/gpu_py_shader.cc b/source/blender/python/gpu/gpu_py_shader.cc index 753cdb8df7a..6e3b1979dc5 100644 --- a/source/blender/python/gpu/gpu_py_shader.cc +++ b/source/blender/python/gpu/gpu_py_shader.cc @@ -13,8 +13,8 @@ #include "BLI_utildefines.h" -#include "GPU_shader.h" -#include "GPU_texture.h" +#include "GPU_shader.hh" +#include "GPU_texture.hh" #include "GPU_uniform_buffer.hh" #include "../generic/py_capi_utils.h" diff --git a/source/blender/python/gpu/gpu_py_shader_create_info.cc b/source/blender/python/gpu/gpu_py_shader_create_info.cc index 0f18fb0164d..9ab6162d052 100644 --- a/source/blender/python/gpu/gpu_py_shader_create_info.cc +++ b/source/blender/python/gpu/gpu_py_shader_create_info.cc @@ -13,7 +13,7 @@ #include "BLI_utildefines.h" -#include "GPU_shader.h" +#include "GPU_shader.hh" #include "intern/gpu_shader_create_info.hh" #include "../generic/py_capi_utils.h" @@ -1102,7 +1102,7 @@ static PyObject *pygpu_shader_info_typedef_source(BPyGPUShaderCreateInfo *self, ShaderCreateInfo *info = reinterpret_cast(self->info); #if 0 if (info->typedef_sources_.is_empty()) { - info->typedef_source("GPU_shader_shared_utils.h"); + info->typedef_source("GPU_shader_shared_utils.hh"); } #endif info->typedef_source_generated = typedef_source; diff --git a/source/blender/python/gpu/gpu_py_state.cc b/source/blender/python/gpu/gpu_py_state.cc index 59851e872c4..73ac2c5987a 100644 --- a/source/blender/python/gpu/gpu_py_state.cc +++ b/source/blender/python/gpu/gpu_py_state.cc @@ -13,8 +13,8 @@ #include -#include "GPU_framebuffer.h" -#include "GPU_state.h" +#include "GPU_framebuffer.hh" +#include "GPU_state.hh" #include "../generic/py_capi_utils.h" #include "../generic/python_utildefines.h" diff --git a/source/blender/python/gpu/gpu_py_texture.cc b/source/blender/python/gpu/gpu_py_texture.cc index 7ad3a1f91f4..1c25d6dc65e 100644 --- a/source/blender/python/gpu/gpu_py_texture.cc +++ b/source/blender/python/gpu/gpu_py_texture.cc @@ -17,8 +17,8 @@ #include "DNA_image_types.h" -#include "GPU_context.h" -#include "GPU_texture.h" +#include "GPU_context.hh" +#include "GPU_texture.hh" #include "BKE_image.h" diff --git a/source/blender/python/gpu/gpu_py_uniformbuffer.cc b/source/blender/python/gpu/gpu_py_uniformbuffer.cc index 695d35bf803..6a507674f24 100644 --- a/source/blender/python/gpu/gpu_py_uniformbuffer.cc +++ b/source/blender/python/gpu/gpu_py_uniformbuffer.cc @@ -15,7 +15,7 @@ #include "BLI_string.h" -#include "GPU_context.h" +#include "GPU_context.hh" #include "GPU_uniform_buffer.hh" #include "../generic/python_compat.h" diff --git a/source/blender/python/gpu/gpu_py_vertex_buffer.cc b/source/blender/python/gpu/gpu_py_vertex_buffer.cc index e3b8f8c4126..3bfda56c8d4 100644 --- a/source/blender/python/gpu/gpu_py_vertex_buffer.cc +++ b/source/blender/python/gpu/gpu_py_vertex_buffer.cc @@ -11,7 +11,7 @@ #include -#include "GPU_vertex_buffer.h" +#include "GPU_vertex_buffer.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/python/gpu/gpu_py_vertex_format.h b/source/blender/python/gpu/gpu_py_vertex_format.h index 0e2276fa2ba..18e031203a4 100644 --- a/source/blender/python/gpu/gpu_py_vertex_format.h +++ b/source/blender/python/gpu/gpu_py_vertex_format.h @@ -8,7 +8,7 @@ #pragma once -#include "GPU_vertex_format.h" +#include "GPU_vertex_format.hh" #ifdef __cplusplus extern "C" { diff --git a/source/blender/python/intern/bpy.cc b/source/blender/python/intern/bpy.cc index 547350df270..14c684f8616 100644 --- a/source/blender/python/intern/bpy.cc +++ b/source/blender/python/intern/bpy.cc @@ -28,7 +28,7 @@ #include "RNA_enum_types.hh" #include "RNA_prototypes.h" -#include "GPU_state.h" +#include "GPU_state.hh" #include "WM_api.hh" /* For #WM_ghost_backend */ diff --git a/source/blender/render/hydra/engine.cc b/source/blender/render/hydra/engine.cc index 43094a70491..053e0e9cad8 100644 --- a/source/blender/render/hydra/engine.cc +++ b/source/blender/render/hydra/engine.cc @@ -15,7 +15,7 @@ #include "BKE_context.hh" -#include "GPU_context.h" +#include "GPU_context.hh" #include "DEG_depsgraph_query.hh" diff --git a/source/blender/render/hydra/render_task_delegate.cc b/source/blender/render/hydra/render_task_delegate.cc index fc42ec90f18..d2450aa68f7 100644 --- a/source/blender/render/hydra/render_task_delegate.cc +++ b/source/blender/render/hydra/render_task_delegate.cc @@ -6,7 +6,7 @@ #include -#include "GPU_context.h" +#include "GPU_context.hh" #include #include diff --git a/source/blender/render/hydra/render_task_delegate.hh b/source/blender/render/hydra/render_task_delegate.hh index 837dcb217fd..884356913d3 100644 --- a/source/blender/render/hydra/render_task_delegate.hh +++ b/source/blender/render/hydra/render_task_delegate.hh @@ -7,8 +7,8 @@ #include #include -#include "GPU_framebuffer.h" -#include "GPU_texture.h" +#include "GPU_framebuffer.hh" +#include "GPU_texture.hh" namespace blender::render::hydra { diff --git a/source/blender/render/hydra/viewport_engine.cc b/source/blender/render/hydra/viewport_engine.cc index 180fe054b8c..038179b44db 100644 --- a/source/blender/render/hydra/viewport_engine.cc +++ b/source/blender/render/hydra/viewport_engine.cc @@ -21,7 +21,7 @@ #include "BKE_camera.h" #include "BKE_context.hh" -#include "GPU_matrix.h" +#include "GPU_matrix.hh" #include "RE_engine.h" diff --git a/source/blender/render/hydra/viewport_engine.hh b/source/blender/render/hydra/viewport_engine.hh index 368a6339492..70dffa22800 100644 --- a/source/blender/render/hydra/viewport_engine.hh +++ b/source/blender/render/hydra/viewport_engine.hh @@ -6,9 +6,9 @@ #include -#include "GPU_batch.h" -#include "GPU_shader.h" -#include "GPU_texture.h" +#include "GPU_batch.hh" +#include "GPU_shader.hh" +#include "GPU_texture.hh" #include "engine.hh" diff --git a/source/blender/render/intern/compositor.cc b/source/blender/render/intern/compositor.cc index 662b6082112..13cf34617f3 100644 --- a/source/blender/render/intern/compositor.cc +++ b/source/blender/render/intern/compositor.cc @@ -35,7 +35,7 @@ #include "WM_api.hh" -#include "GPU_context.h" +#include "GPU_context.hh" #include "render_types.h" diff --git a/source/blender/render/intern/engine.cc b/source/blender/render/intern/engine.cc index 9756d081867..5c68fc0ee98 100644 --- a/source/blender/render/intern/engine.cc +++ b/source/blender/render/intern/engine.cc @@ -30,7 +30,7 @@ #include "DEG_depsgraph_debug.hh" #include "DEG_depsgraph_query.hh" -#include "GPU_context.h" +#include "GPU_context.hh" #ifdef WITH_PYTHON # include "BPY_extern.h" diff --git a/source/blender/render/intern/pipeline.cc b/source/blender/render/intern/pipeline.cc index 4e8bdb59328..eca30156585 100644 --- a/source/blender/render/intern/pipeline.cc +++ b/source/blender/render/intern/pipeline.cc @@ -83,8 +83,8 @@ #include "SEQ_relations.hh" #include "SEQ_render.hh" -#include "GPU_capabilities.h" -#include "GPU_context.h" +#include "GPU_capabilities.hh" +#include "GPU_context.hh" #include "WM_api.hh" #include "wm_window.hh" diff --git a/source/blender/render/intern/render_result.cc b/source/blender/render/intern/render_result.cc index 69ab8ff1b23..735b7a89971 100644 --- a/source/blender/render/intern/render_result.cc +++ b/source/blender/render/intern/render_result.cc @@ -36,7 +36,7 @@ #include "IMB_imbuf_types.hh" #include "IMB_openexr.hh" -#include "GPU_texture.h" +#include "GPU_texture.hh" #include "render_result.h" #include "render_types.h" diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc b/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc index 460d1b58420..11aa46b0678 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc @@ -13,7 +13,7 @@ #include "BKE_context.hh" -#include "GPU_batch.h" +#include "GPU_batch.hh" #include "RNA_access.hh" #include "RNA_define.hh" diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc index f49c6acafb2..d550beaf10a 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc @@ -24,12 +24,12 @@ #include "ED_select_utils.hh" #include "ED_view3d.hh" -#include "GPU_framebuffer.h" -#include "GPU_matrix.h" -#include "GPU_platform.h" +#include "GPU_framebuffer.hh" +#include "GPU_matrix.hh" +#include "GPU_platform.hh" #include "GPU_select.hh" -#include "GPU_state.h" -#include "GPU_viewport.h" +#include "GPU_state.hh" +#include "GPU_viewport.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/windowmanager/intern/wm_dragdrop.cc b/source/blender/windowmanager/intern/wm_dragdrop.cc index d3aa91000e2..deb548980d2 100644 --- a/source/blender/windowmanager/intern/wm_dragdrop.cc +++ b/source/blender/windowmanager/intern/wm_dragdrop.cc @@ -43,9 +43,9 @@ #include "ED_fileselect.hh" #include "ED_screen.hh" -#include "GPU_shader.h" -#include "GPU_state.h" -#include "GPU_viewport.h" +#include "GPU_shader.hh" +#include "GPU_state.hh" +#include "GPU_viewport.hh" #include "IMB_imbuf_types.hh" diff --git a/source/blender/windowmanager/intern/wm_draw.cc b/source/blender/windowmanager/intern/wm_draw.cc index 1311dd56148..4e84d94dfac 100644 --- a/source/blender/windowmanager/intern/wm_draw.cc +++ b/source/blender/windowmanager/intern/wm_draw.cc @@ -36,16 +36,16 @@ #include "ED_screen.hh" #include "ED_view3d.hh" -#include "GPU_batch_presets.h" -#include "GPU_capabilities.h" -#include "GPU_context.h" -#include "GPU_debug.h" -#include "GPU_framebuffer.h" -#include "GPU_immediate.h" -#include "GPU_matrix.h" -#include "GPU_state.h" -#include "GPU_texture.h" -#include "GPU_viewport.h" +#include "GPU_batch_presets.hh" +#include "GPU_capabilities.hh" +#include "GPU_context.hh" +#include "GPU_debug.hh" +#include "GPU_framebuffer.hh" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" +#include "GPU_texture.hh" +#include "GPU_viewport.hh" #include "RE_engine.h" diff --git a/source/blender/windowmanager/intern/wm_event_system.cc b/source/blender/windowmanager/intern/wm_event_system.cc index 61e666b9d3f..d8549c5e89d 100644 --- a/source/blender/windowmanager/intern/wm_event_system.cc +++ b/source/blender/windowmanager/intern/wm_event_system.cc @@ -59,7 +59,7 @@ #include "ED_util.hh" #include "ED_view3d.hh" -#include "GPU_context.h" +#include "GPU_context.hh" #include "RNA_access.hh" diff --git a/source/blender/windowmanager/intern/wm_files.cc b/source/blender/windowmanager/intern/wm_files.cc index f18d540366a..bde6e876358 100644 --- a/source/blender/windowmanager/intern/wm_files.cc +++ b/source/blender/windowmanager/intern/wm_files.cc @@ -109,7 +109,7 @@ #include "GHOST_C-api.h" #include "GHOST_Path-api.hh" -#include "GPU_context.h" +#include "GPU_context.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/windowmanager/intern/wm_gesture.cc b/source/blender/windowmanager/intern/wm_gesture.cc index 568d89c4bf5..251bf1352d2 100644 --- a/source/blender/windowmanager/intern/wm_gesture.cc +++ b/source/blender/windowmanager/intern/wm_gesture.cc @@ -25,9 +25,9 @@ #include "wm.hh" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_state.hh" #include "BIF_glutil.hh" diff --git a/source/blender/windowmanager/intern/wm_init_exit.cc b/source/blender/windowmanager/intern/wm_init_exit.cc index 2effd446388..64cdad7bfa8 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.cc +++ b/source/blender/windowmanager/intern/wm_init_exit.cc @@ -102,8 +102,8 @@ #include "UI_resources.hh" #include "UI_string_search.hh" -#include "GPU_context.h" -#include "GPU_init_exit.h" +#include "GPU_context.hh" +#include "GPU_init_exit.hh" #include "GPU_material.hh" #include "COM_compositor.hh" diff --git a/source/blender/windowmanager/intern/wm_operators.cc b/source/blender/windowmanager/intern/wm_operators.cc index 537ccfc43e5..73f449655c6 100644 --- a/source/blender/windowmanager/intern/wm_operators.cc +++ b/source/blender/windowmanager/intern/wm_operators.cc @@ -70,10 +70,10 @@ #include "BLF_api.hh" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "IMB_imbuf_types.hh" diff --git a/source/blender/windowmanager/intern/wm_platform_support.cc b/source/blender/windowmanager/intern/wm_platform_support.cc index c341e6f8230..2bfafd6d611 100644 --- a/source/blender/windowmanager/intern/wm_platform_support.cc +++ b/source/blender/windowmanager/intern/wm_platform_support.cc @@ -21,7 +21,7 @@ #include "BKE_appdir.hh" #include "BKE_global.hh" -#include "GPU_platform.h" +#include "GPU_platform.hh" #define WM_PLATFORM_SUPPORT_TEXT_SIZE 1024 diff --git a/source/blender/windowmanager/intern/wm_playanim.cc b/source/blender/windowmanager/intern/wm_playanim.cc index 1e0396378e7..fc51d8793c8 100644 --- a/source/blender/windowmanager/intern/wm_playanim.cc +++ b/source/blender/windowmanager/intern/wm_playanim.cc @@ -48,13 +48,13 @@ #include "BIF_glutil.hh" -#include "GPU_context.h" -#include "GPU_framebuffer.h" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_init_exit.h" -#include "GPU_matrix.h" -#include "GPU_state.h" +#include "GPU_context.hh" +#include "GPU_framebuffer.hh" +#include "GPU_immediate.hh" +#include "GPU_immediate_util.hh" +#include "GPU_init_exit.hh" +#include "GPU_matrix.hh" +#include "GPU_state.hh" #include "BLF_api.hh" #include "DNA_scene_types.h" diff --git a/source/blender/windowmanager/intern/wm_stereo.cc b/source/blender/windowmanager/intern/wm_stereo.cc index 4ca44b0f68f..486ecde11c5 100644 --- a/source/blender/windowmanager/intern/wm_stereo.cc +++ b/source/blender/windowmanager/intern/wm_stereo.cc @@ -28,10 +28,10 @@ #include "ED_screen.hh" -#include "GPU_capabilities.h" -#include "GPU_immediate.h" -#include "GPU_texture.h" -#include "GPU_viewport.h" +#include "GPU_capabilities.hh" +#include "GPU_immediate.hh" +#include "GPU_texture.hh" +#include "GPU_viewport.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/windowmanager/intern/wm_subwindow.cc b/source/blender/windowmanager/intern/wm_subwindow.cc index 48b2e638ce2..c5e218df0e5 100644 --- a/source/blender/windowmanager/intern/wm_subwindow.cc +++ b/source/blender/windowmanager/intern/wm_subwindow.cc @@ -15,8 +15,8 @@ #include "DNA_screen_types.h" #include "DNA_windowmanager_types.h" -#include "GPU_matrix.h" -#include "GPU_viewport.h" +#include "GPU_matrix.hh" +#include "GPU_viewport.hh" #include "WM_api.hh" diff --git a/source/blender/windowmanager/intern/wm_surface.cc b/source/blender/windowmanager/intern/wm_surface.cc index ac56a682b8f..2018d7d7328 100644 --- a/source/blender/windowmanager/intern/wm_surface.cc +++ b/source/blender/windowmanager/intern/wm_surface.cc @@ -13,8 +13,8 @@ #include "GHOST_C-api.h" -#include "GPU_context.h" -#include "GPU_framebuffer.h" +#include "GPU_context.hh" +#include "GPU_framebuffer.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/windowmanager/intern/wm_window.cc b/source/blender/windowmanager/intern/wm_window.cc index ba744ea3cc9..20e9c6676e8 100644 --- a/source/blender/windowmanager/intern/wm_window.cc +++ b/source/blender/windowmanager/intern/wm_window.cc @@ -73,15 +73,15 @@ #include "UI_interface_icons.hh" #include "BLF_api.hh" -#include "GPU_batch.h" -#include "GPU_batch_presets.h" -#include "GPU_context.h" -#include "GPU_framebuffer.h" -#include "GPU_immediate.h" -#include "GPU_init_exit.h" -#include "GPU_platform.h" -#include "GPU_state.h" -#include "GPU_texture.h" +#include "GPU_batch.hh" +#include "GPU_batch_presets.hh" +#include "GPU_context.hh" +#include "GPU_framebuffer.hh" +#include "GPU_immediate.hh" +#include "GPU_init_exit.hh" +#include "GPU_platform.hh" +#include "GPU_state.hh" +#include "GPU_texture.hh" #include "UI_resources.hh" diff --git a/source/blender/windowmanager/intern/wm_window_private.hh b/source/blender/windowmanager/intern/wm_window_private.hh index 7bf2770defe..6e9c01ed752 100644 --- a/source/blender/windowmanager/intern/wm_window_private.hh +++ b/source/blender/windowmanager/intern/wm_window_private.hh @@ -11,7 +11,7 @@ #include "GHOST_Types.h" -#include "GPU_context.h" +#include "GPU_context.hh" struct bContext; diff --git a/source/blender/windowmanager/xr/intern/wm_xr.cc b/source/blender/windowmanager/xr/intern/wm_xr.cc index e6289f5e813..bb2d8de4387 100644 --- a/source/blender/windowmanager/xr/intern/wm_xr.cc +++ b/source/blender/windowmanager/xr/intern/wm_xr.cc @@ -23,7 +23,7 @@ #include "GHOST_C-api.h" #ifdef WIN32 -# include "GPU_platform.h" +# include "GPU_platform.hh" #endif #include "MEM_guardedalloc.h" diff --git a/source/blender/windowmanager/xr/intern/wm_xr_draw.cc b/source/blender/windowmanager/xr/intern/wm_xr_draw.cc index 15653108b46..3a267024255 100644 --- a/source/blender/windowmanager/xr/intern/wm_xr_draw.cc +++ b/source/blender/windowmanager/xr/intern/wm_xr_draw.cc @@ -20,11 +20,11 @@ #include "ED_view3d_offscreen.hh" #include "GHOST_C-api.h" -#include "GPU_batch_presets.h" -#include "GPU_immediate.h" -#include "GPU_matrix.h" +#include "GPU_batch_presets.hh" +#include "GPU_immediate.hh" +#include "GPU_matrix.hh" -#include "GPU_viewport.h" +#include "GPU_viewport.hh" #include "WM_api.hh" diff --git a/source/blender/windowmanager/xr/intern/wm_xr_operators.cc b/source/blender/windowmanager/xr/intern/wm_xr_operators.cc index c37d701b265..04153c3df0d 100644 --- a/source/blender/windowmanager/xr/intern/wm_xr_operators.cc +++ b/source/blender/windowmanager/xr/intern/wm_xr_operators.cc @@ -32,7 +32,7 @@ #include "GHOST_Types.h" -#include "GPU_immediate.h" +#include "GPU_immediate.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/windowmanager/xr/intern/wm_xr_session.cc b/source/blender/windowmanager/xr/intern/wm_xr_session.cc index e67c96897db..8690333e78f 100644 --- a/source/blender/windowmanager/xr/intern/wm_xr_session.cc +++ b/source/blender/windowmanager/xr/intern/wm_xr_session.cc @@ -34,8 +34,8 @@ #include "GHOST_C-api.h" -#include "GPU_batch.h" -#include "GPU_viewport.h" +#include "GPU_batch.hh" +#include "GPU_viewport.hh" #include "MEM_guardedalloc.h" diff --git a/source/creator/creator_args.cc b/source/creator/creator_args.cc index 833ee8be0a6..14ff31181e8 100644 --- a/source/creator/creator_args.cc +++ b/source/creator/creator_args.cc @@ -47,7 +47,7 @@ # include "BKE_scene.hh" # include "BKE_sound.h" -# include "GPU_context.h" +# include "GPU_context.hh" # ifdef WITH_PYTHON # include "BPY_extern_python.h"