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 +88 -9
3 changed files with 88 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2888380ffe - Show all commits

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

@ -771,5 +771,90 @@ void groupMemoryBarrier() {}
#include "select_shader_shared.hh"
#include "workbench_shader_shared.h"
/* TODO(fclem): 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. */
/* 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/basic_depth_info.hh"
// #include "infos/eevee_ambient_occlusion_info.hh"
// #include "infos/eevee_deferred_info.hh"
// #include "infos/eevee_depth_of_field_info.hh"
// #include "infos/eevee_film_info.hh"
// #include "infos/eevee_hiz_info.hh"
// #include "infos/eevee_light_culling_info.hh"
// #include "infos/eevee_lightprobe_sphere_info.hh"
// #include "infos/eevee_lightprobe_volume_info.hh"
// #include "infos/eevee_lookdev_info.hh"
// #include "infos/eevee_lut_info.hh"
// #include "infos/eevee_material_info.hh"
// #include "infos/eevee_motion_blur_info.hh"
// #include "infos/eevee_shadow_info.hh"
// #include "infos/eevee_subsurface_info.hh"
// #include "infos/eevee_tracing_info.hh"
// #include "infos/eevee_velocity_info.hh"
// #include "infos/eevee_volume_info.hh"
// #include "infos/engine_image_info.hh"
// #include "infos/gpencil_info.hh"
// #include "infos/gpencil_vfx_info.hh"
// #include "infos/gpu_clip_planes_info.hh"
// #include "infos/gpu_index_load_info.hh"
// #include "infos/gpu_shader_2D_area_borders_info.hh"
// #include "infos/gpu_shader_2D_checker_info.hh"
// #include "infos/gpu_shader_2D_diag_stripes_info.hh"
// #include "infos/gpu_shader_2D_image_desaturate_color_info.hh"
// #include "infos/gpu_shader_2D_image_info.hh"
// #include "infos/gpu_shader_2D_image_overlays_merge_info.hh"
// #include "infos/gpu_shader_2D_image_overlays_stereo_merge_info.hh"
// #include "infos/gpu_shader_2D_image_rect_color_info.hh"
// #include "infos/gpu_shader_2D_image_shuffle_color_info.hh"
// #include "infos/gpu_shader_2D_nodelink_info.hh"
// #include "infos/gpu_shader_2D_point_uniform_size_uniform_color_aa_info.hh"
// #include "infos/gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_info.hh"
// #include "infos/gpu_shader_2D_point_varying_size_varying_color_info.hh"
// #include "infos/gpu_shader_2D_widget_info.hh"
// #include "infos/gpu_shader_3D_depth_only_info.hh"
// #include "infos/gpu_shader_3D_flat_color_info.hh"
// #include "infos/gpu_shader_3D_image_info.hh"
// #include "infos/gpu_shader_3D_point_info.hh"
// #include "infos/gpu_shader_3D_polyline_info.hh"
// #include "infos/gpu_shader_3D_smooth_color_info.hh"
// #include "infos/gpu_shader_3D_uniform_color_info.hh"
// #include "infos/gpu_shader_gpencil_stroke_info.hh"
#include "infos/gpu_shader_icon_info.hh"
// #include "infos/gpu_shader_index_info.hh"
// #include "infos/gpu_shader_instance_varying_color_varying_size_info.hh"
// #include "infos/gpu_shader_keyframe_shape_info.hh"
// #include "infos/gpu_shader_line_dashed_uniform_color_info.hh"
// #include "infos/gpu_shader_print_info.hh"
// #include "infos/gpu_shader_sequencer_info.hh"
// #include "infos/gpu_shader_simple_lighting_info.hh"
// #include "infos/gpu_shader_text_info.hh"
// #include "infos/gpu_srgb_to_framebuffer_space_info.hh"
// #include "infos/overlay_antialiasing_info.hh"
// #include "infos/overlay_armature_info.hh"
// #include "infos/overlay_background_info.hh"
// #include "infos/overlay_edit_mode_info.hh"
// #include "infos/overlay_extra_info.hh"
// #include "infos/overlay_facing_info.hh"
// #include "infos/overlay_grid_info.hh"
// #include "infos/overlay_outline_info.hh"
// #include "infos/overlay_paint_info.hh"
// #include "infos/overlay_sculpt_curves_info.hh"
// #include "infos/overlay_sculpt_info.hh"
// #include "infos/overlay_viewer_attribute_info.hh"
// #include "infos/overlay_volume_info.hh"
// #include "infos/overlay_wireframe_info.hh"
// #include "infos/select_id_info.hh"
// #include "infos/workbench_composite_info.hh"
// #include "infos/workbench_depth_info.hh"
// #include "infos/workbench_effect_antialiasing_info.hh"
// #include "infos/workbench_effect_dof_info.hh"
// #include "infos/workbench_effect_outline_info.hh"
// #include "infos/workbench_prepass_info.hh"
// #include "infos/workbench_shadow_info.hh"
// #include "infos/workbench_transparent_resolve_info.hh"
// #include "infos/workbench_volume_info.hh"

5
source/blender/gpu/shaders/gpu_shader_icon_frag.glsl
View File

@ -10,10 +10,7 @@
* the rounded corner, and the rectangle sides.
*/
/* TODO(fclem): Replace with gpu_glsl_cpp_stubs.hh include. */
#define GLSL_CPP_STUBS
#include "infos/gpu_shader_icon_info.hh"
#include "gpu_glsl_cpp_stubs.hh"
FRAGMENT_SHADER_CREATE_INFO(gpu_shader_icon)

5
source/blender/gpu/shaders/gpu_shader_icon_vert.glsl
View File

@ -7,10 +7,7 @@
* does not need any vertex input (producing less call to immBegin/End)
*/
/* TODO(fclem): Replace with gpu_glsl_cpp_stubs.hh include. */
#define GLSL_CPP_STUBS
#include "infos/gpu_shader_icon_info.hh"
#include "gpu_glsl_cpp_stubs.hh"
VERTEX_SHADER_CREATE_INFO(gpu_shader_icon)