Commit: 6b436b80a45c947d49ab5fbda515fb02877eefd4 Author: Clément Foucault Date: Mon Sep 7 19:35:56 2020 +0200 Branches: master https://developer.blender.org/rB6b436b80a45c947d49ab5fbda515fb02877eefd4
GPU: Rename gpu_extensions to gpu_capabilities This makes more sense as this module has more to it than just GL extensions. =================================================================== M source/blender/blenfont/intern/blf_glyph.c M source/blender/blenkernel/intern/image_gpu.c M source/blender/draw/engines/eevee/eevee_effects.c M source/blender/draw/engines/eevee/eevee_lightcache.c M source/blender/draw/engines/eevee/eevee_lightprobes.c M source/blender/draw/engines/eevee/eevee_occlusion.c M source/blender/draw/engines/eevee/eevee_render.c M source/blender/draw/engines/eevee/eevee_shaders.c M source/blender/draw/engines/eevee/eevee_subsurface.c M source/blender/draw/engines/eevee/eevee_volumes.c M source/blender/draw/engines/workbench/workbench_opaque.c M source/blender/draw/engines/workbench/workbench_transparent.c M source/blender/draw/intern/draw_cache_extract_mesh.c M source/blender/draw/intern/draw_cache_impl_displist.c M source/blender/draw/intern/draw_manager.c M source/blender/draw/intern/draw_manager_exec.c M source/blender/draw/intern/draw_manager_shader.c M source/blender/editors/screen/screen_ops.c M source/blender/editors/sculpt_paint/paint_image_proj.c M source/blender/editors/space_info/info_stats.c M source/blender/gpu/CMakeLists.txt R084 source/blender/gpu/GPU_extensions.h source/blender/gpu/GPU_capabilities.h M source/blender/gpu/intern/gpu_batch.cc R097 source/blender/gpu/intern/gpu_extensions.cc source/blender/gpu/intern/gpu_capabilities.cc R100 source/blender/gpu/intern/gpu_extensions_private.hh source/blender/gpu/intern/gpu_capabilities_private.hh M source/blender/gpu/intern/gpu_codegen.c M source/blender/gpu/intern/gpu_framebuffer.cc M source/blender/gpu/intern/gpu_shader.cc M source/blender/gpu/intern/gpu_shader_builtin.c M source/blender/gpu/intern/gpu_state.cc M source/blender/gpu/intern/gpu_uniform_buffer.cc M source/blender/gpu/opengl/gl_backend.cc M source/blender/gpu/opengl/gl_batch.cc M source/blender/gpu/opengl/gl_drawlist.cc M source/blender/gpu/opengl/gl_framebuffer.cc M source/blender/gpu/opengl/gl_shader.cc M source/blender/gpu/opengl/gl_state.cc M source/blender/gpu/opengl/gl_texture.cc M source/blender/gpu/opengl/gl_uniform_buffer.cc M source/blender/imbuf/intern/util_gpu.c M source/blender/makesrna/intern/rna_render.c M source/blender/makesrna/intern/rna_userdef.c M source/blender/windowmanager/intern/wm_stereo.c =================================================================== diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c index 773d3409905..8e74d5bba7c 100644 --- a/source/blender/blenfont/intern/blf_glyph.c +++ b/source/blender/blenfont/intern/blf_glyph.c @@ -46,7 +46,7 @@ #include "BLF_api.h" -#include "GPU_extensions.h" +#include "GPU_capabilities.h" #include "GPU_immediate.h" #include "blf_internal.h" diff --git a/source/blender/blenkernel/intern/image_gpu.c b/source/blender/blenkernel/intern/image_gpu.c index 083d6c1d973..8b6bd47a0db 100644 --- a/source/blender/blenkernel/intern/image_gpu.c +++ b/source/blender/blenkernel/intern/image_gpu.c @@ -39,7 +39,7 @@ #include "BKE_image.h" #include "BKE_main.h" -#include "GPU_extensions.h" +#include "GPU_capabilities.h" #include "GPU_state.h" #include "GPU_texture.h" diff --git a/source/blender/draw/engines/eevee/eevee_effects.c b/source/blender/draw/engines/eevee/eevee_effects.c index 2bd1a875371..3b2a3cc7c01 100644 --- a/source/blender/draw/engines/eevee/eevee_effects.c +++ b/source/blender/draw/engines/eevee/eevee_effects.c @@ -26,7 +26,7 @@ #include "BKE_global.h" /* for G.debug_value */ -#include "GPU_extensions.h" +#include "GPU_capabilities.h" #include "GPU_platform.h" #include "GPU_state.h" #include "GPU_texture.h" diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.c b/source/blender/draw/engines/eevee/eevee_lightcache.c index 5de161a646b..5a676bf4004 100644 --- a/source/blender/draw/engines/eevee/eevee_lightcache.c +++ b/source/blender/draw/engines/eevee/eevee_lightcache.c @@ -41,8 +41,8 @@ #include "eevee_lightcache.h" #include "eevee_private.h" +#include "GPU_capabilities.h" #include "GPU_context.h" -#include "GPU_extensions.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c index 9f86958cef8..89e61ab939a 100644 --- a/source/blender/draw/engines/eevee/eevee_lightprobes.c +++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c @@ -36,7 +36,7 @@ #include "BKE_object.h" #include "MEM_guardedalloc.h" -#include "GPU_extensions.h" +#include "GPU_capabilities.h" #include "GPU_material.h" #include "GPU_texture.h" #include "GPU_uniform_buffer.h" diff --git a/source/blender/draw/engines/eevee/eevee_occlusion.c b/source/blender/draw/engines/eevee/eevee_occlusion.c index b7b765d9c00..3c684c467a4 100644 --- a/source/blender/draw/engines/eevee/eevee_occlusion.c +++ b/source/blender/draw/engines/eevee/eevee_occlusion.c @@ -32,7 +32,7 @@ #include "eevee_private.h" -#include "GPU_extensions.h" +#include "GPU_capabilities.h" #include "GPU_platform.h" #include "GPU_state.h" diff --git a/source/blender/draw/engines/eevee/eevee_render.c b/source/blender/draw/engines/eevee/eevee_render.c index 2351b06db98..504e4e1d336 100644 --- a/source/blender/draw/engines/eevee/eevee_render.c +++ b/source/blender/draw/engines/eevee/eevee_render.c @@ -38,7 +38,7 @@ #include "DEG_depsgraph_query.h" -#include "GPU_extensions.h" +#include "GPU_capabilities.h" #include "GPU_framebuffer.h" #include "GPU_state.h" diff --git a/source/blender/draw/engines/eevee/eevee_shaders.c b/source/blender/draw/engines/eevee/eevee_shaders.c index bbc5801b0f7..d4b1d421603 100644 --- a/source/blender/draw/engines/eevee/eevee_shaders.c +++ b/source/blender/draw/engines/eevee/eevee_shaders.c @@ -32,7 +32,7 @@ #include "MEM_guardedalloc.h" -#include "GPU_extensions.h" +#include "GPU_capabilities.h" #include "GPU_material.h" #include "GPU_shader.h" diff --git a/source/blender/draw/engines/eevee/eevee_subsurface.c b/source/blender/draw/engines/eevee/eevee_subsurface.c index 58b545be2f5..f9195e5861d 100644 --- a/source/blender/draw/engines/eevee/eevee_subsurface.c +++ b/source/blender/draw/engines/eevee/eevee_subsurface.c @@ -28,7 +28,7 @@ #include "DEG_depsgraph_query.h" -#include "GPU_extensions.h" +#include "GPU_capabilities.h" #include "GPU_material.h" #include "GPU_texture.h" diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c index 85c7c89934c..69b916244b5 100644 --- a/source/blender/draw/engines/eevee/eevee_volumes.c +++ b/source/blender/draw/engines/eevee/eevee_volumes.c @@ -44,7 +44,7 @@ #include "DEG_depsgraph_query.h" -#include "GPU_extensions.h" +#include "GPU_capabilities.h" #include "GPU_material.h" #include "GPU_texture.h" #include "eevee_private.h" diff --git a/source/blender/draw/engines/workbench/workbench_opaque.c b/source/blender/draw/engines/workbench/workbench_opaque.c index 738f4a67471..9fdefed019f 100644 --- a/source/blender/draw/engines/workbench/workbench_opaque.c +++ b/source/blender/draw/engines/workbench/workbench_opaque.c @@ -31,8 +31,6 @@ #include "DRW_render.h" -#include "GPU_extensions.h" - #include "workbench_engine.h" #include "workbench_private.h" diff --git a/source/blender/draw/engines/workbench/workbench_transparent.c b/source/blender/draw/engines/workbench/workbench_transparent.c index 5eff056846c..1c8575ddc12 100644 --- a/source/blender/draw/engines/workbench/workbench_transparent.c +++ b/source/blender/draw/engines/workbench/workbench_transparent.c @@ -35,8 +35,6 @@ #include "ED_view3d.h" -#include "GPU_extensions.h" - #include "workbench_engine.h" #include "workbench_private.h" diff --git a/source/blender/draw/intern/draw_cache_extract_mesh.c b/source/blender/draw/intern/draw_cache_extract_mesh.c index 9f4ae8fbfbf..cb716b3130a 100644 --- a/source/blender/draw/intern/draw_cache_extract_mesh.c +++ b/source/blender/draw/intern/draw_cache_extract_mesh.c @@ -59,7 +59,7 @@ #include "bmesh.h" #include "GPU_batch.h" -#include "GPU_extensions.h" +#include "GPU_capabilities.h" #include "DRW_render.h" diff --git a/source/blender/draw/intern/draw_cache_impl_displist.c b/source/blender/draw/intern/draw_cache_impl_displist.c index 2f7ce54aef4..42e410ad189 100644 --- a/source/blender/draw/intern/draw_cache_impl_displist.c +++ b/source/blender/draw/intern/draw_cache_impl_displist.c @@ -37,7 +37,7 @@ #include "BKE_displist_tangent.h" #include "GPU_batch.h" -#include "GPU_extensions.h" +#include "GPU_capabilities.h" #include "draw_cache_inline.h" diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 49780f59db3..8d69ed05fc6 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -64,7 +64,7 @@ #include "ED_space_api.h" #include "ED_view3d.h" -#include "GPU_extensions.h" +#include "GPU_capabilities.h" #include "GPU_framebuffer.h" #include "GPU_immediate.h" #include "GPU_matrix.h" diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c index 58464c0a15a..79d74e1f67d 100644 --- a/source/blender/draw/intern/draw_manager_exec.c +++ b/source/blender/draw/intern/draw_manager_exec.c @@ -29,7 +29,6 @@ #include "BKE_global.h" -#include "GPU_extensions.h" #include "GPU_platform.h" #include "GPU_shader.h" #include "GPU_state.h" diff --git a/source/blender/draw/intern/draw_manager_shader.c b/source/blender/draw/intern/draw_manager_shader.c index 7602bbb39ac..7eeb5a2fb67 100644 --- a/source/blender/draw/intern/draw_manager_shader.c +++ b/source/blender/draw/intern/draw_manager_shader.c @@ -34,7 +34,7 @@ #include "DEG_depsgraph_query.h" -#include "GPU_extensions.h" +#include "GPU_capabilities.h" #include "GPU_material.h" #include "GPU_shader.h" diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 6c3b47db155..b79447273d6 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -89,7 +89,7 @@ #include "UI_resources.h" #include "UI_view2d.h" -#include "GPU_extensions.h" +#include "GPU_capabilities.h" #include "screen_intern.h" /* own module include */ diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 456c1f61cb1..3886b78286b 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -90,7 +90,7 @@ #include "ED_view3d.h" #include "ED_view3d_offscreen.h" -#include "GPU_extensions.h" +#include "GPU_capabilities.h" #include "GPU_init_exit.h" #include "WM_api.h" diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c index 301e88b0904..3650fbdc9f8 100644 --- a/source/blender/editors/space_info/info_stats.c +++ b/source/blender/editors/space_info/info_stats.c @@ -64,7 +64,7 @@ #include "UI_resources.h" -#include "GPU_extensions.h" +#include "GPU_capabilities.h" #define MAX_INFO_NUM_LEN 16 diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 358bd045c2f..6fdd510ad28 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -59,11 +59,11 @@ set(SRC intern/gpu_batch_presets.c intern/gpu_batch_utils.c intern/gpu_buffers.c + intern/gpu_capabilities.cc intern/gpu_codegen.c intern/gpu_context.cc intern/gpu_debug.cc intern/gpu_drawlist.cc - intern/gpu_extensions.cc intern/gpu_framebuffer.cc intern/gpu_immediate.cc intern/gpu_immediate_util.c @@ -107,11 +107,11 @@ set(SRC GPU_batch_presets.h GPU_batch_utils.h GPU_buffers.h + GPU_capabilities.h GPU_common.h GPU_context.h GPU_debug.h GPU_drawlist.h - GPU_extensions.h GPU_framebuffer.h GPU_glew.h GPU_immediate.h @@ -134,10 +134,10 @@ set(SRC intern/gpu_backend.hh intern/gpu_batch_private.hh + intern/gpu_capabilities_private.hh intern/gpu_codegen.h intern/gpu_context_private.hh intern/gpu_drawlist_private.hh - intern/gpu_extensions_private.hh intern/gpu_framebuffer_private.hh intern/gpu_immediate_private.hh intern/gpu_index_buffer_private.hh diff --git a/source/blender/gpu/GPU_extensions.h b/source/blender/gpu/GPU_capabilities.h similarity index 84% rename from source/blender/gpu/GPU_extensions.h rename to source/blender/gpu/GPU_capabilities.h index 357e867 @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
