diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2022-01-27 16:56:10 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2022-01-27 16:56:10 +0300 |
| commit | 1f2b3cdd73039e951afec1af75ea89b640e8099b (patch) | |
| tree | 228b99dcc2927716cfe39b0ca08f8bcf9bc73ef8 /source | |
| parent | 032baf06f31063c956ab818a927200241529fa99 (diff) | |
Comment eevee_raytrace_resolve_lib out to avoid compilation errors for now
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/draw/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_shader.cc | 6 | ||||
| -rw-r--r-- | source/blender/draw/engines/eevee/shaders/eevee_raytrace_denoise_comp.glsl | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index f8741ea48c4..30c08489bff 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -271,8 +271,6 @@ set(LIB ) set(GLSL_SRC - ${EEVEE_BUILD_DIR}/shaders/eevee_raytrace_resolve_lib.glsl - engines/eevee/shaders/eevee_bsdf_lib.glsl engines/eevee/shaders/eevee_bsdf_microfacet_lib.glsl engines/eevee/shaders/eevee_bsdf_sampling_lib.glsl diff --git a/source/blender/draw/engines/eevee/eevee_shader.cc b/source/blender/draw/engines/eevee/eevee_shader.cc index e04e3d0bd21..ff3a668d474 100644 --- a/source/blender/draw/engines/eevee/eevee_shader.cc +++ b/source/blender/draw/engines/eevee/eevee_shader.cc @@ -110,7 +110,7 @@ extern char datatoc_eevee_raytrace_denoise_comp_glsl[]; extern char datatoc_eevee_raytrace_raygen_frag_glsl[]; extern char datatoc_eevee_raytrace_raygen_lib_glsl[]; extern char datatoc_eevee_raytrace_resolve_frag_glsl[]; -extern char datatoc_eevee_raytrace_resolve_lib_glsl[]; +// extern char datatoc_eevee_raytrace_resolve_lib_glsl[]; extern char datatoc_eevee_raytrace_trace_lib_glsl[]; extern char datatoc_eevee_sampling_lib_glsl[]; extern char datatoc_eevee_shadow_debug_frag_glsl[]; @@ -177,7 +177,7 @@ ShaderModule::ShaderModule() /* NOTE: These need to be ordered by dependencies. */ DRW_SHADER_LIB_ADD(shader_lib_, common_debug_lib); DRW_SHADER_LIB_ADD(shader_lib_, common_math_lib); - DRW_shader_library_add_file(shader_lib_, shared_lib_.c_str(), "eevee_shader_shared.hh"); + // DRW_shader_library_add_file(shader_lib_, shared_lib_.c_str(), "eevee_shader_shared.hh"); DRW_SHADER_LIB_ADD(shader_lib_, common_math_geom_lib); DRW_SHADER_LIB_ADD(shader_lib_, common_hair_lib); DRW_SHADER_LIB_ADD(shader_lib_, common_view_lib); @@ -219,7 +219,7 @@ ShaderModule::ShaderModule() DRW_SHADER_LIB_ADD(shader_lib_, eevee_motion_blur_lib); DRW_SHADER_LIB_ADD(shader_lib_, eevee_raytrace_trace_lib); DRW_SHADER_LIB_ADD(shader_lib_, eevee_raytrace_raygen_lib); - DRW_SHADER_LIB_ADD(shader_lib_, eevee_raytrace_resolve_lib); + // DRW_SHADER_LIB_ADD(shader_lib_, eevee_raytrace_resolve_lib); DRW_SHADER_LIB_ADD(shader_lib_, eevee_surface_lib); DRW_SHADER_LIB_ADD(shader_lib_, eevee_surface_velocity_lib); diff --git a/source/blender/draw/engines/eevee/shaders/eevee_raytrace_denoise_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_raytrace_denoise_comp.glsl index 96718358f6a..8faa62c7a2f 100644 --- a/source/blender/draw/engines/eevee/shaders/eevee_raytrace_denoise_comp.glsl +++ b/source/blender/draw/engines/eevee/shaders/eevee_raytrace_denoise_comp.glsl @@ -17,7 +17,7 @@ #pragma BLENDER_REQUIRE(common_view_lib.glsl) #pragma BLENDER_REQUIRE(eevee_bsdf_microfacet_lib.glsl) #pragma BLENDER_REQUIRE(eevee_gbuffer_lib.glsl) -#pragma BLENDER_REQUIRE(eevee_raytrace_resolve_lib.glsl) +#pragma BLENDER_EQUIRE(eevee_raytrace_resolve_lib.glsl) #pragma BLENDER_REQUIRE(eevee_sampling_lib.glsl) #pragma BLENDER_REQUIRE(eevee_shader_shared.hh) |