From f60182ac42118c817ddabec80330f0331be4e26f Mon Sep 17 00:00:00 2001 From: Cody Winchester Date: Sat, 27 Sep 2025 11:15:31 -0500 Subject: [PATCH] GOOENGINE: Rename folder to gooengine Eevee next eventually renames to eevee so switch it to gooengine for future compatibility --- source/blender/blenkernel/intern/scene.cc | 2 +- source/blender/draw/CMakeLists.txt | 256 +++++++++--------- .../{eevee => gooengine}/eevee_data.cc | 0 .../{eevee => gooengine}/eevee_effects.cc | 0 .../{eevee => gooengine}/eevee_engine.cc | 0 .../{eevee => gooengine}/eevee_lights.cc | 0 .../{eevee => gooengine}/eevee_materials.cc | 0 .../{eevee => gooengine}/eevee_private.h | 0 .../eevee_screen_raytrace.cc | 0 .../{eevee => gooengine}/eevee_shaders.cc | 2 +- .../eevee_shaders_extra.cc | 0 .../{eevee => gooengine}/eevee_shadows.cc | 0 .../eevee_shadows_cascade.cc | 0 .../eevee_shadows_cube.cc | 0 .../eevee_temporal_sampling.cc | 0 .../{eevee => gooengine}/eevee_volumes.cc | 0 .../shaders/closure_eval_lib.glsl | 0 .../shaders/closure_eval_surface_lib.glsl | 0 .../shaders/closure_type_lib.glsl | 0 .../shaders/common_uniforms_lib.glsl | 0 .../effect_reflection_resolve_frag.glsl | 0 .../shaders/effect_translucency_frag.glsl | 0 .../shaders/infos/eevee_legacy_common_info.hh | 0 .../infos/eevee_legacy_material_info.hh | 0 .../infos/engine_eevee_legacy_shared.h | 0 .../shaders/lights_lib.glsl | 0 .../shaders/prepass_frag.glsl | 0 .../shaders/shadow_accum_frag.glsl | 0 .../shaders/surface_frag.glsl | 0 .../shaders/volumetric_scatter_frag.glsl | 0 source/blender/draw/intern/draw_manager_c.cc | 2 +- .../blender/editors/render/render_shading.cc | 2 +- source/blender/gpu/CMakeLists.txt | 18 +- 33 files changed, 141 insertions(+), 141 deletions(-) rename source/blender/draw/engines/{eevee => gooengine}/eevee_data.cc (100%) rename source/blender/draw/engines/{eevee => gooengine}/eevee_effects.cc (100%) rename source/blender/draw/engines/{eevee => gooengine}/eevee_engine.cc (100%) rename source/blender/draw/engines/{eevee => gooengine}/eevee_lights.cc (100%) rename source/blender/draw/engines/{eevee => gooengine}/eevee_materials.cc (100%) rename source/blender/draw/engines/{eevee => gooengine}/eevee_private.h (100%) rename source/blender/draw/engines/{eevee => gooengine}/eevee_screen_raytrace.cc (100%) rename source/blender/draw/engines/{eevee => gooengine}/eevee_shaders.cc (99%) rename source/blender/draw/engines/{eevee => gooengine}/eevee_shaders_extra.cc (100%) rename source/blender/draw/engines/{eevee => gooengine}/eevee_shadows.cc (100%) rename source/blender/draw/engines/{eevee => gooengine}/eevee_shadows_cascade.cc (100%) rename source/blender/draw/engines/{eevee => gooengine}/eevee_shadows_cube.cc (100%) rename source/blender/draw/engines/{eevee => gooengine}/eevee_temporal_sampling.cc (100%) rename source/blender/draw/engines/{eevee => gooengine}/eevee_volumes.cc (100%) rename source/blender/draw/engines/{eevee => gooengine}/shaders/closure_eval_lib.glsl (100%) rename source/blender/draw/engines/{eevee => gooengine}/shaders/closure_eval_surface_lib.glsl (100%) rename source/blender/draw/engines/{eevee => gooengine}/shaders/closure_type_lib.glsl (100%) rename source/blender/draw/engines/{eevee => gooengine}/shaders/common_uniforms_lib.glsl (100%) rename source/blender/draw/engines/{eevee => gooengine}/shaders/effect_reflection_resolve_frag.glsl (100%) rename source/blender/draw/engines/{eevee => gooengine}/shaders/effect_translucency_frag.glsl (100%) rename source/blender/draw/engines/{eevee => gooengine}/shaders/infos/eevee_legacy_common_info.hh (100%) rename source/blender/draw/engines/{eevee => gooengine}/shaders/infos/eevee_legacy_material_info.hh (100%) rename source/blender/draw/engines/{eevee => gooengine}/shaders/infos/engine_eevee_legacy_shared.h (100%) rename source/blender/draw/engines/{eevee => gooengine}/shaders/lights_lib.glsl (100%) rename source/blender/draw/engines/{eevee => gooengine}/shaders/prepass_frag.glsl (100%) rename source/blender/draw/engines/{eevee => gooengine}/shaders/shadow_accum_frag.glsl (100%) rename source/blender/draw/engines/{eevee => gooengine}/shaders/surface_frag.glsl (100%) rename source/blender/draw/engines/{eevee => gooengine}/shaders/volumetric_scatter_frag.glsl (100%) diff --git a/source/blender/blenkernel/intern/scene.cc b/source/blender/blenkernel/intern/scene.cc index 0dfb8b10f11..7399189d66e 100644 --- a/source/blender/blenkernel/intern/scene.cc +++ b/source/blender/blenkernel/intern/scene.cc @@ -101,7 +101,7 @@ #include "BLO_read_write.hh" -#include "engines/eevee/eevee_lightcache.h" +#include "engines/gooengine/eevee_lightcache.h" #include "IMB_colormanagement.hh" #include "IMB_imbuf.hh" diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index 4374a3f1e9e..253090f975f 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -108,33 +108,33 @@ set(SRC engines/compositor/compositor_engine.cc engines/image/image_engine.cc engines/image/image_shader.cc - engines/eevee/eevee_bloom.cc - engines/eevee/eevee_cryptomatte.cc - engines/eevee/eevee_data.cc - engines/eevee/eevee_depth_of_field.cc - engines/eevee/eevee_effects.cc - engines/eevee/eevee_engine.cc - engines/eevee/eevee_lightcache.cc - engines/eevee/eevee_lightprobes.cc - engines/eevee/eevee_lights.cc - engines/eevee/eevee_lookdev.cc - engines/eevee/eevee_lut_gen.cc - engines/eevee/eevee_materials.cc - engines/eevee/eevee_mist.cc - engines/eevee/eevee_motion_blur.cc - engines/eevee/eevee_occlusion.cc - engines/eevee/eevee_render.cc - engines/eevee/eevee_renderpasses.cc - engines/eevee/eevee_sampling.cc - engines/eevee/eevee_screen_raytrace.cc - engines/eevee/eevee_shaders.cc - engines/eevee/eevee_shaders_extra.cc - engines/eevee/eevee_shadows.cc - engines/eevee/eevee_shadows_cascade.cc - engines/eevee/eevee_shadows_cube.cc - engines/eevee/eevee_subsurface.cc - engines/eevee/eevee_temporal_sampling.cc - engines/eevee/eevee_volumes.cc + engines/gooengine/eevee_bloom.cc + engines/gooengine/eevee_cryptomatte.cc + engines/gooengine/eevee_data.cc + engines/gooengine/eevee_depth_of_field.cc + engines/gooengine/eevee_effects.cc + engines/gooengine/eevee_engine.cc + engines/gooengine/eevee_lightcache.cc + engines/gooengine/eevee_lightprobes.cc + engines/gooengine/eevee_lights.cc + engines/gooengine/eevee_lookdev.cc + engines/gooengine/eevee_lut_gen.cc + engines/gooengine/eevee_materials.cc + engines/gooengine/eevee_mist.cc + engines/gooengine/eevee_motion_blur.cc + engines/gooengine/eevee_occlusion.cc + engines/gooengine/eevee_render.cc + engines/gooengine/eevee_renderpasses.cc + engines/gooengine/eevee_sampling.cc + engines/gooengine/eevee_screen_raytrace.cc + engines/gooengine/eevee_shaders.cc + engines/gooengine/eevee_shaders_extra.cc + engines/gooengine/eevee_shadows.cc + engines/gooengine/eevee_shadows_cascade.cc + engines/gooengine/eevee_shadows_cube.cc + engines/gooengine/eevee_subsurface.cc + engines/gooengine/eevee_temporal_sampling.cc + engines/gooengine/eevee_volumes.cc engines/eevee_next/eevee_ambient_occlusion.cc engines/eevee_next/eevee_camera.cc engines/eevee_next/eevee_cryptomatte.cc @@ -267,10 +267,10 @@ set(SRC engines/basic/basic_engine.h engines/basic/basic_private.h engines/compositor/compositor_engine.h - engines/eevee/eevee_engine.h - engines/eevee/eevee_lightcache.h - engines/eevee/eevee_private.hh - engines/eevee/engine_eevee_shared_defines.h + engines/gooengine/eevee_engine.h + engines/gooengine/eevee_lightcache.h + engines/gooengine/eevee_private.hh + engines/gooengine/engine_eevee_shared_defines.h engines/eevee_next/eevee_ambient_occlusion.hh engines/eevee_next/eevee_camera.hh engines/eevee_next/eevee_cryptomatte.hh @@ -353,103 +353,103 @@ set(LIB ) set(GLSL_SRC - engines/eevee/shaders/ambient_occlusion_lib.glsl - engines/eevee/shaders/background_vert.glsl - engines/eevee/shaders/common_uniforms_lib.glsl - engines/eevee/shaders/common_utiltex_lib.glsl - engines/eevee/shaders/lights_lib.glsl - engines/eevee/shaders/lightprobe_lib.glsl - engines/eevee/shaders/lightprobe_filter_glossy_frag.glsl - engines/eevee/shaders/lightprobe_filter_diffuse_frag.glsl - engines/eevee/shaders/lightprobe_filter_visibility_frag.glsl - engines/eevee/shaders/lightprobe_geom.glsl - engines/eevee/shaders/lightprobe_vert.glsl - engines/eevee/shaders/lightprobe_vert_no_geom.glsl - engines/eevee/shaders/lightprobe_cube_display_frag.glsl - engines/eevee/shaders/lightprobe_cube_display_vert.glsl - engines/eevee/shaders/lightprobe_grid_display_frag.glsl - engines/eevee/shaders/lightprobe_grid_display_vert.glsl - engines/eevee/shaders/lightprobe_grid_fill_frag.glsl - engines/eevee/shaders/lightprobe_planar_display_frag.glsl - engines/eevee/shaders/lightprobe_planar_display_vert.glsl - engines/eevee/shaders/lookdev_world_frag.glsl - engines/eevee/shaders/closure_eval_lib.glsl - engines/eevee/shaders/closure_eval_diffuse_lib.glsl - engines/eevee/shaders/closure_eval_glossy_lib.glsl - engines/eevee/shaders/closure_eval_surface_lib.glsl - engines/eevee/shaders/closure_eval_refraction_lib.glsl - engines/eevee/shaders/closure_eval_volume_lib.glsl - engines/eevee/shaders/closure_eval_translucent_lib.glsl - engines/eevee/shaders/closure_type_lib.glsl - engines/eevee/shaders/eevee_empty.glsl - engines/eevee/shaders/eevee_empty_volume.glsl - engines/eevee/shaders/effect_bloom_frag.glsl - engines/eevee/shaders/effect_dof_bokeh_frag.glsl - engines/eevee/shaders/effect_dof_dilate_tiles_frag.glsl - engines/eevee/shaders/effect_dof_downsample_frag.glsl - engines/eevee/shaders/effect_dof_filter_frag.glsl - engines/eevee/shaders/effect_dof_flatten_tiles_frag.glsl - engines/eevee/shaders/effect_dof_gather_frag.glsl - engines/eevee/shaders/effect_dof_lib.glsl - engines/eevee/shaders/effect_dof_reduce_frag.glsl - engines/eevee/shaders/effect_dof_resolve_frag.glsl - engines/eevee/shaders/effect_dof_scatter_frag.glsl - engines/eevee/shaders/effect_dof_scatter_vert.glsl - engines/eevee/shaders/effect_dof_setup_frag.glsl - engines/eevee/shaders/effect_reflection_lib.glsl - engines/eevee/shaders/effect_reflection_resolve_frag.glsl - engines/eevee/shaders/effect_reflection_trace_frag.glsl - engines/eevee/shaders/effect_downsample_frag.glsl - engines/eevee/shaders/effect_downsample_cube_frag.glsl - engines/eevee/shaders/effect_gtao_frag.glsl - engines/eevee/shaders/effect_velocity_resolve_frag.glsl - engines/eevee/shaders/effect_velocity_tile_frag.glsl - engines/eevee/shaders/effect_minmaxz_frag.glsl - engines/eevee/shaders/effect_mist_frag.glsl - engines/eevee/shaders/effect_motion_blur_frag.glsl - engines/eevee/shaders/effect_subsurface_frag.glsl - engines/eevee/shaders/effect_translucency_frag.glsl - engines/eevee/shaders/effect_temporal_aa.glsl - engines/eevee/shaders/lightprobe_planar_downsample_frag.glsl - engines/eevee/shaders/lightprobe_planar_downsample_geom.glsl - engines/eevee/shaders/lightprobe_planar_downsample_vert.glsl - engines/eevee/shaders/object_motion_frag.glsl - engines/eevee/shaders/object_motion_vert.glsl - engines/eevee/shaders/prepass_frag.glsl - engines/eevee/shaders/shadow_accum_frag.glsl - engines/eevee/shaders/shadow_frag.glsl - engines/eevee/shaders/shadow_vert.glsl - engines/eevee/shaders/bsdf_lut_frag.glsl - engines/eevee/shaders/btdf_lut_frag.glsl - engines/eevee/shaders/bsdf_common_lib.glsl - engines/eevee/shaders/irradiance_lib.glsl - engines/eevee/shaders/octahedron_lib.glsl - engines/eevee/shaders/bsdf_sampling_lib.glsl - engines/eevee/shaders/random_lib.glsl - engines/eevee/shaders/raytrace_lib.glsl - engines/eevee/shaders/renderpass_accumulate_frag.glsl - engines/eevee/shaders/renderpass_lib.glsl - engines/eevee/shaders/renderpass_postprocess_frag.glsl - engines/eevee/shaders/cryptomatte_frag.glsl - engines/eevee/shaders/cryptomatte_vert.glsl - engines/eevee/shaders/ltc_lib.glsl - engines/eevee/shaders/ssr_lib.glsl - engines/eevee/shaders/surface_frag.glsl - engines/eevee/shaders/surface_geom.glsl - engines/eevee/shaders/surface_lib.glsl - engines/eevee/shaders/surface_vert.glsl - engines/eevee/shaders/update_noise_frag.glsl - engines/eevee/shaders/volumetric_accum_frag.glsl - engines/eevee/shaders/volumetric_lib.glsl - engines/eevee/shaders/volumetric_frag.glsl - engines/eevee/shaders/volumetric_geom.glsl - engines/eevee/shaders/volumetric_vert.glsl - engines/eevee/shaders/volumetric_resolve_frag.glsl - engines/eevee/shaders/volumetric_scatter_frag.glsl - engines/eevee/shaders/volumetric_integration_frag.glsl - engines/eevee/shaders/world_vert.glsl - engines/eevee/shaders/infos/engine_eevee_legacy_shared.h - engines/eevee/engine_eevee_shared_defines.h + engines/gooengine/shaders/ambient_occlusion_lib.glsl + engines/gooengine/shaders/background_vert.glsl + engines/gooengine/shaders/common_uniforms_lib.glsl + engines/gooengine/shaders/common_utiltex_lib.glsl + engines/gooengine/shaders/lights_lib.glsl + engines/gooengine/shaders/lightprobe_lib.glsl + engines/gooengine/shaders/lightprobe_filter_glossy_frag.glsl + engines/gooengine/shaders/lightprobe_filter_diffuse_frag.glsl + engines/gooengine/shaders/lightprobe_filter_visibility_frag.glsl + engines/gooengine/shaders/lightprobe_geom.glsl + engines/gooengine/shaders/lightprobe_vert.glsl + engines/gooengine/shaders/lightprobe_vert_no_geom.glsl + engines/gooengine/shaders/lightprobe_cube_display_frag.glsl + engines/gooengine/shaders/lightprobe_cube_display_vert.glsl + engines/gooengine/shaders/lightprobe_grid_display_frag.glsl + engines/gooengine/shaders/lightprobe_grid_display_vert.glsl + engines/gooengine/shaders/lightprobe_grid_fill_frag.glsl + engines/gooengine/shaders/lightprobe_planar_display_frag.glsl + engines/gooengine/shaders/lightprobe_planar_display_vert.glsl + engines/gooengine/shaders/lookdev_world_frag.glsl + engines/gooengine/shaders/closure_eval_lib.glsl + engines/gooengine/shaders/closure_eval_diffuse_lib.glsl + engines/gooengine/shaders/closure_eval_glossy_lib.glsl + engines/gooengine/shaders/closure_eval_surface_lib.glsl + engines/gooengine/shaders/closure_eval_refraction_lib.glsl + engines/gooengine/shaders/closure_eval_volume_lib.glsl + engines/gooengine/shaders/closure_eval_translucent_lib.glsl + engines/gooengine/shaders/closure_type_lib.glsl + engines/gooengine/shaders/eevee_empty.glsl + engines/gooengine/shaders/eevee_empty_volume.glsl + engines/gooengine/shaders/effect_bloom_frag.glsl + engines/gooengine/shaders/effect_dof_bokeh_frag.glsl + engines/gooengine/shaders/effect_dof_dilate_tiles_frag.glsl + engines/gooengine/shaders/effect_dof_downsample_frag.glsl + engines/gooengine/shaders/effect_dof_filter_frag.glsl + engines/gooengine/shaders/effect_dof_flatten_tiles_frag.glsl + engines/gooengine/shaders/effect_dof_gather_frag.glsl + engines/gooengine/shaders/effect_dof_lib.glsl + engines/gooengine/shaders/effect_dof_reduce_frag.glsl + engines/gooengine/shaders/effect_dof_resolve_frag.glsl + engines/gooengine/shaders/effect_dof_scatter_frag.glsl + engines/gooengine/shaders/effect_dof_scatter_vert.glsl + engines/gooengine/shaders/effect_dof_setup_frag.glsl + engines/gooengine/shaders/effect_reflection_lib.glsl + engines/gooengine/shaders/effect_reflection_resolve_frag.glsl + engines/gooengine/shaders/effect_reflection_trace_frag.glsl + engines/gooengine/shaders/effect_downsample_frag.glsl + engines/gooengine/shaders/effect_downsample_cube_frag.glsl + engines/gooengine/shaders/effect_gtao_frag.glsl + engines/gooengine/shaders/effect_velocity_resolve_frag.glsl + engines/gooengine/shaders/effect_velocity_tile_frag.glsl + engines/gooengine/shaders/effect_minmaxz_frag.glsl + engines/gooengine/shaders/effect_mist_frag.glsl + engines/gooengine/shaders/effect_motion_blur_frag.glsl + engines/gooengine/shaders/effect_subsurface_frag.glsl + engines/gooengine/shaders/effect_translucency_frag.glsl + engines/gooengine/shaders/effect_temporal_aa.glsl + engines/gooengine/shaders/lightprobe_planar_downsample_frag.glsl + engines/gooengine/shaders/lightprobe_planar_downsample_geom.glsl + engines/gooengine/shaders/lightprobe_planar_downsample_vert.glsl + engines/gooengine/shaders/object_motion_frag.glsl + engines/gooengine/shaders/object_motion_vert.glsl + engines/gooengine/shaders/prepass_frag.glsl + engines/gooengine/shaders/shadow_accum_frag.glsl + engines/gooengine/shaders/shadow_frag.glsl + engines/gooengine/shaders/shadow_vert.glsl + engines/gooengine/shaders/bsdf_lut_frag.glsl + engines/gooengine/shaders/btdf_lut_frag.glsl + engines/gooengine/shaders/bsdf_common_lib.glsl + engines/gooengine/shaders/irradiance_lib.glsl + engines/gooengine/shaders/octahedron_lib.glsl + engines/gooengine/shaders/bsdf_sampling_lib.glsl + engines/gooengine/shaders/random_lib.glsl + engines/gooengine/shaders/raytrace_lib.glsl + engines/gooengine/shaders/renderpass_accumulate_frag.glsl + engines/gooengine/shaders/renderpass_lib.glsl + engines/gooengine/shaders/renderpass_postprocess_frag.glsl + engines/gooengine/shaders/cryptomatte_frag.glsl + engines/gooengine/shaders/cryptomatte_vert.glsl + engines/gooengine/shaders/ltc_lib.glsl + engines/gooengine/shaders/ssr_lib.glsl + engines/gooengine/shaders/surface_frag.glsl + engines/gooengine/shaders/surface_geom.glsl + engines/gooengine/shaders/surface_lib.glsl + engines/gooengine/shaders/surface_vert.glsl + engines/gooengine/shaders/update_noise_frag.glsl + engines/gooengine/shaders/volumetric_accum_frag.glsl + engines/gooengine/shaders/volumetric_lib.glsl + engines/gooengine/shaders/volumetric_frag.glsl + engines/gooengine/shaders/volumetric_geom.glsl + engines/gooengine/shaders/volumetric_vert.glsl + engines/gooengine/shaders/volumetric_resolve_frag.glsl + engines/gooengine/shaders/volumetric_scatter_frag.glsl + engines/gooengine/shaders/volumetric_integration_frag.glsl + engines/gooengine/shaders/world_vert.glsl + engines/gooengine/shaders/infos/engine_eevee_legacy_shared.h + engines/gooengine/engine_eevee_shared_defines.h engines/eevee_next/shaders/eevee_ambient_occlusion_lib.glsl engines/eevee_next/shaders/eevee_ambient_occlusion_pass_comp.glsl diff --git a/source/blender/draw/engines/eevee/eevee_data.cc b/source/blender/draw/engines/gooengine/eevee_data.cc similarity index 100% rename from source/blender/draw/engines/eevee/eevee_data.cc rename to source/blender/draw/engines/gooengine/eevee_data.cc diff --git a/source/blender/draw/engines/eevee/eevee_effects.cc b/source/blender/draw/engines/gooengine/eevee_effects.cc similarity index 100% rename from source/blender/draw/engines/eevee/eevee_effects.cc rename to source/blender/draw/engines/gooengine/eevee_effects.cc diff --git a/source/blender/draw/engines/eevee/eevee_engine.cc b/source/blender/draw/engines/gooengine/eevee_engine.cc similarity index 100% rename from source/blender/draw/engines/eevee/eevee_engine.cc rename to source/blender/draw/engines/gooengine/eevee_engine.cc diff --git a/source/blender/draw/engines/eevee/eevee_lights.cc b/source/blender/draw/engines/gooengine/eevee_lights.cc similarity index 100% rename from source/blender/draw/engines/eevee/eevee_lights.cc rename to source/blender/draw/engines/gooengine/eevee_lights.cc diff --git a/source/blender/draw/engines/eevee/eevee_materials.cc b/source/blender/draw/engines/gooengine/eevee_materials.cc similarity index 100% rename from source/blender/draw/engines/eevee/eevee_materials.cc rename to source/blender/draw/engines/gooengine/eevee_materials.cc diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/gooengine/eevee_private.h similarity index 100% rename from source/blender/draw/engines/eevee/eevee_private.h rename to source/blender/draw/engines/gooengine/eevee_private.h diff --git a/source/blender/draw/engines/eevee/eevee_screen_raytrace.cc b/source/blender/draw/engines/gooengine/eevee_screen_raytrace.cc similarity index 100% rename from source/blender/draw/engines/eevee/eevee_screen_raytrace.cc rename to source/blender/draw/engines/gooengine/eevee_screen_raytrace.cc diff --git a/source/blender/draw/engines/eevee/eevee_shaders.cc b/source/blender/draw/engines/gooengine/eevee_shaders.cc similarity index 99% rename from source/blender/draw/engines/eevee/eevee_shaders.cc rename to source/blender/draw/engines/gooengine/eevee_shaders.cc index 520095799bf..b2b3fb64b32 100644 --- a/source/blender/draw/engines/eevee/eevee_shaders.cc +++ b/source/blender/draw/engines/gooengine/eevee_shaders.cc @@ -1315,7 +1315,7 @@ static char *eevee_get_defines(int options) * `eevee_get_vert/geom/frag_info(..)` * * CreateInfo's for EEVEE materials are declared in: - * `eevee/shaders/infos/eevee_legacy_material_info.hh` + * `gooengine/shaders/infos/eevee_legacy_material_info.hh` * * This function should only contain defines which alter behavior, but do not affect shader * resources. */ diff --git a/source/blender/draw/engines/eevee/eevee_shaders_extra.cc b/source/blender/draw/engines/gooengine/eevee_shaders_extra.cc similarity index 100% rename from source/blender/draw/engines/eevee/eevee_shaders_extra.cc rename to source/blender/draw/engines/gooengine/eevee_shaders_extra.cc diff --git a/source/blender/draw/engines/eevee/eevee_shadows.cc b/source/blender/draw/engines/gooengine/eevee_shadows.cc similarity index 100% rename from source/blender/draw/engines/eevee/eevee_shadows.cc rename to source/blender/draw/engines/gooengine/eevee_shadows.cc diff --git a/source/blender/draw/engines/eevee/eevee_shadows_cascade.cc b/source/blender/draw/engines/gooengine/eevee_shadows_cascade.cc similarity index 100% rename from source/blender/draw/engines/eevee/eevee_shadows_cascade.cc rename to source/blender/draw/engines/gooengine/eevee_shadows_cascade.cc diff --git a/source/blender/draw/engines/eevee/eevee_shadows_cube.cc b/source/blender/draw/engines/gooengine/eevee_shadows_cube.cc similarity index 100% rename from source/blender/draw/engines/eevee/eevee_shadows_cube.cc rename to source/blender/draw/engines/gooengine/eevee_shadows_cube.cc diff --git a/source/blender/draw/engines/eevee/eevee_temporal_sampling.cc b/source/blender/draw/engines/gooengine/eevee_temporal_sampling.cc similarity index 100% rename from source/blender/draw/engines/eevee/eevee_temporal_sampling.cc rename to source/blender/draw/engines/gooengine/eevee_temporal_sampling.cc diff --git a/source/blender/draw/engines/eevee/eevee_volumes.cc b/source/blender/draw/engines/gooengine/eevee_volumes.cc similarity index 100% rename from source/blender/draw/engines/eevee/eevee_volumes.cc rename to source/blender/draw/engines/gooengine/eevee_volumes.cc diff --git a/source/blender/draw/engines/eevee/shaders/closure_eval_lib.glsl b/source/blender/draw/engines/gooengine/shaders/closure_eval_lib.glsl similarity index 100% rename from source/blender/draw/engines/eevee/shaders/closure_eval_lib.glsl rename to source/blender/draw/engines/gooengine/shaders/closure_eval_lib.glsl diff --git a/source/blender/draw/engines/eevee/shaders/closure_eval_surface_lib.glsl b/source/blender/draw/engines/gooengine/shaders/closure_eval_surface_lib.glsl similarity index 100% rename from source/blender/draw/engines/eevee/shaders/closure_eval_surface_lib.glsl rename to source/blender/draw/engines/gooengine/shaders/closure_eval_surface_lib.glsl diff --git a/source/blender/draw/engines/eevee/shaders/closure_type_lib.glsl b/source/blender/draw/engines/gooengine/shaders/closure_type_lib.glsl similarity index 100% rename from source/blender/draw/engines/eevee/shaders/closure_type_lib.glsl rename to source/blender/draw/engines/gooengine/shaders/closure_type_lib.glsl diff --git a/source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl b/source/blender/draw/engines/gooengine/shaders/common_uniforms_lib.glsl similarity index 100% rename from source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl rename to source/blender/draw/engines/gooengine/shaders/common_uniforms_lib.glsl diff --git a/source/blender/draw/engines/eevee/shaders/effect_reflection_resolve_frag.glsl b/source/blender/draw/engines/gooengine/shaders/effect_reflection_resolve_frag.glsl similarity index 100% rename from source/blender/draw/engines/eevee/shaders/effect_reflection_resolve_frag.glsl rename to source/blender/draw/engines/gooengine/shaders/effect_reflection_resolve_frag.glsl diff --git a/source/blender/draw/engines/eevee/shaders/effect_translucency_frag.glsl b/source/blender/draw/engines/gooengine/shaders/effect_translucency_frag.glsl similarity index 100% rename from source/blender/draw/engines/eevee/shaders/effect_translucency_frag.glsl rename to source/blender/draw/engines/gooengine/shaders/effect_translucency_frag.glsl diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_common_info.hh b/source/blender/draw/engines/gooengine/shaders/infos/eevee_legacy_common_info.hh similarity index 100% rename from source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_common_info.hh rename to source/blender/draw/engines/gooengine/shaders/infos/eevee_legacy_common_info.hh diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_material_info.hh b/source/blender/draw/engines/gooengine/shaders/infos/eevee_legacy_material_info.hh similarity index 100% rename from source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_material_info.hh rename to source/blender/draw/engines/gooengine/shaders/infos/eevee_legacy_material_info.hh diff --git a/source/blender/draw/engines/eevee/shaders/infos/engine_eevee_legacy_shared.h b/source/blender/draw/engines/gooengine/shaders/infos/engine_eevee_legacy_shared.h similarity index 100% rename from source/blender/draw/engines/eevee/shaders/infos/engine_eevee_legacy_shared.h rename to source/blender/draw/engines/gooengine/shaders/infos/engine_eevee_legacy_shared.h diff --git a/source/blender/draw/engines/eevee/shaders/lights_lib.glsl b/source/blender/draw/engines/gooengine/shaders/lights_lib.glsl similarity index 100% rename from source/blender/draw/engines/eevee/shaders/lights_lib.glsl rename to source/blender/draw/engines/gooengine/shaders/lights_lib.glsl diff --git a/source/blender/draw/engines/eevee/shaders/prepass_frag.glsl b/source/blender/draw/engines/gooengine/shaders/prepass_frag.glsl similarity index 100% rename from source/blender/draw/engines/eevee/shaders/prepass_frag.glsl rename to source/blender/draw/engines/gooengine/shaders/prepass_frag.glsl diff --git a/source/blender/draw/engines/eevee/shaders/shadow_accum_frag.glsl b/source/blender/draw/engines/gooengine/shaders/shadow_accum_frag.glsl similarity index 100% rename from source/blender/draw/engines/eevee/shaders/shadow_accum_frag.glsl rename to source/blender/draw/engines/gooengine/shaders/shadow_accum_frag.glsl diff --git a/source/blender/draw/engines/eevee/shaders/surface_frag.glsl b/source/blender/draw/engines/gooengine/shaders/surface_frag.glsl similarity index 100% rename from source/blender/draw/engines/eevee/shaders/surface_frag.glsl rename to source/blender/draw/engines/gooengine/shaders/surface_frag.glsl diff --git a/source/blender/draw/engines/eevee/shaders/volumetric_scatter_frag.glsl b/source/blender/draw/engines/gooengine/shaders/volumetric_scatter_frag.glsl similarity index 100% rename from source/blender/draw/engines/eevee/shaders/volumetric_scatter_frag.glsl rename to source/blender/draw/engines/gooengine/shaders/volumetric_scatter_frag.glsl diff --git a/source/blender/draw/intern/draw_manager_c.cc b/source/blender/draw/intern/draw_manager_c.cc index 7d2377ac878..5ef215eea43 100644 --- a/source/blender/draw/intern/draw_manager_c.cc +++ b/source/blender/draw/intern/draw_manager_c.cc @@ -90,7 +90,7 @@ #include "engines/basic/basic_engine.h" #include "engines/compositor/compositor_engine.h" -#include "engines/eevee/eevee_engine.h" +#include "engines/gooengine/eevee_engine.h" #include "engines/eevee_next/eevee_engine.h" #include "engines/external/external_engine.h" #include "engines/gpencil/gpencil_engine.h" diff --git a/source/blender/editors/render/render_shading.cc b/source/blender/editors/render/render_shading.cc index d49513e6204..de123ba66a4 100644 --- a/source/blender/editors/render/render_shading.cc +++ b/source/blender/editors/render/render_shading.cc @@ -95,7 +95,7 @@ #include "RE_engine.h" #include "RE_pipeline.h" -#include "engines/eevee/eevee_lightcache.h" +#include "engines/gooengine/eevee_lightcache.h" #include "engines/eevee_next/eevee_lightcache.hh" #include "render_intern.hh" /* own include */ diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 040df1446d6..b9aabe01be4 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -768,15 +768,15 @@ set(SRC_SHADER_CREATE_INFOS ../draw/engines/workbench/shaders/infos/workbench_transparent_resolve_info.hh ../draw/engines/workbench/shaders/infos/workbench_volume_info.hh - ../draw/engines/eevee/shaders/infos/eevee_legacy_bloom_info.hh - ../draw/engines/eevee/shaders/infos/eevee_legacy_common_info.hh - ../draw/engines/eevee/shaders/infos/eevee_legacy_dof_info.hh - ../draw/engines/eevee/shaders/infos/eevee_legacy_effects_info.hh - ../draw/engines/eevee/shaders/infos/eevee_legacy_lightprobe_info.hh - ../draw/engines/eevee/shaders/infos/eevee_legacy_material_info.hh - ../draw/engines/eevee/shaders/infos/eevee_legacy_motion_blur_info.hh - ../draw/engines/eevee/shaders/infos/eevee_legacy_shadow_info.hh - ../draw/engines/eevee/shaders/infos/eevee_legacy_volume_info.hh + ../draw/engines/gooengine/shaders/infos/eevee_legacy_bloom_info.hh + ../draw/engines/gooengine/shaders/infos/eevee_legacy_common_info.hh + ../draw/engines/gooengine/shaders/infos/eevee_legacy_dof_info.hh + ../draw/engines/gooengine/shaders/infos/eevee_legacy_effects_info.hh + ../draw/engines/gooengine/shaders/infos/eevee_legacy_lightprobe_info.hh + ../draw/engines/gooengine/shaders/infos/eevee_legacy_material_info.hh + ../draw/engines/gooengine/shaders/infos/eevee_legacy_motion_blur_info.hh + ../draw/engines/gooengine/shaders/infos/eevee_legacy_shadow_info.hh + ../draw/engines/gooengine/shaders/infos/eevee_legacy_volume_info.hh ../draw/engines/image/shaders/infos/engine_image_info.hh ../draw/intern/shaders/draw_debug_create_info.hh