[Bf-blender-cvs] [49b0ac57c12] temp-eeveelightcache: Eevee: Light Cache: Create Probe data and share the lightcache.
Clément Foucault
noreply at git.blender.org
Fri Jun 1 14:17:36 CEST 2018
Commit: 49b0ac57c120628491dbf6f6d0ad16f396bc309e
Author: Clément Foucault
Date: Mon May 14 18:29:44 2018 +0200
Branches: temp-eeveelightcache
https://developer.blender.org/rB49b0ac57c120628491dbf6f6d0ad16f396bc309e
Eevee: Light Cache: Create Probe data and share the lightcache.
The lightcache is now can shared between viewlayers. We need this to share
the lighting data with the original viewlayer with the baking layer.
The cache is still not working.
===================================================================
M source/blender/draw/engines/eevee/eevee_lightcache.c
M source/blender/draw/engines/eevee/eevee_lightprobes.c
M source/blender/draw/engines/eevee/eevee_private.h
M source/blender/editors/render/render_shading.c
===================================================================
diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.c b/source/blender/draw/engines/eevee/eevee_lightcache.c
index ac25fa9ccdd..e83b67110e0 100644
--- a/source/blender/draw/engines/eevee/eevee_lightcache.c
+++ b/source/blender/draw/engines/eevee/eevee_lightcache.c
@@ -33,12 +33,17 @@
#include "DEG_depsgraph_query.h"
#include "DNA_lightprobe_types.h"
+#include "DNA_group_types.h"
#include "PIL_time.h"
#include "eevee_lightcache.h"
#include "eevee_private.h"
+/* TODO should be replace by a more elegant alternative. */
+extern void DRW_opengl_context_enable(void);
+extern void DRW_opengl_context_disable(void);
+
typedef struct EEVEE_LightBake {
Depsgraph *depsgraph;
ViewLayer *view_layer;
@@ -49,34 +54,42 @@ typedef struct EEVEE_LightBake {
GPUTexture *rt_color; /* Target cube color texture. */
GPUTexture *rt_depth; /* Target cube depth texture. */
GPUFrameBuffer *rt_fb; /* Target cube framebuffer. */
+ int rt_res; /* Cube render target resolution. */
/* Shared */
int layer; /* Target layer to store the data to. */
float samples_ct, invsamples_ct; /* Sample count for the convolution. */
float lod_factor; /* Sampling bias during convolution step. */
float lod_max; /* Max cubemap LOD to sample when convolving. */
- int cube_count, grid_count; /* */
+ int cube_count, grid_count; /* Number of probes to render + world probe. */
/* Irradiance grid */
int irr_cube_res; /* Target cubemap at MIP 0. */
- int total_irradiance_samples; /* Total for all grids */
+ int total_irr_samples; /* Total for all grids */
int bounce_curr, bounce_count; /* The current light bounce being evaluated. */
float vis_range, vis_blur; /* Sample Visibility compression and bluring. */
float vis_res; /* Resolution of the Visibility shadowmap. */
- GPUTexture *tex_double; /* Result of previous light bounce. */
+ GPUTexture *grid_prev; /* Result of previous light bounce. */
+ LightProbe **grid_prb; /* Pointer to the id.data of the probe object. */
/* Reflection probe */
int ref_cube_res; /* Target cubemap at MIP 0. */
float probemat[6][4][4]; /* ViewProjection matrix for each cube face. */
float texel_size, padding_size; /* Texel and padding size for the final octahedral map. */
float roughness; /* Roughness level of the current mipmap. */
+ LightProbe **cube_prb; /* Pointer to the id.data of the probe object. */
+
+ /* Dummy Textures */
+ struct GPUTexture *dummy_color, *dummy_depth;
+ struct GPUTexture *dummy_layer_color;
} EEVEE_LightBake;
typedef struct EEVEE_LightCache {
int flag;
+ int refcount; /* Light cache can be shared across view layer. Use refcount to know when to free. */
/* only a single cache for now */
- int cube_count, grid_count; /* Number of probes that are ready */
+ int cube_count, grid_count; /* Number of probes to use for rendering. */
GPUTexture *grid_tex;
GPUTexture *cube_tex;
EEVEE_LightProbe *cube_data;
@@ -99,10 +112,9 @@ void *EEVEE_lightcache_job_data_alloc(struct Main *bmain, struct ViewLayer *view
{
EEVEE_LightBake *lbake = MEM_callocN(sizeof(EEVEE_LightBake), "EEVEE_LightBake");
- lbake->view_layer = view_layer;
+ lbake->depsgraph = DEG_graph_new(scene, view_layer, DAG_EVAL_RENDER);
lbake->scene = scene;
lbake->bmain = bmain;
- lbake->depsgraph = DEG_graph_new(scene, view_layer, DAG_EVAL_RENDER);
DEG_graph_relations_update(lbake->depsgraph, bmain, scene, view_layer);
@@ -115,57 +127,151 @@ void EEVEE_lightcache_job_data_free(void *custom_data)
DEG_graph_free(lbake->depsgraph);
+ MEM_SAFE_FREE(lbake->cube_prb);
+ MEM_SAFE_FREE(lbake->grid_prb);
+
+ DRW_TEXTURE_FREE_SAFE(lbake->rt_depth);
+ DRW_TEXTURE_FREE_SAFE(lbake->rt_color);
+ DRW_TEXTURE_FREE_SAFE(lbake->grid_prev);
+
MEM_freeN(lbake);
}
+static void eevee_lightcache_create_resources(SceneEEVEE *eevee, EEVEE_LightBake *lbake, EEVEE_LightCache *lcache)
+{
+ ViewLayer *view_layer = lbake->view_layer;
+ EEVEE_ViewLayerData *sldata = EEVEE_view_layer_data_ensure_ex(lbake->view_layer);
+
+ lbake->bounce_count = eevee->gi_diffuse_bounces;
+ lbake->vis_res = eevee->gi_visibility_resolution;
+ lbake->rt_res = eevee->gi_cubemap_resolution;
+
+ /* TODO: Remove when multiple drawmanager/context are supported.
+ * Currently this lock the viewport without any reason
+ * (resource creation can be done from another context). */
+ DRW_opengl_context_enable();
+
+ //lbake->ref_cube_res = octahedral_from_cubemap();
+ lbake->ref_cube_res = lbake->rt_res;
+
+ /* Only one render target for now. */
+ lbake->rt_depth = DRW_texture_create_cube(lbake->rt_res, GPU_DEPTH_COMPONENT24, 0, NULL);
+ lbake->rt_color = DRW_texture_create_cube(lbake->rt_res, GPU_RGBA16F, DRW_TEX_FILTER | DRW_TEX_MIPMAP, NULL);
+
+ for (int i = 0; i < 6; ++i) {
+ GPU_framebuffer_ensure_config(&sldata->probe_face_fb[i], {
+ GPU_ATTACHMENT_TEXTURE_CUBEFACE(sldata->probe_depth_rt, i),
+ GPU_ATTACHMENT_TEXTURE_CUBEFACE(sldata->probe_rt, i)
+ });
+ }
+
+ int irr_size[3];
+ EEVEE_irradiance_pool_size_get(lbake->vis_res, lbake->total_irr_samples, irr_size);
+
+#ifdef IRRADIANCE_SH_L2
+ /* we need a signed format for Spherical Harmonics */
+ int irradiance_format = GPU_RGBA16F;
+#else
+ int irradiance_format = GPU_RGBA8;
+#endif
+
+ lbake->grid_prev = DRW_texture_create_2D_array(irr_size[0], irr_size[1], irr_size[2], irradiance_format, DRW_TEX_FILTER, NULL);
+ lcache->grid_tex = DRW_texture_create_2D_array(irr_size[0], irr_size[1], irr_size[2], irradiance_format, DRW_TEX_FILTER, NULL);
+ lcache->cube_tex = DRW_texture_create_2D_array(lbake->ref_cube_res, lbake->ref_cube_res, lcache->cube_count, GPU_RGBA8, DRW_TEX_FILTER, NULL);
+
+ /* TODO remove */
+ DRW_opengl_context_disable();
+}
+
+static void eevee_lightcache_render_world(EEVEE_LightBake *UNUSED(lbake), EEVEE_LightCache *UNUSED(lcache))
+{
+ DRW_opengl_context_enable();
+
+ /* TODO DO SOMETHING HERE!!! */
+
+ DRW_opengl_context_disable();
+}
+
void EEVEE_lightcache_bake_job(void *custom_data, short *UNUSED(stop), short *UNUSED(do_update), float *UNUSED(progress))
{
EEVEE_LightBake *lbake = (EEVEE_LightBake *)custom_data;
- EEVEE_ViewLayerData *sldata = EEVEE_view_layer_data_ensure_ex(lbake->view_layer);
- EEVEE_LightCache *lcache = EEVEE_lightcache_ensure(sldata);
Depsgraph *depsgraph = lbake->depsgraph;
int frame = 0; /* TODO make it user param. */
DEG_evaluate_on_framechange(lbake->bmain, lbake->depsgraph, frame);
+ ViewLayer *view_layer_ori = DEG_get_input_view_layer(lbake->depsgraph);
+ const Scene *scene_eval = DEG_get_evaluated_scene(lbake->depsgraph);
+
+ EEVEE_ViewLayerData *sldata_ori = EEVEE_view_layer_data_ensure_ex(view_layer_ori);
+ EEVEE_LightCache *lcache = EEVEE_lightcache_ensure(sldata_ori);
+
+ /* Share light cache with the evaluated layer and the original layer. */
+ lbake->view_layer = DEG_get_evaluated_view_layer(lbake->depsgraph);
+ EEVEE_ViewLayerData *sldata = EEVEE_view_layer_data_ensure_ex(lbake->view_layer);
+ EEVEE_lightcache_add_reference(sldata, lcache);
+
/* First convert all lightprobes to tight UBO data from all lightprobes in the scene.
* This allows a large number of probe to be precomputed. */
- lcache->cube_count = lcache->grid_count = 0;
- lbake->cube_count = lbake->grid_count = 0;
+ lcache->cube_data = MEM_callocN(1, "EEVEE Cube Data Cache");
+ lcache->grid_data = MEM_callocN(1, "EEVEE Grid Data Cache");
+ lbake->cube_prb = MEM_callocN(sizeof(LightProbe *), "EEVEE Cube visgroup ptr");
+ lbake->grid_prb = MEM_callocN(sizeof(LightProbe *), "EEVEE Grid visgroup ptr");
+
+ lcache->grid_count = lbake->grid_count = 1;
+ lcache->cube_count = lbake->cube_count = 1;
+ lbake->total_irr_samples = 1; /* At least one for the world */
DEG_OBJECT_ITER_FOR_RENDER_ENGINE_BEGIN(depsgraph, ob, DEG_ITER_OBJECT_MODE_RENDER)
{
if (ob->type == OB_LIGHTPROBE) {
LightProbe *prb = (LightProbe *)ob->data;
- if ((prb->type & LIGHTPROBE_TYPE_GRID) != 0) {
+ if (prb->type == LIGHTPROBE_TYPE_GRID) {
lbake->grid_count += 1;
lcache->grid_data = MEM_reallocN(lcache->grid_data, sizeof(EEVEE_LightGrid) * lbake->grid_count);
- // EEVEE_lightprobe_grid_data_from_object(ob, &lbake->grid_data[lbake->grid_count - 1]);
+ lbake->grid_prb = MEM_reallocN(lbake->grid_prb, sizeof(LightProbe *) * lbake->cube_count);
+
+ EEVEE_LightGrid *egrid = &lcache->grid_data[lbake->grid_count - 1];
+ EEVEE_lightprobes_grid_data_from_object(ob, egrid, &lbake->total_irr_samples);
+
+ lbake->grid_prb[lbake->grid_count - 1] = prb;
}
- else if ((prb->type & LIGHTPROBE_TYPE_CUBE) != 0) {
+ else if (prb->type == LIGHTPROBE_TYPE_CUBE) {
lbake->cube_count += 1;
lcache->cube_data = MEM_reallocN(lcache->cube_data, sizeof(EEVEE_LightProbe) * lbake->cube_count);
- // EEVEE_lightprobe_cube_data_from_object(ob, &lbake->grid_data[lbake->cube_count - 1]);
+ lbake->cube_prb = MEM_reallocN(lbake->cube_prb, sizeof(LightProbe *) * lbake->cube_count);
+
+ EEVEE_LightProbe *eprobe = &lcache->cube_data[lbake->cube_count - 1];
+ EEVEE_lightprobes_cube_data_from_object(ob, eprobe);
+
+ lbake->cube_prb[lbake->cube_count - 1] = prb;
}
}
}
DEG_OBJECT_ITER_FOR_RENDER_ENGINE_END;
+ eevee_lightcache_create_resources(&scene_eval->eevee, lbake, lcache);
+
+ /* Render world irradiance and reflection first */
+ eevee_lightcache_render_world(lbake, lcache);
+
#if 0
- /* Render irradiance */
+ /* Render irradiance grids */
lbake->bounce_curr = 0;
while (lbake->bounce_curr < lbake->bounce_count) {
- for (LinkData *link = ) {
- /* Ask for lower importance draw manager lock. */
-
+ /* Bypass world, start at 1. */
+ for (int p = 1; p < lbake->grid_count; ++p) {
/* TODO: make DRW manager instanciable (and only lock on drawing) */
+ DRW_opengl_context_enable();
/* Create passes */
/* Iter through objects */
+ DRW_opengl_context_disable();
+
/* Render one cubemap/irradiance sample. */
if (*stop != 0) {
- goto
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list