From 0fa36c81d906264c340cecc457656acf673770cb Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 18 Jan 2022 10:25:37 +1100 Subject: Cleanup: quite old-style-declaration warning, strip trailing space --- source/blender/gpu/CMakeLists.txt | 4 ++-- source/blender/gpu/intern/gpu_shader_shared_utils.h | 2 +- source/blender/gpu/shaders/infos/gpu_shader_2D_area_borders_info.hh | 2 +- .../blender/gpu/shaders/infos/gpu_shader_2D_image_rect_color_info.hh | 1 - source/blender/gpu/shaders/infos/gpu_shader_gpencil_stroke_info.hh | 1 - .../infos/gpu_shader_instance_varying_color_varying_size_info.hh | 1 - source/blender/gpu/shaders/infos/gpu_shader_keyframe_shape_info.hh | 1 - source/blender/gpu/shaders/infos/gpu_shader_text_info.hh | 1 - 8 files changed, 4 insertions(+), 9 deletions(-) (limited to 'source/blender/gpu') diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index a525986e1cd..691c131b1c0 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -481,9 +481,9 @@ if(WITH_GPU_SHADER_BUILDER) ${PLATFORM_LINKLIBS} ) target_include_directories(shader_builder PRIVATE ${INC} ${CMAKE_CURRENT_BINARY_DIR}) - + set(BAKED_CREATE_INFOS_FILE ${CMAKE_CURRENT_BINARY_DIR}/shader_baked.hh) - + add_custom_command( OUTPUT ${BAKED_CREATE_INFOS_FILE} diff --git a/source/blender/gpu/intern/gpu_shader_shared_utils.h b/source/blender/gpu/intern/gpu_shader_shared_utils.h index f2e2aab208c..1097547e5ae 100644 --- a/source/blender/gpu/intern/gpu_shader_shared_utils.h +++ b/source/blender/gpu/intern/gpu_shader_shared_utils.h @@ -102,4 +102,4 @@ typedef int bool2[2]; typedef int bool3[2]; typedef int bool4[4]; -#endif \ No newline at end of file +#endif diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_area_borders_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_area_borders_info.hh index 56c30e79e6d..bf746eae9b4 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_2D_area_borders_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_area_borders_info.hh @@ -36,4 +36,4 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_area_borders) .push_constant(25, Type::INT, "cornerLen") .vertex_source("gpu_shader_2D_area_borders_vert.glsl") .fragment_source("gpu_shader_2D_area_borders_frag.glsl") - .do_static_compilation(true); \ No newline at end of file + .do_static_compilation(true); diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_rect_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_rect_color_info.hh index b9b4381eb50..b94556bbb25 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_rect_color_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_rect_color_info.hh @@ -37,4 +37,3 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_image_rect_color) .vertex_source("gpu_shader_2D_image_rect_vert.glsl") .fragment_source("gpu_shader_image_color_frag.glsl") .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 5fb6c61c5f9..5c8410baf04 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 @@ -48,4 +48,3 @@ GPU_SHADER_CREATE_INFO(gpu_shader_gpencil_stroke) .fragment_source("gpu_shader_gpencil_stroke_frag.glsl") .typedef_source("GPU_shader_shared.h") .do_static_compilation(true); - \ No newline at end of file diff --git a/source/blender/gpu/shaders/infos/gpu_shader_instance_varying_color_varying_size_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_instance_varying_color_varying_size_info.hh index 0d2daf7388d..98a1fcf5b37 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_instance_varying_color_varying_size_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_instance_varying_color_varying_size_info.hh @@ -36,4 +36,3 @@ GPU_SHADER_CREATE_INFO(gpu_shader_instance_varying_color_varying_size) .fragment_source("gpu_shader_flat_color_frag.glsl") .additional_info("gpu_srgb_to_framebuffer_space") .do_static_compilation(true); - \ No newline at end of file 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 8e352af6c1f..f8cb94e52d0 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 @@ -44,4 +44,3 @@ GPU_SHADER_CREATE_INFO(gpu_shader_keyframe_shape) .vertex_source("gpu_shader_keyframe_shape_vert.glsl") .fragment_source("gpu_shader_keyframe_shape_frag.glsl") .do_static_compilation(true); - \ No newline at end of file diff --git a/source/blender/gpu/shaders/infos/gpu_shader_text_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_text_info.hh index a115972694e..2c17a494d76 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_text_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_text_info.hh @@ -43,4 +43,3 @@ GPU_SHADER_CREATE_INFO(gpu_shader_text) .fragment_source("gpu_shader_text_frag.glsl") .additional_info("gpu_srgb_to_framebuffer_space") .do_static_compilation(true); - \ No newline at end of file -- cgit v1.2.3