diff options
Diffstat (limited to 'source/blender/draw/engines/eevee/shaders/infos/eevee_raytrace_info.hh')
| -rw-r--r-- | source/blender/draw/engines/eevee/shaders/infos/eevee_raytrace_info.hh | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_raytrace_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_raytrace_info.hh index 0b7df946df7..24bf585c17b 100644 --- a/source/blender/draw/engines/eevee/shaders/infos/eevee_raytrace_info.hh +++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_raytrace_info.hh @@ -30,32 +30,34 @@ GPU_SHADER_CREATE_INFO(eevee_raytrace_fallback).define("SKIP_TRACE"); GPU_SHADER_CREATE_INFO(eevee_raytrace_raygen) .additional_info("eevee_shared") - .uniform_buf(0, "RaytraceData", "raytrace_buf") + .uniform_buf(4, "RaytraceData", "raytrace_buf") .uniform_buf(1, "HiZData", "hiz_buf") .uniform_buf(2, "CubemapData", "cubes_buf[CULLING_ITEM_BATCH]") .uniform_buf(3, "LightProbeInfoData", "probes_buf") - .sampler(0, ImageType::FLOAT_2D, "hiz_tx") - .sampler(1, ImageType::FLOAT_2D, "hiz_front_tx") .sampler(2, ImageType::FLOAT_CUBE_ARRAY, "lightprobe_cube_tx") .sampler(3, ImageType::FLOAT_2D, "radiance_tx") .sampler(4, ImageType::FLOAT_2D, "combined_tx") .sampler(5, ImageType::FLOAT_2D, "cl_color_tx") .sampler(6, ImageType::FLOAT_2D, "cl_normal_tx") .sampler(7, ImageType::FLOAT_2D, "cl_data_tx") + .sampler(9, ImageType::FLOAT_2D, "hiz_tx") + .sampler(10, ImageType::FLOAT_2D, "hiz_front_tx") .fragment_out(0, Type::VEC4, "out_ray_data") .fragment_out(1, Type::VEC4, "out_ray_radiance") .fragment_source("eevee_raytrace_raygen_frag.glsl") - .additional_info("draw_fullscreen", "eevee_utility_texture", "eevee_sampling_data"); + .additional_info("draw_fullscreen", + "draw_view", + "eevee_utility_texture", + "eevee_sampling_data"); EEVEE_RAYTRACE_SKIP_VARIATIONS(eevee_raytrace_raygen, "eevee_raytrace_raygen"); GPU_SHADER_CREATE_INFO(eevee_raytrace_denoise) - .additional_info("eevee_shared") + .additional_info("eevee_shared", "draw_view") .local_group_size(8, 8) - .uniform_buf(0, "RaytraceData", "raytrace_buf") + .uniform_buf(4, "RaytraceData", "raytrace_buf") .uniform_buf(1, "HiZData", "hiz_buf") .uniform_buf(2, "RaytraceBufferData", "rtbuf_buf") - .sampler(0, ImageType::FLOAT_2D, "hiz_tx") .sampler(1, ImageType::FLOAT_2D, "ray_data_tx") .sampler(2, ImageType::FLOAT_2D, "ray_radiance_tx") .sampler(3, ImageType::FLOAT_2D, "cl_color_tx") @@ -63,6 +65,7 @@ GPU_SHADER_CREATE_INFO(eevee_raytrace_denoise) .sampler(5, ImageType::FLOAT_2D, "cl_data_tx") .sampler(6, ImageType::FLOAT_2D, "ray_history_tx") .sampler(7, ImageType::FLOAT_2D, "ray_variance_tx") + .sampler(8, ImageType::FLOAT_2D, "hiz_tx") .image(0, GPU_RGBA16F, Qualifier::READ_WRITE, ImageType::FLOAT_2D, "out_history_img") .image(1, GPU_R8, Qualifier::READ_WRITE, ImageType::FLOAT_2D, "out_variance_img") .compute_source("eevee_raytrace_denoise_comp.glsl"); @@ -70,7 +73,7 @@ GPU_SHADER_CREATE_INFO(eevee_raytrace_denoise) EEVEE_RAYTRACE_BSDF_VARIATIONS(eevee_raytrace_denoise, "eevee_raytrace_denoise"); GPU_SHADER_CREATE_INFO(eevee_raytrace_resolve) - .additional_info("eevee_shared") + .additional_info("eevee_shared", "draw_view") .uniform_buf(1, "HiZData", "hiz_buf") .sampler(2, ImageType::FLOAT_2D, "ray_radiance_tx") .sampler(3, ImageType::FLOAT_2D, "cl_color_tx") @@ -92,7 +95,7 @@ EEVEE_RAYTRACE_BSDF_VARIATIONS(eevee_raytrace_resolve, "eevee_raytrace_resolve") * \{ */ GPU_SHADER_CREATE_INFO(eevee_raytrace_data) - .uniform_buf(0, "RaytraceData", "raytrace_diffuse") + .uniform_buf(4, "RaytraceData", "raytrace_diffuse") .uniform_buf(1, "RaytraceData", "raytrace_reflection") .uniform_buf(2, "RaytraceData", "raytrace_refraction") .uniform_buf(3, "HiZData", "hiz_buf") |