blender
/
blender
136
407
Fork 590
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

EEVEE Next: Ambient Occlusion #108398

Merged
Miguel Pozo merged 29 commits from pragma37/blender:pull-eevee-next-ao into main 2023-06-30 19:37:37 +02:00
Conversation 4 Commits 29 Files Changed 29 -7
4 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit edb9b9ccc2 - Show all commits

2
source/blender/draw/engines/eevee_next/eevee_ao.cc
View File

@ -39,8 +39,6 @@ void AmbientOcclusion::init()
const Scene *scene = inst_.scene;
data_.enabled = (scene->eevee.flag & SCE_EEVEE_GTAO_ENABLED) ||
(inst_.film.enabled_passes_get() & EEVEE_RENDER_PASS_AO);
debug_ = data_.enabled && G.debug_value == 6;
render_pass_enabled_ = data_.enabled && inst_.film.enabled_passes_get() & EEVEE_RENDER_PASS_AO;
if (!data_.enabled) {

1
source/blender/draw/engines/eevee_next/eevee_ao.hh
View File

@ -23,7 +23,6 @@ class AmbientOcclusion {
private:
class Instance &inst_;
bool debug_;
bool render_pass_enabled_;
AODataBuf data_;

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

@ -85,9 +85,6 @@ const char *ShaderModule::static_shader_create_info_name_get(eShaderType shader_
return "eevee_ao_horizons";
case AO_PASS:
return "eevee_ao_pass";
case AO_DEBUG:
/* TODO */
return "eevee_ao_pass";
case FILM_FRAG:
return "eevee_film_frag";
case FILM_COMP:

1
source/blender/draw/engines/eevee_next/eevee_shader.hh
View File

@ -29,7 +29,6 @@ namespace blender::eevee {
enum eShaderType {
AO_HORIZONS = 0,
AO_PASS,
AO_DEBUG,
FILM_FRAG,
FILM_COMP,