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 9522d41dd5 - Show all commits

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

@ -810,6 +810,11 @@ void groupMemoryBarrier() {}
/* Include all create infos here so that they don't need to be individually included /* Include all create infos here so that they don't need to be individually included
* inside shaders. */ * inside shaders. */
/* TODO(fclem): Enable the ones ported to the macro Create infos. */ /* TODO(fclem): Enable the ones ported to the macro Create infos. */
#include "draw_debug_info.hh"
#include "draw_fullscreen_info.hh"
#include "draw_hair_refine_info.hh"
#include "draw_object_infos_info.hh"
#include "draw_view_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"
@ -868,11 +873,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 "draw_debug_info.hh"
// #include "draw_fullscreen_info.hh"
// #include "draw_hair_refine_info.hh"
// #include "draw_object_infos_info.hh"
// #include "draw_view_info.hh"
// #include "infos/basic_depth_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"