GPUFramebuffer: Refactor (Part 2)

This refactor modernise the use of framebuffers.
It also touches a lot of files so breaking down changes we have:
 - GPUTexture: Allow textures to be attached to more than one GPUFrameBuffer.
   This allows to create and configure more FBO without the need to attach
   and detach texture at drawing time.
 - GPUFrameBuffer: The wrapper starts to mimic opengl a bit closer. This
   allows to configure the framebuffer inside a context other than the one
   that will be rendering the framebuffer. We do the actual configuration
   when binding the FBO. We also Keep track of config validity and save
   drawbuffers state in the FBO. We remove the different bind/unbind
   functions. These make little sense now that we have separate contexts.
 - DRWFrameBuffer: We replace DRW_framebuffer functions by GPU_framebuffer
   ones to avoid another layer of abstraction. We move the DRW convenience
   functions to GPUFramebuffer instead and even add new ones. The MACRO
   GPU_framebuffer_ensure_config is pretty much all you need to create and
   config a GPUFramebuffer.
 - DRWTexture: Due to the removal of DRWFrameBuffer, we needed to create
   functions to create textures for thoses framebuffers. Pool textures are
   now using default texture parameters for the texture type asked.
 - DRWManager: Make sure no framebuffer object is bound when doing cache
   filling.
 - GPUViewport: Add new color_only_fb and depth_only_fb along with FB API
   usage update. This let draw engines render to color/depth only target
   and without the need to attach/detach textures.
 - WM_window: Assert when a framebuffer is bound when changing context.
   This balance the fact we are not track ogl context inside GPUFramebuffer.
 - Eevee, Clay, Mode engines: Update to new API. This comes with a lot of
   code simplification.

This also come with some cleanups in some engine codes.

1 files changed, 81 insertions, 117 deletions

diff --git a/source/blender/draw/engines/eevee/eevee_subsurface.c b/source/blender/draw/engines/eevee/eevee_subsurface.c
index 12a70cc2fe7..510f1e8fdb6 100644
--- a/source/blender/draw/engines/eevee/eevee_subsurface.c
+++ b/source/blender/draw/engines/eevee/eevee_subsurface.c
@@ -66,6 +66,7 @@ int EEVEE_subsurface_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
 	EEVEE_FramebufferList *fbl = vedata->fbl;
 	EEVEE_TextureList *txl = vedata->txl;
 	const float *viewport_size = DRW_viewport_size_get();
+	const int fs_size[2] = {(int)viewport_size[0], (int)viewport_size[1]};
 
 	const DRWContextState *draw_ctx = DRW_context_state_get();
 	ViewLayer *view_layer = draw_ctx->view_layer;
@@ -90,36 +91,45 @@ int EEVEE_subsurface_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
 		 * as the depth buffer we are sampling from. This could be avoided if the stencil is
 		 * a separate texture but that needs OpenGL 4.4 or ARB_texture_stencil8.
 		 * OR OpenGL 4.3 / ARB_ES3_compatibility if using a renderbuffer instead */
-		DRWFboTexture texs[2] = {{&txl->sss_stencil, DRW_TEX_DEPTH_24_STENCIL_8, 0},
-		                         {&txl->sss_blur, DRW_TEX_RGBA_16, DRW_TEX_FILTER}};
-
-		DRW_framebuffer_init(&fbl->sss_blur_fb, &draw_engine_eevee_type, (int)viewport_size[0], (int)viewport_size[1],
-		                     texs, 2);
-
-		DRWFboTexture tex_data = {&txl->sss_data, DRW_TEX_RGBA_16, DRW_TEX_FILTER};
-		DRW_framebuffer_init(&fbl->sss_clear_fb, &draw_engine_eevee_type, (int)viewport_size[0], (int)viewport_size[1],
-		                     &tex_data, 1);
+		effects->sss_stencil = DRW_texture_pool_query_2D(fs_size[0], fs_size[1], DRW_TEX_DEPTH_24_STENCIL_8,
+		                                                 &draw_engine_eevee_type);
+		effects->sss_blur =    DRW_texture_pool_query_2D(fs_size[0], fs_size[1], DRW_TEX_RGBA_16,
+		                                                 &draw_engine_eevee_type);
+		effects->sss_data =    DRW_texture_pool_query_2D(fs_size[0], fs_size[1], DRW_TEX_RGBA_16,
+		                                                 &draw_engine_eevee_type);
+
+		GPU_framebuffer_ensure_config(&fbl->sss_blur_fb, {
+			GPU_ATTACHMENT_TEXTURE(effects->sss_stencil),
+			GPU_ATTACHMENT_TEXTURE(effects->sss_blur)
+		});
+
+		GPU_framebuffer_ensure_config(&fbl->sss_resolve_fb, {
+			GPU_ATTACHMENT_TEXTURE(effects->sss_stencil),
+			GPU_ATTACHMENT_TEXTURE(txl->color)
+		});
+
+		GPU_framebuffer_ensure_config(&fbl->sss_clear_fb, {
+			GPU_ATTACHMENT_NONE,
+			GPU_ATTACHMENT_TEXTURE(effects->sss_data)
+		});
 
 		if (effects->sss_separate_albedo) {
-			if (txl->sss_albedo == NULL) {
-				txl->sss_albedo = DRW_texture_create_2D((int)viewport_size[0], (int)viewport_size[1],
-				                                        DRW_TEX_RGB_11_11_10, 0, NULL);
-			}
+			effects->sss_albedo = DRW_texture_pool_query_2D(fs_size[0], fs_size[1], DRW_TEX_RGB_11_11_10,
+			                                                &draw_engine_eevee_type);
 		}
 		else {
-			/* Cleanup to release memory */
-			DRW_TEXTURE_FREE_SAFE(txl->sss_albedo);
+			effects->sss_albedo = NULL;
 		}
 		return EFFECT_SSS;
 	}
 
 	/* Cleanup to release memory */
-	DRW_TEXTURE_FREE_SAFE(txl->sss_albedo);
-	DRW_TEXTURE_FREE_SAFE(txl->sss_data);
-	DRW_TEXTURE_FREE_SAFE(txl->sss_blur);
-	DRW_TEXTURE_FREE_SAFE(txl->sss_stencil);
-	DRW_FRAMEBUFFER_FREE_SAFE(fbl->sss_blur_fb);
-	DRW_FRAMEBUFFER_FREE_SAFE(fbl->sss_clear_fb);
+	GPU_FRAMEBUFFER_FREE_SAFE(fbl->sss_blur_fb);
+	GPU_FRAMEBUFFER_FREE_SAFE(fbl->sss_resolve_fb);
+	GPU_FRAMEBUFFER_FREE_SAFE(fbl->sss_clear_fb);
+	effects->sss_stencil = NULL;
+	effects->sss_blur = NULL;
+	effects->sss_data = NULL;
 
 	return 0;
 }
@@ -133,23 +143,27 @@ void EEVEE_subsurface_output_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Dat
 {
 	EEVEE_FramebufferList *fbl = vedata->fbl;
 	EEVEE_TextureList *txl = vedata->txl;
-	const float *viewport_size = DRW_viewport_size_get();
+	EEVEE_StorageList *stl = vedata->stl;
+	EEVEE_EffectsInfo *effects = stl->effects;
 
 	const DRWContextState *draw_ctx = DRW_context_state_get();
 	ViewLayer *view_layer = draw_ctx->view_layer;
 	IDProperty *props = BKE_view_layer_engine_evaluated_get(view_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE);
 
 	if (BKE_collection_engine_property_value_get_bool(props, "sss_enable")) {
-		float clear[4] = {0.0f, 0.0f, 0.0f, 0.0f};
+		DRW_texture_ensure_fullscreen_2D(&txl->sss_dir_accum, DRW_TEX_RGBA_16, 0);
+		DRW_texture_ensure_fullscreen_2D(&txl->sss_col_accum, DRW_TEX_RGBA_16, 0);
 
-		DRWFboTexture tex_data[2] = {{&txl->sss_dir_accum, DRW_TEX_RGBA_16, 0},
-		                             {&txl->sss_col_accum, DRW_TEX_RGBA_16, 0}};
-		DRW_framebuffer_init(&fbl->sss_accum_fb, &draw_engine_eevee_type, (int)viewport_size[0], (int)viewport_size[1],
-		                     tex_data, 2);
+		GPU_framebuffer_ensure_config(&fbl->sss_accum_fb, {
+			GPU_ATTACHMENT_TEXTURE(effects->sss_stencil),
+			GPU_ATTACHMENT_TEXTURE(txl->sss_dir_accum),
+			GPU_ATTACHMENT_TEXTURE(txl->sss_col_accum)
+		});
 
 		/* Clear texture. */
-		DRW_framebuffer_bind(fbl->sss_accum_fb);
-		DRW_framebuffer_clear(true, false, false, clear, 0.0f);
+		float clear[4] = {0.0f, 0.0f, 0.0f, 0.0f};
+		GPU_framebuffer_bind(fbl->sss_accum_fb);
+		GPU_framebuffer_clear_color(fbl->sss_accum_fb, clear);
 
 		/* Make the opaque refraction pass mask the sss. */
 		DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_EQUAL | DRW_STATE_CLIP_PLANES |
@@ -161,7 +175,7 @@ void EEVEE_subsurface_output_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Dat
 		/* Cleanup to release memory */
 		DRW_TEXTURE_FREE_SAFE(txl->sss_dir_accum);
 		DRW_TEXTURE_FREE_SAFE(txl->sss_col_accum);
-		DRW_FRAMEBUFFER_FREE_SAFE(fbl->sss_accum_fb);
+		GPU_FRAMEBUFFER_FREE_SAFE(fbl->sss_accum_fb);
 	}
 }
 
@@ -187,7 +201,6 @@ void EEVEE_subsurface_add_pass(
         EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata, unsigned int sss_id, struct GPUUniformBuffer *sss_profile)
 {
 	DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
-	EEVEE_TextureList *txl = vedata->txl;
 	EEVEE_PassList *psl = vedata->psl;
 	EEVEE_StorageList *stl = vedata->stl;
 	EEVEE_EffectsInfo *effects = stl->effects;
@@ -196,7 +209,7 @@ void EEVEE_subsurface_add_pass(
 	DRWShadingGroup *grp = DRW_shgroup_create(e_data.sss_sh[0], psl->sss_blur_ps);
 	DRW_shgroup_uniform_texture(grp, "utilTex", EEVEE_materials_get_util_tex());
 	DRW_shgroup_uniform_buffer(grp, "depthBuffer", &dtxl->depth);
-	DRW_shgroup_uniform_buffer(grp, "sssData", &txl->sss_data);
+	DRW_shgroup_uniform_buffer(grp, "sssData", &effects->sss_data);
 	DRW_shgroup_uniform_block(grp, "sssProfile", sss_profile);
 	DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
 	DRW_shgroup_stencil_mask(grp, sss_id);
@@ -206,22 +219,22 @@ void EEVEE_subsurface_add_pass(
 	grp = DRW_shgroup_create(sh, psl->sss_resolve_ps);
 	DRW_shgroup_uniform_texture(grp, "utilTex", EEVEE_materials_get_util_tex());
 	DRW_shgroup_uniform_buffer(grp, "depthBuffer", &dtxl->depth);
-	DRW_shgroup_uniform_buffer(grp, "sssData", &txl->sss_blur);
+	DRW_shgroup_uniform_buffer(grp, "sssData", &effects->sss_blur);
 	DRW_shgroup_uniform_block(grp, "sssProfile", sss_profile);
 	DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
 	DRW_shgroup_stencil_mask(grp, sss_id);
 	DRW_shgroup_call_add(grp, quad, NULL);
 
 	if (effects->sss_separate_albedo) {
-		DRW_shgroup_uniform_buffer(grp, "sssAlbedo", &txl->sss_albedo);
+		DRW_shgroup_uniform_buffer(grp, "sssAlbedo", &effects->sss_albedo);
 	}
 
 	if (DRW_state_is_image_render()) {
 		grp = DRW_shgroup_create(e_data.sss_sh[3], psl->sss_accum_ps);
 		DRW_shgroup_uniform_texture(grp, "utilTex", EEVEE_materials_get_util_tex());
 		DRW_shgroup_uniform_buffer(grp, "depthBuffer", &dtxl->depth);
-		DRW_shgroup_uniform_buffer(grp, "sssData", &txl->sss_blur);
-		DRW_shgroup_uniform_buffer(grp, "sssAlbedo", &txl->sss_albedo);
+		DRW_shgroup_uniform_buffer(grp, "sssData", &effects->sss_blur);
+		DRW_shgroup_uniform_buffer(grp, "sssAlbedo", &effects->sss_albedo);
 		DRW_shgroup_uniform_block(grp, "sssProfile", sss_profile);
 		DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
 		DRW_shgroup_stencil_mask(grp, sss_id);
@@ -232,7 +245,6 @@ void EEVEE_subsurface_add_pass(
 void EEVEE_subsurface_data_render(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata)
 {
 	EEVEE_PassList *psl = vedata->psl;
-	EEVEE_TextureList *txl = vedata->txl;
 	EEVEE_FramebufferList *fbl = vedata->fbl;
 	EEVEE_StorageList *stl = vedata->stl;
 	EEVEE_EffectsInfo *effects = stl->effects;
@@ -240,103 +252,60 @@ void EEVEE_subsurface_data_render(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Dat
 	if ((effects->enabled_effects & EFFECT_SSS) != 0) {
 		float clear[4] = {0.0f, 0.0f, 0.0f, 0.0f};
 		/* Clear sss_data texture only... can this be done in a more clever way? */
-		DRW_framebuffer_bind(fbl->sss_clear_fb);
-		DRW_framebuffer_clear(true, false, false, clear, 0.0f);
-
-
-		DRW_framebuffer_texture_detach(txl->sss_data);
-		if ((effects->enabled_effects & EFFECT_NORMAL_BUFFER) != 0) {
-			DRW_framebuffer_texture_detach(txl->ssr_normal_input);
-		}
-		if ((effects->enabled_effects & EFFECT_SSR) != 0) {
-			DRW_framebuffer_texture_detach(txl->ssr_specrough_input);
-		}
-
-		/* Start at slot 1 because slot 0 is txl->color */
-		int tex_slot = 1;
-		DRW_framebuffer_texture_attach(fbl->main, txl->sss_data, tex_slot++, 0);
-		if (effects->sss_separate_albedo) {
-			DRW_framebuffer_texture_attach(fbl->main, txl->sss_albedo, tex_slot++, 0);
-		}
-		if ((effects->enabled_effects & EFFECT_NORMAL_BUFFER) != 0) {
-			DRW_framebuffer_texture_attach(fbl->main, txl->ssr_normal_input, tex_slot++, 0);
-		}
-		if ((effects->enabled_effects & EFFECT_SSR) != 0) {
-			DRW_framebuffer_texture_attach(fbl->main, txl->ssr_specrough_input, tex_slot++, 0);
-		}
-		DRW_framebuffer_bind(fbl->main);
-
+		GPU_framebuffer_bind(fbl->sss_clear_fb);
+		GPU_framebuffer_clear_color(fbl->sss_clear_fb, clear);
+
+		GPU_framebuffer_ensure_config(&fbl->main_fb, {
+			GPU_ATTACHMENT_LEAVE,
+			GPU_ATTACHMENT_LEAVE,
+			GPU_ATTACHMENT_LEAVE,
+			GPU_ATTACHMENT_LEAVE,
+			GPU_ATTACHMENT_TEXTURE(effects->sss_data),
+			GPU_ATTACHMENT_TEXTURE(effects->sss_albedo)
+		});
+
+		GPU_framebuffer_bind(fbl->main_fb);
 		DRW_draw_pass(psl->sss_pass);
 
 		/* Restore */
-		DRW_framebuffer_texture_detach(txl->sss_data);
-		if (effects->sss_separate_albedo) {
-			DRW_framebuffer_texture_detach(txl->sss_albedo);
-		}
-		if ((effects->enabled_effects & EFFECT_NORMAL_BUFFER) != 0) {
-			DRW_framebuffer_texture_detach(txl->ssr_normal_input);
-		}
-		if ((effects->enabled_effects & EFFECT_SSR) != 0) {
-			DRW_framebuffer_texture_detach(txl->ssr_specrough_input);
-		}
-
-		DRW_framebuffer_texture_attach(fbl->sss_clear_fb, txl->sss_data, 0, 0);
-		if ((effects->enabled_effects & EFFECT_NORMAL_BUFFER) != 0) {
-			DRW_framebuffer_texture_attach(fbl->main, txl->ssr_normal_input, 1, 0);
-		}
-		if ((effects->enabled_effects & EFFECT_SSR) != 0) {
-			DRW_framebuffer_texture_attach(fbl->main, txl->ssr_specrough_input, 2, 0);
-		}
+		GPU_framebuffer_ensure_config(&fbl->main_fb, {
+			GPU_ATTACHMENT_LEAVE,
+			GPU_ATTACHMENT_LEAVE,
+			GPU_ATTACHMENT_LEAVE,
+			GPU_ATTACHMENT_LEAVE,
+			GPU_ATTACHMENT_NONE,
+			GPU_ATTACHMENT_NONE
+		});
 	}
 }
 
 void EEVEE_subsurface_compute(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata)
 {
 	EEVEE_PassList *psl = vedata->psl;
-	EEVEE_FramebufferList *fbl = vedata->fbl;
-	EEVEE_TextureList *txl = vedata->txl;
 	EEVEE_StorageList *stl = vedata->stl;
+	EEVEE_TextureList *txl = vedata->txl;
+	EEVEE_FramebufferList *fbl = vedata->fbl;
 	EEVEE_EffectsInfo *effects = stl->effects;
 
 	if ((effects->enabled_effects & EFFECT_SSS) != 0) {
 		float clear[4] = {0.0f, 0.0f, 0.0f, 0.0f};
-		DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
 
 		DRW_stats_group_start("SSS");
 
 		/* Copy stencil channel, could be avoided (see EEVEE_subsurface_init) */
-		DRW_framebuffer_blit(fbl->main, fbl->sss_blur_fb, false, true);
-
-		DRW_framebuffer_texture_detach(dtxl->depth);
+		GPU_framebuffer_blit(fbl->main_fb, 0, fbl->sss_blur_fb, 0, GPU_STENCIL_BIT);
 
 		/* 1. horizontal pass */
-		DRW_framebuffer_bind(fbl->sss_blur_fb);
-		DRW_framebuffer_clear(true, false, false, clear, 0.0f);
+		GPU_framebuffer_bind(fbl->sss_blur_fb);
+		GPU_framebuffer_clear_color(fbl->sss_blur_fb, clear);
 		DRW_draw_pass(psl->sss_blur_ps);
 
 		/* 2. vertical pass + Resolve */
-		DRW_framebuffer_texture_detach(txl->sss_stencil);
-		if ((effects->enabled_effects & EFFECT_NORMAL_BUFFER) != 0) {
-			DRW_framebuffer_texture_detach(txl->ssr_normal_input);
-		}
-		if ((effects->enabled_effects & EFFECT_SSR) != 0) {
-			DRW_framebuffer_texture_detach(txl->ssr_specrough_input);
-		}
-		DRW_framebuffer_texture_attach(fbl->main, txl->sss_stencil, 0, 0);
-		DRW_framebuffer_bind(fbl->main);
+		GPU_framebuffer_texture_attach(fbl->sss_resolve_fb, txl->color, 0, 0);
+		GPU_framebuffer_bind(fbl->sss_resolve_fb);
 		DRW_draw_pass(psl->sss_resolve_ps);
 
-		/* Restore */
-		DRW_framebuffer_texture_detach(txl->sss_stencil);
-		DRW_framebuffer_texture_attach(fbl->sss_blur_fb, txl->sss_stencil, 0, 0);
-		DRW_framebuffer_texture_attach(fbl->main, dtxl->depth, 0, 0);
-		if ((effects->enabled_effects & EFFECT_NORMAL_BUFFER) != 0) {
-			DRW_framebuffer_texture_attach(fbl->main, txl->ssr_normal_input, 1, 0);
-		}
-		if ((effects->enabled_effects & EFFECT_SSR) != 0) {
-			DRW_framebuffer_texture_attach(fbl->main, txl->ssr_specrough_input, 2, 0);
-		}
-
+		GPU_framebuffer_bind(fbl->main_fb);
 		DRW_stats_group_end();
 	}
 }
@@ -345,24 +314,19 @@ void EEVEE_subsurface_output_accumulate(EEVEE_ViewLayerData *UNUSED(sldata), EEV
 {
 	EEVEE_PassList *psl = vedata->psl;
 	EEVEE_FramebufferList *fbl = vedata->fbl;
-	EEVEE_TextureList *txl = vedata->txl;
 	EEVEE_StorageList *stl = vedata->stl;
 	EEVEE_EffectsInfo *effects = stl->effects;
 
 	if (((effects->enabled_effects & EFFECT_SSS) != 0) && (fbl->sss_accum_fb != NULL)) {
 		/* Copy stencil channel, could be avoided (see EEVEE_subsurface_init) */
-		DRW_framebuffer_blit(fbl->main, fbl->sss_blur_fb, false, true);
+		GPU_framebuffer_blit(fbl->main_fb, 0, fbl->sss_blur_fb, 0, GPU_STENCIL_BIT);
 
 		/* Only do vertical pass + Resolve */
-		DRW_framebuffer_texture_detach(txl->sss_stencil);
-		DRW_framebuffer_texture_attach(fbl->sss_accum_fb, txl->sss_stencil, 0, 0);
-		DRW_framebuffer_bind(fbl->sss_accum_fb);
+		GPU_framebuffer_bind(fbl->sss_accum_fb);
 		DRW_draw_pass(psl->sss_accum_ps);
 
 		/* Restore */
-		DRW_framebuffer_texture_detach(txl->sss_stencil);
-		DRW_framebuffer_texture_attach(fbl->sss_blur_fb, txl->sss_stencil, 0, 0);
-		DRW_framebuffer_bind(fbl->main);
+		GPU_framebuffer_bind(fbl->main_fb);
 	}
 }