fclem/blender
2
1
Fork 0
forked from blender/blender
Code Pull Requests 1 Activity

GPU: Shader Create Info GLSL-C++ stubs #3

Closed
Clément Foucault wants to merge 90 commits from create-info-cpp-macros into glsl-include
pull from: create-info-cpp-macros
merge into: fclem:glsl-include

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 90 Files Changed 158 +5 -5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fcad801b87 - Show all commits

10
source/blender/gpu/shaders/gpu_glsl_cpp_stubs.hh
View File

@ -815,6 +815,7 @@ void groupMemoryBarrier() {}
#include "draw_hair_refine_info.hh" #include "draw_hair_refine_info.hh"
#include "draw_object_infos_info.hh" #include "draw_object_infos_info.hh"
#include "draw_view_info.hh" #include "draw_view_info.hh"
#include "infos/basic_depth_info.hh"
#include "infos/compositor_alpha_crop_info.hh" #include "infos/compositor_alpha_crop_info.hh"
#include "infos/compositor_bilateral_blur_info.hh" #include "infos/compositor_bilateral_blur_info.hh"
#include "infos/compositor_bokeh_blur_info.hh" #include "infos/compositor_bokeh_blur_info.hh"
@ -873,7 +874,6 @@ void groupMemoryBarrier() {}
#include "infos/compositor_van_vliet_gaussian_blur_info.hh" #include "infos/compositor_van_vliet_gaussian_blur_info.hh"
#include "infos/compositor_write_output_info.hh" #include "infos/compositor_write_output_info.hh"
#include "infos/compositor_z_combine_info.hh" #include "infos/compositor_z_combine_info.hh"
// #include "infos/basic_depth_info.hh"
// #include "infos/eevee_ambient_occlusion_info.hh" // #include "infos/eevee_ambient_occlusion_info.hh"
// #include "infos/eevee_deferred_info.hh" // #include "infos/eevee_deferred_info.hh"
// #include "infos/eevee_depth_of_field_info.hh" // #include "infos/eevee_depth_of_field_info.hh"
@ -891,9 +891,9 @@ void groupMemoryBarrier() {}
// #include "infos/eevee_tracing_info.hh" // #include "infos/eevee_tracing_info.hh"
// #include "infos/eevee_velocity_info.hh" // #include "infos/eevee_velocity_info.hh"
// #include "infos/eevee_volume_info.hh" // #include "infos/eevee_volume_info.hh"
// #include "infos/engine_image_info.hh" #include "infos/engine_image_info.hh"
// #include "infos/gpencil_info.hh" #include "infos/gpencil_info.hh"
// #include "infos/gpencil_vfx_info.hh" #include "infos/gpencil_vfx_info.hh"
#include "infos/gpu_clip_planes_info.hh" #include "infos/gpu_clip_planes_info.hh"
#include "infos/gpu_index_load_info.hh" #include "infos/gpu_index_load_info.hh"
#include "infos/gpu_shader_2D_area_borders_info.hh" #include "infos/gpu_shader_2D_area_borders_info.hh"
@ -942,7 +942,7 @@ void groupMemoryBarrier() {}
// #include "infos/overlay_viewer_attribute_info.hh" // #include "infos/overlay_viewer_attribute_info.hh"
// #include "infos/overlay_volume_info.hh" // #include "infos/overlay_volume_info.hh"
// #include "infos/overlay_wireframe_info.hh" // #include "infos/overlay_wireframe_info.hh"
// #include "infos/select_id_info.hh" #include "infos/select_id_info.hh"
#include "infos/workbench_composite_info.hh" #include "infos/workbench_composite_info.hh"
#include "infos/workbench_depth_info.hh" #include "infos/workbench_depth_info.hh"
#include "infos/workbench_effect_antialiasing_info.hh" #include "infos/workbench_effect_antialiasing_info.hh"