Use more of the new API in eevee next

5 files changed, 28 insertions, 32 deletions

diff --git a/source/blender/draw/engines/eevee_next/eevee_pipeline.cc b/source/blender/draw/engines/eevee_next/eevee_pipeline.cc
index d9ac39f4fb9..0e6262e4cb5 100644
--- a/source/blender/draw/engines/eevee_next/eevee_pipeline.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_pipeline.cc
@@ -24,36 +24,36 @@ namespace blender::eevee {
 
 void WorldPipeline::sync(GPUMaterial *gpumat)
 {
+  Manager &drw = *DRW_manager_get();
   RenderBuffers &rbufs = inst_.render_buffers;
 
-  DRWState state = DRW_STATE_WRITE_COLOR;
-  world_ps_ = DRW_pass_create("World", state);
+  ResourceHandle handle = drw.resource_handle(float4x4::identity().ptr());
 
-  /* Push a matrix at the same location as the camera. */
-  float4x4 camera_mat = float4x4::identity();
-  // copy_v3_v3(camera_mat[3], inst_.camera.data_get().viewinv[3]);
-
-  DRWShadingGroup *grp = DRW_shgroup_material_create(gpumat, world_ps_);
-  DRW_shgroup_uniform_texture(grp, "utility_tx", inst_.pipelines.utility_tx);
-  DRW_shgroup_call_obmat(grp, DRW_cache_fullscreen_quad_get(), camera_mat.ptr());
-  DRW_shgroup_uniform_float_copy(grp, "world_opacity_fade", inst_.film.background_opacity_get());
+  world_ps_.init();
+  world_ps_.state_set(DRW_STATE_WRITE_COLOR);
+  world_ps_.material_set(drw, gpumat);
+  world_ps_.push_constant("world_opacity_fade", inst_.film.background_opacity_get());
+  world_ps_.bind("utility_tx", inst_.pipelines.utility_tx);
   /* AOVs. */
-  DRW_shgroup_uniform_image_ref(grp, "aov_color_img", &rbufs.aov_color_tx);
-  DRW_shgroup_uniform_image_ref(grp, "aov_value_img", &rbufs.aov_value_tx);
-  DRW_shgroup_storage_block_ref(grp, "aov_buf", &inst_.film.aovs_info);
+  world_ps_.bind("aov_color_img", as_image(&rbufs.aov_color_tx));
+  world_ps_.bind("aov_value_img", as_image(&rbufs.aov_value_tx));
+  world_ps_.bind("aov_buf", &inst_.film.aovs_info);
   /* RenderPasses. Cleared by background (even if bad practice). */
-  DRW_shgroup_uniform_image_ref(grp, "rp_normal_img", &rbufs.normal_tx);
-  DRW_shgroup_uniform_image_ref(grp, "rp_light_img", &rbufs.light_tx);
-  DRW_shgroup_uniform_image_ref(grp, "rp_diffuse_color_img", &rbufs.diffuse_color_tx);
-  DRW_shgroup_uniform_image_ref(grp, "rp_specular_color_img", &rbufs.specular_color_tx);
-  DRW_shgroup_uniform_image_ref(grp, "rp_emission_img", &rbufs.emission_tx);
+  world_ps_.bind("rp_normal_img", as_image(&rbufs.normal_tx));
+  world_ps_.bind("rp_light_img", as_image(&rbufs.light_tx));
+  world_ps_.bind("rp_diffuse_color_img", as_image(&rbufs.diffuse_color_tx));
+  world_ps_.bind("rp_specular_color_img", as_image(&rbufs.specular_color_tx));
+  world_ps_.bind("rp_emission_img", as_image(&rbufs.emission_tx));
+
+  world_ps_.draw(DRW_cache_fullscreen_quad_get(), handle);
   /* To allow opaque pass rendering over it. */
-  DRW_shgroup_barrier(grp, GPU_BARRIER_SHADER_IMAGE_ACCESS);
+  world_ps_.barrier(GPU_BARRIER_SHADER_IMAGE_ACCESS);
 }
 
-void WorldPipeline::render()
+void WorldPipeline::render(View &view)
 {
-  DRW_draw_pass(world_ps_);
+  Manager &drw = *DRW_manager_get();
+  drw.submit(world_ps_, view);
 }
 
 /** \} */
diff --git a/source/blender/draw/engines/eevee_next/eevee_pipeline.hh b/source/blender/draw/engines/eevee_next/eevee_pipeline.hh
index ed6986b9b61..bc34b040b7b 100644
--- a/source/blender/draw/engines/eevee_next/eevee_pipeline.hh
+++ b/source/blender/draw/engines/eevee_next/eevee_pipeline.hh
@@ -31,13 +31,13 @@ class WorldPipeline {
  private:
   Instance &inst_;
 
-  DRWPass *world_ps_ = nullptr;
+  PassSimple world_ps_ = {"World.Background"};
 
  public:
   WorldPipeline(Instance &inst) : inst_(inst){};
 
   void sync(GPUMaterial *gpumat);
-  void render();
+  void render(View &view);
 };
 
 /** \} */
diff --git a/source/blender/draw/engines/eevee_next/eevee_shader.cc b/source/blender/draw/engines/eevee_next/eevee_shader.cc
index 0e49b195ea2..d07aabf14b0 100644
--- a/source/blender/draw/engines/eevee_next/eevee_shader.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_shader.cc
@@ -180,8 +180,6 @@ void ShaderModule::material_create_info_ammend(GPUMaterial *gpumat, GPUCodegenOu
   GPUCodegenOutput &codegen = *codegen_;
   ShaderCreateInfo &info = *reinterpret_cast<ShaderCreateInfo *>(codegen.create_info);
 
-  info.auto_resource_location(true);
-
   if (GPU_material_flag_get(gpumat, GPU_MATFLAG_TRANSPARENT)) {
     info.define("MAT_TRANSPARENT");
   }
diff --git a/source/blender/draw/engines/eevee_next/eevee_shader_shared.hh b/source/blender/draw/engines/eevee_next/eevee_shader_shared.hh
index ef689f1399f..6bb1b8c7221 100644
--- a/source/blender/draw/engines/eevee_next/eevee_shader_shared.hh
+++ b/source/blender/draw/engines/eevee_next/eevee_shader_shared.hh
@@ -13,6 +13,7 @@
 #  include "DRW_gpu_wrapper.hh"
 
 #  include "draw_manager.hh"
+#  include "draw_pass.hh"
 
 #  include "eevee_defines.hh"
 
@@ -20,12 +21,7 @@
 
 namespace blender::eevee {
 
-using draw::Framebuffer;
-using draw::PassMain;
-using draw::PassSimple;
-using draw::SwapChain;
-using draw::Texture;
-using draw::TextureFromPool;
+using namespace draw;
 
 constexpr eGPUSamplerState no_filter = GPU_SAMPLER_DEFAULT;
 constexpr eGPUSamplerState with_filter = GPU_SAMPLER_FILTER;
diff --git a/source/blender/draw/engines/eevee_next/eevee_view.cc b/source/blender/draw/engines/eevee_next/eevee_view.cc
index 44067aff9ca..7ebe458192b 100644
--- a/source/blender/draw/engines/eevee_next/eevee_view.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_view.cc
@@ -107,6 +107,8 @@ void ShadingView::render()
   DRW_stats_group_start(name_);
   DRW_view_set_active(render_view_);
 
+  View render_view_new(name_, render_view_);
+
   /* If camera has any motion, compute motion vector in the film pass. Otherwise, we avoid float
    * precision issue by setting the motion of all static geometry to 0. */
   float4 clear_velocity = float4(inst_.velocity.camera_has_motion() ? VELOCITY_INVALID : 0.0f);
@@ -118,7 +120,7 @@ void ShadingView::render()
   GPU_framebuffer_bind(combined_fb_);
   GPU_framebuffer_clear_color_depth(combined_fb_, clear_color, 1.0f);
 
-  inst_.pipelines.world.render();
+  inst_.pipelines.world.render(render_view_new);
 
   /* TODO(fclem): Move it after the first prepass (and hiz update) once pipeline is stabilized. */
   inst_.lights.set_view(render_view_, extent_);