griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GPU: Shader: Make info files generated

Browse Source 
This is the first step of moving the create infos
back inside shader sources.

All info files are now treated as source files.
However, they are not considered in the include tree
yet. This will come in another following PR.

Each shader source file now generate a `.info` file
containing only the create info declarations.

This renames all info files so that they do not
conflict with their previous versions that were
copied (non-generated).

Pull Request: https://projects.blender.org/blender/blender/pulls/146676
This commit is contained in:
Clément Foucault
2025-09-25 10:57:02 +02:00
committed by Clément Foucault
parent e655243825
commit fe213f80a4
569 changed files with 1195 additions and 764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build_files/cmake/macros.cmake
View File

@@ -1061,6 +1061,7 @@ function(glsl_to_c
get_filename_component(_file_from ${CMAKE_CURRENT_SOURCE_DIR}/${file_from} REALPATH) get_filename_component(_file_from ${CMAKE_CURRENT_SOURCE_DIR}/${file_from} REALPATH)
get_filename_component(_file_tmp ${CMAKE_CURRENT_BINARY_DIR}/${file_from} REALPATH) get_filename_component(_file_tmp ${CMAKE_CURRENT_BINARY_DIR}/${file_from} REALPATH)
get_filename_component(_file_meta ${CMAKE_CURRENT_BINARY_DIR}/${file_from}.hh REALPATH) get_filename_component(_file_meta ${CMAKE_CURRENT_BINARY_DIR}/${file_from}.hh REALPATH)
get_filename_component(_file_info ${CMAKE_CURRENT_BINARY_DIR}/${file_from}.info REALPATH)
get_filename_component(_file_to ${CMAKE_CURRENT_BINARY_DIR}/${file_from}.c REALPATH) get_filename_component(_file_to ${CMAKE_CURRENT_BINARY_DIR}/${file_from}.c REALPATH)
list(APPEND ${list_to_add} ${_file_to}) list(APPEND ${list_to_add} ${_file_to})
@@ -1071,14 +1072,15 @@ function(glsl_to_c
get_filename_component(_file_to_path ${_file_to} PATH) get_filename_component(_file_to_path ${_file_to} PATH)
add_custom_command( add_custom_command(
OUTPUT ${_file_to} ${_file_meta} OUTPUT ${_file_to} ${_file_meta} ${_file_info}
COMMAND "$<TARGET_FILE:glsl_preprocess>" ${_file_from} ${_file_tmp} ${_file_meta} COMMAND "$<TARGET_FILE:glsl_preprocess>" ${_file_from} ${_file_tmp} ${_file_meta} ${_file_info}
COMMAND "$<TARGET_FILE:datatoc>" ${_file_tmp} ${_file_to} COMMAND "$<TARGET_FILE:datatoc>" ${_file_tmp} ${_file_to}
DEPENDS ${_file_from} datatoc glsl_preprocess) DEPENDS ${_file_from} datatoc glsl_preprocess)
set_source_files_properties(${_file_tmp} PROPERTIES GENERATED TRUE) set_source_files_properties(${_file_tmp} PROPERTIES GENERATED TRUE)
set_source_files_properties(${_file_to} PROPERTIES GENERATED TRUE) set_source_files_properties(${_file_to} PROPERTIES GENERATED TRUE)
set_source_files_properties(${_file_meta} PROPERTIES GENERATED TRUE) set_source_files_properties(${_file_meta} PROPERTIES GENERATED TRUE)
set_source_files_properties(${_file_info} PROPERTIES GENERATED TRUE)
endfunction() endfunction()

5
intern/opensubdiv/CMakeLists.txt
View File

@@ -103,11 +103,13 @@ if(WITH_OPENSUBDIV)
set(GLSL_SOURCE_CONTENT "") set(GLSL_SOURCE_CONTENT "")
set(GLSL_METADATA_CONTENT "") set(GLSL_METADATA_CONTENT "")
set(GLSL_INFOS_CONTENT "")
foreach(GLSL_FILE ${GLSL_SRC}) foreach(GLSL_FILE ${GLSL_SRC})
get_filename_component(GLSL_FILE_NAME ${GLSL_FILE} NAME) get_filename_component(GLSL_FILE_NAME ${GLSL_FILE} NAME)
string(REPLACE "." "_" GLSL_FILE_NAME_UNDERSCORES ${GLSL_FILE_NAME}) string(REPLACE "." "_" GLSL_FILE_NAME_UNDERSCORES ${GLSL_FILE_NAME})
string(APPEND GLSL_SOURCE_CONTENT "SHADER_SOURCE\(${GLSL_FILE_NAME_UNDERSCORES}, \"${GLSL_FILE_NAME}\", \"${GLSL_FILE}\"\)\n") string(APPEND GLSL_SOURCE_CONTENT "SHADER_SOURCE\(${GLSL_FILE_NAME_UNDERSCORES}, \"${GLSL_FILE_NAME}\", \"${GLSL_FILE}\"\)\n")
string(APPEND GLSL_METADATA_CONTENT "#include \"${GLSL_FILE}.hh\"\n") string(APPEND GLSL_METADATA_CONTENT "#include \"${GLSL_FILE}.hh\"\n")
string(APPEND GLSL_INFOS_CONTENT "#include \"${GLSL_FILE}.info\"\n")
endforeach() endforeach()
set(glsl_source_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_osd_source_list.h") set(glsl_source_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_osd_source_list.h")
@@ -116,6 +118,9 @@ if(WITH_OPENSUBDIV)
set(glsl_metadata_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_osd_metadata_list.hh") set(glsl_metadata_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_osd_metadata_list.hh")
file(GENERATE OUTPUT ${glsl_metadata_list_file} CONTENT "${GLSL_METADATA_CONTENT}") file(GENERATE OUTPUT ${glsl_metadata_list_file} CONTENT "${GLSL_METADATA_CONTENT}")
list(APPEND SRC ${glsl_metadata_list_file}) list(APPEND SRC ${glsl_metadata_list_file})
set(glsl_infos_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_osd_infos_list.hh")
file(GENERATE OUTPUT ${glsl_infos_list_file} CONTENT "${GLSL_INFOS_CONTENT}")
list(APPEND SRC ${glsl_infos_list_file})
list(APPEND INC ${CMAKE_CURRENT_BINARY_DIR}) list(APPEND INC ${CMAKE_CURRENT_BINARY_DIR})
target_include_directories(bf_osd_shaders PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories(bf_osd_shaders PUBLIC ${CMAKE_CURRENT_BINARY_DIR})

67
source/blender/compositor/CMakeLists.txt
View File

@@ -167,6 +167,68 @@ set(LIB
) )
set(GLSL_SRC set(GLSL_SRC
shaders/infos/compositor_alpha_crop_infos.hh
shaders/infos/compositor_bilateral_blur_infos.hh
shaders/infos/compositor_bokeh_blur_infos.hh
shaders/infos/compositor_bokeh_blur_variable_size_infos.hh
shaders/infos/compositor_bokeh_image_infos.hh
shaders/infos/compositor_box_mask_infos.hh
shaders/infos/compositor_compute_preview_infos.hh
shaders/infos/compositor_convert_infos.hh
shaders/infos/compositor_cryptomatte_infos.hh
shaders/infos/compositor_defocus_infos.hh
shaders/infos/compositor_deriche_gaussian_blur_infos.hh
shaders/infos/compositor_despeckle_infos.hh
shaders/infos/compositor_directional_blur_infos.hh
shaders/infos/compositor_displace_infos.hh
shaders/infos/compositor_double_edge_mask_infos.hh
shaders/infos/compositor_edge_filter_infos.hh
shaders/infos/compositor_ellipse_mask_infos.hh
shaders/infos/compositor_filter_infos.hh
shaders/infos/compositor_flip_infos.hh
shaders/infos/compositor_gamma_correct_infos.hh
shaders/infos/compositor_glare_infos.hh
shaders/infos/compositor_id_mask_infos.hh
shaders/infos/compositor_image_coordinates_infos.hh
shaders/infos/compositor_image_crop_infos.hh
shaders/infos/compositor_inpaint_infos.hh
shaders/infos/compositor_jump_flooding_infos.hh
shaders/infos/compositor_keying_infos.hh
shaders/infos/compositor_keying_screen_infos.hh
shaders/infos/compositor_kuwahara_infos.hh
shaders/infos/compositor_lens_distortion_infos.hh
shaders/infos/compositor_map_uv_infos.hh
shaders/infos/compositor_morphological_blur_infos.hh
shaders/infos/compositor_morphological_distance_feather_infos.hh
shaders/infos/compositor_morphological_distance_infos.hh
shaders/infos/compositor_morphological_distance_threshold_infos.hh
shaders/infos/compositor_morphological_step_infos.hh
shaders/infos/compositor_motion_blur_infos.hh
shaders/infos/compositor_movie_distortion_infos.hh
shaders/infos/compositor_normalize_infos.hh
shaders/infos/compositor_pad_infos.hh
shaders/infos/compositor_parallel_reduction_infos.hh
shaders/infos/compositor_pixelate_infos.hh
shaders/infos/compositor_plane_deform_infos.hh
shaders/infos/compositor_premultiply_alpha_infos.hh
shaders/infos/compositor_read_input_infos.hh
shaders/infos/compositor_realize_on_domain_infos.hh
shaders/infos/compositor_sample_pixel_infos.hh
shaders/infos/compositor_scale_variable_infos.hh
shaders/infos/compositor_smaa_infos.hh
shaders/infos/compositor_split_infos.hh
shaders/infos/compositor_summed_area_table_infos.hh
shaders/infos/compositor_symmetric_blur_infos.hh
shaders/infos/compositor_symmetric_blur_variable_size_infos.hh
shaders/infos/compositor_symmetric_separable_blur_infos.hh
shaders/infos/compositor_symmetric_separable_blur_variable_size_infos.hh
shaders/infos/compositor_tone_map_photoreceptor_infos.hh
shaders/infos/compositor_tone_map_simple_infos.hh
shaders/infos/compositor_translate_wrapped_infos.hh
shaders/infos/compositor_van_vliet_gaussian_blur_infos.hh
shaders/infos/compositor_write_output_infos.hh
shaders/infos/compositor_z_combine_infos.hh
shaders/compositor_alpha_crop.glsl shaders/compositor_alpha_crop.glsl
shaders/compositor_bilateral_blur.glsl shaders/compositor_bilateral_blur.glsl
shaders/compositor_bokeh_blur.glsl shaders/compositor_bokeh_blur.glsl
@@ -325,11 +387,13 @@ list(APPEND LIB
set(GLSL_SOURCE_CONTENT "") set(GLSL_SOURCE_CONTENT "")
set(GLSL_METADATA_CONTENT "") set(GLSL_METADATA_CONTENT "")
set(GLSL_INFOS_CONTENT "")
foreach(GLSL_FILE ${GLSL_SRC}) foreach(GLSL_FILE ${GLSL_SRC})
get_filename_component(GLSL_FILE_NAME ${GLSL_FILE} NAME) get_filename_component(GLSL_FILE_NAME ${GLSL_FILE} NAME)
string(REPLACE "." "_" GLSL_FILE_NAME_UNDERSCORES ${GLSL_FILE_NAME}) string(REPLACE "." "_" GLSL_FILE_NAME_UNDERSCORES ${GLSL_FILE_NAME})
string(APPEND GLSL_SOURCE_CONTENT "SHADER_SOURCE\(${GLSL_FILE_NAME_UNDERSCORES}, \"${GLSL_FILE_NAME}\", \"${GLSL_FILE}\"\)\n") string(APPEND GLSL_SOURCE_CONTENT "SHADER_SOURCE\(${GLSL_FILE_NAME_UNDERSCORES}, \"${GLSL_FILE_NAME}\", \"${GLSL_FILE}\"\)\n")
string(APPEND GLSL_METADATA_CONTENT "#include \"${GLSL_FILE}.hh\"\n") string(APPEND GLSL_METADATA_CONTENT "#include \"${GLSL_FILE}.hh\"\n")
string(APPEND GLSL_INFOS_CONTENT "#include \"${GLSL_FILE}.info\"\n")
endforeach() endforeach()
set(glsl_source_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_compositor_source_list.h") set(glsl_source_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_compositor_source_list.h")
@@ -338,6 +402,9 @@ list(APPEND SRC ${glsl_source_list_file})
set(glsl_metadata_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_compositor_metadata_list.hh") set(glsl_metadata_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_compositor_metadata_list.hh")
file(GENERATE OUTPUT ${glsl_metadata_list_file} CONTENT "${GLSL_METADATA_CONTENT}") file(GENERATE OUTPUT ${glsl_metadata_list_file} CONTENT "${GLSL_METADATA_CONTENT}")
list(APPEND SRC ${glsl_metadata_list_file}) list(APPEND SRC ${glsl_metadata_list_file})
set(glsl_infos_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_compositor_infos_list.hh")
file(GENERATE OUTPUT ${glsl_infos_list_file} CONTENT "${GLSL_INFOS_CONTENT}")
list(APPEND SRC ${glsl_infos_list_file})
list(APPEND INC ${CMAKE_CURRENT_BINARY_DIR}) list(APPEND INC ${CMAKE_CURRENT_BINARY_DIR})
target_include_directories(bf_compositor_shaders PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories(bf_compositor_shaders PUBLIC ${CMAKE_CURRENT_BINARY_DIR})

2
source/blender/compositor/shaders/compositor_parallel_reduction.glsl
View File

@@ -39,7 +39,7 @@
* The shader is generic enough to implement many types of reductions. This is done by using macros * The shader is generic enough to implement many types of reductions. This is done by using macros
* that the developer should define to implement a certain reduction operation. Those include, * that the developer should define to implement a certain reduction operation. Those include,
* TYPE, IDENTITY, INITIALIZE, LOAD, REDUCE, and WRITE. See the implementation below for more * TYPE, IDENTITY, INITIALIZE, LOAD, REDUCE, and WRITE. See the implementation below for more
* information as well as the compositor_parallel_reduction_info.hh for example reductions * information as well as the compositor_parallel_reduction_infos.hh for example reductions
* operations. */ * operations. */
/* Doing the reduction in shared memory is faster, so create a shared array where the whole data /* Doing the reduction in shared memory is faster, so create a shared array where the whole data

0
source/blender/compositor/shaders/infos/compositor_alpha_crop_info.hh → source/blender/compositor/shaders/infos/compositor_alpha_crop_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_bilateral_blur_info.hh → source/blender/compositor/shaders/infos/compositor_bilateral_blur_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_bokeh_blur_info.hh → source/blender/compositor/shaders/infos/compositor_bokeh_blur_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_bokeh_blur_variable_size_info.hh → source/blender/compositor/shaders/infos/compositor_bokeh_blur_variable_size_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_bokeh_image_info.hh → source/blender/compositor/shaders/infos/compositor_bokeh_image_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_box_mask_info.hh → source/blender/compositor/shaders/infos/compositor_box_mask_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_compute_preview_info.hh → source/blender/compositor/shaders/infos/compositor_compute_preview_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_convert_info.hh → source/blender/compositor/shaders/infos/compositor_convert_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_cryptomatte_info.hh → source/blender/compositor/shaders/infos/compositor_cryptomatte_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_defocus_info.hh → source/blender/compositor/shaders/infos/compositor_defocus_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_deriche_gaussian_blur_info.hh → source/blender/compositor/shaders/infos/compositor_deriche_gaussian_blur_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_despeckle_info.hh → source/blender/compositor/shaders/infos/compositor_despeckle_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_directional_blur_info.hh → source/blender/compositor/shaders/infos/compositor_directional_blur_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_displace_info.hh → source/blender/compositor/shaders/infos/compositor_displace_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_double_edge_mask_info.hh → source/blender/compositor/shaders/infos/compositor_double_edge_mask_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_edge_filter_info.hh → source/blender/compositor/shaders/infos/compositor_edge_filter_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_ellipse_mask_info.hh → source/blender/compositor/shaders/infos/compositor_ellipse_mask_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_filter_info.hh → source/blender/compositor/shaders/infos/compositor_filter_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_flip_info.hh → source/blender/compositor/shaders/infos/compositor_flip_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_gamma_correct_info.hh → source/blender/compositor/shaders/infos/compositor_gamma_correct_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_glare_info.hh → source/blender/compositor/shaders/infos/compositor_glare_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_id_mask_info.hh → source/blender/compositor/shaders/infos/compositor_id_mask_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_image_coordinates_info.hh → source/blender/compositor/shaders/infos/compositor_image_coordinates_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_image_crop_info.hh → source/blender/compositor/shaders/infos/compositor_image_crop_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_inpaint_info.hh → source/blender/compositor/shaders/infos/compositor_inpaint_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_jump_flooding_info.hh → source/blender/compositor/shaders/infos/compositor_jump_flooding_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_keying_info.hh → source/blender/compositor/shaders/infos/compositor_keying_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_keying_screen_info.hh → source/blender/compositor/shaders/infos/compositor_keying_screen_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_kuwahara_info.hh → source/blender/compositor/shaders/infos/compositor_kuwahara_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_lens_distortion_info.hh → source/blender/compositor/shaders/infos/compositor_lens_distortion_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_map_uv_info.hh → source/blender/compositor/shaders/infos/compositor_map_uv_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_morphological_blur_info.hh → source/blender/compositor/shaders/infos/compositor_morphological_blur_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_morphological_distance_feather_info.hh → source/blender/compositor/shaders/infos/compositor_morphological_distance_feather_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_morphological_distance_info.hh → source/blender/compositor/shaders/infos/compositor_morphological_distance_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_morphological_distance_threshold_info.hh → source/blender/compositor/shaders/infos/compositor_morphological_distance_threshold_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_morphological_step_info.hh → source/blender/compositor/shaders/infos/compositor_morphological_step_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_motion_blur_info.hh → source/blender/compositor/shaders/infos/compositor_motion_blur_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_movie_distortion_info.hh → source/blender/compositor/shaders/infos/compositor_movie_distortion_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_normalize_info.hh → source/blender/compositor/shaders/infos/compositor_normalize_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_pad_info.hh → source/blender/compositor/shaders/infos/compositor_pad_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_parallel_reduction_info.hh → source/blender/compositor/shaders/infos/compositor_parallel_reduction_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_pixelate_info.hh → source/blender/compositor/shaders/infos/compositor_pixelate_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_plane_deform_info.hh → source/blender/compositor/shaders/infos/compositor_plane_deform_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_premultiply_alpha_info.hh → source/blender/compositor/shaders/infos/compositor_premultiply_alpha_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_read_input_info.hh → source/blender/compositor/shaders/infos/compositor_read_input_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_realize_on_domain_info.hh → source/blender/compositor/shaders/infos/compositor_realize_on_domain_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_sample_pixel_info.hh → source/blender/compositor/shaders/infos/compositor_sample_pixel_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_scale_variable_info.hh → source/blender/compositor/shaders/infos/compositor_scale_variable_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_smaa_info.hh → source/blender/compositor/shaders/infos/compositor_smaa_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_split_info.hh → source/blender/compositor/shaders/infos/compositor_split_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_summed_area_table_info.hh → source/blender/compositor/shaders/infos/compositor_summed_area_table_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_symmetric_blur_info.hh → source/blender/compositor/shaders/infos/compositor_symmetric_blur_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_symmetric_blur_variable_size_info.hh → source/blender/compositor/shaders/infos/compositor_symmetric_blur_variable_size_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_symmetric_separable_blur_info.hh → source/blender/compositor/shaders/infos/compositor_symmetric_separable_blur_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_symmetric_separable_blur_variable_size_info.hh → source/blender/compositor/shaders/infos/compositor_symmetric_separable_blur_variable_size_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_tone_map_photoreceptor_info.hh → source/blender/compositor/shaders/infos/compositor_tone_map_photoreceptor_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_tone_map_simple_info.hh → source/blender/compositor/shaders/infos/compositor_tone_map_simple_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_translate_wrapped_info.hh → source/blender/compositor/shaders/infos/compositor_translate_wrapped_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_van_vliet_gaussian_blur_info.hh → source/blender/compositor/shaders/infos/compositor_van_vliet_gaussian_blur_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_write_output_info.hh → source/blender/compositor/shaders/infos/compositor_write_output_infos.hh
View File

0
source/blender/compositor/shaders/infos/compositor_z_combine_info.hh → source/blender/compositor/shaders/infos/compositor_z_combine_infos.hh
View File

63
source/blender/draw/CMakeLists.txt
View File

@@ -313,6 +313,64 @@ set(LIB
) )
set(GLSL_SRC set(GLSL_SRC
intern/shaders/draw_curves_infos.hh
intern/shaders/draw_debug_infos.hh
intern/shaders/draw_object_infos_infos.hh
intern/shaders/draw_view_infos.hh
intern/shaders/subdiv_infos.hh
engines/eevee/shaders/infos/eevee_ambient_occlusion_infos.hh
engines/eevee/shaders/infos/eevee_common_infos.hh
engines/eevee/shaders/infos/eevee_deferred_infos.hh
engines/eevee/shaders/infos/eevee_depth_of_field_infos.hh
engines/eevee/shaders/infos/eevee_film_infos.hh
engines/eevee/shaders/infos/eevee_hiz_infos.hh
engines/eevee/shaders/infos/eevee_light_culling_infos.hh
engines/eevee/shaders/infos/eevee_lightprobe_sphere_infos.hh
engines/eevee/shaders/infos/eevee_lightprobe_volume_infos.hh
engines/eevee/shaders/infos/eevee_lookdev_infos.hh
engines/eevee/shaders/infos/eevee_lut_infos.hh
engines/eevee/shaders/infos/eevee_material_infos.hh
engines/eevee/shaders/infos/eevee_motion_blur_infos.hh
engines/eevee/shaders/infos/eevee_shadow_infos.hh
engines/eevee/shaders/infos/eevee_subsurface_infos.hh
engines/eevee/shaders/infos/eevee_tracing_infos.hh
engines/eevee/shaders/infos/eevee_velocity_infos.hh
engines/eevee/shaders/infos/eevee_volume_infos.hh
engines/image/shaders/infos/engine_image_infos.hh
engines/gpencil/shaders/infos/gpencil_infos.hh
engines/gpencil/shaders/infos/gpencil_vfx_infos.hh
engines/overlay/shaders/infos/overlay_antialiasing_infos.hh
engines/overlay/shaders/infos/overlay_armature_infos.hh
engines/overlay/shaders/infos/overlay_background_infos.hh
engines/overlay/shaders/infos/overlay_common_infos.hh
engines/overlay/shaders/infos/overlay_edit_mode_infos.hh
engines/overlay/shaders/infos/overlay_extra_infos.hh
engines/overlay/shaders/infos/overlay_facing_infos.hh
engines/overlay/shaders/infos/overlay_grid_infos.hh
engines/overlay/shaders/infos/overlay_outline_infos.hh
engines/overlay/shaders/infos/overlay_paint_infos.hh
engines/overlay/shaders/infos/overlay_sculpt_curves_infos.hh
engines/overlay/shaders/infos/overlay_sculpt_infos.hh
engines/overlay/shaders/infos/overlay_viewer_attribute_infos.hh
engines/overlay/shaders/infos/overlay_volume_infos.hh
engines/overlay/shaders/infos/overlay_wireframe_infos.hh
engines/select/shaders/infos/select_id_infos.hh
engines/workbench/shaders/infos/workbench_composite_infos.hh
engines/workbench/shaders/infos/workbench_depth_infos.hh
engines/workbench/shaders/infos/workbench_effect_antialiasing_infos.hh
engines/workbench/shaders/infos/workbench_effect_dof_infos.hh
engines/workbench/shaders/infos/workbench_effect_outline_infos.hh
engines/workbench/shaders/infos/workbench_prepass_infos.hh
engines/workbench/shaders/infos/workbench_shadow_infos.hh
engines/workbench/shaders/infos/workbench_transparent_resolve_infos.hh
engines/workbench/shaders/infos/workbench_volume_infos.hh
engines/eevee/shaders/eevee_ambient_occlusion_lib.glsl engines/eevee/shaders/eevee_ambient_occlusion_lib.glsl
engines/eevee/shaders/eevee_ambient_occlusion_pass_comp.glsl engines/eevee/shaders/eevee_ambient_occlusion_pass_comp.glsl
engines/eevee/shaders/eevee_attributes_curves_lib.glsl engines/eevee/shaders/eevee_attributes_curves_lib.glsl
@@ -771,11 +829,13 @@ list(APPEND LIB
set(GLSL_SOURCE_CONTENT "") set(GLSL_SOURCE_CONTENT "")
set(GLSL_METADATA_CONTENT "") set(GLSL_METADATA_CONTENT "")
set(GLSL_INFOS_CONTENT "")
foreach(GLSL_FILE ${GLSL_SRC}) foreach(GLSL_FILE ${GLSL_SRC})
get_filename_component(GLSL_FILE_NAME ${GLSL_FILE} NAME) get_filename_component(GLSL_FILE_NAME ${GLSL_FILE} NAME)
string(REPLACE "." "_" GLSL_FILE_NAME_UNDERSCORES ${GLSL_FILE_NAME}) string(REPLACE "." "_" GLSL_FILE_NAME_UNDERSCORES ${GLSL_FILE_NAME})
string(APPEND GLSL_SOURCE_CONTENT "SHADER_SOURCE\(${GLSL_FILE_NAME_UNDERSCORES}, \"${GLSL_FILE_NAME}\", \"${GLSL_FILE}\"\)\n") string(APPEND GLSL_SOURCE_CONTENT "SHADER_SOURCE\(${GLSL_FILE_NAME_UNDERSCORES}, \"${GLSL_FILE_NAME}\", \"${GLSL_FILE}\"\)\n")
string(APPEND GLSL_METADATA_CONTENT "#include \"${GLSL_FILE}.hh\"\n") string(APPEND GLSL_METADATA_CONTENT "#include \"${GLSL_FILE}.hh\"\n")
string(APPEND GLSL_INFOS_CONTENT "#include \"${GLSL_FILE}.info\"\n")
endforeach() endforeach()
set(glsl_source_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_draw_source_list.h") set(glsl_source_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_draw_source_list.h")
@@ -784,6 +844,9 @@ list(APPEND SRC ${glsl_source_list_file})
set(glsl_metadata_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_draw_metadata_list.hh") set(glsl_metadata_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_draw_metadata_list.hh")
file(GENERATE OUTPUT ${glsl_metadata_list_file} CONTENT "${GLSL_METADATA_CONTENT}") file(GENERATE OUTPUT ${glsl_metadata_list_file} CONTENT "${GLSL_METADATA_CONTENT}")
list(APPEND SRC ${glsl_metadata_list_file}) list(APPEND SRC ${glsl_metadata_list_file})
set(glsl_infos_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_draw_infos_list.hh")
file(GENERATE OUTPUT ${glsl_infos_list_file} CONTENT "${GLSL_INFOS_CONTENT}")
list(APPEND SRC ${glsl_infos_list_file})
list(APPEND INC ${CMAKE_CURRENT_BINARY_DIR}) list(APPEND INC ${CMAKE_CURRENT_BINARY_DIR})
target_include_directories(bf_draw_shaders PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories(bf_draw_shaders PUBLIC ${CMAKE_CURRENT_BINARY_DIR})

2
source/blender/draw/engines/eevee/shaders/eevee_ambient_occlusion_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/eevee_common_info.hh" #include "infos/eevee_common_infos.hh"
SHADER_LIBRARY_CREATE_INFO(eevee_global_ubo) SHADER_LIBRARY_CREATE_INFO(eevee_global_ubo)
SHADER_LIBRARY_CREATE_INFO(eevee_hiz_data) SHADER_LIBRARY_CREATE_INFO(eevee_hiz_data)

2
source/blender/draw/engines/eevee/shaders/eevee_ambient_occlusion_pass_comp.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/eevee_ambient_occlusion_info.hh" #include "infos/eevee_ambient_occlusion_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_ambient_occlusion_pass) COMPUTE_SHADER_CREATE_INFO(eevee_ambient_occlusion_pass)

2
source/blender/draw/engines/eevee/shaders/eevee_attributes_curves_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "draw_object_infos_info.hh" #include "draw_object_infos_infos.hh"
#ifdef GPU_LIBRARY_SHADER #ifdef GPU_LIBRARY_SHADER
# define CURVES_SHADER # define CURVES_SHADER

2
source/blender/draw/engines/eevee/shaders/eevee_attributes_mesh_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "draw_object_infos_info.hh" #include "draw_object_infos_infos.hh"
#ifdef GPU_LIBRARY_SHADER #ifdef GPU_LIBRARY_SHADER
SHADER_LIBRARY_CREATE_INFO(draw_modelmat) SHADER_LIBRARY_CREATE_INFO(draw_modelmat)

2
source/blender/draw/engines/eevee/shaders/eevee_attributes_pointcloud_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "draw_object_infos_info.hh" #include "draw_object_infos_infos.hh"
#ifdef GPU_LIBRARY_SHADER #ifdef GPU_LIBRARY_SHADER
# define POINTCLOUD_SHADER # define POINTCLOUD_SHADER

2
source/blender/draw/engines/eevee/shaders/eevee_attributes_volume_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "draw_object_infos_info.hh" #include "draw_object_infos_infos.hh"
#ifdef GPU_LIBRARY_SHADER #ifdef GPU_LIBRARY_SHADER
SHADER_LIBRARY_CREATE_INFO(draw_modelmat) SHADER_LIBRARY_CREATE_INFO(draw_modelmat)

2
source/blender/draw/engines/eevee/shaders/eevee_bxdf_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/eevee_common_info.hh" #include "infos/eevee_common_infos.hh"
/** /**
* BxDF evaluation functions. * BxDF evaluation functions.

2
source/blender/draw/engines/eevee/shaders/eevee_bxdf_microfacet_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/eevee_common_info.hh" #include "infos/eevee_common_infos.hh"
SHADER_LIBRARY_CREATE_INFO(eevee_utility_texture) SHADER_LIBRARY_CREATE_INFO(eevee_utility_texture)

2
source/blender/draw/engines/eevee/shaders/eevee_camera_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/eevee_common_info.hh" #include "infos/eevee_common_infos.hh"
/** /**
* Camera projection / uv functions and utils. * Camera projection / uv functions and utils.

2
source/blender/draw/engines/eevee/shaders/eevee_cryptomatte_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/eevee_film_info.hh" #include "infos/eevee_film_infos.hh"
SHADER_LIBRARY_CREATE_INFO(eevee_film) SHADER_LIBRARY_CREATE_INFO(eevee_film)

2
source/blender/draw/engines/eevee/shaders/eevee_debug_gbuffer_frag.glsl
View File

@@ -7,7 +7,7 @@
* This also fills the different render passes. * This also fills the different render passes.
*/ */
#include "infos/eevee_deferred_info.hh" #include "infos/eevee_deferred_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_debug_gbuffer) FRAGMENT_SHADER_CREATE_INFO(eevee_debug_gbuffer)

2
source/blender/draw/engines/eevee/shaders/eevee_debug_irradiance_grid_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/eevee_lightprobe_volume_info.hh" #include "infos/eevee_lightprobe_volume_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_debug_irradiance_grid) FRAGMENT_SHADER_CREATE_INFO(eevee_debug_irradiance_grid)

2
source/blender/draw/engines/eevee/shaders/eevee_debug_irradiance_grid_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/eevee_lightprobe_volume_info.hh" #include "infos/eevee_lightprobe_volume_infos.hh"
VERTEX_SHADER_CREATE_INFO(eevee_debug_irradiance_grid) VERTEX_SHADER_CREATE_INFO(eevee_debug_irradiance_grid)

2
source/blender/draw/engines/eevee/shaders/eevee_debug_surfels_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/eevee_lightprobe_volume_info.hh" #include "infos/eevee_lightprobe_volume_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_debug_surfels) FRAGMENT_SHADER_CREATE_INFO(eevee_debug_surfels)

2
source/blender/draw/engines/eevee/shaders/eevee_debug_surfels_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/eevee_lightprobe_volume_info.hh" #include "infos/eevee_lightprobe_volume_infos.hh"
VERTEX_SHADER_CREATE_INFO(eevee_debug_surfels) VERTEX_SHADER_CREATE_INFO(eevee_debug_surfels)

2
source/blender/draw/engines/eevee/shaders/eevee_deferred_aov_clear_frag.glsl
View File

@@ -11,7 +11,7 @@
* AOVs for the pixel affected by the next layer using stencil test after the prepass. * AOVs for the pixel affected by the next layer using stencil test after the prepass.
*/ */
#include "infos/eevee_deferred_info.hh" #include "infos/eevee_deferred_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_deferred_aov_clear) FRAGMENT_SHADER_CREATE_INFO(eevee_deferred_aov_clear)

2
source/blender/draw/engines/eevee/shaders/eevee_deferred_capture_frag.glsl
View File

@@ -6,7 +6,7 @@
* Compute light objects lighting contribution using captured Gbuffer data. * Compute light objects lighting contribution using captured Gbuffer data.
*/ */
#include "infos/eevee_deferred_info.hh" #include "infos/eevee_deferred_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_deferred_capture_eval) FRAGMENT_SHADER_CREATE_INFO(eevee_deferred_capture_eval)

2
source/blender/draw/engines/eevee/shaders/eevee_deferred_combine_frag.glsl
View File

@@ -7,7 +7,7 @@
* This also fills the different render passes. * This also fills the different render passes.
*/ */
#include "infos/eevee_deferred_info.hh" #include "infos/eevee_deferred_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_deferred_combine) FRAGMENT_SHADER_CREATE_INFO(eevee_deferred_combine)

2
source/blender/draw/engines/eevee/shaders/eevee_deferred_light_frag.glsl
View File

@@ -6,7 +6,7 @@
* Compute light objects lighting contribution using Gbuffer data. * Compute light objects lighting contribution using Gbuffer data.
*/ */
#include "infos/eevee_deferred_info.hh" #include "infos/eevee_deferred_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_deferred_light) FRAGMENT_SHADER_CREATE_INFO(eevee_deferred_light)

2
source/blender/draw/engines/eevee/shaders/eevee_deferred_planar_frag.glsl
View File

@@ -6,7 +6,7 @@
* Compute light objects lighting contribution using captured Gbuffer data. * Compute light objects lighting contribution using captured Gbuffer data.
*/ */
#include "infos/eevee_deferred_info.hh" #include "infos/eevee_deferred_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_deferred_planar_eval) FRAGMENT_SHADER_CREATE_INFO(eevee_deferred_planar_eval)

2
source/blender/draw/engines/eevee/shaders/eevee_deferred_thickness_amend_frag.glsl
View File

@@ -10,7 +10,7 @@
* - tilemaps_tx * - tilemaps_tx
*/ */
#include "infos/eevee_deferred_info.hh" #include "infos/eevee_deferred_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_deferred_thickness_amend) FRAGMENT_SHADER_CREATE_INFO(eevee_deferred_thickness_amend)

2
source/blender/draw/engines/eevee/shaders/eevee_deferred_tile_classify_frag.glsl
View File

@@ -7,7 +7,7 @@
* lighting complexity. * lighting complexity.
*/ */
#include "infos/eevee_deferred_info.hh" #include "infos/eevee_deferred_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_deferred_tile_classify) FRAGMENT_SHADER_CREATE_INFO(eevee_deferred_tile_classify)

2
source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_accumulator_lib.glsl
View File

@@ -10,7 +10,7 @@
* One is for the half-resolution gather passes and the other one for slight in focus regions. * One is for the half-resolution gather passes and the other one for slight in focus regions.
*/ */
#include "infos/eevee_depth_of_field_info.hh" #include "infos/eevee_depth_of_field_infos.hh"
SHADER_LIBRARY_CREATE_INFO(eevee_depth_of_field_lut) SHADER_LIBRARY_CREATE_INFO(eevee_depth_of_field_lut)
#ifdef GPU_LIBRARY_SHADER #ifdef GPU_LIBRARY_SHADER

2
source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_bokeh_lut_comp.glsl
View File

@@ -10,7 +10,7 @@
* as it is way more complex and expensive to do. * as it is way more complex and expensive to do.
*/ */
#include "infos/eevee_depth_of_field_info.hh" #include "infos/eevee_depth_of_field_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_bokeh_lut) COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_bokeh_lut)

2
source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_downsample_comp.glsl
View File

@@ -9,7 +9,7 @@
* Also does not weight luma for the bilateral weights. * Also does not weight luma for the bilateral weights.
*/ */
#include "infos/eevee_depth_of_field_info.hh" #include "infos/eevee_depth_of_field_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_downsample) COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_downsample)

2
source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_filter_comp.glsl
View File

@@ -9,7 +9,7 @@
* cheaper. * cheaper.
*/ */
#include "infos/eevee_depth_of_field_info.hh" #include "infos/eevee_depth_of_field_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_filter) COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_filter)

2
source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_gather_comp.glsl
View File

@@ -15,7 +15,7 @@
* - Color * Weight, Weight, Occlusion 'CoC' Depth (mean and variance) * - Color * Weight, Weight, Occlusion 'CoC' Depth (mean and variance)
*/ */
#include "infos/eevee_depth_of_field_info.hh" #include "infos/eevee_depth_of_field_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_gather) COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_gather)

2
source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_hole_fill_comp.glsl
View File

@@ -12,7 +12,7 @@
* rotation to ensure maximum coverage. * rotation to ensure maximum coverage.
*/ */
#include "infos/eevee_depth_of_field_info.hh" #include "infos/eevee_depth_of_field_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_hole_fill) COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_hole_fill)

2
source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_lib.glsl
View File

@@ -8,7 +8,7 @@
* Depth of Field utils. * Depth of Field utils.
*/ */
#include "infos/eevee_common_info.hh" #include "infos/eevee_common_infos.hh"
#include "draw_view_lib.glsl" #include "draw_view_lib.glsl"
#include "gpu_shader_math_base_lib.glsl" #include "gpu_shader_math_base_lib.glsl"

2
source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_reduce_comp.glsl
View File

@@ -15,7 +15,7 @@
* - Gather input color (whole mip chain), Scatter rect list, Signed CoC (whole mip chain). * - Gather input color (whole mip chain), Scatter rect list, Signed CoC (whole mip chain).
*/ */
#include "infos/eevee_depth_of_field_info.hh" #include "infos/eevee_depth_of_field_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_reduce) COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_reduce)

2
source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_resolve_comp.glsl
View File

@@ -11,7 +11,7 @@
* in-focus and defocus regions. * in-focus and defocus regions.
*/ */
#include "infos/eevee_depth_of_field_info.hh" #include "infos/eevee_depth_of_field_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_resolve) COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_resolve)

2
source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_scatter_frag.glsl
View File

@@ -9,7 +9,7 @@
* invocations and overdraw. * invocations and overdraw.
*/ */
#include "infos/eevee_depth_of_field_info.hh" #include "infos/eevee_depth_of_field_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_depth_of_field_scatter) FRAGMENT_SHADER_CREATE_INFO(eevee_depth_of_field_scatter)

2
source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_scatter_vert.glsl
View File

@@ -9,7 +9,7 @@
* invocations and overdraw. * invocations and overdraw.
*/ */
#include "infos/eevee_depth_of_field_info.hh" #include "infos/eevee_depth_of_field_infos.hh"
VERTEX_SHADER_CREATE_INFO(eevee_depth_of_field_scatter) VERTEX_SHADER_CREATE_INFO(eevee_depth_of_field_scatter)

2
source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_setup_comp.glsl
View File

@@ -14,7 +14,7 @@
* Half-resolution Color, signed CoC (out_coc.x), and max slight focus abs CoC (out_coc.y). * Half-resolution Color, signed CoC (out_coc.x), and max slight focus abs CoC (out_coc.y).
*/ */
#include "infos/eevee_depth_of_field_info.hh" #include "infos/eevee_depth_of_field_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_setup) COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_setup)

2
source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_stabilize_comp.glsl
View File

@@ -17,7 +17,7 @@
* - Stabilized Color and CoC (half-resolution). * - Stabilized Color and CoC (half-resolution).
*/ */
#include "infos/eevee_depth_of_field_info.hh" #include "infos/eevee_depth_of_field_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_stabilize) COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_stabilize)

2
source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_tiles_dilate_comp.glsl
View File

@@ -10,7 +10,7 @@
* - Separated foreground and background CoC. 1/8th of half-res resolution. So 1/16th of full-res. * - Separated foreground and background CoC. 1/8th of half-res resolution. So 1/16th of full-res.
*/ */
#include "infos/eevee_depth_of_field_info.hh" #include "infos/eevee_depth_of_field_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_tiles_dilate) COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_tiles_dilate)

2
source/blender/draw/engines/eevee/shaders/eevee_depth_of_field_tiles_flatten_comp.glsl
View File

@@ -15,7 +15,7 @@
* - Separated foreground and background CoC. 1/8th of half-res resolution. So 1/16th of full-res. * - Separated foreground and background CoC. 1/8th of half-res resolution. So 1/16th of full-res.
*/ */
#include "infos/eevee_depth_of_field_info.hh" #include "infos/eevee_depth_of_field_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_tiles_flatten) COMPUTE_SHADER_CREATE_INFO(eevee_depth_of_field_tiles_flatten)

2
source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_planar_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/eevee_lightprobe_sphere_info.hh" #include "infos/eevee_lightprobe_sphere_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_display_lightprobe_planar) FRAGMENT_SHADER_CREATE_INFO(eevee_display_lightprobe_planar)

2
source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_planar_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/eevee_lightprobe_sphere_info.hh" #include "infos/eevee_lightprobe_sphere_infos.hh"
VERTEX_SHADER_CREATE_INFO(eevee_display_lightprobe_planar) VERTEX_SHADER_CREATE_INFO(eevee_display_lightprobe_planar)

2
source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_sphere_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/eevee_lightprobe_sphere_info.hh" #include "infos/eevee_lightprobe_sphere_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_display_lightprobe_sphere) FRAGMENT_SHADER_CREATE_INFO(eevee_display_lightprobe_sphere)

2
source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_sphere_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/eevee_lightprobe_sphere_info.hh" #include "infos/eevee_lightprobe_sphere_infos.hh"
VERTEX_SHADER_CREATE_INFO(eevee_display_lightprobe_sphere) VERTEX_SHADER_CREATE_INFO(eevee_display_lightprobe_sphere)

2
source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_volume_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/eevee_lightprobe_volume_info.hh" #include "infos/eevee_lightprobe_volume_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_display_lightprobe_volume) FRAGMENT_SHADER_CREATE_INFO(eevee_display_lightprobe_volume)

2
source/blender/draw/engines/eevee/shaders/eevee_display_lightprobe_volume_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/eevee_lightprobe_volume_info.hh" #include "infos/eevee_lightprobe_volume_infos.hh"
VERTEX_SHADER_CREATE_INFO(eevee_display_lightprobe_volume) VERTEX_SHADER_CREATE_INFO(eevee_display_lightprobe_volume)

2
source/blender/draw/engines/eevee/shaders/eevee_film_comp.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/eevee_film_info.hh" #include "infos/eevee_film_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_film_comp) COMPUTE_SHADER_CREATE_INFO(eevee_film_comp)

2
source/blender/draw/engines/eevee/shaders/eevee_film_copy_frag.glsl
View File

@@ -12,7 +12,7 @@
* Code is duplicated here to ensure that the compiler will pass read/write resource checks. * Code is duplicated here to ensure that the compiler will pass read/write resource checks.
*/ */
#include "infos/eevee_film_info.hh" #include "infos/eevee_film_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_film_copy_frag) FRAGMENT_SHADER_CREATE_INFO(eevee_film_copy_frag)

2
source/blender/draw/engines/eevee/shaders/eevee_film_cryptomatte_post_comp.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/eevee_film_info.hh" #include "infos/eevee_film_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_film_cryptomatte_post) COMPUTE_SHADER_CREATE_INFO(eevee_film_cryptomatte_post)

2
source/blender/draw/engines/eevee/shaders/eevee_film_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/eevee_film_info.hh" #include "infos/eevee_film_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_film_frag) FRAGMENT_SHADER_CREATE_INFO(eevee_film_frag)

2
source/blender/draw/engines/eevee/shaders/eevee_film_lib.glsl
View File

@@ -8,7 +8,7 @@
* Film accumulation utils functions. * Film accumulation utils functions.
*/ */
#include "infos/eevee_film_info.hh" #include "infos/eevee_film_infos.hh"
SHADER_LIBRARY_CREATE_INFO(eevee_film) SHADER_LIBRARY_CREATE_INFO(eevee_film)

2
source/blender/draw/engines/eevee/shaders/eevee_film_pass_convert_comp.glsl
View File

@@ -6,7 +6,7 @@
* output passes covert the entire display extent even when border rendering because that's what * output passes covert the entire display extent even when border rendering because that's what
* the compositor expects, so areas outside of the border are zeroed. */ * the compositor expects, so areas outside of the border are zeroed. */
#include "infos/eevee_film_info.hh" #include "infos/eevee_film_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_film_pass_convert_color) COMPUTE_SHADER_CREATE_INFO(eevee_film_pass_convert_color)

2
source/blender/draw/engines/eevee/shaders/eevee_gbuffer_lib.glsl
View File

@@ -21,7 +21,7 @@
*/ */
#include "gpu_shader_math_vector_reduce_lib.glsl" #include "gpu_shader_math_vector_reduce_lib.glsl"
#include "infos/eevee_common_info.hh" #include "infos/eevee_common_infos.hh"
#include "gpu_shader_codegen_lib.glsl" #include "gpu_shader_codegen_lib.glsl"
#include "gpu_shader_math_vector_lib.glsl" #include "gpu_shader_math_vector_lib.glsl"

2
source/blender/draw/engines/eevee/shaders/eevee_gbuffer_write_lib.glsl
View File

@@ -20,7 +20,7 @@
* without dealing with none-closures. * without dealing with none-closures.
*/ */
#include "infos/eevee_common_info.hh" #include "infos/eevee_common_infos.hh"
#include "eevee_gbuffer_lib.glsl" #include "eevee_gbuffer_lib.glsl"

2
source/blender/draw/engines/eevee/shaders/eevee_geom_curves_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/eevee_material_info.hh" #include "infos/eevee_material_infos.hh"
VERTEX_SHADER_CREATE_INFO(eevee_clip_plane) VERTEX_SHADER_CREATE_INFO(eevee_clip_plane)
VERTEX_SHADER_CREATE_INFO(eevee_geom_curves) VERTEX_SHADER_CREATE_INFO(eevee_geom_curves)

2
source/blender/draw/engines/eevee/shaders/eevee_geom_mesh_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/eevee_material_info.hh" #include "infos/eevee_material_infos.hh"
VERTEX_SHADER_CREATE_INFO(eevee_clip_plane) VERTEX_SHADER_CREATE_INFO(eevee_clip_plane)
VERTEX_SHADER_CREATE_INFO(eevee_geom_mesh) VERTEX_SHADER_CREATE_INFO(eevee_geom_mesh)

2
source/blender/draw/engines/eevee/shaders/eevee_geom_pointcloud_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/eevee_material_info.hh" #include "infos/eevee_material_infos.hh"
VERTEX_SHADER_CREATE_INFO(eevee_clip_plane) VERTEX_SHADER_CREATE_INFO(eevee_clip_plane)
VERTEX_SHADER_CREATE_INFO(eevee_geom_pointcloud) VERTEX_SHADER_CREATE_INFO(eevee_geom_pointcloud)

2
source/blender/draw/engines/eevee/shaders/eevee_geom_volume_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/eevee_material_info.hh" #include "infos/eevee_material_infos.hh"
VERTEX_SHADER_CREATE_INFO(eevee_clip_plane) VERTEX_SHADER_CREATE_INFO(eevee_clip_plane)
VERTEX_SHADER_CREATE_INFO(eevee_geom_volume) VERTEX_SHADER_CREATE_INFO(eevee_geom_volume)

2
source/blender/draw/engines/eevee/shaders/eevee_geom_world_vert.glsl
View File

@@ -6,7 +6,7 @@
* Custom full-screen triangle with placeholders varyings. * Custom full-screen triangle with placeholders varyings.
*/ */
#include "infos/eevee_material_info.hh" #include "infos/eevee_material_infos.hh"
VERTEX_SHADER_CREATE_INFO(eevee_geom_world) VERTEX_SHADER_CREATE_INFO(eevee_geom_world)

2
source/blender/draw/engines/eevee/shaders/eevee_hiz_debug_frag.glsl
View File

@@ -7,7 +7,7 @@
* Output red if above any max pixels, blue otherwise. * Output red if above any max pixels, blue otherwise.
*/ */
#include "infos/eevee_hiz_info.hh" #include "infos/eevee_hiz_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_hiz_debug) FRAGMENT_SHADER_CREATE_INFO(eevee_hiz_debug)

2
source/blender/draw/engines/eevee/shaders/eevee_hiz_update_comp.glsl
View File

@@ -17,7 +17,7 @@
* downsample to max level. * downsample to max level.
*/ */
#include "infos/eevee_hiz_info.hh" #include "infos/eevee_hiz_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_hiz_update) COMPUTE_SHADER_CREATE_INFO(eevee_hiz_update)

2
source/blender/draw/engines/eevee/shaders/eevee_horizon_denoise_comp.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/eevee_tracing_info.hh" #include "infos/eevee_tracing_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_horizon_denoise) COMPUTE_SHADER_CREATE_INFO(eevee_horizon_denoise)

2
source/blender/draw/engines/eevee/shaders/eevee_horizon_resolve_comp.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/eevee_tracing_info.hh" #include "infos/eevee_tracing_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_horizon_resolve) COMPUTE_SHADER_CREATE_INFO(eevee_horizon_resolve)

2
source/blender/draw/engines/eevee/shaders/eevee_horizon_scan_comp.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/eevee_tracing_info.hh" #include "infos/eevee_tracing_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_horizon_scan) COMPUTE_SHADER_CREATE_INFO(eevee_horizon_scan)

2
source/blender/draw/engines/eevee/shaders/eevee_horizon_scan_eval_lib.glsl
View File

@@ -15,7 +15,7 @@
* defined. * defined.
*/ */
#include "infos/eevee_tracing_info.hh" #include "infos/eevee_tracing_infos.hh"
SHADER_LIBRARY_CREATE_INFO(eevee_horizon_scan) SHADER_LIBRARY_CREATE_INFO(eevee_horizon_scan)

2
source/blender/draw/engines/eevee/shaders/eevee_horizon_setup_comp.glsl
View File

@@ -8,7 +8,7 @@
* Dispatched as one thread for each trace resolution pixel. * Dispatched as one thread for each trace resolution pixel.
*/ */
#include "infos/eevee_tracing_info.hh" #include "infos/eevee_tracing_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_horizon_setup) COMPUTE_SHADER_CREATE_INFO(eevee_horizon_setup)

2
source/blender/draw/engines/eevee/shaders/eevee_light_culling_debug_frag.glsl
View File

@@ -8,7 +8,7 @@
* pass is not conservative enough). * pass is not conservative enough).
*/ */
#include "infos/eevee_light_culling_info.hh" #include "infos/eevee_light_culling_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_light_culling_debug) FRAGMENT_SHADER_CREATE_INFO(eevee_light_culling_debug)

2
source/blender/draw/engines/eevee/shaders/eevee_light_culling_select_comp.glsl
View File

@@ -6,7 +6,7 @@
* Select the visible items inside the active view and put them inside the sorting buffer. * Select the visible items inside the active view and put them inside the sorting buffer.
*/ */
#include "infos/eevee_light_culling_info.hh" #include "infos/eevee_light_culling_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_light_culling_select) COMPUTE_SHADER_CREATE_INFO(eevee_light_culling_select)

2
source/blender/draw/engines/eevee/shaders/eevee_light_culling_sort_comp.glsl
View File

@@ -8,7 +8,7 @@
* One thread processes one Light entity. * One thread processes one Light entity.
*/ */
#include "infos/eevee_light_culling_info.hh" #include "infos/eevee_light_culling_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_light_culling_sort) COMPUTE_SHADER_CREATE_INFO(eevee_light_culling_sort)

2
source/blender/draw/engines/eevee/shaders/eevee_light_culling_tile_comp.glsl
View File

@@ -8,7 +8,7 @@
* Dispatch one thread per word. * Dispatch one thread per word.
*/ */
#include "infos/eevee_light_culling_info.hh" #include "infos/eevee_light_culling_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_light_culling_tile) COMPUTE_SHADER_CREATE_INFO(eevee_light_culling_tile)

2
source/blender/draw/engines/eevee/shaders/eevee_light_culling_zbin_comp.glsl
View File

@@ -8,7 +8,7 @@
* For this reason, we only dispatch 1 thread group. * For this reason, we only dispatch 1 thread group.
*/ */
#include "infos/eevee_light_culling_info.hh" #include "infos/eevee_light_culling_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_light_culling_zbin) COMPUTE_SHADER_CREATE_INFO(eevee_light_culling_zbin)

2
source/blender/draw/engines/eevee/shaders/eevee_light_eval_lib.glsl
View File

@@ -15,7 +15,7 @@
* - utility_tx * - utility_tx
*/ */
#include "infos/eevee_common_info.hh" #include "infos/eevee_common_infos.hh"
SHADER_LIBRARY_CREATE_INFO(eevee_light_data) SHADER_LIBRARY_CREATE_INFO(eevee_light_data)

2
source/blender/draw/engines/eevee/shaders/eevee_light_shadow_setup_comp.glsl
View File

@@ -7,7 +7,7 @@
* Dispatched one thread per light. * Dispatched one thread per light.
*/ */
#include "infos/eevee_light_culling_info.hh" #include "infos/eevee_light_culling_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_light_shadow_setup) COMPUTE_SHADER_CREATE_INFO(eevee_light_shadow_setup)

2
source/blender/draw/engines/eevee/shaders/eevee_lightprobe_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/eevee_lightprobe_sphere_info.hh" #include "infos/eevee_lightprobe_sphere_infos.hh"
/* TODO(fclem): Pass the lightprobe_sphere_buf around and avoid relying on interface. /* TODO(fclem): Pass the lightprobe_sphere_buf around and avoid relying on interface.
* Currently in conflict with eevee_lightprobe_volume_load. */ * Currently in conflict with eevee_lightprobe_volume_load. */

2
source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_convolve_comp.glsl
View File

@@ -4,7 +4,7 @@
/* Shader to convert cube-map to octahedral projection. */ /* Shader to convert cube-map to octahedral projection. */
#include "infos/eevee_lightprobe_sphere_info.hh" #include "infos/eevee_lightprobe_sphere_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_lightprobe_sphere_convolve) COMPUTE_SHADER_CREATE_INFO(eevee_lightprobe_sphere_convolve)

2
source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_irradiance_comp.glsl
View File

@@ -5,7 +5,7 @@
/* Sum all spherical harmonic coefficients extracting during remapping to octahedral map. /* Sum all spherical harmonic coefficients extracting during remapping to octahedral map.
* Dispatch only one thread-group that sums. */ * Dispatch only one thread-group that sums. */
#include "infos/eevee_lightprobe_sphere_info.hh" #include "infos/eevee_lightprobe_sphere_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_lightprobe_sphere_irradiance) COMPUTE_SHADER_CREATE_INFO(eevee_lightprobe_sphere_irradiance)

2
source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/eevee_lightprobe_sphere_info.hh" #include "infos/eevee_lightprobe_sphere_infos.hh"
/* TODO(fclem): Pass the lightprobe_sphere_buf around and avoid relying on interface. /* TODO(fclem): Pass the lightprobe_sphere_buf around and avoid relying on interface.
* Currently in conflict with eevee_lightprobe_volume_load. */ * Currently in conflict with eevee_lightprobe_volume_load. */

2
source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_mapping_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/eevee_common_info.hh" #include "infos/eevee_common_infos.hh"
#include "eevee_octahedron_lib.glsl" #include "eevee_octahedron_lib.glsl"
#include "gpu_shader_math_base_lib.glsl" #include "gpu_shader_math_base_lib.glsl"

2
source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_remap_comp.glsl
View File

@@ -4,7 +4,7 @@
/* Shader to convert cube-map to octahedral projection. */ /* Shader to convert cube-map to octahedral projection. */
#include "infos/eevee_lightprobe_sphere_info.hh" #include "infos/eevee_lightprobe_sphere_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_lightprobe_sphere_remap) COMPUTE_SHADER_CREATE_INFO(eevee_lightprobe_sphere_remap)

2
source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_select_comp.glsl
View File

@@ -7,7 +7,7 @@
* irradiance cache from each spherical probe location except for the world probe. * irradiance cache from each spherical probe location except for the world probe.
*/ */
#include "infos/eevee_lightprobe_sphere_info.hh" #include "infos/eevee_lightprobe_sphere_infos.hh"
#ifdef GLSL_CPP_STUBS #ifdef GLSL_CPP_STUBS
# define SPHERE_PROBE_SELECT # define SPHERE_PROBE_SELECT

2
source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_sunlight_comp.glsl
View File

@@ -5,7 +5,7 @@
/* Sum all Suns extracting during remapping to octahedral map. /* Sum all Suns extracting during remapping to octahedral map.
* Dispatch only one thread-group that sums. */ * Dispatch only one thread-group that sums. */
#include "infos/eevee_lightprobe_sphere_info.hh" #include "infos/eevee_lightprobe_sphere_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_lightprobe_sphere_sunlight) COMPUTE_SHADER_CREATE_INFO(eevee_lightprobe_sphere_sunlight)

2
source/blender/draw/engines/eevee/shaders/eevee_lightprobe_volume_bounds_comp.glsl
View File

@@ -9,7 +9,7 @@
* - capture_info_buf * - capture_info_buf
*/ */
#include "infos/eevee_lightprobe_volume_info.hh" #include "infos/eevee_lightprobe_volume_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_lightprobe_volume_bounds) COMPUTE_SHADER_CREATE_INFO(eevee_lightprobe_volume_bounds)

2
source/blender/draw/engines/eevee/shaders/eevee_lightprobe_volume_load_comp.glsl
View File

@@ -9,7 +9,7 @@
* Each thread group will load a brick worth of data and add the needed padding texels. * Each thread group will load a brick worth of data and add the needed padding texels.
*/ */
#include "infos/eevee_lightprobe_volume_info.hh" #include "infos/eevee_lightprobe_volume_infos.hh"
#ifdef GLSL_CPP_STUBS #ifdef GLSL_CPP_STUBS
# define IRRADIANCE_GRID_UPLOAD # define IRRADIANCE_GRID_UPLOAD

2
source/blender/draw/engines/eevee/shaders/eevee_lightprobe_volume_offset_comp.glsl
View File

@@ -10,7 +10,7 @@
* Dispatched as 1 thread per irradiance probe sample. * Dispatched as 1 thread per irradiance probe sample.
*/ */
#include "infos/eevee_lightprobe_volume_info.hh" #include "infos/eevee_lightprobe_volume_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_lightprobe_volume_offset) COMPUTE_SHADER_CREATE_INFO(eevee_lightprobe_volume_offset)

2
source/blender/draw/engines/eevee/shaders/eevee_lightprobe_volume_ray_comp.glsl
View File

@@ -10,7 +10,7 @@
* Dispatched as 1 thread per irradiance probe sample. * Dispatched as 1 thread per irradiance probe sample.
*/ */
#include "infos/eevee_lightprobe_volume_info.hh" #include "infos/eevee_lightprobe_volume_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_lightprobe_volume_ray) COMPUTE_SHADER_CREATE_INFO(eevee_lightprobe_volume_ray)

2
source/blender/draw/engines/eevee/shaders/eevee_lightprobe_volume_world_comp.glsl
View File

@@ -8,7 +8,7 @@
* The whole thread group will load the same data and write a brick worth of data. * The whole thread group will load the same data and write a brick worth of data.
*/ */
#include "infos/eevee_lightprobe_volume_info.hh" #include "infos/eevee_lightprobe_volume_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_lightprobe_volume_world) COMPUTE_SHADER_CREATE_INFO(eevee_lightprobe_volume_world)

2
source/blender/draw/engines/eevee/shaders/eevee_lookdev_display_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/eevee_lookdev_info.hh" #include "infos/eevee_lookdev_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_lookdev_display) FRAGMENT_SHADER_CREATE_INFO(eevee_lookdev_display)

2
source/blender/draw/engines/eevee/shaders/eevee_lookdev_display_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/eevee_lookdev_info.hh" #include "infos/eevee_lookdev_infos.hh"
VERTEX_SHADER_CREATE_INFO(eevee_lookdev_display) VERTEX_SHADER_CREATE_INFO(eevee_lookdev_display)

2
source/blender/draw/engines/eevee/shaders/eevee_ltc_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/eevee_common_info.hh" #include "infos/eevee_common_infos.hh"
/** /**
* Adapted from : * Adapted from :

2
source/blender/draw/engines/eevee/shaders/eevee_lut_comp.glsl
View File

@@ -7,7 +7,7 @@
* the blender executable. This is only used for reference or to update them. * the blender executable. This is only used for reference or to update them.
*/ */
#include "infos/eevee_lut_info.hh" #include "infos/eevee_lut_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_lut) COMPUTE_SHADER_CREATE_INFO(eevee_lut)

2
source/blender/draw/engines/eevee/shaders/eevee_motion_blur_dilate_comp.glsl
View File

@@ -7,7 +7,7 @@
* Outputs the largest intersecting motion vector in the neighborhood. * Outputs the largest intersecting motion vector in the neighborhood.
*/ */
#include "infos/eevee_motion_blur_info.hh" #include "infos/eevee_motion_blur_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_motion_blur_tiles_dilate) COMPUTE_SHADER_CREATE_INFO(eevee_motion_blur_tiles_dilate)

2
source/blender/draw/engines/eevee/shaders/eevee_motion_blur_flatten_comp.glsl
View File

@@ -14,7 +14,7 @@
* Adapted from G3D Innovation Engine implementation. * Adapted from G3D Innovation Engine implementation.
*/ */
#include "infos/eevee_motion_blur_info.hh" #include "infos/eevee_motion_blur_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_motion_blur_tiles_flatten_rgba) COMPUTE_SHADER_CREATE_INFO(eevee_motion_blur_tiles_flatten_rgba)

2
source/blender/draw/engines/eevee/shaders/eevee_motion_blur_gather_comp.glsl
View File

@@ -13,7 +13,7 @@
* by Jorge Jimenez * by Jorge Jimenez
*/ */
#include "infos/eevee_motion_blur_info.hh" #include "infos/eevee_motion_blur_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_motion_blur_gather) COMPUTE_SHADER_CREATE_INFO(eevee_motion_blur_gather)

2
source/blender/draw/engines/eevee/shaders/eevee_motion_blur_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/eevee_common_info.hh" #include "infos/eevee_common_infos.hh"
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/** \name Tile indirection packing /** \name Tile indirection packing

2
source/blender/draw/engines/eevee/shaders/eevee_nodetree_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/eevee_common_info.hh" #include "infos/eevee_common_infos.hh"
SHADER_LIBRARY_CREATE_INFO(eevee_global_ubo) SHADER_LIBRARY_CREATE_INFO(eevee_global_ubo)
SHADER_LIBRARY_CREATE_INFO(eevee_utility_texture) SHADER_LIBRARY_CREATE_INFO(eevee_utility_texture)

2
source/blender/draw/engines/eevee/shaders/eevee_occupancy_convert_frag.glsl
View File

@@ -6,7 +6,7 @@
* Convert hit list to occupancy bit-field for the material pass. * Convert hit list to occupancy bit-field for the material pass.
*/ */
#include "infos/eevee_volume_info.hh" #include "infos/eevee_volume_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_volume_occupancy_convert) FRAGMENT_SHADER_CREATE_INFO(eevee_volume_occupancy_convert)

2
source/blender/draw/engines/eevee/shaders/eevee_ray_denoise_bilateral_comp.glsl
View File

@@ -15,7 +15,7 @@
* https://www.ea.com/seed/news/seed-dd18-presentation-slides-raytracing * https://www.ea.com/seed/news/seed-dd18-presentation-slides-raytracing
*/ */
#include "infos/eevee_tracing_info.hh" #include "infos/eevee_tracing_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_ray_denoise_bilateral) COMPUTE_SHADER_CREATE_INFO(eevee_ray_denoise_bilateral)

2
source/blender/draw/engines/eevee/shaders/eevee_ray_denoise_spatial_comp.glsl
View File

@@ -15,7 +15,7 @@
* https://www.ea.com/seed/news/seed-dd18-presentation-slides-raytracing * https://www.ea.com/seed/news/seed-dd18-presentation-slides-raytracing
*/ */
#include "infos/eevee_tracing_info.hh" #include "infos/eevee_tracing_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_ray_denoise_spatial) COMPUTE_SHADER_CREATE_INFO(eevee_ray_denoise_spatial)

2
source/blender/draw/engines/eevee/shaders/eevee_ray_denoise_temporal_comp.glsl
View File

@@ -15,7 +15,7 @@
* https://www.ea.com/seed/news/seed-dd18-presentation-slides-raytracing * https://www.ea.com/seed/news/seed-dd18-presentation-slides-raytracing
*/ */
#include "infos/eevee_tracing_info.hh" #include "infos/eevee_tracing_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_ray_denoise_temporal) COMPUTE_SHADER_CREATE_INFO(eevee_ray_denoise_temporal)

2
source/blender/draw/engines/eevee/shaders/eevee_ray_generate_comp.glsl
View File

@@ -7,7 +7,7 @@
* by the next pass to trace the rays. * by the next pass to trace the rays.
*/ */
#include "infos/eevee_tracing_info.hh" #include "infos/eevee_tracing_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_ray_generate) COMPUTE_SHADER_CREATE_INFO(eevee_ray_generate)

2
source/blender/draw/engines/eevee/shaders/eevee_ray_tile_classify_comp.glsl
View File

@@ -7,7 +7,7 @@
* This mask is then processed by the compaction phase. * This mask is then processed by the compaction phase.
*/ */
#include "infos/eevee_tracing_info.hh" #include "infos/eevee_tracing_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_ray_tile_classify) COMPUTE_SHADER_CREATE_INFO(eevee_ray_tile_classify)

2
source/blender/draw/engines/eevee/shaders/eevee_ray_tile_compact_comp.glsl
View File

@@ -8,7 +8,7 @@
* Dispatched as one thread for each trace resolution tile. * Dispatched as one thread for each trace resolution tile.
*/ */
#include "infos/eevee_tracing_info.hh" #include "infos/eevee_tracing_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_ray_tile_compact) COMPUTE_SHADER_CREATE_INFO(eevee_ray_tile_compact)

2
source/blender/draw/engines/eevee/shaders/eevee_ray_trace_fallback_comp.glsl
View File

@@ -6,7 +6,7 @@
* Does not use any tracing method. Only rely on local light probes to get the incoming radiance. * Does not use any tracing method. Only rely on local light probes to get the incoming radiance.
*/ */
#include "infos/eevee_tracing_info.hh" #include "infos/eevee_tracing_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_ray_trace_fallback) COMPUTE_SHADER_CREATE_INFO(eevee_ray_trace_fallback)

2
source/blender/draw/engines/eevee/shaders/eevee_ray_trace_planar_comp.glsl
View File

@@ -9,7 +9,7 @@
* are then tagged to avoid re-evaluation by screen trace. * are then tagged to avoid re-evaluation by screen trace.
*/ */
#include "infos/eevee_tracing_info.hh" #include "infos/eevee_tracing_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_ray_trace_planar) COMPUTE_SHADER_CREATE_INFO(eevee_ray_trace_planar)

2
source/blender/draw/engines/eevee/shaders/eevee_ray_trace_screen_comp.glsl
View File

@@ -6,7 +6,7 @@
* Use screen space tracing against depth buffer to find intersection with the scene. * Use screen space tracing against depth buffer to find intersection with the scene.
*/ */
#include "infos/eevee_tracing_info.hh" #include "infos/eevee_tracing_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_ray_trace_screen) COMPUTE_SHADER_CREATE_INFO(eevee_ray_trace_screen)

2
source/blender/draw/engines/eevee/shaders/eevee_renderpass_clear_frag.glsl
View File

@@ -6,7 +6,7 @@
* Clear render passes and background. * Clear render passes and background.
*/ */
#include "infos/eevee_material_info.hh" #include "infos/eevee_material_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_renderpass_clear) FRAGMENT_SHADER_CREATE_INFO(eevee_renderpass_clear)

2
source/blender/draw/engines/eevee/shaders/eevee_renderpass_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/eevee_common_info.hh" #include "infos/eevee_common_infos.hh"
SHADER_LIBRARY_CREATE_INFO(eevee_render_pass_out) SHADER_LIBRARY_CREATE_INFO(eevee_render_pass_out)

2
source/blender/draw/engines/eevee/shaders/eevee_sampling_lib.glsl
View File

@@ -9,7 +9,7 @@
* Also contains some sample mapping functions. * Also contains some sample mapping functions.
*/ */
#include "infos/eevee_common_info.hh" #include "infos/eevee_common_infos.hh"
SHADER_LIBRARY_CREATE_INFO(eevee_sampling_data) SHADER_LIBRARY_CREATE_INFO(eevee_sampling_data)

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_clipmap_clear_comp.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/eevee_shadow_info.hh" #include "infos/eevee_shadow_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_shadow_clipmap_clear) COMPUTE_SHADER_CREATE_INFO(eevee_shadow_clipmap_clear)

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_debug_frag.glsl
View File

@@ -7,7 +7,7 @@
* See eShadowDebug for more information. * See eShadowDebug for more information.
*/ */
#include "infos/eevee_shadow_info.hh" #include "infos/eevee_shadow_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_shadow_debug) FRAGMENT_SHADER_CREATE_INFO(eevee_shadow_debug)

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_page_allocate_comp.glsl
View File

@@ -9,7 +9,7 @@
* Note that allocation can fail, in this case the tile is left with no page. * Note that allocation can fail, in this case the tile is left with no page.
*/ */
#include "infos/eevee_shadow_info.hh" #include "infos/eevee_shadow_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_shadow_page_allocate) COMPUTE_SHADER_CREATE_INFO(eevee_shadow_page_allocate)

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_page_clear_comp.glsl
View File

@@ -8,7 +8,7 @@
* Equivalent to a frame-buffer depth clear but only for pages pushed to the clear_page_buf. * Equivalent to a frame-buffer depth clear but only for pages pushed to the clear_page_buf.
*/ */
#include "infos/eevee_shadow_info.hh" #include "infos/eevee_shadow_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_shadow_page_clear) COMPUTE_SHADER_CREATE_INFO(eevee_shadow_page_clear)

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_page_defrag_comp.glsl
View File

@@ -18,7 +18,7 @@
* `[----xxxxxx------]` * `[----xxxxxx------]`
*/ */
#include "infos/eevee_shadow_info.hh" #include "infos/eevee_shadow_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_shadow_page_defrag) COMPUTE_SHADER_CREATE_INFO(eevee_shadow_page_defrag)

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_page_free_comp.glsl
View File

@@ -10,7 +10,7 @@
* Note that we also count the number of new page allocations needed. * Note that we also count the number of new page allocations needed.
*/ */
#include "infos/eevee_shadow_info.hh" #include "infos/eevee_shadow_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_shadow_page_free) COMPUTE_SHADER_CREATE_INFO(eevee_shadow_page_free)

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_page_mask_comp.glsl
View File

@@ -9,7 +9,7 @@
* views per shadow map). * views per shadow map).
*/ */
#include "infos/eevee_shadow_info.hh" #include "infos/eevee_shadow_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_shadow_page_mask) COMPUTE_SHADER_CREATE_INFO(eevee_shadow_page_mask)

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_page_ops_lib.glsl
View File

@@ -27,7 +27,7 @@
* IMPORTANT: Do not forget to manually store the tile data after doing operations on them. * IMPORTANT: Do not forget to manually store the tile data after doing operations on them.
*/ */
#include "infos/eevee_shadow_info.hh" #include "infos/eevee_shadow_infos.hh"
#ifdef GPU_LIBRARY_SHADER #ifdef GPU_LIBRARY_SHADER
SHADER_LIBRARY_CREATE_INFO(eevee_shadow_page_free) SHADER_LIBRARY_CREATE_INFO(eevee_shadow_page_free)

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_page_tile_frag.glsl
View File

@@ -35,7 +35,7 @@
* belong to shadow pages not being updated in this pass are discarded. * belong to shadow pages not being updated in this pass are discarded.
**/ **/
#include "infos/eevee_shadow_info.hh" #include "infos/eevee_shadow_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_shadow_page_tile_clear) FRAGMENT_SHADER_CREATE_INFO(eevee_shadow_page_tile_clear)

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_page_tile_vert.glsl
View File

@@ -8,7 +8,7 @@
* See fragment shader for more infos. * See fragment shader for more infos.
*/ */
#include "infos/eevee_shadow_info.hh" #include "infos/eevee_shadow_infos.hh"
VERTEX_SHADER_CREATE_INFO(eevee_shadow_page_tile_clear) VERTEX_SHADER_CREATE_INFO(eevee_shadow_page_tile_clear)

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_update_comp.glsl
View File

@@ -11,7 +11,7 @@
* tag the appropriate tiles. * tag the appropriate tiles.
*/ */
#include "infos/eevee_shadow_info.hh" #include "infos/eevee_shadow_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tag_update) COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tag_update)

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_comp.glsl
View File

@@ -10,7 +10,7 @@
* needed. * needed.
*/ */
#include "infos/eevee_shadow_info.hh" #include "infos/eevee_shadow_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tag_usage_opaque) COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tag_usage_opaque)

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_frag.glsl
View File

@@ -10,7 +10,7 @@
* tiles. * tiles.
*/ */
#include "infos/eevee_shadow_info.hh" #include "infos/eevee_shadow_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_shadow_tag_usage_transparent) FRAGMENT_SHADER_CREATE_INFO(eevee_shadow_tag_usage_transparent)

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_lib.glsl
View File

@@ -11,7 +11,7 @@
* This contains the common logic used for tagging shadows for opaque and transparent receivers. * This contains the common logic used for tagging shadows for opaque and transparent receivers.
*/ */
#include "infos/eevee_shadow_info.hh" #include "infos/eevee_shadow_infos.hh"
#ifdef GPU_LIBRARY_SHADER #ifdef GPU_LIBRARY_SHADER
SHADER_LIBRARY_CREATE_INFO(eevee_shadow_tag_usage_surfels) SHADER_LIBRARY_CREATE_INFO(eevee_shadow_tag_usage_surfels)

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_surfels_comp.glsl
View File

@@ -10,7 +10,7 @@
* needed. * needed.
*/ */
#include "infos/eevee_shadow_info.hh" #include "infos/eevee_shadow_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tag_usage_surfels) COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tag_usage_surfels)

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_vert.glsl
View File

@@ -9,7 +9,7 @@
* This renders the bounding boxes for transparent objects in order to tag the correct shadows. * This renders the bounding boxes for transparent objects in order to tag the correct shadows.
*/ */
#include "infos/eevee_shadow_info.hh" #include "infos/eevee_shadow_infos.hh"
VERTEX_SHADER_CREATE_INFO(eevee_shadow_tag_usage_transparent) VERTEX_SHADER_CREATE_INFO(eevee_shadow_tag_usage_transparent)

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_volume_comp.glsl
View File

@@ -9,7 +9,7 @@
* This pass scans all volume froxels and tags tiles needed for shadowing. * This pass scans all volume froxels and tags tiles needed for shadowing.
*/ */
#include "infos/eevee_shadow_info.hh" #include "infos/eevee_shadow_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tag_usage_volume) COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tag_usage_volume)

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_amend_comp.glsl
View File

@@ -15,7 +15,7 @@
* Currently this shader is dispatched with one thread-group for all directional light. * Currently this shader is dispatched with one thread-group for all directional light.
*/ */
#include "infos/eevee_shadow_info.hh" #include "infos/eevee_shadow_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tilemap_amend) COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tilemap_amend)

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_bounds_comp.glsl
View File

@@ -10,7 +10,7 @@
* their range changes. * their range changes.
*/ */
#include "infos/eevee_shadow_info.hh" #include "infos/eevee_shadow_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tilemap_bounds) COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tilemap_bounds)

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_finalize_comp.glsl
View File

@@ -10,7 +10,7 @@
* to use a sampler instead of a SSBO bind. * to use a sampler instead of a SSBO bind.
*/ */
#include "infos/eevee_shadow_info.hh" #include "infos/eevee_shadow_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tilemap_finalize) COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tilemap_finalize)

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_init_comp.glsl
View File

@@ -10,7 +10,7 @@
* Dispatched with one local thread per LOD0 tile and one work-group per tile-map. * Dispatched with one local thread per LOD0 tile and one work-group per tile-map.
*/ */
#include "infos/eevee_shadow_info.hh" #include "infos/eevee_shadow_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tilemap_init) COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tilemap_init)

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/eevee_common_info.hh" #include "infos/eevee_common_infos.hh"
#include "draw_shape_lib.glsl" #include "draw_shape_lib.glsl"
#include "gpu_shader_math_constants_lib.glsl" #include "gpu_shader_math_constants_lib.glsl"

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_tilemap_rendermap_comp.glsl
View File

@@ -8,7 +8,7 @@
* For each shadow view, copy page atlas location to the indirection table before render. * For each shadow view, copy page atlas location to the indirection table before render.
*/ */
#include "infos/eevee_shadow_info.hh" #include "infos/eevee_shadow_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tilemap_rendermap) COMPUTE_SHADER_CREATE_INFO(eevee_shadow_tilemap_rendermap)

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_tracing_lib.glsl
View File

@@ -8,7 +8,7 @@
* Evaluate shadowing using shadow map ray-tracing. * Evaluate shadowing using shadow map ray-tracing.
*/ */
#include "infos/eevee_shadow_info.hh" #include "infos/eevee_shadow_infos.hh"
SHADER_LIBRARY_CREATE_INFO(eevee_global_ubo) SHADER_LIBRARY_CREATE_INFO(eevee_global_ubo)
SHADER_LIBRARY_CREATE_INFO(eevee_shadow_data) SHADER_LIBRARY_CREATE_INFO(eevee_shadow_data)

2
source/blender/draw/engines/eevee/shaders/eevee_shadow_visibility_comp.glsl
View File

@@ -8,7 +8,7 @@
*/ */
/* TODO(fclem): Could reject bounding boxes that are covering only invalid tiles. */ /* TODO(fclem): Could reject bounding boxes that are covering only invalid tiles. */
#include "infos/eevee_shadow_info.hh" #include "infos/eevee_shadow_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_shadow_view_visibility) COMPUTE_SHADER_CREATE_INFO(eevee_shadow_view_visibility)

2
source/blender/draw/engines/eevee/shaders/eevee_subsurface_convolve_comp.glsl
View File

@@ -13,7 +13,7 @@
* we precompute a weight profile texture to be able to support per pixel AND per channel radius. * we precompute a weight profile texture to be able to support per pixel AND per channel radius.
*/ */
#include "infos/eevee_subsurface_info.hh" #include "infos/eevee_subsurface_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_subsurface_convolve) COMPUTE_SHADER_CREATE_INFO(eevee_subsurface_convolve)

2
source/blender/draw/engines/eevee/shaders/eevee_subsurface_lib.glsl
View File

@@ -11,7 +11,7 @@
* - utility_tx * - utility_tx
*/ */
#include "infos/eevee_common_info.hh" #include "infos/eevee_common_infos.hh"
#include "eevee_utility_tx_lib.glsl" #include "eevee_utility_tx_lib.glsl"
#include "gpu_shader_utildefines_lib.glsl" #include "gpu_shader_utildefines_lib.glsl"

2
source/blender/draw/engines/eevee/shaders/eevee_subsurface_setup_comp.glsl
View File

@@ -7,7 +7,7 @@
* processing. * processing.
*/ */
#include "infos/eevee_subsurface_info.hh" #include "infos/eevee_subsurface_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_subsurface_setup) COMPUTE_SHADER_CREATE_INFO(eevee_subsurface_setup)

2
source/blender/draw/engines/eevee/shaders/eevee_surf_capture_frag.glsl
View File

@@ -9,7 +9,7 @@
* into other surface shaders. * into other surface shaders.
*/ */
#include "infos/eevee_material_info.hh" #include "infos/eevee_material_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_geom_mesh) FRAGMENT_SHADER_CREATE_INFO(eevee_geom_mesh)
FRAGMENT_SHADER_CREATE_INFO(eevee_surf_capture) FRAGMENT_SHADER_CREATE_INFO(eevee_surf_capture)

2
source/blender/draw/engines/eevee/shaders/eevee_surf_deferred_frag.glsl
View File

@@ -9,7 +9,7 @@
* Some render-pass are written during this pass. * Some render-pass are written during this pass.
*/ */
#include "infos/eevee_material_info.hh" #include "infos/eevee_material_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_node_tree) FRAGMENT_SHADER_CREATE_INFO(eevee_node_tree)
FRAGMENT_SHADER_CREATE_INFO(eevee_geom_mesh) FRAGMENT_SHADER_CREATE_INFO(eevee_geom_mesh)

2
source/blender/draw/engines/eevee/shaders/eevee_surf_depth_frag.glsl
View File

@@ -6,7 +6,7 @@
* Depth shader that can stochastically discard transparent pixel. * Depth shader that can stochastically discard transparent pixel.
*/ */
#include "infos/eevee_material_info.hh" #include "infos/eevee_material_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_clip_plane) FRAGMENT_SHADER_CREATE_INFO(eevee_clip_plane)
FRAGMENT_SHADER_CREATE_INFO(eevee_geom_mesh) FRAGMENT_SHADER_CREATE_INFO(eevee_geom_mesh)

2
source/blender/draw/engines/eevee/shaders/eevee_surf_forward_frag.glsl
View File

@@ -8,7 +8,7 @@
* This is used by alpha blended materials and materials using Shader to RGB nodes. * This is used by alpha blended materials and materials using Shader to RGB nodes.
*/ */
#include "infos/eevee_material_info.hh" #include "infos/eevee_material_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_geom_mesh) FRAGMENT_SHADER_CREATE_INFO(eevee_geom_mesh)
FRAGMENT_SHADER_CREATE_INFO(eevee_surf_forward) FRAGMENT_SHADER_CREATE_INFO(eevee_surf_forward)

2
source/blender/draw/engines/eevee/shaders/eevee_surf_hybrid_frag.glsl
View File

@@ -9,7 +9,7 @@
* Some render-pass are written during this pass. * Some render-pass are written during this pass.
*/ */
#include "infos/eevee_material_info.hh" #include "infos/eevee_material_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_node_tree) FRAGMENT_SHADER_CREATE_INFO(eevee_node_tree)
FRAGMENT_SHADER_CREATE_INFO(eevee_geom_mesh) FRAGMENT_SHADER_CREATE_INFO(eevee_geom_mesh)

2
source/blender/draw/engines/eevee/shaders/eevee_surf_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/eevee_material_info.hh" #include "infos/eevee_material_infos.hh"
SHADER_LIBRARY_CREATE_INFO(eevee_geom_mesh) SHADER_LIBRARY_CREATE_INFO(eevee_geom_mesh)
SHADER_LIBRARY_CREATE_INFO(eevee_global_ubo) SHADER_LIBRARY_CREATE_INFO(eevee_global_ubo)

2
source/blender/draw/engines/eevee/shaders/eevee_surf_occupancy_frag.glsl
View File

@@ -30,7 +30,7 @@
* *
*/ */
#include "infos/eevee_material_info.hh" #include "infos/eevee_material_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_geom_mesh) FRAGMENT_SHADER_CREATE_INFO(eevee_geom_mesh)
FRAGMENT_SHADER_CREATE_INFO(eevee_surf_occupancy) FRAGMENT_SHADER_CREATE_INFO(eevee_surf_occupancy)

2
source/blender/draw/engines/eevee/shaders/eevee_surf_shadow_frag.glsl
View File

@@ -11,7 +11,7 @@
* the destination texel. * the destination texel.
*/ */
#include "infos/eevee_material_info.hh" #include "infos/eevee_material_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_geom_mesh) FRAGMENT_SHADER_CREATE_INFO(eevee_geom_mesh)
FRAGMENT_SHADER_CREATE_INFO(eevee_surf_shadow_atomic) FRAGMENT_SHADER_CREATE_INFO(eevee_surf_shadow_atomic)

2
source/blender/draw/engines/eevee/shaders/eevee_surf_volume_frag.glsl
View File

@@ -7,7 +7,7 @@
/* Store volumetric properties into the froxel textures. */ /* Store volumetric properties into the froxel textures. */
#include "infos/eevee_material_info.hh" #include "infos/eevee_material_infos.hh"
#ifdef GLSL_CPP_STUBS #ifdef GLSL_CPP_STUBS
# define MAT_VOLUME # define MAT_VOLUME

2
source/blender/draw/engines/eevee/shaders/eevee_surf_world_frag.glsl
View File

@@ -8,7 +8,7 @@
* Outputs shading parameter per pixel using a set of randomized BSDFs. * Outputs shading parameter per pixel using a set of randomized BSDFs.
*/ */
#include "infos/eevee_material_info.hh" #include "infos/eevee_material_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_geom_world) FRAGMENT_SHADER_CREATE_INFO(eevee_geom_world)
FRAGMENT_SHADER_CREATE_INFO(eevee_surf_world) FRAGMENT_SHADER_CREATE_INFO(eevee_surf_world)

2
source/blender/draw/engines/eevee/shaders/eevee_surfel_cluster_build_comp.glsl
View File

@@ -10,7 +10,7 @@
* Dispatch 1 thread per surfel. * Dispatch 1 thread per surfel.
*/ */
#include "infos/eevee_lightprobe_volume_info.hh" #include "infos/eevee_lightprobe_volume_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_surfel_cluster_build) COMPUTE_SHADER_CREATE_INFO(eevee_surfel_cluster_build)

2
source/blender/draw/engines/eevee/shaders/eevee_surfel_light_comp.glsl
View File

@@ -6,7 +6,7 @@
* Apply lights contribution to scene surfel representation. * Apply lights contribution to scene surfel representation.
*/ */
#include "infos/eevee_lightprobe_volume_info.hh" #include "infos/eevee_lightprobe_volume_infos.hh"
#ifdef GLSL_CPP_STUBS #ifdef GLSL_CPP_STUBS
# define LIGHT_ITER_FORCE_NO_CULLING # define LIGHT_ITER_FORCE_NO_CULLING

2
source/blender/draw/engines/eevee/shaders/eevee_surfel_list_build_comp.glsl
View File

@@ -13,7 +13,7 @@
* Dispatch 1 thread per surfel. * Dispatch 1 thread per surfel.
*/ */
#include "infos/eevee_lightprobe_volume_info.hh" #include "infos/eevee_lightprobe_volume_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_surfel_list_build) COMPUTE_SHADER_CREATE_INFO(eevee_surfel_list_build)

2
source/blender/draw/engines/eevee/shaders/eevee_surfel_list_sort_comp.glsl
View File

@@ -12,7 +12,7 @@
* Dispatched as 1 thread per list. * Dispatched as 1 thread per list.
*/ */
#include "infos/eevee_lightprobe_volume_info.hh" #include "infos/eevee_lightprobe_volume_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_surfel_list_sort) COMPUTE_SHADER_CREATE_INFO(eevee_surfel_list_sort)

2
source/blender/draw/engines/eevee/shaders/eevee_surfel_ray_comp.glsl
View File

@@ -11,7 +11,7 @@
* Dispatched as 1 thread per surfel. * Dispatched as 1 thread per surfel.
*/ */
#include "infos/eevee_lightprobe_volume_info.hh" #include "infos/eevee_lightprobe_volume_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_surfel_ray) COMPUTE_SHADER_CREATE_INFO(eevee_surfel_ray)

2
source/blender/draw/engines/eevee/shaders/eevee_utility_tx_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/eevee_common_info.hh" #include "infos/eevee_common_infos.hh"
#include "gpu_shader_compat.hh" #include "gpu_shader_compat.hh"

2
source/blender/draw/engines/eevee/shaders/eevee_velocity_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/eevee_velocity_info.hh" #include "infos/eevee_velocity_infos.hh"
SHADER_LIBRARY_CREATE_INFO(eevee_velocity_camera) SHADER_LIBRARY_CREATE_INFO(eevee_velocity_camera)

2
source/blender/draw/engines/eevee/shaders/eevee_vertex_copy_comp.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/eevee_velocity_info.hh" #include "infos/eevee_velocity_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_vertex_copy) COMPUTE_SHADER_CREATE_INFO(eevee_vertex_copy)

2
source/blender/draw/engines/eevee/shaders/eevee_volume_integration_comp.glsl
View File

@@ -8,7 +8,7 @@
/* Step 3 : Integrate for each froxel the final amount of light /* Step 3 : Integrate for each froxel the final amount of light
* scattered back to the viewer and the amount of transmittance. */ * scattered back to the viewer and the amount of transmittance. */
#include "infos/eevee_volume_info.hh" #include "infos/eevee_volume_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_volume_integration) COMPUTE_SHADER_CREATE_INFO(eevee_volume_integration)

2
source/blender/draw/engines/eevee/shaders/eevee_volume_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/eevee_common_info.hh" #include "infos/eevee_common_infos.hh"
SHADER_LIBRARY_CREATE_INFO(eevee_global_ubo) SHADER_LIBRARY_CREATE_INFO(eevee_global_ubo)

2
source/blender/draw/engines/eevee/shaders/eevee_volume_resolve_frag.glsl
View File

@@ -7,7 +7,7 @@
/* Step 4 : Apply final integration on top of the scene color. */ /* Step 4 : Apply final integration on top of the scene color. */
#include "infos/eevee_volume_info.hh" #include "infos/eevee_volume_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(eevee_volume_resolve) FRAGMENT_SHADER_CREATE_INFO(eevee_volume_resolve)

2
source/blender/draw/engines/eevee/shaders/eevee_volume_scatter_comp.glsl
View File

@@ -8,7 +8,7 @@
/* Step 2 : Evaluate all light scattering for each froxels. /* Step 2 : Evaluate all light scattering for each froxels.
* Also do the temporal reprojection to fight aliasing artifacts. */ * Also do the temporal reprojection to fight aliasing artifacts. */
#include "infos/eevee_volume_info.hh" #include "infos/eevee_volume_infos.hh"
COMPUTE_SHADER_CREATE_INFO(eevee_volume_scatter_with_lights) COMPUTE_SHADER_CREATE_INFO(eevee_volume_scatter_with_lights)

4
source/blender/draw/engines/eevee/shaders/infos/eevee_ambient_occlusion_info.hh → source/blender/draw/engines/eevee/shaders/infos/eevee_ambient_occlusion_infos.hh
View File

@@ -6,8 +6,8 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "eevee_common_info.hh" # include "eevee_common_infos.hh"
# define HORIZON_OCCLUSION # define HORIZON_OCCLUSION
#endif #endif

4
source/blender/draw/engines/eevee/shaders/infos/eevee_common_info.hh
View File

@@ -6,8 +6,8 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_object_infos_info.hh" # include "draw_object_infos_infos.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "eevee_light_shared.hh" # include "eevee_light_shared.hh"
# include "eevee_lightprobe_shared.hh" # include "eevee_lightprobe_shared.hh"
# include "eevee_sampling_shared.hh" # include "eevee_sampling_shared.hh"

173
source/blender/draw/engines/eevee/shaders/infos/eevee_common_infos.hh Normal file
View File

@@ -0,0 +1,173 @@
/* SPDX-FileCopyrightText: 2023 Blender Authors
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#ifdef GPU_SHADER
# pragma once
# include "gpu_shader_compat.hh"
# include "draw_object_infos_infos.hh"
# include "draw_view_infos.hh"
# include "eevee_light_shared.hh"
# include "eevee_lightprobe_shared.hh"
# include "eevee_sampling_shared.hh"
# include "eevee_shadow_shared.hh"
# include "eevee_uniform_shared.hh"
# define EEVEE_SAMPLING_DATA
# define MAT_CLIP_PLANE
# define PLANAR_PROBES
# define MAT_RENDER_PASS_SUPPORT
# define SHADOW_READ_ATOMIC
/* Stub for C++ compilation. */
struct NodeTree {
float crypto_hash;
float _pad0;
float _pad1;
float _pad2;
};
#endif
#include "eevee_defines.hh"
#include "gpu_shader_create_info.hh"
/* -------------------------------------------------------------------- */
/** \name Common
* \{ */
/* Stub for C++ compilation. */
/* TODO(fclem): Use it for actual interface. */
GPU_SHADER_CREATE_INFO(eevee_node_tree)
UNIFORM_BUF(0 /*GPU_NODE_TREE_UBO_SLOT*/, NodeTree, node_tree)
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(eevee_global_ubo)
TYPEDEF_SOURCE("eevee_uniform_shared.hh")
UNIFORM_BUF(UNIFORM_BUF_SLOT, UniformData, uniform_buf)
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(eevee_hiz_data)
SAMPLER(HIZ_TEX_SLOT, sampler2D, hiz_tx)
ADDITIONAL_INFO(eevee_global_ubo)
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(eevee_sampling_data)
DEFINE("EEVEE_SAMPLING_DATA")
TYPEDEF_SOURCE("eevee_defines.hh")
TYPEDEF_SOURCE("eevee_sampling_shared.hh")
STORAGE_BUF(SAMPLING_BUF_SLOT, read, SamplingData, sampling_buf)
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(eevee_utility_texture)
SAMPLER(RBUFS_UTILITY_TEX_SLOT, sampler2DArray, utility_tx)
GPU_SHADER_CREATE_END()
GPU_SHADER_NAMED_INTERFACE_INFO(eevee_clip_plane_iface, clip_interp)
SMOOTH(float, clip_distance)
GPU_SHADER_NAMED_INTERFACE_END(clip_interp)
GPU_SHADER_CREATE_INFO(eevee_clip_plane)
VERTEX_OUT(eevee_clip_plane_iface)
TYPEDEF_SOURCE("eevee_uniform_shared.hh")
UNIFORM_BUF(CLIP_PLANE_BUF, ClipPlaneData, clip_plane)
DEFINE("MAT_CLIP_PLANE")
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(eevee_lightprobe_sphere_data)
DEFINE("SPHERE_PROBE")
TYPEDEF_SOURCE("eevee_lightprobe_shared.hh")
UNIFORM_BUF(SPHERE_PROBE_BUF_SLOT, SphereProbeData, lightprobe_sphere_buf[SPHERE_PROBE_MAX])
SAMPLER(SPHERE_PROBE_TEX_SLOT, sampler2DArray, lightprobe_spheres_tx)
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(eevee_volume_probe_data)
TYPEDEF_SOURCE("eevee_lightprobe_shared.hh")
UNIFORM_BUF(IRRADIANCE_GRID_BUF_SLOT, VolumeProbeData, grids_infos_buf[IRRADIANCE_GRID_MAX])
/* NOTE: Use uint instead of IrradianceBrickPacked because Metal needs to know the exact type.
*/
STORAGE_BUF(IRRADIANCE_BRICK_BUF_SLOT, read, uint, bricks_infos_buf[])
SAMPLER(VOLUME_PROBE_TEX_SLOT, sampler3D, irradiance_atlas_tx)
DEFINE("IRRADIANCE_GRID_SAMPLING")
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(eevee_lightprobe_planar_data)
DEFINE("SPHERE_PROBE")
TYPEDEF_SOURCE("eevee_lightprobe_shared.hh")
UNIFORM_BUF(PLANAR_PROBE_BUF_SLOT, PlanarProbeData, probe_planar_buf[PLANAR_PROBE_MAX])
SAMPLER(PLANAR_PROBE_RADIANCE_TEX_SLOT, sampler2DArray, planar_radiance_tx)
SAMPLER(PLANAR_PROBE_DEPTH_TEX_SLOT, sampler2DArrayDepth, planar_depth_tx)
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(eevee_lightprobe_data)
ADDITIONAL_INFO(eevee_lightprobe_sphere_data)
ADDITIONAL_INFO(eevee_volume_probe_data)
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(eevee_light_data)
TYPEDEF_SOURCE("eevee_light_shared.hh")
STORAGE_BUF(LIGHT_CULL_BUF_SLOT, read, LightCullingData, light_cull_buf)
STORAGE_BUF(LIGHT_BUF_SLOT, read, LightData, light_buf[])
STORAGE_BUF(LIGHT_ZBIN_BUF_SLOT, read, uint, light_zbin_buf[])
STORAGE_BUF(LIGHT_TILE_BUF_SLOT, read, uint, light_tile_buf[])
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(eevee_shadow_data)
TYPEDEF_SOURCE("eevee_shadow_shared.hh")
/* SHADOW_READ_ATOMIC macro indicating shadow functions should use `usampler2DArrayAtomic` as
* the atlas type. */
DEFINE("SHADOW_READ_ATOMIC")
BUILTINS(BuiltinBits::TEXTURE_ATOMIC)
SAMPLER(SHADOW_ATLAS_TEX_SLOT, usampler2DArrayAtomic, shadow_atlas_tx)
SAMPLER(SHADOW_TILEMAPS_TEX_SLOT, usampler2D, shadow_tilemaps_tx)
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(eevee_shadow_data_non_atomic)
TYPEDEF_SOURCE("eevee_shadow_shared.hh")
SAMPLER(SHADOW_ATLAS_TEX_SLOT, usampler2DArray, shadow_atlas_tx)
SAMPLER(SHADOW_TILEMAPS_TEX_SLOT, usampler2D, shadow_tilemaps_tx)
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(eevee_surfel_common)
TYPEDEF_SOURCE("eevee_lightprobe_shared.hh")
STORAGE_BUF(SURFEL_BUF_SLOT, read_write, Surfel, surfel_buf[])
STORAGE_BUF(CAPTURE_BUF_SLOT, read, CaptureInfoData, capture_info_buf)
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(eevee_volume_properties_data)
ADDITIONAL_INFO(eevee_global_ubo)
IMAGE(VOLUME_PROP_SCATTERING_IMG_SLOT, UFLOAT_11_11_10, read, image3D, in_scattering_img)
IMAGE(VOLUME_PROP_EXTINCTION_IMG_SLOT, UFLOAT_11_11_10, read, image3D, in_extinction_img)
IMAGE(VOLUME_PROP_EMISSION_IMG_SLOT, UFLOAT_11_11_10, read, image3D, in_emission_img)
IMAGE(VOLUME_PROP_PHASE_IMG_SLOT, SFLOAT_16, read, image3D, in_phase_img)
IMAGE(VOLUME_PROP_PHASE_WEIGHT_IMG_SLOT, SFLOAT_16, read, image3D, in_phase_weight_img)
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(eevee_gbuffer_data)
DEFINE("GBUFFER_LOAD")
SAMPLER(12, usampler2DArray, gbuf_header_tx)
SAMPLER(13, sampler2DArray, gbuf_closure_tx)
SAMPLER(14, sampler2DArray, gbuf_normal_tx)
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(eevee_render_pass_out)
DEFINE("MAT_RENDER_PASS_SUPPORT")
ADDITIONAL_INFO(eevee_global_ubo)
IMAGE_FREQ(RBUFS_COLOR_SLOT, SFLOAT_16_16_16_16, write, image2DArray, rp_color_img, PASS)
IMAGE_FREQ(RBUFS_VALUE_SLOT, SFLOAT_16, write, image2DArray, rp_value_img, PASS)
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(eevee_cryptomatte_out)
STORAGE_BUF(CRYPTOMATTE_BUF_SLOT, read, float2, cryptomatte_object_buf[])
IMAGE_FREQ(RBUFS_CRYPTOMATTE_SLOT, SFLOAT_32_32_32_32, write, image2D, rp_cryptomatte_img, PASS)
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(eevee_tests_data)
TYPEDEF_SOURCE("eevee_defines.hh")
DEFINE("MAT_REFLECTION")
DEFINE("MAT_REFRACTION")
DEFINE("MAT_SUBSURFACE")
DEFINE("MAT_TRANSLUCENT")
GPU_SHADER_CREATE_END()
/** \} */

6
source/blender/draw/engines/eevee/shaders/infos/eevee_deferred_info.hh → source/blender/draw/engines/eevee/shaders/infos/eevee_deferred_infos.hh
View File

@@ -6,10 +6,10 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "eevee_common_info.hh" # include "eevee_common_infos.hh"
# include "eevee_debug_shared.hh" # include "eevee_debug_shared.hh"
# include "gpu_shader_fullscreen_info.hh" # include "gpu_shader_fullscreen_infos.hh"
#endif #endif
#include "eevee_defines.hh" #include "eevee_defines.hh"

6
source/blender/draw/engines/eevee/shaders/infos/eevee_depth_of_field_info.hh → source/blender/draw/engines/eevee/shaders/infos/eevee_depth_of_field_infos.hh
View File

@@ -8,10 +8,10 @@
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "eevee_common_info.hh" # include "eevee_common_infos.hh"
# include "eevee_depth_of_field_shared.hh" # include "eevee_depth_of_field_shared.hh"
# include "eevee_velocity_info.hh" # include "eevee_velocity_infos.hh"
# define DOF_BOKEH_TEXTURE true # define DOF_BOKEH_TEXTURE true
# define DILATE_MODE_MIN_MAX true # define DILATE_MODE_MIN_MAX true

8
source/blender/draw/engines/eevee/shaders/infos/eevee_film_info.hh → source/blender/draw/engines/eevee/shaders/infos/eevee_film_infos.hh
View File

@@ -6,11 +6,11 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "eevee_common_info.hh" # include "eevee_common_infos.hh"
# include "eevee_film_shared.hh" # include "eevee_film_shared.hh"
# include "eevee_velocity_info.hh" # include "eevee_velocity_infos.hh"
# include "gpu_shader_fullscreen_info.hh" # include "gpu_shader_fullscreen_infos.hh"
#endif #endif
#include "eevee_defines.hh" #include "eevee_defines.hh"

6
source/blender/draw/engines/eevee/shaders/infos/eevee_hiz_info.hh → source/blender/draw/engines/eevee/shaders/infos/eevee_hiz_infos.hh
View File

@@ -6,9 +6,9 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "eevee_common_info.hh" # include "eevee_common_infos.hh"
# include "gpu_shader_fullscreen_info.hh" # include "gpu_shader_fullscreen_infos.hh"
#endif #endif
#include "eevee_defines.hh" #include "eevee_defines.hh"

8
source/blender/draw/engines/eevee/shaders/infos/eevee_light_culling_info.hh → source/blender/draw/engines/eevee/shaders/infos/eevee_light_culling_infos.hh
View File

@@ -6,11 +6,11 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_object_infos_info.hh" # include "draw_object_infos_infos.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "eevee_common_info.hh" # include "eevee_common_infos.hh"
# include "eevee_light_shared.hh" # include "eevee_light_shared.hh"
# include "gpu_shader_fullscreen_info.hh" # include "gpu_shader_fullscreen_infos.hh"
# define SPHERE_PROBE # define SPHERE_PROBE
#endif #endif

8
source/blender/draw/engines/eevee/shaders/infos/eevee_lightprobe_sphere_info.hh → source/blender/draw/engines/eevee/shaders/infos/eevee_lightprobe_sphere_infos.hh
View File

@@ -6,11 +6,11 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_object_infos_info.hh" # include "draw_object_infos_infos.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "eevee_common_info.hh" # include "eevee_common_infos.hh"
# include "eevee_lightprobe_shared.hh" # include "eevee_lightprobe_shared.hh"
# include "eevee_lightprobe_volume_info.hh" # include "eevee_lightprobe_volume_infos.hh"
# define SPHERE_PROBE # define SPHERE_PROBE
#endif #endif

6
source/blender/draw/engines/eevee/shaders/infos/eevee_lightprobe_volume_info.hh → source/blender/draw/engines/eevee/shaders/infos/eevee_lightprobe_volume_infos.hh
View File

@@ -6,9 +6,9 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_object_infos_info.hh" # include "draw_object_infos_infos.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "eevee_common_info.hh" # include "eevee_common_infos.hh"
# include "eevee_debug_shared.hh" # include "eevee_debug_shared.hh"
# include "eevee_lightprobe_shared.hh" # include "eevee_lightprobe_shared.hh"

2
source/blender/draw/engines/eevee/shaders/infos/eevee_lookdev_info.hh → source/blender/draw/engines/eevee/shaders/infos/eevee_lookdev_infos.hh
View File

@@ -6,7 +6,7 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# define SPHERE_PROBE # define SPHERE_PROBE
#endif #endif

2
source/blender/draw/engines/eevee/shaders/infos/eevee_lut_info.hh → source/blender/draw/engines/eevee/shaders/infos/eevee_lut_infos.hh
View File

@@ -6,7 +6,7 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "eevee_common_info.hh" # include "eevee_common_infos.hh"
# include "eevee_light_shared.hh" # include "eevee_light_shared.hh"
# include "eevee_precompute_shared.hh" # include "eevee_precompute_shared.hh"
#endif #endif

8
source/blender/draw/engines/eevee/shaders/infos/eevee_material_info.hh → source/blender/draw/engines/eevee/shaders/infos/eevee_material_infos.hh
View File

@@ -8,12 +8,12 @@
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_object_infos_info.hh" # include "draw_object_infos_infos.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "eevee_common_info.hh" # include "eevee_common_infos.hh"
# include "eevee_shadow_shared.hh" # include "eevee_shadow_shared.hh"
# include "eevee_volume_info.hh" # include "eevee_volume_infos.hh"
# define CURVES_SHADER # define CURVES_SHADER
# define DRW_HAIR_INFO # define DRW_HAIR_INFO

6
source/blender/draw/engines/eevee/shaders/infos/eevee_motion_blur_info.hh → source/blender/draw/engines/eevee/shaders/infos/eevee_motion_blur_infos.hh
View File

@@ -6,10 +6,10 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "eevee_common_info.hh" # include "eevee_common_infos.hh"
# include "eevee_motion_blur_shared.hh" # include "eevee_motion_blur_shared.hh"
# include "eevee_velocity_info.hh" # include "eevee_velocity_infos.hh"
#endif #endif
#include "eevee_defines.hh" #include "eevee_defines.hh"

8
source/blender/draw/engines/eevee/shaders/infos/eevee_shadow_info.hh → source/blender/draw/engines/eevee/shaders/infos/eevee_shadow_infos.hh
View File

@@ -6,12 +6,12 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_object_infos_info.hh" # include "draw_object_infos_infos.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "eevee_common_info.hh" # include "eevee_common_infos.hh"
# include "eevee_debug_shared.hh" # include "eevee_debug_shared.hh"
# include "eevee_shadow_shared.hh" # include "eevee_shadow_shared.hh"
# include "gpu_shader_fullscreen_info.hh" # include "gpu_shader_fullscreen_infos.hh"
# define SPHERE_PROBE # define SPHERE_PROBE
#endif #endif

2
source/blender/draw/engines/eevee/shaders/infos/eevee_subsurface_info.hh → source/blender/draw/engines/eevee/shaders/infos/eevee_subsurface_infos.hh
View File

@@ -6,7 +6,7 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "eevee_common_info.hh" # include "eevee_common_infos.hh"
#endif #endif
#include "eevee_defines.hh" #include "eevee_defines.hh"

4
source/blender/draw/engines/eevee/shaders/infos/eevee_tracing_info.hh → source/blender/draw/engines/eevee/shaders/infos/eevee_tracing_infos.hh
View File

@@ -6,8 +6,8 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "eevee_common_info.hh" # include "eevee_common_infos.hh"
# include "eevee_raytrace_shared.hh" # include "eevee_raytrace_shared.hh"
# define SPHERE_PROBE # define SPHERE_PROBE

4
source/blender/draw/engines/eevee/shaders/infos/eevee_velocity_info.hh → source/blender/draw/engines/eevee/shaders/infos/eevee_velocity_infos.hh
View File

@@ -6,8 +6,8 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_object_infos_info.hh" # include "draw_object_infos_infos.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "eevee_camera_shared.hh" # include "eevee_camera_shared.hh"
# include "eevee_velocity_shared.hh" # include "eevee_velocity_shared.hh"

8
source/blender/draw/engines/eevee/shaders/infos/eevee_volume_info.hh → source/blender/draw/engines/eevee/shaders/infos/eevee_volume_infos.hh
View File

@@ -6,11 +6,11 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_object_infos_info.hh" # include "draw_object_infos_infos.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "eevee_common_info.hh" # include "eevee_common_infos.hh"
# include "eevee_volume_shared.hh" # include "eevee_volume_shared.hh"
# include "gpu_shader_fullscreen_info.hh" # include "gpu_shader_fullscreen_infos.hh"
# define SPHERE_PROBE # define SPHERE_PROBE
#endif #endif

2
source/blender/draw/engines/gpencil/shaders/gpencil_antialiasing_accumulation_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpencil_info.hh" #include "infos/gpencil_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpencil_antialiasing_accumulation) FRAGMENT_SHADER_CREATE_INFO(gpencil_antialiasing_accumulation)

2
source/blender/draw/engines/gpencil/shaders/gpencil_antialiasing_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpencil_info.hh" #include "infos/gpencil_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpencil_antialiasing_stage_1) FRAGMENT_SHADER_CREATE_INFO(gpencil_antialiasing_stage_1)

2
source/blender/draw/engines/gpencil/shaders/gpencil_antialiasing_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpencil_info.hh" #include "infos/gpencil_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpencil_antialiasing_stage_1) VERTEX_SHADER_CREATE_INFO(gpencil_antialiasing_stage_1)

2
source/blender/draw/engines/gpencil/shaders/gpencil_depth_merge_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpencil_info.hh" #include "infos/gpencil_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpencil_depth_merge) FRAGMENT_SHADER_CREATE_INFO(gpencil_depth_merge)

2
source/blender/draw/engines/gpencil/shaders/gpencil_depth_merge_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpencil_info.hh" #include "infos/gpencil_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpencil_depth_merge) VERTEX_SHADER_CREATE_INFO(gpencil_depth_merge)

2
source/blender/draw/engines/gpencil/shaders/gpencil_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpencil_info.hh" #include "infos/gpencil_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpencil_geometry) FRAGMENT_SHADER_CREATE_INFO(gpencil_geometry)

2
source/blender/draw/engines/gpencil/shaders/gpencil_layer_blend_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpencil_info.hh" #include "infos/gpencil_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpencil_layer_blend) FRAGMENT_SHADER_CREATE_INFO(gpencil_layer_blend)

2
source/blender/draw/engines/gpencil/shaders/gpencil_mask_invert_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpencil_info.hh" #include "infos/gpencil_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpencil_mask_invert) FRAGMENT_SHADER_CREATE_INFO(gpencil_mask_invert)

2
source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpencil_info.hh" #include "infos/gpencil_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpencil_geometry) VERTEX_SHADER_CREATE_INFO(gpencil_geometry)

2
source/blender/draw/engines/gpencil/shaders/gpencil_vfx_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpencil_vfx_info.hh" #include "infos/gpencil_vfx_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpencil_fx_composite) FRAGMENT_SHADER_CREATE_INFO(gpencil_fx_composite)

6
source/blender/draw/engines/gpencil/shaders/infos/gpencil_info.hh → source/blender/draw/engines/gpencil/shaders/infos/gpencil_infos.hh
View File

@@ -11,9 +11,9 @@
# include "gpencil_shader_shared.hh" # include "gpencil_shader_shared.hh"
# include "draw_object_infos_info.hh" # include "draw_object_infos_infos.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "gpu_shader_fullscreen_info.hh" # include "gpu_shader_fullscreen_infos.hh"
# define SMAA_GLSL_3 # define SMAA_GLSL_3
# define SMAA_STAGE 1 # define SMAA_STAGE 1

4
source/blender/draw/engines/gpencil/shaders/infos/gpencil_vfx_info.hh → source/blender/draw/engines/gpencil/shaders/infos/gpencil_vfx_infos.hh
View File

@@ -9,8 +9,8 @@
# include "gpencil_shader_shared.hh" # include "gpencil_shader_shared.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "gpu_shader_fullscreen_info.hh" # include "gpu_shader_fullscreen_infos.hh"
# define COMPOSITE # define COMPOSITE
#endif #endif

0
source/blender/draw/engines/image/shaders/infos/engine_image_info.hh → source/blender/draw/engines/image/shaders/infos/engine_image_infos.hh
View File

4
source/blender/draw/engines/overlay/shaders/infos/overlay_antialiasing_info.hh → source/blender/draw/engines/overlay/shaders/infos/overlay_antialiasing_infos.hh
View File

@@ -6,12 +6,12 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "gpu_shader_fullscreen_info.hh" # include "gpu_shader_fullscreen_infos.hh"
# include "overlay_shader_shared.hh" # include "overlay_shader_shared.hh"
#endif #endif
#include "overlay_common_info.hh" #include "overlay_common_infos.hh"
GPU_SHADER_CREATE_INFO(overlay_antialiasing) GPU_SHADER_CREATE_INFO(overlay_antialiasing)
DO_STATIC_COMPILATION() DO_STATIC_COMPILATION()

10
source/blender/draw/engines/overlay/shaders/infos/overlay_armature_info.hh → source/blender/draw/engines/overlay/shaders/infos/overlay_armature_infos.hh
View File

@@ -6,16 +6,16 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_object_infos_info.hh" # include "draw_object_infos_infos.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "gpu_index_load_info.hh" # include "gpu_index_load_infos.hh"
# include "overlay_common_info.hh" # include "overlay_common_infos.hh"
# include "overlay_shader_shared.hh" # include "overlay_shader_shared.hh"
#endif #endif
#include "overlay_common_info.hh" #include "overlay_common_infos.hh"
GPU_SHADER_CREATE_INFO(overlay_frag_output) GPU_SHADER_CREATE_INFO(overlay_frag_output)
FRAGMENT_OUT(0, float4, frag_color) FRAGMENT_OUT(0, float4, frag_color)

6
source/blender/draw/engines/overlay/shaders/infos/overlay_background_info.hh → source/blender/draw/engines/overlay/shaders/infos/overlay_background_infos.hh
View File

@@ -6,10 +6,10 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "gpu_shader_fullscreen_info.hh" # include "gpu_shader_fullscreen_infos.hh"
# include "overlay_common_info.hh" # include "overlay_common_infos.hh"
# include "overlay_shader_shared.hh" # include "overlay_shader_shared.hh"
#endif #endif

0
source/blender/draw/engines/overlay/shaders/infos/overlay_common_info.hh → source/blender/draw/engines/overlay/shaders/infos/overlay_common_infos.hh
View File

8
source/blender/draw/engines/overlay/shaders/infos/overlay_edit_mode_info.hh → source/blender/draw/engines/overlay/shaders/infos/overlay_edit_mode_infos.hh
View File

@@ -6,10 +6,10 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_object_infos_info.hh" # include "draw_object_infos_infos.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "gpu_index_load_info.hh" # include "gpu_index_load_infos.hh"
# include "overlay_shader_shared.hh" # include "overlay_shader_shared.hh"
@@ -20,7 +20,7 @@
# define DRW_POINTCLOUD_INFO # define DRW_POINTCLOUD_INFO
#endif #endif
#include "overlay_common_info.hh" #include "overlay_common_infos.hh"
GPU_SHADER_INTERFACE_INFO(overlay_edit_flat_wire_iface) GPU_SHADER_INTERFACE_INFO(overlay_edit_flat_wire_iface)
NO_PERSPECTIVE(float2, edge_pos) NO_PERSPECTIVE(float2, edge_pos)

8
source/blender/draw/engines/overlay/shaders/infos/overlay_extra_info.hh → source/blender/draw/engines/overlay/shaders/infos/overlay_extra_infos.hh
View File

@@ -6,15 +6,15 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_object_infos_info.hh" # include "draw_object_infos_infos.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "gpu_index_load_info.hh" # include "gpu_index_load_infos.hh"
# include "overlay_shader_shared.hh" # include "overlay_shader_shared.hh"
#endif #endif
#include "overlay_common_info.hh" #include "overlay_common_infos.hh"
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/** \name Extra shapes /** \name Extra shapes

6
source/blender/draw/engines/overlay/shaders/infos/overlay_facing_info.hh → source/blender/draw/engines/overlay/shaders/infos/overlay_facing_infos.hh
View File

@@ -6,11 +6,11 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_object_infos_info.hh" # include "draw_object_infos_infos.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
#endif #endif
#include "overlay_common_info.hh" #include "overlay_common_infos.hh"
GPU_SHADER_CREATE_INFO(overlay_facing_base) GPU_SHADER_CREATE_INFO(overlay_facing_base)
VERTEX_IN(0, float3, pos) VERTEX_IN(0, float3, pos)

4
source/blender/draw/engines/overlay/shaders/infos/overlay_grid_info.hh → source/blender/draw/engines/overlay/shaders/infos/overlay_grid_infos.hh
View File

@@ -6,12 +6,12 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "overlay_shader_shared.hh" # include "overlay_shader_shared.hh"
#endif #endif
#include "overlay_common_info.hh" #include "overlay_common_infos.hh"
/* We use the normalized local position to avoid precision loss during interpolation. */ /* We use the normalized local position to avoid precision loss during interpolation. */
GPU_SHADER_INTERFACE_INFO(overlay_grid_iface) GPU_SHADER_INTERFACE_INFO(overlay_grid_iface)

10
source/blender/draw/engines/overlay/shaders/infos/overlay_outline_info.hh → source/blender/draw/engines/overlay/shaders/infos/overlay_outline_infos.hh
View File

@@ -6,11 +6,11 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_object_infos_info.hh" # include "draw_object_infos_infos.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "gpu_shader_fullscreen_info.hh" # include "gpu_shader_fullscreen_infos.hh"
# include "gpu_index_load_info.hh" # include "gpu_index_load_infos.hh"
# include "gpu_shader_create_info.hh" # include "gpu_shader_create_info.hh"
# include "overlay_shader_shared.hh" # include "overlay_shader_shared.hh"
@@ -22,7 +22,7 @@
# define DRW_POINTCLOUD_INFO # define DRW_POINTCLOUD_INFO
#endif #endif
#include "overlay_common_info.hh" #include "overlay_common_infos.hh"
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/** \name Outline Pre-pass /** \name Outline Pre-pass

6
source/blender/draw/engines/overlay/shaders/infos/overlay_paint_info.hh → source/blender/draw/engines/overlay/shaders/infos/overlay_paint_infos.hh
View File

@@ -6,11 +6,11 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_object_infos_info.hh" # include "draw_object_infos_infos.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
#endif #endif
#include "overlay_common_info.hh" #include "overlay_common_infos.hh"
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/** \name OVERLAY_shader_paint_face. /** \name OVERLAY_shader_paint_face.

6
source/blender/draw/engines/overlay/shaders/infos/overlay_sculpt_curves_info.hh → source/blender/draw/engines/overlay/shaders/infos/overlay_sculpt_curves_infos.hh
View File

@@ -6,14 +6,14 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_object_infos_info.hh" # include "draw_object_infos_infos.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# define CURVES_SHADER # define CURVES_SHADER
# define DRW_HAIR_INFO # define DRW_HAIR_INFO
#endif #endif
#include "overlay_common_info.hh" #include "overlay_common_infos.hh"
GPU_SHADER_INTERFACE_INFO(overlay_sculpt_curves_selection_iface) GPU_SHADER_INTERFACE_INFO(overlay_sculpt_curves_selection_iface)
SMOOTH(float, mask_weight) SMOOTH(float, mask_weight)

6
source/blender/draw/engines/overlay/shaders/infos/overlay_sculpt_info.hh → source/blender/draw/engines/overlay/shaders/infos/overlay_sculpt_infos.hh
View File

@@ -6,11 +6,11 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_object_infos_info.hh" # include "draw_object_infos_infos.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
#endif #endif
#include "overlay_common_info.hh" #include "overlay_common_infos.hh"
GPU_SHADER_INTERFACE_INFO(overlay_sculpt_mask_iface) GPU_SHADER_INTERFACE_INFO(overlay_sculpt_mask_iface)
FLAT(float3, faceset_color) FLAT(float3, faceset_color)

8
source/blender/draw/engines/overlay/shaders/infos/overlay_viewer_attribute_info.hh → source/blender/draw/engines/overlay/shaders/infos/overlay_viewer_attribute_infos.hh
View File

@@ -6,9 +6,9 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_object_infos_info.hh" # include "draw_object_infos_infos.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "overlay_common_info.hh" # include "overlay_common_infos.hh"
# define CURVES_SHADER # define CURVES_SHADER
# define DRW_HAIR_INFO # define DRW_HAIR_INFO
@@ -17,7 +17,7 @@
# define DRW_POINTCLOUD_INFO # define DRW_POINTCLOUD_INFO
#endif #endif
#include "overlay_common_info.hh" #include "overlay_common_infos.hh"
GPU_SHADER_INTERFACE_INFO(overlay_viewer_attribute_iface) GPU_SHADER_INTERFACE_INFO(overlay_viewer_attribute_iface)
SMOOTH(float4, final_color) SMOOTH(float4, final_color)

6
source/blender/draw/engines/overlay/shaders/infos/overlay_volume_info.hh → source/blender/draw/engines/overlay/shaders/infos/overlay_volume_infos.hh
View File

@@ -6,9 +6,9 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_object_infos_info.hh" # include "draw_object_infos_infos.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "overlay_common_info.hh" # include "overlay_common_infos.hh"
# define USE_MAC # define USE_MAC
# define SHOW_RANGE # define SHOW_RANGE

8
source/blender/draw/engines/overlay/shaders/infos/overlay_wireframe_info.hh → source/blender/draw/engines/overlay/shaders/infos/overlay_wireframe_infos.hh
View File

@@ -6,10 +6,10 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_object_infos_info.hh" # include "draw_object_infos_infos.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "gpu_index_load_info.hh" # include "gpu_index_load_infos.hh"
# include "overlay_common_info.hh" # include "overlay_common_infos.hh"
# define CUSTOM_DEPTH_BIAS_CONST # define CUSTOM_DEPTH_BIAS_CONST
#endif #endif

2
source/blender/draw/engines/overlay/shaders/overlay_antialiasing_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_antialiasing_info.hh" #include "infos/overlay_antialiasing_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_antialiasing) FRAGMENT_SHADER_CREATE_INFO(overlay_antialiasing)

2
source/blender/draw/engines/overlay/shaders/overlay_armature_dof_solid_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_armature_info.hh" #include "infos/overlay_armature_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_armature_dof) FRAGMENT_SHADER_CREATE_INFO(overlay_armature_dof)

2
source/blender/draw/engines/overlay/shaders/overlay_armature_dof_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_armature_info.hh" #include "infos/overlay_armature_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_armature_dof) VERTEX_SHADER_CREATE_INFO(overlay_armature_dof)

2
source/blender/draw/engines/overlay/shaders/overlay_armature_envelope_outline_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_armature_info.hh" #include "infos/overlay_armature_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_armature_envelope_outline) VERTEX_SHADER_CREATE_INFO(overlay_armature_envelope_outline)

2
source/blender/draw/engines/overlay/shaders/overlay_armature_envelope_solid_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_armature_info.hh" #include "infos/overlay_armature_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_armature_envelope_solid) FRAGMENT_SHADER_CREATE_INFO(overlay_armature_envelope_solid)

2
source/blender/draw/engines/overlay/shaders/overlay_armature_envelope_solid_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_armature_info.hh" #include "infos/overlay_armature_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_armature_envelope_solid) VERTEX_SHADER_CREATE_INFO(overlay_armature_envelope_solid)

2
source/blender/draw/engines/overlay/shaders/overlay_armature_shape_outline_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_armature_info.hh" #include "infos/overlay_armature_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_armature_shape_outline) VERTEX_SHADER_CREATE_INFO(overlay_armature_shape_outline)

2
source/blender/draw/engines/overlay/shaders/overlay_armature_shape_solid_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_armature_info.hh" #include "infos/overlay_armature_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_armature_shape_solid) FRAGMENT_SHADER_CREATE_INFO(overlay_armature_shape_solid)

2
source/blender/draw/engines/overlay/shaders/overlay_armature_shape_solid_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_armature_info.hh" #include "infos/overlay_armature_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_armature_shape_solid) VERTEX_SHADER_CREATE_INFO(overlay_armature_shape_solid)

2
source/blender/draw/engines/overlay/shaders/overlay_armature_shape_wire_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_armature_info.hh" #include "infos/overlay_armature_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_armature_shape_wire) FRAGMENT_SHADER_CREATE_INFO(overlay_armature_shape_wire)

2
source/blender/draw/engines/overlay/shaders/overlay_armature_shape_wire_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_armature_info.hh" #include "infos/overlay_armature_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_armature_shape_wire) VERTEX_SHADER_CREATE_INFO(overlay_armature_shape_wire)

2
source/blender/draw/engines/overlay/shaders/overlay_armature_sphere_outline_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_armature_info.hh" #include "infos/overlay_armature_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_armature_sphere_outline) VERTEX_SHADER_CREATE_INFO(overlay_armature_sphere_outline)

2
source/blender/draw/engines/overlay/shaders/overlay_armature_sphere_solid_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_armature_info.hh" #include "infos/overlay_armature_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_armature_sphere_solid) FRAGMENT_SHADER_CREATE_INFO(overlay_armature_sphere_solid)

2
source/blender/draw/engines/overlay/shaders/overlay_armature_sphere_solid_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_armature_info.hh" #include "infos/overlay_armature_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_armature_sphere_solid) VERTEX_SHADER_CREATE_INFO(overlay_armature_sphere_solid)

2
source/blender/draw/engines/overlay/shaders/overlay_armature_stick_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_armature_info.hh" #include "infos/overlay_armature_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_armature_stick) FRAGMENT_SHADER_CREATE_INFO(overlay_armature_stick)

2
source/blender/draw/engines/overlay/shaders/overlay_armature_stick_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_armature_info.hh" #include "infos/overlay_armature_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_armature_stick) VERTEX_SHADER_CREATE_INFO(overlay_armature_stick)

2
source/blender/draw/engines/overlay/shaders/overlay_armature_wire_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_armature_info.hh" #include "infos/overlay_armature_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_armature_wire) FRAGMENT_SHADER_CREATE_INFO(overlay_armature_wire)

2
source/blender/draw/engines/overlay/shaders/overlay_armature_wire_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_armature_info.hh" #include "infos/overlay_armature_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_armature_wire) VERTEX_SHADER_CREATE_INFO(overlay_armature_wire)

2
source/blender/draw/engines/overlay/shaders/overlay_background_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_background_info.hh" #include "infos/overlay_background_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_background) FRAGMENT_SHADER_CREATE_INFO(overlay_background)

2
source/blender/draw/engines/overlay/shaders/overlay_clipbound_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_background_info.hh" #include "infos/overlay_background_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_clipbound) VERTEX_SHADER_CREATE_INFO(overlay_clipbound)

2
source/blender/draw/engines/overlay/shaders/overlay_depth_only_curves_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_depth_curves) VERTEX_SHADER_CREATE_INFO(overlay_depth_curves)

2
source/blender/draw/engines/overlay/shaders/overlay_depth_only_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_depth_mesh_base) FRAGMENT_SHADER_CREATE_INFO(overlay_depth_mesh_base)

2
source/blender/draw/engines/overlay/shaders/overlay_depth_only_gpencil_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_depth_gpencil) FRAGMENT_SHADER_CREATE_INFO(overlay_depth_gpencil)

2
source/blender/draw/engines/overlay/shaders/overlay_depth_only_gpencil_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_depth_gpencil) VERTEX_SHADER_CREATE_INFO(overlay_depth_gpencil)

2
source/blender/draw/engines/overlay/shaders/overlay_depth_only_mesh_conservative_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_depth_mesh_conservative) VERTEX_SHADER_CREATE_INFO(overlay_depth_mesh_conservative)

2
source/blender/draw/engines/overlay/shaders/overlay_depth_only_pointcloud_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_depth_pointcloud) VERTEX_SHADER_CREATE_INFO(overlay_depth_pointcloud)

2
source/blender/draw/engines/overlay/shaders/overlay_depth_only_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_depth_mesh) VERTEX_SHADER_CREATE_INFO(overlay_depth_mesh)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_curve_handle_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_edit_curve_handle) VERTEX_SHADER_CREATE_INFO(overlay_edit_curve_handle)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_curve_normals_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_edit_curve_normals) VERTEX_SHADER_CREATE_INFO(overlay_edit_curve_normals)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_curve_point_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_edit_curve_point) VERTEX_SHADER_CREATE_INFO(overlay_edit_curve_point)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_curve_wire_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_edit_curve_wire) VERTEX_SHADER_CREATE_INFO(overlay_edit_curve_wire)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_curves_handle_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_edit_curves_handle) VERTEX_SHADER_CREATE_INFO(overlay_edit_curves_handle)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_gpencil_canvas_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_extra_info.hh" #include "infos/overlay_extra_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_gpencil_canvas) VERTEX_SHADER_CREATE_INFO(overlay_gpencil_canvas)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_lattice_point_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_edit_lattice_point) VERTEX_SHADER_CREATE_INFO(overlay_edit_lattice_point)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_lattice_wire_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_edit_lattice_wire) VERTEX_SHADER_CREATE_INFO(overlay_edit_lattice_wire)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_analysis_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_edit_mesh_analysis) FRAGMENT_SHADER_CREATE_INFO(overlay_edit_mesh_analysis)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_analysis_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_edit_mesh_analysis) VERTEX_SHADER_CREATE_INFO(overlay_edit_mesh_analysis)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_common_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
SHADER_LIBRARY_CREATE_INFO(overlay_edit_mesh_common) SHADER_LIBRARY_CREATE_INFO(overlay_edit_mesh_common)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_depth_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_edit_mesh_depth) VERTEX_SHADER_CREATE_INFO(overlay_edit_mesh_depth)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_edge_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_edit_mesh_edge) VERTEX_SHADER_CREATE_INFO(overlay_edit_mesh_edge)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_facedot_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_edit_mesh_facedot) VERTEX_SHADER_CREATE_INFO(overlay_edit_mesh_facedot)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_edit_mesh_edge) FRAGMENT_SHADER_CREATE_INFO(overlay_edit_mesh_edge)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
SHADER_LIBRARY_CREATE_INFO(overlay_edit_mesh_common) SHADER_LIBRARY_CREATE_INFO(overlay_edit_mesh_common)
SHADER_LIBRARY_CREATE_INFO(draw_modelmat) SHADER_LIBRARY_CREATE_INFO(draw_modelmat)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_normal_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_mesh_loop_normal) VERTEX_SHADER_CREATE_INFO(overlay_mesh_loop_normal)
#ifdef GLSL_CPP_STUBS #ifdef GLSL_CPP_STUBS

2
source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_skin_root_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_edit_mesh_skin_root) VERTEX_SHADER_CREATE_INFO(overlay_edit_mesh_skin_root)
#ifdef GLSL_CPP_STUBS #ifdef GLSL_CPP_STUBS

2
source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_edit_mesh_vert) VERTEX_SHADER_CREATE_INFO(overlay_edit_mesh_vert)
#ifdef GLSL_CPP_STUBS #ifdef GLSL_CPP_STUBS

2
source/blender/draw/engines/overlay/shaders/overlay_edit_particle_point_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_edit_particle_point) VERTEX_SHADER_CREATE_INFO(overlay_edit_particle_point)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_particle_strand_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_edit_particle_strand) VERTEX_SHADER_CREATE_INFO(overlay_edit_particle_strand)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_pointcloud_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_edit_pointcloud) VERTEX_SHADER_CREATE_INFO(overlay_edit_pointcloud)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_uv_edges_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_edit_uv_edges) FRAGMENT_SHADER_CREATE_INFO(overlay_edit_uv_edges)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_uv_edges_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_edit_uv_edges) VERTEX_SHADER_CREATE_INFO(overlay_edit_uv_edges)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_uv_face_dots_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_edit_uv_face_dots) VERTEX_SHADER_CREATE_INFO(overlay_edit_uv_face_dots)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_uv_faces_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_edit_uv_faces) VERTEX_SHADER_CREATE_INFO(overlay_edit_uv_faces)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_uv_image_mask_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_edit_uv_mask_image) FRAGMENT_SHADER_CREATE_INFO(overlay_edit_uv_mask_image)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_uv_image_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_edit_uv_mask_image) VERTEX_SHADER_CREATE_INFO(overlay_edit_uv_mask_image)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_uv_stretching_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_edit_uv_stretching_area) VERTEX_SHADER_CREATE_INFO(overlay_edit_uv_stretching_area)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_uv_tiled_image_borders_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_edit_uv_tiled_image_borders) VERTEX_SHADER_CREATE_INFO(overlay_edit_uv_tiled_image_borders)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_uv_verts_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_edit_uv_verts) FRAGMENT_SHADER_CREATE_INFO(overlay_edit_uv_verts)

2
source/blender/draw/engines/overlay/shaders/overlay_edit_uv_verts_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_edit_mode_info.hh" #include "infos/overlay_edit_mode_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_edit_uv_verts) VERTEX_SHADER_CREATE_INFO(overlay_edit_uv_verts)

2
source/blender/draw/engines/overlay/shaders/overlay_extra_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_extra_info.hh" #include "infos/overlay_extra_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_extra_groundline) FRAGMENT_SHADER_CREATE_INFO(overlay_extra_groundline)

2
source/blender/draw/engines/overlay/shaders/overlay_extra_groundline_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_extra_info.hh" #include "infos/overlay_extra_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_extra_groundline) VERTEX_SHADER_CREATE_INFO(overlay_extra_groundline)

2
source/blender/draw/engines/overlay/shaders/overlay_extra_lightprobe_grid_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_extra_info.hh" #include "infos/overlay_extra_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_extra_grid_base) VERTEX_SHADER_CREATE_INFO(overlay_extra_grid_base)
VERTEX_SHADER_CREATE_INFO(draw_modelmat) VERTEX_SHADER_CREATE_INFO(draw_modelmat)

2
source/blender/draw/engines/overlay/shaders/overlay_extra_loose_point_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_extra_info.hh" #include "infos/overlay_extra_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_extra_loose_point_base) FRAGMENT_SHADER_CREATE_INFO(overlay_extra_loose_point_base)

2
source/blender/draw/engines/overlay/shaders/overlay_extra_loose_point_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_extra_info.hh" #include "infos/overlay_extra_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_extra_loose_point_base) VERTEX_SHADER_CREATE_INFO(overlay_extra_loose_point_base)
VERTEX_SHADER_CREATE_INFO(draw_modelmat) VERTEX_SHADER_CREATE_INFO(draw_modelmat)

2
source/blender/draw/engines/overlay/shaders/overlay_extra_point_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_extra_info.hh" #include "infos/overlay_extra_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_extra_point_base) VERTEX_SHADER_CREATE_INFO(overlay_extra_point_base)
VERTEX_SHADER_CREATE_INFO(draw_modelmat) VERTEX_SHADER_CREATE_INFO(draw_modelmat)

2
source/blender/draw/engines/overlay/shaders/overlay_extra_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_extra_info.hh" #include "infos/overlay_extra_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_extra_spot_cone) VERTEX_SHADER_CREATE_INFO(overlay_extra_spot_cone)

2
source/blender/draw/engines/overlay/shaders/overlay_extra_wire_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_extra_info.hh" #include "infos/overlay_extra_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_extra_wire_base) FRAGMENT_SHADER_CREATE_INFO(overlay_extra_wire_base)

2
source/blender/draw/engines/overlay/shaders/overlay_extra_wire_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_extra_info.hh" #include "infos/overlay_extra_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_extra_wire_object_base) VERTEX_SHADER_CREATE_INFO(overlay_extra_wire_object_base)
VERTEX_SHADER_CREATE_INFO(draw_modelmat) VERTEX_SHADER_CREATE_INFO(draw_modelmat)

2
source/blender/draw/engines/overlay/shaders/overlay_facing_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_facing_info.hh" #include "infos/overlay_facing_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_facing_base) FRAGMENT_SHADER_CREATE_INFO(overlay_facing_base)

2
source/blender/draw/engines/overlay/shaders/overlay_facing_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_facing_info.hh" #include "infos/overlay_facing_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_facing_base) VERTEX_SHADER_CREATE_INFO(overlay_facing_base)
VERTEX_SHADER_CREATE_INFO(draw_modelmat) VERTEX_SHADER_CREATE_INFO(draw_modelmat)

2
source/blender/draw/engines/overlay/shaders/overlay_grid_background_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_grid_info.hh" #include "infos/overlay_grid_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_grid_background) FRAGMENT_SHADER_CREATE_INFO(overlay_grid_background)

2
source/blender/draw/engines/overlay/shaders/overlay_grid_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_grid_info.hh" #include "infos/overlay_grid_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_grid_next) FRAGMENT_SHADER_CREATE_INFO(overlay_grid_next)

2
source/blender/draw/engines/overlay/shaders/overlay_grid_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_grid_info.hh" #include "infos/overlay_grid_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_grid_next) VERTEX_SHADER_CREATE_INFO(overlay_grid_next)

2
source/blender/draw/engines/overlay/shaders/overlay_image_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_extra_info.hh" #include "infos/overlay_extra_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_image_base) FRAGMENT_SHADER_CREATE_INFO(overlay_image_base)

2
source/blender/draw/engines/overlay/shaders/overlay_image_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_extra_info.hh" #include "infos/overlay_extra_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_image_base) VERTEX_SHADER_CREATE_INFO(overlay_image_base)
VERTEX_SHADER_CREATE_INFO(draw_modelmat) VERTEX_SHADER_CREATE_INFO(draw_modelmat)

2
source/blender/draw/engines/overlay/shaders/overlay_motion_path_line_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_extra_info.hh" #include "infos/overlay_extra_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_motion_path_line) FRAGMENT_SHADER_CREATE_INFO(overlay_motion_path_line)

2
source/blender/draw/engines/overlay/shaders/overlay_motion_path_line_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_extra_info.hh" #include "infos/overlay_extra_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_motion_path_line) VERTEX_SHADER_CREATE_INFO(overlay_motion_path_line)

2
source/blender/draw/engines/overlay/shaders/overlay_motion_path_point_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_extra_info.hh" #include "infos/overlay_extra_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_motion_path_point) VERTEX_SHADER_CREATE_INFO(overlay_motion_path_point)

2
source/blender/draw/engines/overlay/shaders/overlay_outline_detect_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_outline_info.hh" #include "infos/overlay_outline_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_outline_detect) FRAGMENT_SHADER_CREATE_INFO(overlay_outline_detect)

2
source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_curves_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_outline_info.hh" #include "infos/overlay_outline_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_outline_prepass_curves) VERTEX_SHADER_CREATE_INFO(overlay_outline_prepass_curves)

2
source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_outline_info.hh" #include "infos/overlay_outline_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_outline_prepass) FRAGMENT_SHADER_CREATE_INFO(overlay_outline_prepass)

2
source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_gpencil_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_outline_info.hh" #include "infos/overlay_outline_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_outline_prepass_gpencil) FRAGMENT_SHADER_CREATE_INFO(overlay_outline_prepass_gpencil)

2
source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_gpencil_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_outline_info.hh" #include "infos/overlay_outline_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_outline_prepass_gpencil) VERTEX_SHADER_CREATE_INFO(overlay_outline_prepass_gpencil)

2
source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_pointcloud_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_outline_info.hh" #include "infos/overlay_outline_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_outline_prepass_pointcloud) VERTEX_SHADER_CREATE_INFO(overlay_outline_prepass_pointcloud)

2
source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_outline_info.hh" #include "infos/overlay_outline_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_outline_prepass_mesh) VERTEX_SHADER_CREATE_INFO(overlay_outline_prepass_mesh)

2
source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_wire_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_outline_info.hh" #include "infos/overlay_outline_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_outline_prepass_wire) VERTEX_SHADER_CREATE_INFO(overlay_outline_prepass_wire)

2
source/blender/draw/engines/overlay/shaders/overlay_paint_face_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_paint_info.hh" #include "infos/overlay_paint_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_paint_face) VERTEX_SHADER_CREATE_INFO(overlay_paint_face)

2
source/blender/draw/engines/overlay/shaders/overlay_paint_point_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_paint_info.hh" #include "infos/overlay_paint_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_paint_point) VERTEX_SHADER_CREATE_INFO(overlay_paint_point)

2
source/blender/draw/engines/overlay/shaders/overlay_paint_texture_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_paint_info.hh" #include "infos/overlay_paint_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_paint_texture) FRAGMENT_SHADER_CREATE_INFO(overlay_paint_texture)

2
source/blender/draw/engines/overlay/shaders/overlay_paint_texture_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_paint_info.hh" #include "infos/overlay_paint_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_paint_texture) VERTEX_SHADER_CREATE_INFO(overlay_paint_texture)

2
source/blender/draw/engines/overlay/shaders/overlay_paint_weight_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_paint_info.hh" #include "infos/overlay_paint_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_paint_weight) FRAGMENT_SHADER_CREATE_INFO(overlay_paint_weight)

2
source/blender/draw/engines/overlay/shaders/overlay_paint_weight_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_paint_info.hh" #include "infos/overlay_paint_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_paint_weight) VERTEX_SHADER_CREATE_INFO(overlay_paint_weight)

2
source/blender/draw/engines/overlay/shaders/overlay_paint_wire_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_paint_info.hh" #include "infos/overlay_paint_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_paint_wire) VERTEX_SHADER_CREATE_INFO(overlay_paint_wire)

2
source/blender/draw/engines/overlay/shaders/overlay_particle_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_extra_info.hh" #include "infos/overlay_extra_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_particle_dot_base) FRAGMENT_SHADER_CREATE_INFO(overlay_particle_dot_base)

2
source/blender/draw/engines/overlay/shaders/overlay_particle_hair_vert.glsl
View File

@@ -6,7 +6,7 @@
* Draw particles as shapes using primitive expansion. * Draw particles as shapes using primitive expansion.
*/ */
#include "infos/overlay_extra_info.hh" #include "infos/overlay_extra_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_particle_hair) VERTEX_SHADER_CREATE_INFO(overlay_particle_hair)

2
source/blender/draw/engines/overlay/shaders/overlay_particle_shape_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_extra_info.hh" #include "infos/overlay_extra_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_particle_shape_base) FRAGMENT_SHADER_CREATE_INFO(overlay_particle_shape_base)

2
source/blender/draw/engines/overlay/shaders/overlay_particle_shape_vert.glsl
View File

@@ -6,7 +6,7 @@
* Draw particles as shapes using primitive expansion. * Draw particles as shapes using primitive expansion.
*/ */
#include "infos/overlay_extra_info.hh" #include "infos/overlay_extra_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_particle_shape) VERTEX_SHADER_CREATE_INFO(overlay_particle_shape)

2
source/blender/draw/engines/overlay/shaders/overlay_particle_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_extra_info.hh" #include "infos/overlay_extra_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_particle_dot) VERTEX_SHADER_CREATE_INFO(overlay_particle_dot)

2
source/blender/draw/engines/overlay/shaders/overlay_point_varying_color_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_extra_info.hh" #include "infos/overlay_extra_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_extra_grid_base) FRAGMENT_SHADER_CREATE_INFO(overlay_extra_grid_base)

2
source/blender/draw/engines/overlay/shaders/overlay_point_varying_color_varying_outline_aa_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_extra_info.hh" #include "infos/overlay_extra_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_extra_point_base) FRAGMENT_SHADER_CREATE_INFO(overlay_extra_point_base)

2
source/blender/draw/engines/overlay/shaders/overlay_sculpt_curves_cage_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_sculpt_curves_info.hh" #include "infos/overlay_sculpt_curves_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_sculpt_curves_cage) VERTEX_SHADER_CREATE_INFO(overlay_sculpt_curves_cage)

2
source/blender/draw/engines/overlay/shaders/overlay_sculpt_curves_selection_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_sculpt_curves_info.hh" #include "infos/overlay_sculpt_curves_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_sculpt_curves_selection) FRAGMENT_SHADER_CREATE_INFO(overlay_sculpt_curves_selection)

2
source/blender/draw/engines/overlay/shaders/overlay_sculpt_curves_selection_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_sculpt_curves_info.hh" #include "infos/overlay_sculpt_curves_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_sculpt_curves_selection) VERTEX_SHADER_CREATE_INFO(overlay_sculpt_curves_selection)

2
source/blender/draw/engines/overlay/shaders/overlay_sculpt_mask_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_sculpt_info.hh" #include "infos/overlay_sculpt_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_sculpt_mask) FRAGMENT_SHADER_CREATE_INFO(overlay_sculpt_mask)

2
source/blender/draw/engines/overlay/shaders/overlay_sculpt_mask_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_sculpt_info.hh" #include "infos/overlay_sculpt_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_sculpt_mask) VERTEX_SHADER_CREATE_INFO(overlay_sculpt_mask)

2
source/blender/draw/engines/overlay/shaders/overlay_uniform_color_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_paint_info.hh" #include "infos/overlay_paint_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_paint_face) FRAGMENT_SHADER_CREATE_INFO(overlay_paint_face)

2
source/blender/draw/engines/overlay/shaders/overlay_varying_color.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_volume_info.hh" #include "infos/overlay_volume_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_volume_velocity_mac) VERTEX_SHADER_CREATE_INFO(overlay_volume_velocity_mac)

2
source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_curve_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_viewer_attribute_info.hh" #include "infos/overlay_viewer_attribute_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_viewer_attribute_curve) VERTEX_SHADER_CREATE_INFO(overlay_viewer_attribute_curve)

2
source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_curves_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_viewer_attribute_info.hh" #include "infos/overlay_viewer_attribute_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_viewer_attribute_curves) VERTEX_SHADER_CREATE_INFO(overlay_viewer_attribute_curves)

2
source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_viewer_attribute_info.hh" #include "infos/overlay_viewer_attribute_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_viewer_attribute_pointcloud) FRAGMENT_SHADER_CREATE_INFO(overlay_viewer_attribute_pointcloud)

2
source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_mesh_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_viewer_attribute_info.hh" #include "infos/overlay_viewer_attribute_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_viewer_attribute_mesh) VERTEX_SHADER_CREATE_INFO(overlay_viewer_attribute_mesh)

2
source/blender/draw/engines/overlay/shaders/overlay_viewer_attribute_pointcloud_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_viewer_attribute_info.hh" #include "infos/overlay_viewer_attribute_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_viewer_attribute_pointcloud) VERTEX_SHADER_CREATE_INFO(overlay_viewer_attribute_pointcloud)

2
source/blender/draw/engines/overlay/shaders/overlay_volume_gridlines_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_volume_info.hh" #include "infos/overlay_volume_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_volume_gridlines_range) VERTEX_SHADER_CREATE_INFO(overlay_volume_gridlines_range)

2
source/blender/draw/engines/overlay/shaders/overlay_volume_velocity_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_volume_info.hh" #include "infos/overlay_volume_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_volume_velocity_mac) VERTEX_SHADER_CREATE_INFO(overlay_volume_velocity_mac)

2
source/blender/draw/engines/overlay/shaders/overlay_wireframe_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_wireframe_info.hh" #include "infos/overlay_wireframe_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_wireframe_base) FRAGMENT_SHADER_CREATE_INFO(overlay_wireframe_base)

2
source/blender/draw/engines/overlay/shaders/overlay_wireframe_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_wireframe_info.hh" #include "infos/overlay_wireframe_infos.hh"
VERTEX_SHADER_CREATE_INFO(overlay_wireframe) VERTEX_SHADER_CREATE_INFO(overlay_wireframe)

2
source/blender/draw/engines/overlay/shaders/overlay_xray_fade_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/overlay_antialiasing_info.hh" #include "infos/overlay_antialiasing_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(overlay_xray_fade) FRAGMENT_SHADER_CREATE_INFO(overlay_xray_fade)

0
source/blender/draw/engines/select/shaders/infos/select_id_info.hh → source/blender/draw/engines/select/shaders/infos/select_id_infos.hh
View File

4
source/blender/draw/engines/workbench/shaders/infos/workbench_composite_info.hh → source/blender/draw/engines/workbench/shaders/infos/workbench_composite_infos.hh
View File

@@ -10,8 +10,8 @@
# include "workbench_shader_shared.hh" # include "workbench_shader_shared.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "gpu_shader_fullscreen_info.hh" # include "gpu_shader_fullscreen_infos.hh"
# define WORKBENCH_LIGHTING_STUDIO # define WORKBENCH_LIGHTING_STUDIO
# define WORKBENCH_LIGHTING_MATCAP # define WORKBENCH_LIGHTING_MATCAP

2
source/blender/draw/engines/workbench/shaders/infos/workbench_depth_info.hh → source/blender/draw/engines/workbench/shaders/infos/workbench_depth_infos.hh
View File

@@ -6,7 +6,7 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "gpu_shader_fullscreen_info.hh" # include "gpu_shader_fullscreen_infos.hh"
#endif #endif
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"

2
source/blender/draw/engines/workbench/shaders/infos/workbench_effect_antialiasing_info.hh → source/blender/draw/engines/workbench/shaders/infos/workbench_effect_antialiasing_infos.hh
View File

@@ -6,7 +6,7 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "gpu_shader_fullscreen_info.hh" # include "gpu_shader_fullscreen_infos.hh"
# define SMAA_GLSL_3 # define SMAA_GLSL_3
# define SMAA_STAGE 1 # define SMAA_STAGE 1

2
source/blender/draw/engines/workbench/shaders/infos/workbench_effect_dof_info.hh
View File

@@ -8,7 +8,7 @@
# include "workbench_shader_shared.hh" # include "workbench_shader_shared.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "gpu_shader_fullscreen_info.hh" # include "gpu_shader_fullscreen_info.hh"
# define PREPARE # define PREPARE

93
source/blender/draw/engines/workbench/shaders/infos/workbench_effect_dof_infos.hh Normal file
View File

@@ -0,0 +1,93 @@
/* SPDX-FileCopyrightText: 2023 Blender Authors
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#ifdef GPU_SHADER
# pragma once
# include "gpu_shader_compat.hh"
# include "workbench_shader_shared.hh"
# include "draw_view_infos.hh"
# include "gpu_shader_fullscreen_infos.hh"
# define PREPARE
# define DOWNSAMPLE
# define BLUR1
# define BLUR2
# define RESOLVE
# define NUM_SAMPLES 49
#endif
#include "gpu_shader_create_info.hh"
/*
* NOTE: Keep the sampler bind points consistent between the steps.
*
* SAMPLER(0, sampler2D, input_coc_tx)
* SAMPLER(1, sampler2D, scene_color_tx)
* SAMPLER(2, sampler2D, scene_depth_tx)
* SAMPLER(3, sampler2D, half_res_color_tx)
* SAMPLER(4, sampler2D, blur_tx)
* SAMPLER(5, sampler2D, noise_tx)
*/
GPU_SHADER_CREATE_INFO(workbench_effect_dof)
PUSH_CONSTANT(float2, inverted_viewport_size)
PUSH_CONSTANT(float2, near_far)
PUSH_CONSTANT(float3, dof_params)
PUSH_CONSTANT(float, noise_offset)
ADDITIONAL_INFO(gpu_fullscreen)
ADDITIONAL_INFO(draw_view)
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(workbench_effect_dof_prepare)
SAMPLER(1, sampler2D, scene_color_tx)
SAMPLER(2, sampler2D, scene_depth_tx)
FRAGMENT_OUT(0, float4, halfResColor)
FRAGMENT_OUT(1, float2, normalizedCoc)
FRAGMENT_SOURCE("workbench_effect_dof_prepare_frag.glsl")
ADDITIONAL_INFO(workbench_effect_dof)
DO_STATIC_COMPILATION()
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(workbench_effect_dof_downsample)
SAMPLER(0, sampler2D, input_coc_tx)
SAMPLER(1, sampler2D, scene_color_tx)
FRAGMENT_OUT(0, float4, outColor)
FRAGMENT_OUT(1, float2, outCocs)
FRAGMENT_SOURCE("workbench_effect_dof_downsample_frag.glsl")
ADDITIONAL_INFO(workbench_effect_dof)
DO_STATIC_COMPILATION()
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(workbench_effect_dof_blur1)
DEFINE_VALUE("NUM_SAMPLES", "49")
SAMPLER(0, sampler2D, input_coc_tx)
SAMPLER(3, sampler2D, half_res_color_tx)
SAMPLER(5, sampler2D, noise_tx)
UNIFORM_BUF(1, float4, samples[49])
FRAGMENT_OUT(0, float4, blurColor)
FRAGMENT_SOURCE("workbench_effect_dof_blur1_frag.glsl")
ADDITIONAL_INFO(workbench_effect_dof)
DO_STATIC_COMPILATION()
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(workbench_effect_dof_blur2)
SAMPLER(0, sampler2D, input_coc_tx)
SAMPLER(4, sampler2D, blur_tx)
FRAGMENT_OUT(0, float4, final_color)
FRAGMENT_SOURCE("workbench_effect_dof_blur2_frag.glsl")
ADDITIONAL_INFO(workbench_effect_dof)
DO_STATIC_COMPILATION()
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(workbench_effect_dof_resolve)
SAMPLER(2, sampler2D, scene_depth_tx)
SAMPLER(3, sampler2D, half_res_color_tx)
FRAGMENT_OUT_DUAL(0, float4, final_colorAdd, SRC_0)
FRAGMENT_OUT_DUAL(0, float4, final_colorMul, SRC_1)
FRAGMENT_SOURCE("workbench_effect_dof_resolve_frag.glsl")
ADDITIONAL_INFO(workbench_effect_dof)
DO_STATIC_COMPILATION()
GPU_SHADER_CREATE_END()

2
source/blender/draw/engines/workbench/shaders/infos/workbench_effect_outline_info.hh → source/blender/draw/engines/workbench/shaders/infos/workbench_effect_outline_infos.hh
View File

@@ -6,7 +6,7 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "gpu_shader_fullscreen_info.hh" # include "gpu_shader_fullscreen_infos.hh"
# include "workbench_shader_shared.hh" # include "workbench_shader_shared.hh"
#endif #endif

4
source/blender/draw/engines/workbench/shaders/infos/workbench_prepass_info.hh → source/blender/draw/engines/workbench/shaders/infos/workbench_prepass_infos.hh
View File

@@ -9,8 +9,8 @@
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_object_infos_info.hh" # include "draw_object_infos_infos.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "workbench_shader_shared.hh" # include "workbench_shader_shared.hh"
# define WORKBENCH_COLOR_MATERIAL # define WORKBENCH_COLOR_MATERIAL

6
source/blender/draw/engines/workbench/shaders/infos/workbench_shadow_info.hh → source/blender/draw/engines/workbench/shaders/infos/workbench_shadow_infos.hh
View File

@@ -9,9 +9,9 @@
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_object_infos_info.hh" # include "draw_object_infos_infos.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# include "gpu_index_load_info.hh" # include "gpu_index_load_infos.hh"
# include "workbench_shader_shared.hh" # include "workbench_shader_shared.hh"
# define DYNAMIC_PASS_SELECTION # define DYNAMIC_PASS_SELECTION

2
source/blender/draw/engines/workbench/shaders/infos/workbench_transparent_resolve_info.hh → source/blender/draw/engines/workbench/shaders/infos/workbench_transparent_resolve_infos.hh
View File

@@ -6,7 +6,7 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "gpu_shader_fullscreen_info.hh" # include "gpu_shader_fullscreen_infos.hh"
#endif #endif
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"

2
source/blender/draw/engines/workbench/shaders/infos/workbench_volume_info.hh → source/blender/draw/engines/workbench/shaders/infos/workbench_volume_infos.hh
View File

@@ -8,7 +8,7 @@
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_object_infos_info.hh" # include "draw_object_infos_infos.hh"
# include "workbench_shader_shared.hh" # include "workbench_shader_shared.hh"
# define VOLUME_SMOKE # define VOLUME_SMOKE

2
source/blender/draw/engines/workbench/shaders/workbench_cavity_lib.glsl
View File

@@ -3,7 +3,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#pragma once #pragma once
#include "infos/workbench_composite_info.hh" #include "infos/workbench_composite_infos.hh"
#include "draw_view_lib.glsl" #include "draw_view_lib.glsl"
#include "workbench_common_lib.glsl" #include "workbench_common_lib.glsl"

2
source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/workbench_composite_info.hh" #include "infos/workbench_composite_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(workbench_composite) FRAGMENT_SHADER_CREATE_INFO(workbench_composite)
FRAGMENT_SHADER_CREATE_INFO(workbench_resolve_opaque_matcap) FRAGMENT_SHADER_CREATE_INFO(workbench_resolve_opaque_matcap)

2
source/blender/draw/engines/workbench/shaders/workbench_effect_dof_blur1_frag.glsl
View File

@@ -8,7 +8,7 @@
* Converted and adapted from HLSL to GLSL by Clément Foucault * Converted and adapted from HLSL to GLSL by Clément Foucault
*/ */
#include "infos/workbench_effect_dof_info.hh" #include "infos/workbench_effect_dof_infos.hh"
#include "gpu_shader_math_constants_lib.glsl" #include "gpu_shader_math_constants_lib.glsl"
#include "workbench_effect_dof_lib.glsl" #include "workbench_effect_dof_lib.glsl"

2
source/blender/draw/engines/workbench/shaders/workbench_effect_dof_blur2_frag.glsl
View File

@@ -8,7 +8,7 @@
* Converted and adapted from HLSL to GLSL by Clément Foucault * Converted and adapted from HLSL to GLSL by Clément Foucault
*/ */
#include "infos/workbench_effect_dof_info.hh" #include "infos/workbench_effect_dof_infos.hh"
#include "draw_view_lib.glsl" #include "draw_view_lib.glsl"
#include "gpu_shader_utildefines_lib.glsl" #include "gpu_shader_utildefines_lib.glsl"

2
source/blender/draw/engines/workbench/shaders/workbench_effect_dof_downsample_frag.glsl
View File

@@ -8,7 +8,7 @@
* Converted and adapted from HLSL to GLSL by Clément Foucault * Converted and adapted from HLSL to GLSL by Clément Foucault
*/ */
#include "infos/workbench_effect_dof_info.hh" #include "infos/workbench_effect_dof_infos.hh"
#include "gpu_shader_math_safe_lib.glsl" #include "gpu_shader_math_safe_lib.glsl"
#include "gpu_shader_math_vector_reduce_lib.glsl" #include "gpu_shader_math_vector_reduce_lib.glsl"

2
source/blender/draw/engines/workbench/shaders/workbench_effect_dof_prepare_frag.glsl
View File

@@ -8,7 +8,7 @@
* Converted and adapted from HLSL to GLSL by Clément Foucault * Converted and adapted from HLSL to GLSL by Clément Foucault
*/ */
#include "infos/workbench_effect_dof_info.hh" #include "infos/workbench_effect_dof_infos.hh"
#include "draw_view_lib.glsl" #include "draw_view_lib.glsl"
#include "gpu_shader_math_safe_lib.glsl" #include "gpu_shader_math_safe_lib.glsl"

2
source/blender/draw/engines/workbench/shaders/workbench_effect_dof_resolve_frag.glsl
View File

@@ -8,7 +8,7 @@
* Converted and adapted from HLSL to GLSL by Clément Foucault * Converted and adapted from HLSL to GLSL by Clément Foucault
*/ */
#include "infos/workbench_effect_dof_info.hh" #include "infos/workbench_effect_dof_infos.hh"
#include "draw_view_lib.glsl" #include "draw_view_lib.glsl"
#include "gpu_shader_utildefines_lib.glsl" #include "gpu_shader_utildefines_lib.glsl"

2
source/blender/draw/engines/workbench/shaders/workbench_effect_outline_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/workbench_effect_outline_info.hh" #include "infos/workbench_effect_outline_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(workbench_effect_outline) FRAGMENT_SHADER_CREATE_INFO(workbench_effect_outline)

2
source/blender/draw/engines/workbench/shaders/workbench_effect_smaa_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/workbench_effect_antialiasing_info.hh" #include "infos/workbench_effect_antialiasing_infos.hh"
/* Adjust according to SMAA_STAGE for C++ compilation. */ /* Adjust according to SMAA_STAGE for C++ compilation. */
FRAGMENT_SHADER_CREATE_INFO(workbench_smaa_stage_1) FRAGMENT_SHADER_CREATE_INFO(workbench_smaa_stage_1)

2
source/blender/draw/engines/workbench/shaders/workbench_effect_smaa_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/workbench_effect_antialiasing_info.hh" #include "infos/workbench_effect_antialiasing_infos.hh"
VERTEX_SHADER_CREATE_INFO(workbench_smaa) VERTEX_SHADER_CREATE_INFO(workbench_smaa)

2
source/blender/draw/engines/workbench/shaders/workbench_effect_taa_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/workbench_effect_antialiasing_info.hh" #include "infos/workbench_effect_antialiasing_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(workbench_taa) FRAGMENT_SHADER_CREATE_INFO(workbench_taa)

2
source/blender/draw/engines/workbench/shaders/workbench_image_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/workbench_prepass_info.hh" #include "infos/workbench_prepass_infos.hh"
SHADER_LIBRARY_CREATE_INFO(workbench_color_texture) SHADER_LIBRARY_CREATE_INFO(workbench_color_texture)

2
source/blender/draw/engines/workbench/shaders/workbench_matcap_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/workbench_prepass_info.hh" #include "infos/workbench_prepass_infos.hh"
#ifdef GPU_LIBRARY_SHADER #ifdef GPU_LIBRARY_SHADER
SHADER_LIBRARY_CREATE_INFO(workbench_prepass) SHADER_LIBRARY_CREATE_INFO(workbench_prepass)

2
source/blender/draw/engines/workbench/shaders/workbench_material_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/workbench_prepass_info.hh" #include "infos/workbench_prepass_infos.hh"
// SHADER_LIBRARY_CREATE_INFO(workbench_color_material) // SHADER_LIBRARY_CREATE_INFO(workbench_color_material)
SHADER_LIBRARY_CREATE_INFO(workbench_color_texture) SHADER_LIBRARY_CREATE_INFO(workbench_color_texture)

2
source/blender/draw/engines/workbench/shaders/workbench_merge_depth_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/workbench_depth_info.hh" #include "infos/workbench_depth_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(workbench_merge_depth) FRAGMENT_SHADER_CREATE_INFO(workbench_merge_depth)

2
source/blender/draw/engines/workbench/shaders/workbench_overlay_depth_frag.glsl
View File

@@ -4,7 +4,7 @@
/* Prepare the Depth Buffer for the Overlay Engine. */ /* Prepare the Depth Buffer for the Overlay Engine. */
#include "infos/workbench_depth_info.hh" #include "infos/workbench_depth_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(workbench_overlay_depth) FRAGMENT_SHADER_CREATE_INFO(workbench_overlay_depth)

2
source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/workbench_prepass_info.hh" #include "infos/workbench_prepass_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(workbench_prepass) FRAGMENT_SHADER_CREATE_INFO(workbench_prepass)
FRAGMENT_SHADER_CREATE_INFO(workbench_opaque) FRAGMENT_SHADER_CREATE_INFO(workbench_opaque)

2
source/blender/draw/engines/workbench/shaders/workbench_prepass_hair_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/workbench_prepass_info.hh" #include "infos/workbench_prepass_infos.hh"
VERTEX_SHADER_CREATE_INFO(workbench_prepass) VERTEX_SHADER_CREATE_INFO(workbench_prepass)
VERTEX_SHADER_CREATE_INFO(workbench_lighting_flat) VERTEX_SHADER_CREATE_INFO(workbench_lighting_flat)

2
source/blender/draw/engines/workbench/shaders/workbench_prepass_pointcloud_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/workbench_prepass_info.hh" #include "infos/workbench_prepass_infos.hh"
VERTEX_SHADER_CREATE_INFO(workbench_prepass) VERTEX_SHADER_CREATE_INFO(workbench_prepass)
VERTEX_SHADER_CREATE_INFO(workbench_lighting_flat) VERTEX_SHADER_CREATE_INFO(workbench_lighting_flat)

2
source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/workbench_prepass_info.hh" #include "infos/workbench_prepass_infos.hh"
VERTEX_SHADER_CREATE_INFO(workbench_prepass) VERTEX_SHADER_CREATE_INFO(workbench_prepass)
VERTEX_SHADER_CREATE_INFO(workbench_lighting_flat) VERTEX_SHADER_CREATE_INFO(workbench_lighting_flat)

2
source/blender/draw/engines/workbench/shaders/workbench_shadow_caps_vert.glsl
View File

@@ -16,7 +16,7 @@
* execute the vertex shader code on each of the input primitive's vertices. * execute the vertex shader code on each of the input primitive's vertices.
*/ */
#include "infos/workbench_shadow_info.hh" #include "infos/workbench_shadow_infos.hh"
VERTEX_SHADER_CREATE_INFO(workbench_shadow_common) VERTEX_SHADER_CREATE_INFO(workbench_shadow_common)

2
source/blender/draw/engines/workbench/shaders/workbench_shadow_debug_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/workbench_shadow_info.hh" #include "infos/workbench_shadow_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(workbench_shadow_debug) FRAGMENT_SHADER_CREATE_INFO(workbench_shadow_debug)

2
source/blender/draw/engines/workbench/shaders/workbench_shadow_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/workbench_shadow_info.hh" #include "infos/workbench_shadow_infos.hh"
VERTEX_SHADER_CREATE_INFO(workbench_shadow_common) VERTEX_SHADER_CREATE_INFO(workbench_shadow_common)

2
source/blender/draw/engines/workbench/shaders/workbench_shadow_vert.glsl
View File

@@ -17,7 +17,7 @@
* execute the vertex shader code on each of the input primitive's vertices. * execute the vertex shader code on each of the input primitive's vertices.
*/ */
#include "infos/workbench_shadow_info.hh" #include "infos/workbench_shadow_infos.hh"
VERTEX_SHADER_CREATE_INFO(workbench_shadow_common) VERTEX_SHADER_CREATE_INFO(workbench_shadow_common)

2
source/blender/draw/engines/workbench/shaders/workbench_shadow_visibility_comp.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/workbench_shadow_info.hh" #include "infos/workbench_shadow_infos.hh"
COMPUTE_SHADER_CREATE_INFO(workbench_shadow_visibility_compute_dynamic_pass_type) COMPUTE_SHADER_CREATE_INFO(workbench_shadow_visibility_compute_dynamic_pass_type)

2
source/blender/draw/engines/workbench/shaders/workbench_transparent_accum_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/workbench_prepass_info.hh" #include "infos/workbench_prepass_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(workbench_prepass) FRAGMENT_SHADER_CREATE_INFO(workbench_prepass)
FRAGMENT_SHADER_CREATE_INFO(workbench_transparent_accum) FRAGMENT_SHADER_CREATE_INFO(workbench_transparent_accum)

2
source/blender/draw/engines/workbench/shaders/workbench_transparent_resolve_frag.glsl
View File

@@ -7,7 +7,7 @@
* Computer Graphics Techniques (JCGT), vol. 2, no. 2, 122–141, 2013 * Computer Graphics Techniques (JCGT), vol. 2, no. 2, 122–141, 2013
*/ */
#include "infos/workbench_transparent_resolve_info.hh" #include "infos/workbench_transparent_resolve_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(workbench_transparent_resolve) FRAGMENT_SHADER_CREATE_INFO(workbench_transparent_resolve)

2
source/blender/draw/engines/workbench/shaders/workbench_volume_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/workbench_volume_info.hh" #include "infos/workbench_volume_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(workbench_volume) FRAGMENT_SHADER_CREATE_INFO(workbench_volume)
FRAGMENT_SHADER_CREATE_INFO(workbench_volume_slice) FRAGMENT_SHADER_CREATE_INFO(workbench_volume_slice)

2
source/blender/draw/engines/workbench/shaders/workbench_volume_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/workbench_volume_info.hh" #include "infos/workbench_volume_infos.hh"
VERTEX_SHADER_CREATE_INFO(workbench_volume) VERTEX_SHADER_CREATE_INFO(workbench_volume)
VERTEX_SHADER_CREATE_INFO(workbench_volume_slice) VERTEX_SHADER_CREATE_INFO(workbench_volume_slice)

2
source/blender/draw/engines/workbench/shaders/workbench_world_light_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/workbench_prepass_info.hh" #include "infos/workbench_prepass_infos.hh"
#ifdef GPU_LIBRARY_SHADER #ifdef GPU_LIBRARY_SHADER
SHADER_LIBRARY_CREATE_INFO(workbench_prepass) SHADER_LIBRARY_CREATE_INFO(workbench_prepass)

2
source/blender/draw/intern/shaders/draw_command_generate_comp.glsl
View File

@@ -6,7 +6,7 @@
* Convert DrawPrototype into draw commands. * Convert DrawPrototype into draw commands.
*/ */
#include "draw_view_info.hh" #include "draw_view_infos.hh"
COMPUTE_SHADER_CREATE_INFO(draw_command_generate) COMPUTE_SHADER_CREATE_INFO(draw_command_generate)

2
source/blender/draw/intern/shaders/draw_curves_info.hh
View File

@@ -11,7 +11,7 @@
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "draw_attribute_shader_shared.hh" # include "draw_attribute_shader_shared.hh"
# include "draw_object_infos_info.hh" # include "draw_object_infos_infos.hh"
# define DRW_HAIR_INFO # define DRW_HAIR_INFO
#endif #endif

133
source/blender/draw/intern/shaders/draw_curves_infos.hh Normal file
View File

@@ -0,0 +1,133 @@
/* SPDX-FileCopyrightText: 2025 Blender Authors
*
* SPDX-License-Identifier: GPL-2.0-or-later */
/** \file
* \ingroup draw
*/
#ifdef GPU_SHADER
# pragma once
# include "gpu_shader_compat.hh"
# include "draw_attribute_shader_shared.hh"
# include "draw_object_infos_infos.hh"
# define DRW_HAIR_INFO
#endif
#include "draw_curves_defines.hh"
#include "gpu_shader_create_info.hh"
GPU_SHADER_CREATE_INFO(draw_curves_topology)
LOCAL_GROUP_SIZE(CURVES_PER_THREADGROUP)
/* Offsets giving the start and end of the curve. */
STORAGE_BUF(0, read, int, evaluated_offsets_buf[])
STORAGE_BUF(1, read, uint, curves_cyclic_buf[]) /* Actually bool (1 byte). */
STORAGE_BUF(2, write, int, indirection_buf[])
PUSH_CONSTANT(int, curves_start)
PUSH_CONSTANT(int, curves_count)
PUSH_CONSTANT(bool, is_ribbon_topology)
PUSH_CONSTANT(bool, use_cyclic)
COMPUTE_SOURCE("draw_curves_topology_comp.glsl")
DO_STATIC_COMPILATION()
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(draw_curves_data)
LOCAL_GROUP_SIZE(CURVES_PER_THREADGROUP)
/* Offsets giving the start and end of the curve. */
STORAGE_BUF(EVALUATED_POINT_SLOT, read, int, evaluated_points_by_curve_buf[])
STORAGE_BUF(POINTS_BY_CURVES_SLOT, read, int, points_by_curve_buf[])
STORAGE_BUF(CURVE_RESOLUTION_SLOT, read, uint, curves_resolution_buf[])
STORAGE_BUF(CURVE_TYPE_SLOT, read, uint, curves_type_buf[]) /* Actually int8_t. */
STORAGE_BUF(CURVE_CYCLIC_SLOT, read, uint, curves_cyclic_buf[]) /* Actually bool (1 byte). */
/* Bezier handles (if needed). */
STORAGE_BUF(HANDLES_POS_LEFT_SLOT, read, float, handles_positions_left_buf[])
STORAGE_BUF(HANDLES_POS_RIGHT_SLOT, read, float, handles_positions_right_buf[])
STORAGE_BUF(BEZIER_OFFSETS_SLOT, read, int, bezier_offsets_buf[])
/* Nurbs (alias of other buffers). */
// STORAGE_BUF(CURVES_ORDER_SLOT, read, uint, curves_order_buf[]) /* Actually int8_t. */
// STORAGE_BUF(BASIS_CACHE_SLOT, read, float, basis_cache_buf[])
// STORAGE_BUF(CONTROL_WEIGHTS_SLOT, read, float, control_weights_buf[])
// STORAGE_BUF(BASIS_CACHE_OFFSET_SLOT, read, int, basis_cache_offset_buf[])
PUSH_CONSTANT(int, curves_start)
PUSH_CONSTANT(int, curves_count)
PUSH_CONSTANT(bool, use_point_weight)
PUSH_CONSTANT(bool, use_cyclic)
/** IMPORTANT: For very dumb reasons, on GL the default specialization is compiled and used for
* creating the shader interface. If this happens to optimize out some push_constants that are
* valid in other specialization, we will never be able to set them. So choose the specialization
* that uses all push_constants. */
SPECIALIZATION_CONSTANT(int, evaluated_type, 3) /* CURVE_TYPE_NURBS */
TYPEDEF_SOURCE("draw_attribute_shader_shared.hh")
COMPUTE_SOURCE("draw_curves_interpolation_comp.glsl")
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(draw_curves_interpolate_position)
ADDITIONAL_INFO(draw_curves_data)
/* Attributes. */
STORAGE_BUF(POINT_POSITIONS_SLOT, read, float, positions_buf[])
STORAGE_BUF(POINT_RADII_SLOT, read, float, radii_buf[])
/* Outputs. */
STORAGE_BUF(EVALUATED_POS_RAD_SLOT, read_write, float4, evaluated_positions_radii_buf[])
PUSH_CONSTANT(float4x4, transform)
COMPUTE_FUNCTION("evaluate_position_radius")
DO_STATIC_COMPILATION()
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(draw_curves_interpolate_float4_attribute)
ADDITIONAL_INFO(draw_curves_data)
STORAGE_BUF(POINT_ATTR_SLOT, read, StoredFloat4, attribute_float4_buf[])
STORAGE_BUF(EVALUATED_ATTR_SLOT, read_write, StoredFloat4, evaluated_float4_buf[])
COMPUTE_FUNCTION("evaluate_attribute_float4")
DO_STATIC_COMPILATION()
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(draw_curves_interpolate_float3_attribute)
ADDITIONAL_INFO(draw_curves_data)
STORAGE_BUF(POINT_ATTR_SLOT, read, StoredFloat3, attribute_float3_buf[])
STORAGE_BUF(EVALUATED_ATTR_SLOT, read_write, StoredFloat3, evaluated_float3_buf[])
COMPUTE_FUNCTION("evaluate_attribute_float3")
DO_STATIC_COMPILATION()
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(draw_curves_interpolate_float2_attribute)
ADDITIONAL_INFO(draw_curves_data)
STORAGE_BUF(POINT_ATTR_SLOT, read, StoredFloat2, attribute_float2_buf[])
STORAGE_BUF(EVALUATED_ATTR_SLOT, read_write, StoredFloat2, evaluated_float2_buf[])
COMPUTE_FUNCTION("evaluate_attribute_float2")
DO_STATIC_COMPILATION()
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(draw_curves_interpolate_float_attribute)
ADDITIONAL_INFO(draw_curves_data)
STORAGE_BUF(POINT_ATTR_SLOT, read, StoredFloat, attribute_float_buf[])
STORAGE_BUF(EVALUATED_ATTR_SLOT, read_write, StoredFloat, evaluated_float_buf[])
COMPUTE_FUNCTION("evaluate_attribute_float")
DO_STATIC_COMPILATION()
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(draw_curves_evaluate_length_intercept)
LOCAL_GROUP_SIZE(CURVES_PER_THREADGROUP)
STORAGE_BUF(EVALUATED_POINT_SLOT, read, int, evaluated_points_by_curve_buf[])
STORAGE_BUF(EVALUATED_POS_RAD_SLOT, read, float4, evaluated_positions_radii_buf[])
STORAGE_BUF(EVALUATED_TIME_SLOT, read_write, float, evaluated_time_buf[])
STORAGE_BUF(CURVES_LENGTH_SLOT, write, float, curves_length_buf[])
PUSH_CONSTANT(int, curves_start)
PUSH_CONSTANT(int, curves_count)
PUSH_CONSTANT(bool, use_cyclic)
COMPUTE_FUNCTION("evaluate_length_intercept")
COMPUTE_SOURCE("draw_curves_length_intercept_comp.glsl")
DO_STATIC_COMPILATION()
GPU_SHADER_CREATE_END()
GPU_SHADER_CREATE_INFO(draw_curves_test)
STORAGE_BUF(0, write, float, result_pos_buf[])
STORAGE_BUF(1, write, int4, result_indices_buf[])
VERTEX_SOURCE("draw_curves_test.glsl")
FRAGMENT_SOURCE("draw_curves_test.glsl")
ADDITIONAL_INFO(draw_curves_infos)
ADDITIONAL_INFO(draw_curves)
DO_STATIC_COMPILATION()
GPU_SHADER_CREATE_END()

2
source/blender/draw/intern/shaders/draw_curves_interpolation_comp.glsl
View File

@@ -9,7 +9,7 @@
* Equivalent of `CurvesGeometry::evaluated_positions()`. * Equivalent of `CurvesGeometry::evaluated_positions()`.
*/ */
#include "draw_curves_info.hh" #include "draw_curves_infos.hh"
#include "gpu_shader_attribute_load_lib.glsl" #include "gpu_shader_attribute_load_lib.glsl"
#include "gpu_shader_math_matrix_transform_lib.glsl" #include "gpu_shader_math_matrix_transform_lib.glsl"

2
source/blender/draw/intern/shaders/draw_curves_length_intercept_comp.glsl
View File

@@ -7,7 +7,7 @@
* One thread processes one curve. * One thread processes one curve.
*/ */
#include "draw_curves_info.hh" #include "draw_curves_infos.hh"
COMPUTE_SHADER_CREATE_INFO(draw_curves_evaluate_length_intercept) COMPUTE_SHADER_CREATE_INFO(draw_curves_evaluate_length_intercept)

2
source/blender/draw/intern/shaders/draw_curves_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "draw_object_infos_info.hh" #include "draw_object_infos_infos.hh"
#include "gpu_shader_math_constants_lib.glsl" #include "gpu_shader_math_constants_lib.glsl"
#include "gpu_shader_math_matrix_conversion_lib.glsl" #include "gpu_shader_math_matrix_conversion_lib.glsl"

2
source/blender/draw/intern/shaders/draw_curves_test.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "draw_curves_info.hh" #include "draw_curves_infos.hh"
VERTEX_SHADER_CREATE_INFO(draw_curves_test) VERTEX_SHADER_CREATE_INFO(draw_curves_test)

2
source/blender/draw/intern/shaders/draw_curves_topology_comp.glsl
View File

@@ -7,7 +7,7 @@
* One thread processes one curve. * One thread processes one curve.
*/ */
#include "draw_curves_info.hh" #include "draw_curves_infos.hh"
COMPUTE_SHADER_CREATE_INFO(draw_curves_topology) COMPUTE_SHADER_CREATE_INFO(draw_curves_topology)

2
source/blender/draw/intern/shaders/draw_debug_draw_display_frag.glsl
View File

@@ -6,7 +6,7 @@
* Display debug edge list. * Display debug edge list.
*/ */
#include "draw_debug_info.hh" #include "draw_debug_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(draw_debug_draw_display) FRAGMENT_SHADER_CREATE_INFO(draw_debug_draw_display)

2
source/blender/draw/intern/shaders/draw_debug_draw_display_vert.glsl
View File

@@ -6,7 +6,7 @@
* Display debug edge list. * Display debug edge list.
*/ */
#include "draw_debug_info.hh" #include "draw_debug_infos.hh"
VERTEX_SHADER_CREATE_INFO(draw_debug_draw_display) VERTEX_SHADER_CREATE_INFO(draw_debug_draw_display)

2
source/blender/draw/intern/shaders/draw_debug_draw_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "draw_debug_info.hh" #include "draw_debug_infos.hh"
SHADER_LIBRARY_CREATE_INFO(draw_debug_draw) SHADER_LIBRARY_CREATE_INFO(draw_debug_draw)

0
source/blender/draw/intern/shaders/draw_debug_info.hh → source/blender/draw/intern/shaders/draw_debug_infos.hh
View File

2
source/blender/draw/intern/shaders/draw_grease_pencil_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "draw_object_infos_info.hh" #include "draw_object_infos_infos.hh"
SHADER_LIBRARY_CREATE_INFO(draw_gpencil) SHADER_LIBRARY_CREATE_INFO(draw_gpencil)

2
source/blender/draw/intern/shaders/draw_intersect_lib.glsl
View File

@@ -9,7 +9,7 @@
* Results are meant to be conservative. * Results are meant to be conservative.
*/ */
#include "draw_view_info.hh" #include "draw_view_infos.hh"
#include "draw_shape_lib.glsl" #include "draw_shape_lib.glsl"
#include "gpu_shader_math_base_lib.glsl" #include "gpu_shader_math_base_lib.glsl"

2
source/blender/draw/intern/shaders/draw_model_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "draw_view_info.hh" #include "draw_view_infos.hh"
#include "draw_view_lib.glsl" #include "draw_view_lib.glsl"

2
source/blender/draw/intern/shaders/draw_object_infos_info.hh → source/blender/draw/intern/shaders/draw_object_infos_infos.hh
View File

@@ -9,7 +9,7 @@
# include "draw_shader_shared.hh" # include "draw_shader_shared.hh"
# include "gpencil_shader_shared.hh" # include "gpencil_shader_shared.hh"
# include "draw_view_info.hh" # include "draw_view_infos.hh"
# define CURVES_SHADER # define CURVES_SHADER
# define DRW_GPENCIL_INFO # define DRW_GPENCIL_INFO

2
source/blender/draw/intern/shaders/draw_object_infos_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "draw_object_infos_info.hh" #include "draw_object_infos_infos.hh"
#include "draw_model_lib.glsl" #include "draw_model_lib.glsl"

2
source/blender/draw/intern/shaders/draw_resource_finalize_comp.glsl
View File

@@ -6,7 +6,7 @@
* Finish computation of a few draw resource after sync. * Finish computation of a few draw resource after sync.
*/ */
#include "draw_view_info.hh" #include "draw_view_infos.hh"
#include "gpu_shader_math_matrix_transform_lib.glsl" #include "gpu_shader_math_matrix_transform_lib.glsl"
#include "gpu_shader_math_vector_reduce_lib.glsl" #include "gpu_shader_math_vector_reduce_lib.glsl"

2
source/blender/draw/intern/shaders/draw_view_finalize_comp.glsl
View File

@@ -6,7 +6,7 @@
* Compute culling data for each views of a given view buffer. * Compute culling data for each views of a given view buffer.
*/ */
#include "draw_view_info.hh" #include "draw_view_infos.hh"
#include "draw_view_lib.glsl" #include "draw_view_lib.glsl"
#include "gpu_shader_math_matrix_transform_lib.glsl" #include "gpu_shader_math_matrix_transform_lib.glsl"

0
source/blender/draw/intern/shaders/draw_view_info.hh → source/blender/draw/intern/shaders/draw_view_infos.hh
View File

2
source/blender/draw/intern/shaders/draw_view_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "draw_view_info.hh" #include "draw_view_infos.hh"
SHADER_LIBRARY_CREATE_INFO(draw_view) SHADER_LIBRARY_CREATE_INFO(draw_view)

2
source/blender/draw/intern/shaders/draw_visibility_comp.glsl
View File

@@ -7,7 +7,7 @@
*/ */
/* TODO(fclem): This could be augmented by a 2 pass occlusion culling system. */ /* TODO(fclem): This could be augmented by a 2 pass occlusion culling system. */
#include "draw_view_info.hh" #include "draw_view_infos.hh"
#include "draw_intersect_lib.glsl" #include "draw_intersect_lib.glsl"

0
source/blender/draw/intern/shaders/subdiv_info.hh → source/blender/draw/intern/shaders/subdiv_infos.hh
View File

2
source/blender/draw/intern/shaders/subdiv_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "subdiv_info.hh" #include "subdiv_infos.hh"
#ifdef SUBDIV_POLYGON_OFFSET #ifdef SUBDIV_POLYGON_OFFSET
COMPUTE_SHADER_CREATE_INFO(subdiv_polygon_offset_base) COMPUTE_SHADER_CREATE_INFO(subdiv_polygon_offset_base)

50
source/blender/gpu/CMakeLists.txt
View File

@@ -155,7 +155,6 @@ set(SRC
intern/gpu_query.hh intern/gpu_query.hh
intern/gpu_select_private.hh intern/gpu_select_private.hh
intern/gpu_shader_create_info.hh intern/gpu_shader_create_info.hh
intern/gpu_shader_create_info_list.hh
intern/gpu_shader_create_info_private.hh intern/gpu_shader_create_info_private.hh
intern/gpu_shader_dependency_private.hh intern/gpu_shader_dependency_private.hh
intern/gpu_shader_interface.hh intern/gpu_shader_interface.hh
@@ -450,6 +449,43 @@ endif()
set(GLSL_SRC set(GLSL_SRC
GPU_shader_shared.hh GPU_shader_shared.hh
shaders/infos/gpu_clip_planes_infos.hh
shaders/infos/gpu_index_load_infos.hh
shaders/infos/gpu_interface_infos.hh
shaders/infos/gpu_shader_2D_area_borders_infos.hh
shaders/infos/gpu_shader_2D_checker_infos.hh
shaders/infos/gpu_shader_2D_diag_stripes_infos.hh
shaders/infos/gpu_shader_2D_image_desaturate_color_infos.hh
shaders/infos/gpu_shader_2D_image_infos.hh
shaders/infos/gpu_shader_2D_image_overlays_merge_infos.hh
shaders/infos/gpu_shader_2D_image_overlays_stereo_merge_infos.hh
shaders/infos/gpu_shader_2D_image_rect_color_infos.hh
shaders/infos/gpu_shader_2D_image_shuffle_color_infos.hh
shaders/infos/gpu_shader_2D_node_socket_infos.hh
shaders/infos/gpu_shader_2D_nodelink_infos.hh
shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_aa_infos.hh
shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_infos.hh
shaders/infos/gpu_shader_2D_point_varying_size_varying_color_infos.hh
shaders/infos/gpu_shader_2D_widget_infos.hh
shaders/infos/gpu_shader_3D_depth_only_infos.hh
shaders/infos/gpu_shader_3D_flat_color_infos.hh
shaders/infos/gpu_shader_3D_image_infos.hh
shaders/infos/gpu_shader_3D_point_infos.hh
shaders/infos/gpu_shader_3D_polyline_infos.hh
shaders/infos/gpu_shader_3D_smooth_color_infos.hh
shaders/infos/gpu_shader_3D_uniform_color_infos.hh
shaders/infos/gpu_shader_fullscreen_infos.hh
shaders/infos/gpu_shader_gpencil_stroke_infos.hh
shaders/infos/gpu_shader_icon_infos.hh
shaders/infos/gpu_shader_index_infos.hh
shaders/infos/gpu_shader_keyframe_shape_infos.hh
shaders/infos/gpu_shader_line_dashed_uniform_color_infos.hh
shaders/infos/gpu_shader_print_infos.hh
shaders/infos/gpu_shader_sequencer_infos.hh
shaders/infos/gpu_shader_simple_lighting_infos.hh
shaders/infos/gpu_shader_text_infos.hh
shaders/infos/gpu_srgb_to_framebuffer_space_infos.hh
shaders/gpu_shader_depth_only_frag.glsl shaders/gpu_shader_depth_only_frag.glsl
shaders/gpu_shader_uniform_color_frag.glsl shaders/gpu_shader_uniform_color_frag.glsl
shaders/gpu_shader_checker_frag.glsl shaders/gpu_shader_checker_frag.glsl
@@ -672,6 +708,8 @@ set(GLSL_SRC
) )
set(GLSL_SRC_TEST set(GLSL_SRC_TEST
shaders/infos/gpu_shader_test_infos.hh
tests/shaders/gpu_math_test.glsl tests/shaders/gpu_math_test.glsl
tests/shaders/gpu_buffer_texture_test.glsl tests/shaders/gpu_buffer_texture_test.glsl
tests/shaders/gpu_compute_1d_test.glsl tests/shaders/gpu_compute_1d_test.glsl
@@ -687,6 +725,9 @@ set(GLSL_SRC_TEST
) )
set(MTL_BACKEND_GLSL_SRC set(MTL_BACKEND_GLSL_SRC
metal/kernels/depth_2d_update_infos.hh
metal/kernels/gpu_shader_fullscreen_blit_infos.hh
metal/kernels/depth_2d_update_float_frag.glsl metal/kernels/depth_2d_update_float_frag.glsl
metal/kernels/depth_2d_update_int24_frag.glsl metal/kernels/depth_2d_update_int24_frag.glsl
metal/kernels/depth_2d_update_int32_frag.glsl metal/kernels/depth_2d_update_int32_frag.glsl
@@ -714,6 +755,8 @@ set(MSL_SRC
) )
set(VULKAN_BACKEND_GLSL_SRC set(VULKAN_BACKEND_GLSL_SRC
vulkan/shaders/vk_backbuffer_blit_infos.hh
vulkan/shaders/vk_backbuffer_blit_comp.glsl vulkan/shaders/vk_backbuffer_blit_comp.glsl
) )
@@ -756,11 +799,13 @@ list(APPEND LIB
set(GLSL_SOURCE_CONTENT "") set(GLSL_SOURCE_CONTENT "")
set(GLSL_METADATA_CONTENT "") set(GLSL_METADATA_CONTENT "")
set(GLSL_INFOS_CONTENT "")
foreach(GLSL_FILE ${GLSL_SRC}) foreach(GLSL_FILE ${GLSL_SRC})
get_filename_component(GLSL_FILE_NAME ${GLSL_FILE} NAME) get_filename_component(GLSL_FILE_NAME ${GLSL_FILE} NAME)
string(REPLACE "." "_" GLSL_FILE_NAME_UNDERSCORES ${GLSL_FILE_NAME}) string(REPLACE "." "_" GLSL_FILE_NAME_UNDERSCORES ${GLSL_FILE_NAME})
string(APPEND GLSL_SOURCE_CONTENT "SHADER_SOURCE\(${GLSL_FILE_NAME_UNDERSCORES}, \"${GLSL_FILE_NAME}\", \"${GLSL_FILE}\"\)\n") string(APPEND GLSL_SOURCE_CONTENT "SHADER_SOURCE\(${GLSL_FILE_NAME_UNDERSCORES}, \"${GLSL_FILE_NAME}\", \"${GLSL_FILE}\"\)\n")
string(APPEND GLSL_METADATA_CONTENT "#include \"${GLSL_FILE}.hh\"\n") string(APPEND GLSL_METADATA_CONTENT "#include \"${GLSL_FILE}.hh\"\n")
string(APPEND GLSL_INFOS_CONTENT "#include \"${GLSL_FILE}.info\"\n")
endforeach() endforeach()
set(glsl_source_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_gpu_source_list.h") set(glsl_source_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_gpu_source_list.h")
@@ -769,6 +814,9 @@ list(APPEND SRC ${glsl_source_list_file})
set(glsl_metadata_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_gpu_metadata_list.hh") set(glsl_metadata_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_gpu_metadata_list.hh")
file(GENERATE OUTPUT ${glsl_metadata_list_file} CONTENT "${GLSL_METADATA_CONTENT}") file(GENERATE OUTPUT ${glsl_metadata_list_file} CONTENT "${GLSL_METADATA_CONTENT}")
list(APPEND SRC ${glsl_metadata_list_file}) list(APPEND SRC ${glsl_metadata_list_file})
set(glsl_infos_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_gpu_infos_list.hh")
file(GENERATE OUTPUT ${glsl_infos_list_file} CONTENT "${GLSL_INFOS_CONTENT}")
list(APPEND SRC ${glsl_infos_list_file})
list(APPEND INC ${CMAKE_CURRENT_BINARY_DIR}) list(APPEND INC ${CMAKE_CURRENT_BINARY_DIR})
if(WITH_MOD_FLUID) if(WITH_MOD_FLUID)

35
source/blender/gpu/glsl_preprocess/glsl_preprocess.cc
View File

@@ -16,8 +16,9 @@
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
if (argc != 4) { if (argc != 5) {
std::cerr << "Usage: glsl_preprocess <data_file_from> <data_file_to> <metadata_file_to>" std::cerr << "Usage: glsl_preprocess <data_file_from> <data_file_to> <metadata_file_to> "
"<infos_file_to>"
<< std::endl; << std::endl;
exit(1); exit(1);
} }
@@ -25,6 +26,7 @@ int main(int argc, char **argv)
const char *input_file_name = argv[1]; const char *input_file_name = argv[1];
const char *output_file_name = argv[2]; const char *output_file_name = argv[2];
const char *metadata_file_name = argv[3]; const char *metadata_file_name = argv[3];
const char *infos_file_name = argv[4];
/* Open the input file for reading */ /* Open the input file for reading */
std::ifstream input_file(input_file_name); std::ifstream input_file(input_file_name);
@@ -62,6 +64,14 @@ int main(int argc, char **argv)
exit(1); exit(1);
} }
/* Open the output file for writing */
std::ofstream infos_file(infos_file_name, std::ofstream::out | std::ofstream::binary);
if (!output_file) {
std::cerr << "Error: Could not open output file " << infos_file_name << std::endl;
input_file.close();
exit(1);
}
std::stringstream buffer; std::stringstream buffer;
buffer << input_file.rdbuf(); buffer << input_file.rdbuf();
@@ -78,7 +88,7 @@ int main(int argc, char **argv)
error++; error++;
}; };
std::string filename(output_file_name); std::string filename(output_file_name);
const bool is_info = filename.find("info.hh") != std::string::npos; const bool is_info = filename.find("infos.hh") != std::string::npos;
const bool is_glsl = filename.find(".glsl") != std::string::npos; const bool is_glsl = filename.find(".glsl") != std::string::npos;
const bool is_shared = filename.find("shared.h") != std::string::npos; const bool is_shared = filename.find("shared.h") != std::string::npos;
const bool is_library = is_glsl && const bool is_library = is_glsl &&
@@ -86,12 +96,6 @@ int main(int argc, char **argv)
filename.find("gpu_shader_common_") != std::string::npos || filename.find("gpu_shader_common_") != std::string::npos ||
filename.find("gpu_shader_compositor_") != std::string::npos); filename.find("gpu_shader_compositor_") != std::string::npos);
if (is_info) {
std::cerr << "File " << output_file_name
<< " is a create info file and should not be processed as glsl" << std::endl;
return 1;
}
using Preprocessor = blender::gpu::shader::Preprocessor; using Preprocessor = blender::gpu::shader::Preprocessor;
Preprocessor processor; Preprocessor processor;
@@ -103,8 +107,14 @@ int main(int argc, char **argv)
} }
blender::gpu::shader::metadata::Source metadata; blender::gpu::shader::metadata::Source metadata;
if (is_info) {
/* Until they are parsed properly. Nullify them. */
output_file << "";
}
else {
output_file << processor.process( output_file << processor.process(
language, buffer.str(), input_file_name, is_library, is_shared, report_error, metadata); language, buffer.str(), input_file_name, is_library, is_shared, report_error, metadata);
}
/* TODO(fclem): Don't use regex for that. */ /* TODO(fclem): Don't use regex for that. */
std::string metadata_function_name = "metadata_" + std::string metadata_function_name = "metadata_" +
@@ -113,10 +123,17 @@ int main(int argc, char **argv)
std::replace(metadata_function_name.begin(), metadata_function_name.end(), '.', '_'); std::replace(metadata_function_name.begin(), metadata_function_name.end(), '.', '_');
metadata_file << metadata.serialize(metadata_function_name); metadata_file << metadata.serialize(metadata_function_name);
if (is_info) {
/* Simple copy for now. But we need to rename all includes. */
std::string str = std::regex_replace(
buffer.str(), std::regex(R"(_infos.hh")"), "_infos.hh.info\"");
infos_file << str;
}
input_file.close(); input_file.close();
output_file.close(); output_file.close();
metadata_file.close(); metadata_file.close();
infos_file.close();
return error; return error;
} }

7
source/blender/gpu/glsl_preprocess/glsl_preprocess.hh
View File

@@ -720,7 +720,12 @@ class Preprocessor {
parser.erase(tokens.front(), tokens.back()); parser.erase(tokens.front(), tokens.back());
return; return;
} }
if (dependency_name.find("info.hh") != std::string::npos) { if (dependency_name.find("infos.hh") != std::string::npos) {
/* Skip info files. They are only for IDE linting. */
parser.erase(tokens.front(), tokens.back());
return;
}
if (dependency_name.find("gpu_shader_create_info.hh") != std::string::npos) {
/* Skip info files. They are only for IDE linting. */ /* Skip info files. They are only for IDE linting. */
parser.erase(tokens.front(), tokens.back()); parser.erase(tokens.front(), tokens.back());
return; return;

8
source/blender/gpu/intern/gpu_shader_create_info.cc
View File

@@ -526,7 +526,13 @@ void gpu_shader_create_info_init()
#define GPU_SHADER_CREATE_END() ; #define GPU_SHADER_CREATE_END() ;
/* Declare, register and construct the infos. */ /* Declare, register and construct the infos. */
#include "gpu_shader_create_info_list.hh" #include "glsl_compositor_infos_list.hh"
#include "glsl_draw_infos_list.hh"
#include "glsl_gpu_infos_list.hh"
#include "glsl_ocio_infos_list.hh"
#ifdef WITH_OPENSUBDIV
# include "glsl_osd_infos_list.hh"
#endif
if (GPU_stencil_clasify_buffer_workaround()) { if (GPU_stencil_clasify_buffer_workaround()) {
/* WORKAROUND: Adding a dummy buffer that isn't used fixes a bug inside the Qualcomm driver. */ /* WORKAROUND: Adding a dummy buffer that isn't used fixes a bug inside the Qualcomm driver. */

186
source/blender/gpu/intern/gpu_shader_create_info_list.hh
View File

@@ -1,186 +0,0 @@
/* SPDX-FileCopyrightText: 2024 Blender Authors
*
* SPDX-License-Identifier: GPL-2.0-or-later */
/* GPU module. */
#include "gpu_clip_planes_info.hh"
#include "gpu_index_load_info.hh"
#include "gpu_shader_2D_area_borders_info.hh"
#include "gpu_shader_2D_checker_info.hh"
#include "gpu_shader_2D_diag_stripes_info.hh"
#include "gpu_shader_2D_image_desaturate_color_info.hh"
#include "gpu_shader_2D_image_info.hh"
#include "gpu_shader_2D_image_overlays_merge_info.hh"
#include "gpu_shader_2D_image_overlays_stereo_merge_info.hh"
#include "gpu_shader_2D_image_rect_color_info.hh"
#include "gpu_shader_2D_image_shuffle_color_info.hh"
#include "gpu_shader_2D_node_socket_info.hh"
#include "gpu_shader_2D_nodelink_info.hh"
#include "gpu_shader_2D_point_uniform_size_uniform_color_aa_info.hh"
#include "gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_info.hh"
#include "gpu_shader_2D_point_varying_size_varying_color_info.hh"
#include "gpu_shader_2D_widget_info.hh"
#include "gpu_shader_3D_depth_only_info.hh"
#include "gpu_shader_3D_flat_color_info.hh"
#include "gpu_shader_3D_image_info.hh"
#include "gpu_shader_3D_point_info.hh"
#include "gpu_shader_3D_polyline_info.hh"
#include "gpu_shader_3D_smooth_color_info.hh"
#include "gpu_shader_3D_uniform_color_info.hh"
#include "gpu_shader_gpencil_stroke_info.hh"
#include "gpu_shader_icon_info.hh"
#include "gpu_shader_index_info.hh"
#include "gpu_shader_keyframe_shape_info.hh"
#include "gpu_shader_line_dashed_uniform_color_info.hh"
#include "gpu_shader_print_info.hh"
#include "gpu_shader_sequencer_info.hh"
#include "gpu_shader_simple_lighting_info.hh"
#include "gpu_shader_text_info.hh"
#include "gpu_srgb_to_framebuffer_space_info.hh"
#ifdef WITH_GTESTS
# ifdef WITH_GPU_BACKEND_TESTS
# include "gpu_shader_test_info.hh"
# endif
#endif
#ifdef WITH_METAL_BACKEND
/* Metal */
# include "depth_2d_update_info.hh"
# include "gpu_shader_fullscreen_blit_info.hh"
#endif
#ifdef WITH_VULKAN_BACKEND
# include "vk_backbuffer_blit_info.hh"
#endif
/* Compositor. */
#include "compositor_alpha_crop_info.hh"
#include "compositor_bilateral_blur_info.hh"
#include "compositor_bokeh_blur_info.hh"
#include "compositor_bokeh_blur_variable_size_info.hh"
#include "compositor_bokeh_image_info.hh"
#include "compositor_box_mask_info.hh"
#include "compositor_compute_preview_info.hh"
#include "compositor_convert_info.hh"
#include "compositor_cryptomatte_info.hh"
#include "compositor_defocus_info.hh"
#include "compositor_deriche_gaussian_blur_info.hh"
#include "compositor_despeckle_info.hh"
#include "compositor_directional_blur_info.hh"
#include "compositor_displace_info.hh"
#include "compositor_double_edge_mask_info.hh"
#include "compositor_edge_filter_info.hh"
#include "compositor_ellipse_mask_info.hh"
#include "compositor_filter_info.hh"
#include "compositor_flip_info.hh"
#include "compositor_gamma_correct_info.hh"
#include "compositor_glare_info.hh"
#include "compositor_id_mask_info.hh"
#include "compositor_image_coordinates_info.hh"
#include "compositor_image_crop_info.hh"
#include "compositor_inpaint_info.hh"
#include "compositor_jump_flooding_info.hh"
#include "compositor_keying_info.hh"
#include "compositor_keying_screen_info.hh"
#include "compositor_kuwahara_info.hh"
#include "compositor_lens_distortion_info.hh"
#include "compositor_map_uv_info.hh"
#include "compositor_morphological_blur_info.hh"
#include "compositor_morphological_distance_feather_info.hh"
#include "compositor_morphological_distance_info.hh"
#include "compositor_morphological_distance_threshold_info.hh"
#include "compositor_morphological_step_info.hh"
#include "compositor_motion_blur_info.hh"
#include "compositor_movie_distortion_info.hh"
#include "compositor_normalize_info.hh"
#include "compositor_pad_info.hh"
#include "compositor_parallel_reduction_info.hh"
#include "compositor_pixelate_info.hh"
#include "compositor_plane_deform_info.hh"
#include "compositor_premultiply_alpha_info.hh"
#include "compositor_read_input_info.hh"
#include "compositor_realize_on_domain_info.hh"
#include "compositor_sample_pixel_info.hh"
#include "compositor_scale_variable_info.hh"
#include "compositor_smaa_info.hh"
#include "compositor_split_info.hh"
#include "compositor_summed_area_table_info.hh"
#include "compositor_symmetric_blur_info.hh"
#include "compositor_symmetric_blur_variable_size_info.hh"
#include "compositor_symmetric_separable_blur_info.hh"
#include "compositor_symmetric_separable_blur_variable_size_info.hh"
#include "compositor_tone_map_photoreceptor_info.hh"
#include "compositor_tone_map_simple_info.hh"
#include "compositor_translate_wrapped_info.hh"
#include "compositor_van_vliet_gaussian_blur_info.hh"
#include "compositor_write_output_info.hh"
#include "compositor_z_combine_info.hh"
/* DRW module. */
#include "draw_curves_info.hh"
#include "draw_debug_info.hh"
#include "draw_object_infos_info.hh"
#include "draw_view_info.hh"
#include "gpu_shader_fullscreen_info.hh"
#ifdef WITH_OPENSUBDIV
# include "subdiv_info.hh"
#endif
/* EEVEE engine. */
#include "eevee_ambient_occlusion_info.hh"
#include "eevee_common_info.hh"
#include "eevee_deferred_info.hh"
#include "eevee_depth_of_field_info.hh"
#include "eevee_film_info.hh"
#include "eevee_hiz_info.hh"
#include "eevee_light_culling_info.hh"
#include "eevee_lightprobe_sphere_info.hh"
#include "eevee_lightprobe_volume_info.hh"
#include "eevee_lookdev_info.hh"
#include "eevee_lut_info.hh"
#include "eevee_material_info.hh"
#include "eevee_motion_blur_info.hh"
#include "eevee_shadow_info.hh"
#include "eevee_subsurface_info.hh"
#include "eevee_tracing_info.hh"
#include "eevee_velocity_info.hh"
#include "eevee_volume_info.hh"
/* Image engine. */
#include "engine_image_info.hh"
/* Grease Pencil engine. */
#include "gpencil_info.hh"
#include "gpencil_vfx_info.hh"
/* Overlay engine. */
#include "overlay_antialiasing_info.hh"
#include "overlay_armature_info.hh"
#include "overlay_background_info.hh"
#include "overlay_common_info.hh"
#include "overlay_edit_mode_info.hh"
#include "overlay_extra_info.hh"
#include "overlay_facing_info.hh"
#include "overlay_grid_info.hh"
#include "overlay_outline_info.hh"
#include "overlay_paint_info.hh"
#include "overlay_sculpt_curves_info.hh"
#include "overlay_sculpt_info.hh"
#include "overlay_viewer_attribute_info.hh"
#include "overlay_volume_info.hh"
#include "overlay_wireframe_info.hh"
/* Selection engine. */
#include "select_id_info.hh"
/* Workbench engine. */
#include "workbench_composite_info.hh"
#include "workbench_depth_info.hh"
#include "workbench_effect_antialiasing_info.hh"
#include "workbench_effect_dof_info.hh"
#include "workbench_effect_outline_info.hh"
#include "workbench_prepass_info.hh"
#include "workbench_shadow_info.hh"
#include "workbench_transparent_resolve_info.hh"
#include "workbench_volume_info.hh"

0
source/blender/gpu/metal/kernels/depth_2d_update_info.hh → source/blender/gpu/metal/kernels/depth_2d_update_infos.hh
View File

0
source/blender/gpu/metal/kernels/gpu_shader_fullscreen_blit_info.hh → source/blender/gpu/metal/kernels/gpu_shader_fullscreen_blit_infos.hh
View File

2
source/blender/gpu/shaders/common/gpu_shader_fullscreen_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "gpu_shader_fullscreen_info.hh" #include "gpu_shader_fullscreen_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpu_fullscreen) VERTEX_SHADER_CREATE_INFO(gpu_fullscreen)

2
source/blender/gpu/shaders/common/gpu_shader_index_load_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/gpu_index_load_info.hh" #include "infos/gpu_index_load_infos.hh"
SHADER_LIBRARY_CREATE_INFO(gpu_index_buffer_load) SHADER_LIBRARY_CREATE_INFO(gpu_index_buffer_load)

2
source/blender/gpu/shaders/common/gpu_shader_print_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/gpu_shader_print_info.hh" #include "infos/gpu_shader_print_infos.hh"
SHADER_LIBRARY_CREATE_INFO(gpu_print) SHADER_LIBRARY_CREATE_INFO(gpu_print)

2
source/blender/gpu/shaders/common/gpu_shader_sequencer_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/gpu_shader_sequencer_info.hh" #include "infos/gpu_shader_sequencer_infos.hh"
SHADER_LIBRARY_CREATE_INFO(gpu_shader_sequencer_strips) SHADER_LIBRARY_CREATE_INFO(gpu_shader_sequencer_strips)

2
source/blender/gpu/shaders/gpu_shader_2D_area_borders_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_area_borders_info.hh" #include "infos/gpu_shader_2D_area_borders_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_area_borders) FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_area_borders)

2
source/blender/gpu/shaders/gpu_shader_2D_area_borders_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_area_borders_info.hh" #include "infos/gpu_shader_2D_area_borders_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_area_borders) VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_area_borders)

2
source/blender/gpu/shaders/gpu_shader_2D_image_rect_vert.glsl
View File

@@ -7,7 +7,7 @@
* does not need any vertex input (producing less call to immBegin/End) * does not need any vertex input (producing less call to immBegin/End)
*/ */
#include "infos/gpu_shader_2D_image_rect_color_info.hh" #include "infos/gpu_shader_2D_image_rect_color_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_image_rect_color) VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_image_rect_color)

2
source/blender/gpu/shaders/gpu_shader_2D_image_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_image_info.hh" #include "infos/gpu_shader_2D_image_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_image_common) VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_image_common)

2
source/blender/gpu/shaders/gpu_shader_2D_line_dashed_frag.glsl
View File

@@ -9,7 +9,7 @@
* Dashed is performed in screen space. * Dashed is performed in screen space.
*/ */
#include "infos/gpu_shader_line_dashed_uniform_color_info.hh" #include "infos/gpu_shader_line_dashed_uniform_color_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpu_shader_3D_line_dashed_uniform_color) FRAGMENT_SHADER_CREATE_INFO(gpu_shader_3D_line_dashed_uniform_color)

2
source/blender/gpu/shaders/gpu_shader_2D_node_socket_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_node_socket_info.hh" #include "infos/gpu_shader_2D_node_socket_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_node_socket_inst) FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_node_socket_inst)

2
source/blender/gpu/shaders/gpu_shader_2D_node_socket_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_node_socket_info.hh" #include "infos/gpu_shader_2D_node_socket_infos.hh"
#include "gpu_shader_math_base_lib.glsl" #include "gpu_shader_math_base_lib.glsl"

2
source/blender/gpu/shaders/gpu_shader_2D_nodelink_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_nodelink_info.hh" #include "infos/gpu_shader_2D_nodelink_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_nodelink) FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_nodelink)

2
source/blender/gpu/shaders/gpu_shader_2D_nodelink_vert.glsl
View File

@@ -12,7 +12,7 @@
* `pos` is the verts position in the curve tangent space * `pos` is the verts position in the curve tangent space
*/ */
#include "infos/gpu_shader_2D_nodelink_info.hh" #include "infos/gpu_shader_2D_nodelink_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_nodelink) VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_nodelink)

2
source/blender/gpu/shaders/gpu_shader_2D_point_uniform_size_aa_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_point_uniform_size_uniform_color_aa_info.hh" #include "infos/gpu_shader_2D_point_uniform_size_uniform_color_aa_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_point_uniform_size_uniform_color_aa) VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_point_uniform_size_uniform_color_aa)

2
source/blender/gpu/shaders/gpu_shader_2D_point_uniform_size_outline_aa_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_info.hh" #include "infos/gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_point_uniform_size_uniform_color_outline_aa) VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_point_uniform_size_uniform_color_outline_aa)

2
source/blender/gpu/shaders/gpu_shader_2D_point_varying_size_varying_color_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_point_varying_size_varying_color_info.hh" #include "infos/gpu_shader_2D_point_varying_size_varying_color_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_point_varying_size_varying_color) VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_point_varying_size_varying_color)

2
source/blender/gpu/shaders/gpu_shader_2D_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_checker_info.hh" #include "infos/gpu_shader_2D_checker_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_checker) VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_checker)

2
source/blender/gpu/shaders/gpu_shader_2D_widget_base_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_widget_info.hh" #include "infos/gpu_shader_2D_widget_infos.hh"
#include "gpu_shader_colorspace_lib.glsl" #include "gpu_shader_colorspace_lib.glsl"

2
source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_widget_info.hh" #include "infos/gpu_shader_2D_widget_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_widget_base) VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_widget_base)

2
source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_widget_info.hh" #include "infos/gpu_shader_2D_widget_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_widget_shadow) FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_widget_shadow)

2
source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_widget_info.hh" #include "infos/gpu_shader_2D_widget_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_widget_shadow) VERTEX_SHADER_CREATE_INFO(gpu_shader_2D_widget_shadow)

2
source/blender/gpu/shaders/gpu_shader_3D_clipped_uniform_color_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_3D_uniform_color_info.hh" #include "infos/gpu_shader_3D_uniform_color_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpu_shader_3D_clipped_uniform_color) VERTEX_SHADER_CREATE_INFO(gpu_shader_3D_clipped_uniform_color)

2
source/blender/gpu/shaders/gpu_shader_3D_flat_color_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_3D_flat_color_info.hh" #include "infos/gpu_shader_3D_flat_color_infos.hh"
#include "gpu_shader_cfg_world_clip_lib.glsl" #include "gpu_shader_cfg_world_clip_lib.glsl"

2
source/blender/gpu/shaders/gpu_shader_3D_image_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_3D_image_info.hh" #include "infos/gpu_shader_3D_image_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpu_shader_3D_image_common) VERTEX_SHADER_CREATE_INFO(gpu_shader_3D_image_common)

2
source/blender/gpu/shaders/gpu_shader_3D_line_dashed_uniform_color_vert.glsl
View File

@@ -9,7 +9,7 @@
* Dashed is performed in screen space. * Dashed is performed in screen space.
*/ */
#include "infos/gpu_shader_line_dashed_uniform_color_info.hh" #include "infos/gpu_shader_line_dashed_uniform_color_infos.hh"
#include "gpu_shader_cfg_world_clip_lib.glsl" #include "gpu_shader_cfg_world_clip_lib.glsl"

2
source/blender/gpu/shaders/gpu_shader_3D_normal_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_simple_lighting_info.hh" #include "infos/gpu_shader_simple_lighting_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpu_shader_simple_lighting) VERTEX_SHADER_CREATE_INFO(gpu_shader_simple_lighting)

2
source/blender/gpu/shaders/gpu_shader_3D_point_flat_color_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_3D_point_info.hh" #include "infos/gpu_shader_3D_point_infos.hh"
#include "gpu_shader_cfg_world_clip_lib.glsl" #include "gpu_shader_cfg_world_clip_lib.glsl"

2
source/blender/gpu/shaders/gpu_shader_3D_point_uniform_size_aa_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_3D_point_info.hh" #include "infos/gpu_shader_3D_point_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpu_shader_3D_point_uniform_size_uniform_color_aa) VERTEX_SHADER_CREATE_INFO(gpu_shader_3D_point_uniform_size_uniform_color_aa)

2
source/blender/gpu/shaders/gpu_shader_3D_point_varying_size_varying_color_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_3D_point_info.hh" #include "infos/gpu_shader_3D_point_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpu_shader_3D_point_varying_size_varying_color) VERTEX_SHADER_CREATE_INFO(gpu_shader_3D_point_varying_size_varying_color)

2
source/blender/gpu/shaders/gpu_shader_3D_polyline_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_3D_polyline_info.hh" #include "infos/gpu_shader_3D_polyline_infos.hh"
#include "gpu_shader_colorspace_lib.glsl" #include "gpu_shader_colorspace_lib.glsl"

2
source/blender/gpu/shaders/gpu_shader_3D_polyline_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_3D_polyline_info.hh" #include "infos/gpu_shader_3D_polyline_infos.hh"
#include "gpu_shader_attribute_load_lib.glsl" #include "gpu_shader_attribute_load_lib.glsl"
#include "gpu_shader_index_load_lib.glsl" #include "gpu_shader_index_load_lib.glsl"

2
source/blender/gpu/shaders/gpu_shader_3D_smooth_color_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_3D_smooth_color_info.hh" #include "infos/gpu_shader_3D_smooth_color_infos.hh"
#include "gpu_shader_colorspace_lib.glsl" #include "gpu_shader_colorspace_lib.glsl"

2
source/blender/gpu/shaders/gpu_shader_3D_smooth_color_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_3D_smooth_color_info.hh" #include "infos/gpu_shader_3D_smooth_color_infos.hh"
#include "gpu_shader_cfg_world_clip_lib.glsl" #include "gpu_shader_cfg_world_clip_lib.glsl"

2
source/blender/gpu/shaders/gpu_shader_3D_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_3D_depth_only_info.hh" #include "infos/gpu_shader_3D_depth_only_infos.hh"
#include "gpu_shader_cfg_world_clip_lib.glsl" #include "gpu_shader_cfg_world_clip_lib.glsl"

2
source/blender/gpu/shaders/gpu_shader_cfg_world_clip_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/gpu_clip_planes_info.hh" #include "infos/gpu_clip_planes_infos.hh"
#ifdef GPU_FRAGMENT_SHADER #ifdef GPU_FRAGMENT_SHADER
# error File should not be included in fragment shader # error File should not be included in fragment shader

2
source/blender/gpu/shaders/gpu_shader_checker_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_checker_info.hh" #include "infos/gpu_shader_2D_checker_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_checker) FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_checker)

2
source/blender/gpu/shaders/gpu_shader_colorspace_lib.glsl
View File

@@ -4,7 +4,7 @@
#pragma once #pragma once
#include "infos/gpu_srgb_to_framebuffer_space_info.hh" #include "infos/gpu_srgb_to_framebuffer_space_infos.hh"
SHADER_LIBRARY_CREATE_INFO(gpu_srgb_to_framebuffer_space) SHADER_LIBRARY_CREATE_INFO(gpu_srgb_to_framebuffer_space)

2
source/blender/gpu/shaders/gpu_shader_depth_only_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_3D_depth_only_info.hh" #include "infos/gpu_shader_3D_depth_only_infos.hh"
void main() void main()
{ {

2
source/blender/gpu/shaders/gpu_shader_diag_stripes_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_diag_stripes_info.hh" #include "infos/gpu_shader_2D_diag_stripes_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_diag_stripes) FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_diag_stripes)

2
source/blender/gpu/shaders/gpu_shader_display_fallback_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_image_overlays_merge_info.hh" #include "infos/gpu_shader_2D_image_overlays_merge_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpu_shader_cycles_display_fallback) FRAGMENT_SHADER_CREATE_INFO(gpu_shader_cycles_display_fallback)

2
source/blender/gpu/shaders/gpu_shader_display_fallback_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_image_overlays_merge_info.hh" #include "infos/gpu_shader_2D_image_overlays_merge_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpu_shader_cycles_display_fallback) VERTEX_SHADER_CREATE_INFO(gpu_shader_cycles_display_fallback)

2
source/blender/gpu/shaders/gpu_shader_flat_color_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_3D_flat_color_info.hh" #include "infos/gpu_shader_3D_flat_color_infos.hh"
#include "gpu_shader_colorspace_lib.glsl" #include "gpu_shader_colorspace_lib.glsl"

2
source/blender/gpu/shaders/gpu_shader_gpencil_stroke_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_gpencil_stroke_info.hh" #include "infos/gpu_shader_gpencil_stroke_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpu_shader_gpencil_stroke) FRAGMENT_SHADER_CREATE_INFO(gpu_shader_gpencil_stroke)

2
source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_gpencil_stroke_info.hh" #include "infos/gpu_shader_gpencil_stroke_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpu_shader_gpencil_stroke) VERTEX_SHADER_CREATE_INFO(gpu_shader_gpencil_stroke)

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

@@ -10,7 +10,7 @@
* the rounded corner, and the rectangle sides. * the rounded corner, and the rectangle sides.
*/ */
#include "infos/gpu_shader_icon_info.hh" #include "infos/gpu_shader_icon_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpu_shader_icon) FRAGMENT_SHADER_CREATE_INFO(gpu_shader_icon)

2
source/blender/gpu/shaders/gpu_shader_icon_multi_vert.glsl
View File

@@ -7,7 +7,7 @@
* does not need any vertex input (producing less call to immBegin/End) * does not need any vertex input (producing less call to immBegin/End)
*/ */
#include "infos/gpu_shader_icon_info.hh" #include "infos/gpu_shader_icon_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpu_shader_icon_multi) VERTEX_SHADER_CREATE_INFO(gpu_shader_icon_multi)

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

@@ -7,7 +7,7 @@
* does not need any vertex input (producing less call to immBegin/End) * does not need any vertex input (producing less call to immBegin/End)
*/ */
#include "infos/gpu_shader_icon_info.hh" #include "infos/gpu_shader_icon_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpu_shader_icon) VERTEX_SHADER_CREATE_INFO(gpu_shader_icon)

2
source/blender/gpu/shaders/gpu_shader_image_color_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_image_rect_color_info.hh" #include "infos/gpu_shader_2D_image_rect_color_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_image_rect_color) FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_image_rect_color)

2
source/blender/gpu/shaders/gpu_shader_image_desaturate_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_image_desaturate_color_info.hh" #include "infos/gpu_shader_2D_image_desaturate_color_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_image_desaturate_color) FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_image_desaturate_color)

2
source/blender/gpu/shaders/gpu_shader_image_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_image_info.hh" #include "infos/gpu_shader_2D_image_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_image_common) FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_image_common)

2
source/blender/gpu/shaders/gpu_shader_image_overlays_merge_frag.glsl
View File

@@ -4,7 +4,7 @@
/* Merge overlays texture on top of image texture and transform to display space (assume sRGB) */ /* Merge overlays texture on top of image texture and transform to display space (assume sRGB) */
#include "infos/gpu_shader_2D_image_overlays_merge_info.hh" #include "infos/gpu_shader_2D_image_overlays_merge_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_image_overlays_merge) FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_image_overlays_merge)

2
source/blender/gpu/shaders/gpu_shader_image_overlays_stereo_merge_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_image_overlays_stereo_merge_info.hh" #include "infos/gpu_shader_2D_image_overlays_stereo_merge_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_image_overlays_stereo_merge) FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_image_overlays_stereo_merge)

2
source/blender/gpu/shaders/gpu_shader_image_shuffle_color_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_image_shuffle_color_info.hh" #include "infos/gpu_shader_2D_image_shuffle_color_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_image_shuffle_color) FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_image_shuffle_color)

2
source/blender/gpu/shaders/gpu_shader_index_2d_array_lines.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_index_info.hh" #include "infos/gpu_shader_index_infos.hh"
COMPUTE_SHADER_CREATE_INFO(gpu_shader_index_2d_array_lines) COMPUTE_SHADER_CREATE_INFO(gpu_shader_index_2d_array_lines)

2
source/blender/gpu/shaders/gpu_shader_index_2d_array_points.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_index_info.hh" #include "infos/gpu_shader_index_infos.hh"
COMPUTE_SHADER_CREATE_INFO(gpu_shader_index_2d_array_points) COMPUTE_SHADER_CREATE_INFO(gpu_shader_index_2d_array_points)

2
source/blender/gpu/shaders/gpu_shader_index_2d_array_tris.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_index_info.hh" #include "infos/gpu_shader_index_infos.hh"
COMPUTE_SHADER_CREATE_INFO(gpu_shader_index_2d_array_tris) COMPUTE_SHADER_CREATE_INFO(gpu_shader_index_2d_array_tris)

2
source/blender/gpu/shaders/gpu_shader_keyframe_shape_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_keyframe_shape_info.hh" #include "infos/gpu_shader_keyframe_shape_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpu_shader_keyframe_shape) FRAGMENT_SHADER_CREATE_INFO(gpu_shader_keyframe_shape)

2
source/blender/gpu/shaders/gpu_shader_keyframe_shape_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_keyframe_shape_info.hh" #include "infos/gpu_shader_keyframe_shape_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpu_shader_keyframe_shape) VERTEX_SHADER_CREATE_INFO(gpu_shader_keyframe_shape)

2
source/blender/gpu/shaders/gpu_shader_point_uniform_color_aa_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_point_uniform_size_uniform_color_aa_info.hh" #include "infos/gpu_shader_2D_point_uniform_size_uniform_color_aa_infos.hh"
#include "gpu_shader_colorspace_lib.glsl" #include "gpu_shader_colorspace_lib.glsl"

2
source/blender/gpu/shaders/gpu_shader_point_uniform_color_outline_aa_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_info.hh" #include "infos/gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_point_uniform_size_uniform_color_outline_aa) FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_point_uniform_size_uniform_color_outline_aa)

2
source/blender/gpu/shaders/gpu_shader_point_varying_color_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_2D_point_varying_size_varying_color_info.hh" #include "infos/gpu_shader_2D_point_varying_size_varying_color_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_point_varying_size_varying_color) FRAGMENT_SHADER_CREATE_INFO(gpu_shader_2D_point_varying_size_varying_color)

2
source/blender/gpu/shaders/gpu_shader_sequencer_scope_comp.glsl
View File

@@ -3,7 +3,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "gpu_shader_common_color_utils.glsl" #include "gpu_shader_common_color_utils.glsl"
#include "infos/gpu_shader_sequencer_info.hh" #include "infos/gpu_shader_sequencer_infos.hh"
COMPUTE_SHADER_CREATE_INFO(gpu_shader_sequencer_scope_raster) COMPUTE_SHADER_CREATE_INFO(gpu_shader_sequencer_scope_raster)

2
source/blender/gpu/shaders/gpu_shader_sequencer_scope_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_sequencer_info.hh" #include "infos/gpu_shader_sequencer_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpu_shader_sequencer_scope_resolve) FRAGMENT_SHADER_CREATE_INFO(gpu_shader_sequencer_scope_resolve)

2
source/blender/gpu/shaders/gpu_shader_sequencer_strips_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_sequencer_info.hh" #include "infos/gpu_shader_sequencer_infos.hh"
#include "gpu_shader_sequencer_lib.glsl" #include "gpu_shader_sequencer_lib.glsl"

2
source/blender/gpu/shaders/gpu_shader_sequencer_strips_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_sequencer_info.hh" #include "infos/gpu_shader_sequencer_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpu_shader_sequencer_strips) VERTEX_SHADER_CREATE_INFO(gpu_shader_sequencer_strips)

2
source/blender/gpu/shaders/gpu_shader_sequencer_thumbs_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_sequencer_info.hh" #include "infos/gpu_shader_sequencer_infos.hh"
#include "gpu_shader_sequencer_lib.glsl" #include "gpu_shader_sequencer_lib.glsl"

2
source/blender/gpu/shaders/gpu_shader_sequencer_thumbs_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_sequencer_info.hh" #include "infos/gpu_shader_sequencer_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpu_shader_sequencer_thumbs) VERTEX_SHADER_CREATE_INFO(gpu_shader_sequencer_thumbs)

2
source/blender/gpu/shaders/gpu_shader_sequencer_zebra_frag.glsl
View File

@@ -3,7 +3,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "gpu_shader_common_color_utils.glsl" #include "gpu_shader_common_color_utils.glsl"
#include "infos/gpu_shader_sequencer_info.hh" #include "infos/gpu_shader_sequencer_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpu_shader_sequencer_zebra) FRAGMENT_SHADER_CREATE_INFO(gpu_shader_sequencer_zebra)

2
source/blender/gpu/shaders/gpu_shader_simple_lighting_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_simple_lighting_info.hh" #include "infos/gpu_shader_simple_lighting_infos.hh"
FRAGMENT_SHADER_CREATE_INFO(gpu_shader_simple_lighting) FRAGMENT_SHADER_CREATE_INFO(gpu_shader_simple_lighting)

2
source/blender/gpu/shaders/gpu_shader_text_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_text_info.hh" #include "infos/gpu_shader_text_infos.hh"
#include "gpu_shader_colorspace_lib.glsl" #include "gpu_shader_colorspace_lib.glsl"

2
source/blender/gpu/shaders/gpu_shader_text_vert.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_text_info.hh" #include "infos/gpu_shader_text_infos.hh"
VERTEX_SHADER_CREATE_INFO(gpu_shader_text) VERTEX_SHADER_CREATE_INFO(gpu_shader_text)

2
source/blender/gpu/shaders/gpu_shader_uniform_color_frag.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "infos/gpu_shader_3D_uniform_color_info.hh" #include "infos/gpu_shader_3D_uniform_color_infos.hh"
#include "gpu_shader_colorspace_lib.glsl" #include "gpu_shader_colorspace_lib.glsl"

0
source/blender/gpu/shaders/infos/gpu_clip_planes_info.hh → source/blender/gpu/shaders/infos/gpu_clip_planes_infos.hh
View File

0
source/blender/gpu/shaders/infos/gpu_index_load_info.hh → source/blender/gpu/shaders/infos/gpu_index_load_infos.hh
View File

0
source/blender/gpu/shaders/infos/gpu_interface_info.hh → source/blender/gpu/shaders/infos/gpu_interface_infos.hh
View File

0
source/blender/gpu/shaders/infos/gpu_shader_2D_area_borders_info.hh → source/blender/gpu/shaders/infos/gpu_shader_2D_area_borders_infos.hh
View File

0
source/blender/gpu/shaders/infos/gpu_shader_2D_checker_info.hh → source/blender/gpu/shaders/infos/gpu_shader_2D_checker_infos.hh
View File

0
source/blender/gpu/shaders/infos/gpu_shader_2D_diag_stripes_info.hh → source/blender/gpu/shaders/infos/gpu_shader_2D_diag_stripes_infos.hh
View File

2
source/blender/gpu/shaders/infos/gpu_shader_2D_image_desaturate_color_info.hh → source/blender/gpu/shaders/infos/gpu_shader_2D_image_desaturate_color_infos.hh
View File

@@ -11,7 +11,7 @@
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "GPU_shader_shared.hh" # include "GPU_shader_shared.hh"
# include "gpu_shader_2D_image_info.hh" # include "gpu_shader_2D_image_infos.hh"
#endif #endif
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"

4
source/blender/gpu/shaders/infos/gpu_shader_2D_image_info.hh → source/blender/gpu/shaders/infos/gpu_shader_2D_image_infos.hh
View File

@@ -12,10 +12,10 @@
# include "GPU_shader_shared.hh" # include "GPU_shader_shared.hh"
# include "gpu_srgb_to_framebuffer_space_info.hh" # include "gpu_srgb_to_framebuffer_space_infos.hh"
#endif #endif
#include "gpu_interface_info.hh" #include "gpu_interface_infos.hh"
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"
GPU_SHADER_CREATE_INFO(gpu_shader_2D_image_common) GPU_SHADER_CREATE_INFO(gpu_shader_2D_image_common)

2
source/blender/gpu/shaders/infos/gpu_shader_2D_image_overlays_merge_info.hh → source/blender/gpu/shaders/infos/gpu_shader_2D_image_overlays_merge_infos.hh
View File

@@ -13,7 +13,7 @@
# include "GPU_shader_shared.hh" # include "GPU_shader_shared.hh"
#endif #endif
#include "gpu_interface_info.hh" #include "gpu_interface_infos.hh"
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"
GPU_SHADER_CREATE_INFO(gpu_shader_2D_image_overlays_merge) GPU_SHADER_CREATE_INFO(gpu_shader_2D_image_overlays_merge)

0
source/blender/gpu/shaders/infos/gpu_shader_2D_image_overlays_stereo_merge_info.hh → source/blender/gpu/shaders/infos/gpu_shader_2D_image_overlays_stereo_merge_infos.hh
View File

4
source/blender/gpu/shaders/infos/gpu_shader_2D_image_rect_color_info.hh → source/blender/gpu/shaders/infos/gpu_shader_2D_image_rect_color_infos.hh
View File

@@ -12,10 +12,10 @@
# include "GPU_shader_shared.hh" # include "GPU_shader_shared.hh"
# include "gpu_srgb_to_framebuffer_space_info.hh" # include "gpu_srgb_to_framebuffer_space_infos.hh"
#endif #endif
#include "gpu_interface_info.hh" #include "gpu_interface_infos.hh"
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"
GPU_SHADER_CREATE_INFO(gpu_shader_2D_image_rect_color) GPU_SHADER_CREATE_INFO(gpu_shader_2D_image_rect_color)

2
source/blender/gpu/shaders/infos/gpu_shader_2D_image_shuffle_color_info.hh → source/blender/gpu/shaders/infos/gpu_shader_2D_image_shuffle_color_infos.hh
View File

@@ -11,7 +11,7 @@
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "GPU_shader_shared.hh" # include "GPU_shader_shared.hh"
# include "gpu_shader_2D_image_info.hh" # include "gpu_shader_2D_image_infos.hh"
#endif #endif
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"

0
source/blender/gpu/shaders/infos/gpu_shader_2D_node_socket_info.hh → source/blender/gpu/shaders/infos/gpu_shader_2D_node_socket_infos.hh
View File

0
source/blender/gpu/shaders/infos/gpu_shader_2D_nodelink_info.hh → source/blender/gpu/shaders/infos/gpu_shader_2D_nodelink_infos.hh
View File

4
source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_aa_info.hh → source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_aa_infos.hh
View File

@@ -11,10 +11,10 @@
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "GPU_shader_shared.hh" # include "GPU_shader_shared.hh"
# include "gpu_srgb_to_framebuffer_space_info.hh" # include "gpu_srgb_to_framebuffer_space_infos.hh"
#endif #endif
#include "gpu_interface_info.hh" #include "gpu_interface_infos.hh"
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"
GPU_SHADER_CREATE_INFO(gpu_shader_2D_point_uniform_size_uniform_color_aa) GPU_SHADER_CREATE_INFO(gpu_shader_2D_point_uniform_size_uniform_color_aa)

2
source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_info.hh → source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_infos.hh
View File

@@ -13,7 +13,7 @@
# include "GPU_shader_shared.hh" # include "GPU_shader_shared.hh"
#endif #endif
#include "gpu_interface_info.hh" #include "gpu_interface_infos.hh"
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"
GPU_SHADER_CREATE_INFO(gpu_shader_2D_point_uniform_size_uniform_color_outline_aa) GPU_SHADER_CREATE_INFO(gpu_shader_2D_point_uniform_size_uniform_color_outline_aa)

2
source/blender/gpu/shaders/infos/gpu_shader_2D_point_varying_size_varying_color_info.hh → source/blender/gpu/shaders/infos/gpu_shader_2D_point_varying_size_varying_color_infos.hh
View File

@@ -13,7 +13,7 @@
# include "GPU_shader_shared.hh" # include "GPU_shader_shared.hh"
#endif #endif
#include "gpu_interface_info.hh" #include "gpu_interface_infos.hh"
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"
GPU_SHADER_CREATE_INFO(gpu_shader_2D_point_varying_size_varying_color) GPU_SHADER_CREATE_INFO(gpu_shader_2D_point_varying_size_varying_color)

4
source/blender/gpu/shaders/infos/gpu_shader_2D_widget_info.hh → source/blender/gpu/shaders/infos/gpu_shader_2D_widget_infos.hh
View File

@@ -11,12 +11,12 @@
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "GPU_shader_shared.hh" # include "GPU_shader_shared.hh"
# include "gpu_srgb_to_framebuffer_space_info.hh" # include "gpu_srgb_to_framebuffer_space_infos.hh"
# define widgetID 0 # define widgetID 0
#endif #endif
#include "gpu_interface_info.hh" #include "gpu_interface_infos.hh"
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"
GPU_SHADER_INTERFACE_INFO(gpu_widget_iface) GPU_SHADER_INTERFACE_INFO(gpu_widget_iface)

4
source/blender/gpu/shaders/infos/gpu_shader_3D_depth_only_info.hh → source/blender/gpu/shaders/infos/gpu_shader_3D_depth_only_infos.hh
View File

@@ -11,10 +11,10 @@
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "GPU_shader_shared.hh" # include "GPU_shader_shared.hh"
# include "gpu_clip_planes_info.hh" # include "gpu_clip_planes_infos.hh"
#endif #endif
#include "gpu_interface_info.hh" #include "gpu_interface_infos.hh"
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"
GPU_SHADER_CREATE_INFO(gpu_shader_3D_depth_only) GPU_SHADER_CREATE_INFO(gpu_shader_3D_depth_only)

6
source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_info.hh → source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_infos.hh
View File

@@ -11,11 +11,11 @@
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "GPU_shader_shared.hh" # include "GPU_shader_shared.hh"
# include "gpu_clip_planes_info.hh" # include "gpu_clip_planes_infos.hh"
# include "gpu_srgb_to_framebuffer_space_info.hh" # include "gpu_srgb_to_framebuffer_space_infos.hh"
#endif #endif
#include "gpu_interface_info.hh" #include "gpu_interface_infos.hh"
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"
GPU_SHADER_CREATE_INFO(gpu_shader_3D_flat_color) GPU_SHADER_CREATE_INFO(gpu_shader_3D_flat_color)

4
source/blender/gpu/shaders/infos/gpu_shader_3D_image_info.hh → source/blender/gpu/shaders/infos/gpu_shader_3D_image_infos.hh
View File

@@ -12,10 +12,10 @@
# include "GPU_shader_shared.hh" # include "GPU_shader_shared.hh"
# include "gpu_srgb_to_framebuffer_space_info.hh" # include "gpu_srgb_to_framebuffer_space_infos.hh"
#endif #endif
#include "gpu_interface_info.hh" #include "gpu_interface_infos.hh"
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"
GPU_SHADER_CREATE_INFO(gpu_shader_3D_image_common) GPU_SHADER_CREATE_INFO(gpu_shader_3D_image_common)

6
source/blender/gpu/shaders/infos/gpu_shader_3D_point_info.hh → source/blender/gpu/shaders/infos/gpu_shader_3D_point_infos.hh
View File

@@ -11,9 +11,9 @@
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "GPU_shader_shared.hh" # include "GPU_shader_shared.hh"
# include "gpu_clip_planes_info.hh" # include "gpu_clip_planes_infos.hh"
# include "gpu_interface_info.hh" # include "gpu_interface_infos.hh"
# include "gpu_srgb_to_framebuffer_space_info.hh" # include "gpu_srgb_to_framebuffer_space_infos.hh"
#endif #endif
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"

6
source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_info.hh → source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_infos.hh
View File

@@ -11,12 +11,12 @@
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "GPU_shader_shared.hh" # include "GPU_shader_shared.hh"
# include "gpu_index_load_info.hh" # include "gpu_index_load_infos.hh"
# include "gpu_srgb_to_framebuffer_space_info.hh" # include "gpu_srgb_to_framebuffer_space_infos.hh"
# define SMOOTH_WIDTH 1.0f # define SMOOTH_WIDTH 1.0f
#endif #endif
#include "gpu_interface_info.hh" #include "gpu_interface_infos.hh"
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"
GPU_SHADER_INTERFACE_INFO(gpu_shader_3D_polyline_iface) GPU_SHADER_INTERFACE_INFO(gpu_shader_3D_polyline_iface)

6
source/blender/gpu/shaders/infos/gpu_shader_3D_smooth_color_info.hh → source/blender/gpu/shaders/infos/gpu_shader_3D_smooth_color_infos.hh
View File

@@ -11,11 +11,11 @@
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "GPU_shader_shared.hh" # include "GPU_shader_shared.hh"
# include "gpu_clip_planes_info.hh" # include "gpu_clip_planes_infos.hh"
# include "gpu_srgb_to_framebuffer_space_info.hh" # include "gpu_srgb_to_framebuffer_space_infos.hh"
#endif #endif
#include "gpu_interface_info.hh" #include "gpu_interface_infos.hh"
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"
GPU_SHADER_CREATE_INFO(gpu_shader_3D_smooth_color) GPU_SHADER_CREATE_INFO(gpu_shader_3D_smooth_color)

4
source/blender/gpu/shaders/infos/gpu_shader_3D_uniform_color_info.hh → source/blender/gpu/shaders/infos/gpu_shader_3D_uniform_color_infos.hh
View File

@@ -11,8 +11,8 @@
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "GPU_shader_shared.hh" # include "GPU_shader_shared.hh"
# include "gpu_clip_planes_info.hh" # include "gpu_clip_planes_infos.hh"
# include "gpu_srgb_to_framebuffer_space_info.hh" # include "gpu_srgb_to_framebuffer_space_infos.hh"
#endif #endif
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"

0
source/blender/gpu/shaders/infos/gpu_shader_fullscreen_info.hh → source/blender/gpu/shaders/infos/gpu_shader_fullscreen_infos.hh
View File

0
source/blender/gpu/shaders/infos/gpu_shader_gpencil_stroke_info.hh → source/blender/gpu/shaders/infos/gpu_shader_gpencil_stroke_infos.hh
View File

2
source/blender/gpu/shaders/infos/gpu_shader_icon_info.hh → source/blender/gpu/shaders/infos/gpu_shader_icon_infos.hh
View File

@@ -13,7 +13,7 @@
# include "GPU_shader_shared.hh" # include "GPU_shader_shared.hh"
#endif #endif
#include "gpu_interface_info.hh" #include "gpu_interface_infos.hh"
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"
GPU_SHADER_CREATE_INFO(gpu_shader_icon_shared) GPU_SHADER_CREATE_INFO(gpu_shader_icon_shared)

2
source/blender/gpu/shaders/infos/gpu_shader_index_info.hh → source/blender/gpu/shaders/infos/gpu_shader_index_infos.hh
View File

@@ -13,7 +13,7 @@
# include "GPU_shader_shared.hh" # include "GPU_shader_shared.hh"
#endif #endif
#include "gpu_interface_info.hh" #include "gpu_interface_infos.hh"
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"
GPU_SHADER_CREATE_INFO(gpu_shader_index_2d_array_points) GPU_SHADER_CREATE_INFO(gpu_shader_index_2d_array_points)

0
source/blender/gpu/shaders/infos/gpu_shader_keyframe_shape_info.hh → source/blender/gpu/shaders/infos/gpu_shader_keyframe_shape_infos.hh
View File

4
source/blender/gpu/shaders/infos/gpu_shader_line_dashed_uniform_color_info.hh → source/blender/gpu/shaders/infos/gpu_shader_line_dashed_uniform_color_infos.hh
View File

@@ -11,10 +11,10 @@
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "GPU_shader_shared.hh" # include "GPU_shader_shared.hh"
# include "gpu_clip_planes_info.hh" # include "gpu_clip_planes_infos.hh"
#endif #endif
#include "gpu_interface_info.hh" #include "gpu_interface_infos.hh"
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"
/* We leverage hardware interpolation to compute distance along the line. */ /* We leverage hardware interpolation to compute distance along the line. */

0
source/blender/gpu/shaders/infos/gpu_shader_print_info.hh → source/blender/gpu/shaders/infos/gpu_shader_print_infos.hh
View File

4
source/blender/gpu/shaders/infos/gpu_shader_sequencer_info.hh → source/blender/gpu/shaders/infos/gpu_shader_sequencer_infos.hh
View File

@@ -11,10 +11,10 @@
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "GPU_shader_shared.hh" # include "GPU_shader_shared.hh"
# include "gpu_shader_fullscreen_info.hh" # include "gpu_shader_fullscreen_infos.hh"
#endif #endif
#include "gpu_interface_info.hh" #include "gpu_interface_infos.hh"
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"
GPU_SHADER_INTERFACE_INFO(gpu_seq_strip_iface) GPU_SHADER_INTERFACE_INFO(gpu_seq_strip_iface)

0
source/blender/gpu/shaders/infos/gpu_shader_simple_lighting_info.hh → source/blender/gpu/shaders/infos/gpu_shader_simple_lighting_infos.hh
View File

2
source/blender/gpu/shaders/infos/gpu_shader_test_info.hh → source/blender/gpu/shaders/infos/gpu_shader_test_infos.hh
View File

@@ -13,7 +13,7 @@
# include "GPU_shader_shared.hh" # include "GPU_shader_shared.hh"
#endif #endif
#include "gpu_interface_info.hh" #include "gpu_interface_infos.hh"
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"
GPU_SHADER_CREATE_INFO(gpu_shader_test) GPU_SHADER_CREATE_INFO(gpu_shader_test)

2
source/blender/gpu/shaders/infos/gpu_shader_text_info.hh → source/blender/gpu/shaders/infos/gpu_shader_text_infos.hh
View File

@@ -11,7 +11,7 @@
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "GPU_shader_shared.hh" # include "GPU_shader_shared.hh"
# include "gpu_srgb_to_framebuffer_space_info.hh" # include "gpu_srgb_to_framebuffer_space_infos.hh"
#endif #endif
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"

2
source/blender/gpu/shaders/infos/gpu_srgb_to_framebuffer_space_info.hh → source/blender/gpu/shaders/infos/gpu_srgb_to_framebuffer_space_infos.hh
View File

@@ -10,7 +10,7 @@
# pragma once # pragma once
# include "gpu_shader_compat.hh" # include "gpu_shader_compat.hh"
# include "gpu_srgb_to_framebuffer_space_info.hh" # include "gpu_srgb_to_framebuffer_space_infos.hh"
#endif #endif
#include "gpu_shader_create_info.hh" #include "gpu_shader_create_info.hh"

2
source/blender/gpu/vulkan/shaders/vk_backbuffer_blit_comp.glsl
View File

@@ -2,7 +2,7 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "vk_backbuffer_blit_info.hh" #include "vk_backbuffer_blit_infos.hh"
COMPUTE_SHADER_CREATE_INFO(vk_backbuffer_blit) COMPUTE_SHADER_CREATE_INFO(vk_backbuffer_blit)

0
source/blender/gpu/vulkan/shaders/vk_backbuffer_blit_info.hh → source/blender/gpu/vulkan/shaders/vk_backbuffer_blit_infos.hh
View File

5
source/blender/imbuf/opencolorio/CMakeLists.txt
View File

@@ -109,11 +109,13 @@ target_link_libraries(bf_imbuf_opencolorio PRIVATE bf_imbuf_opencolorio_shaders)
set(GLSL_SOURCE_CONTENT "") set(GLSL_SOURCE_CONTENT "")
set(GLSL_METADATA_CONTENT "") set(GLSL_METADATA_CONTENT "")
set(GLSL_INFOS_CONTENT "")
foreach(GLSL_FILE ${GLSL_SRC}) foreach(GLSL_FILE ${GLSL_SRC})
get_filename_component(GLSL_FILE_NAME ${GLSL_FILE} NAME) get_filename_component(GLSL_FILE_NAME ${GLSL_FILE} NAME)
string(REPLACE "." "_" GLSL_FILE_NAME_UNDERSCORES ${GLSL_FILE_NAME}) string(REPLACE "." "_" GLSL_FILE_NAME_UNDERSCORES ${GLSL_FILE_NAME})
string(APPEND GLSL_SOURCE_CONTENT "SHADER_SOURCE\(${GLSL_FILE_NAME_UNDERSCORES}, \"${GLSL_FILE_NAME}\", \"${GLSL_FILE}\"\)\n") string(APPEND GLSL_SOURCE_CONTENT "SHADER_SOURCE\(${GLSL_FILE_NAME_UNDERSCORES}, \"${GLSL_FILE_NAME}\", \"${GLSL_FILE}\"\)\n")
string(APPEND GLSL_METADATA_CONTENT "#include \"${GLSL_FILE}.hh\"\n") string(APPEND GLSL_METADATA_CONTENT "#include \"${GLSL_FILE}.hh\"\n")
string(APPEND GLSL_INFOS_CONTENT "#include \"${GLSL_FILE}.info\"\n")
endforeach() endforeach()
set(glsl_source_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_ocio_source_list.h") set(glsl_source_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_ocio_source_list.h")
@@ -122,6 +124,9 @@ list(APPEND SRC ${glsl_source_list_file})
set(glsl_metadata_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_ocio_metadata_list.hh") set(glsl_metadata_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_ocio_metadata_list.hh")
file(GENERATE OUTPUT ${glsl_metadata_list_file} CONTENT "${GLSL_METADATA_CONTENT}") file(GENERATE OUTPUT ${glsl_metadata_list_file} CONTENT "${GLSL_METADATA_CONTENT}")
list(APPEND SRC ${glsl_metadata_list_file}) list(APPEND SRC ${glsl_metadata_list_file})
set(glsl_infos_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_ocio_infos_list.hh")
file(GENERATE OUTPUT ${glsl_infos_list_file} CONTENT "${GLSL_INFOS_CONTENT}")
list(APPEND SRC ${glsl_infos_list_file})
list(APPEND INC ${CMAKE_CURRENT_BINARY_DIR}) list(APPEND INC ${CMAKE_CURRENT_BINARY_DIR})
target_include_directories(bf_imbuf_opencolorio_shaders PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories(bf_imbuf_opencolorio_shaders PUBLIC ${CMAKE_CURRENT_BINARY_DIR})