blender
/
blender
136
412
Fork 596
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

EEVEE: Fix Compilation Errors #113576

Merged
Jeroen Bakker merged 1 commits from Jeroen-Bakker/blender:eevee/fix-compilation-errors-double-sided into main 2023-10-12 08:57:34 +02:00
Conversation 0 Commits 1 Files Changed 3 +6 -5
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/draw/engines/eevee_next/eevee_pipeline.cc
View File

@ -1099,7 +1099,8 @@ PassMain::Sub *CapturePipeline::surface_material_add(::Material *blender_mat, GP
PassMain::Sub &sub_pass = surface_ps_.sub(GPU_material_get_name(gpumat));
GPUPass *gpupass = GPU_material_get_pass(gpumat);
sub_pass.shader_set(GPU_pass_shader_get(gpupass));
sub_pass.push_constant("double_sided", !(blender_mat->blend_flag & MA_BL_CULL_BACKFACE_PROBE));
sub_pass.push_constant("is_double_sided",
!(blender_mat->blend_flag & MA_BL_CULL_BACKFACE_PROBE));
return &sub_pass;
}

6
source/blender/draw/engines/eevee_next/shaders/eevee_surf_capture_frag.glsl
View File

@ -53,10 +53,10 @@ void main()
surfel_buf[surfel_id].radiance_direct.front.rgb = g_emission;
surfel_buf[surfel_id].radiance_direct.front.a = 0.0;
/* TODO(fclem): 2nd surface evaluation. */
surfel_buf[surfel_id].albedo_back = double_sided ? albedo : vec3(0);
surfel_buf[surfel_id].radiance_direct.back.rgb = double_sided ? g_emission : vec3(0);
surfel_buf[surfel_id].albedo_back = is_double_sided ? albedo : vec3(0);
surfel_buf[surfel_id].radiance_direct.back.rgb = is_double_sided ? g_emission : vec3(0);
surfel_buf[surfel_id].radiance_direct.back.a = 0.0;
surfel_buf[surfel_id].double_sided = double_sided;
surfel_buf[surfel_id].double_sided = is_double_sided;
if (!capture_info_buf.capture_emission) {
surfel_buf[surfel_id].radiance_direct.front.rgb = vec3(0.0);

2
source/blender/draw/engines/eevee_next/shaders/infos/eevee_material_info.hh
View File

@ -182,7 +182,7 @@ GPU_SHADER_CREATE_INFO(eevee_surf_capture)
.define("MAT_CAPTURE")
.storage_buf(SURFEL_BUF_SLOT, Qualifier::WRITE, "Surfel", "surfel_buf[]")
.storage_buf(CAPTURE_BUF_SLOT, Qualifier::READ_WRITE, "CaptureInfoData", "capture_info_buf")
.push_constant(Type::BOOL, "double_sided")
.push_constant(Type::BOOL, "is_double_sided")
.fragment_source("eevee_surf_capture_frag.glsl")
.additional_info("eevee_global_ubo", "eevee_utility_texture");