Commit: 46a93d7c1fad1486032ca37c9b63164d16b2b23d
Author: Campbell Barton
Date: Mon Jun 12 21:05:12 2017 +1000
Branches: temp-lightprobe-rename
https://developer.blender.org/rB46a93d7c1fad1486032ca37c9b63164d16b2b23d
Rename probe -> lightprobe for eevee as well
===================================================================
M source/blender/draw/CMakeLists.txt
M source/blender/draw/engines/eevee/eevee_data.c
M source/blender/draw/engines/eevee/eevee_engine.c
R094 source/blender/draw/engines/eevee/eevee_probes.c
source/blender/draw/engines/eevee/eevee_lightprobes.c
M source/blender/draw/engines/eevee/eevee_materials.c
M source/blender/draw/engines/eevee/eevee_private.h
R100 source/blender/draw/engines/eevee/shaders/probe_filter_frag.glsl
source/blender/draw/engines/eevee/shaders/lightprobe_filter_frag.glsl
R100 source/blender/draw/engines/eevee/shaders/probe_geom.glsl
source/blender/draw/engines/eevee/shaders/lightprobe_geom.glsl
R100 source/blender/draw/engines/eevee/shaders/probe_sh_frag.glsl
source/blender/draw/engines/eevee/shaders/lightprobe_sh_frag.glsl
R100 source/blender/draw/engines/eevee/shaders/probe_vert.glsl
source/blender/draw/engines/eevee/shaders/lightprobe_vert.glsl
===================================================================
diff --git a/source/blender/draw/CMakeLists.txt
b/source/blender/draw/CMakeLists.txt
index ef477f4eb7a..eed65b3571e 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -83,8 +83,8 @@ set(SRC
engines/eevee/eevee_data.c
engines/eevee/eevee_engine.c
engines/eevee/eevee_lights.c
+ engines/eevee/eevee_lightprobes.c
engines/eevee/eevee_materials.c
- engines/eevee/eevee_probes.c
engines/eevee/eevee_effects.c
engines/external/external_engine.c
@@ -117,6 +117,10 @@
data_to_c_simple(engines/clay/shaders/ssao_groundtruth.glsl SRC)
data_to_c_simple(engines/eevee/shaders/default_frag.glsl SRC)
data_to_c_simple(engines/eevee/shaders/default_world_frag.glsl SRC)
data_to_c_simple(engines/eevee/shaders/background_vert.glsl SRC)
+data_to_c_simple(engines/eevee/shaders/lightprobe_filter_frag.glsl SRC)
+data_to_c_simple(engines/eevee/shaders/lightprobe_sh_frag.glsl SRC)
+data_to_c_simple(engines/eevee/shaders/lightprobe_geom.glsl SRC)
+data_to_c_simple(engines/eevee/shaders/lightprobe_vert.glsl SRC)
data_to_c_simple(engines/eevee/shaders/lit_surface_frag.glsl SRC)
data_to_c_simple(engines/eevee/shaders/lit_surface_vert.glsl SRC)
data_to_c_simple(engines/eevee/shaders/effect_bloom_frag.glsl SRC)
@@ -124,10 +128,6 @@
data_to_c_simple(engines/eevee/shaders/effect_dof_vert.glsl SRC)
data_to_c_simple(engines/eevee/shaders/effect_dof_geom.glsl SRC)
data_to_c_simple(engines/eevee/shaders/effect_dof_frag.glsl SRC)
data_to_c_simple(engines/eevee/shaders/effect_motion_blur_frag.glsl SRC)
-data_to_c_simple(engines/eevee/shaders/probe_filter_frag.glsl SRC)
-data_to_c_simple(engines/eevee/shaders/probe_sh_frag.glsl SRC)
-data_to_c_simple(engines/eevee/shaders/probe_geom.glsl SRC)
-data_to_c_simple(engines/eevee/shaders/probe_vert.glsl SRC)
data_to_c_simple(engines/eevee/shaders/shadow_frag.glsl SRC)
data_to_c_simple(engines/eevee/shaders/shadow_geom.glsl SRC)
data_to_c_simple(engines/eevee/shaders/shadow_vert.glsl SRC)
diff --git a/source/blender/draw/engines/eevee/eevee_data.c
b/source/blender/draw/engines/eevee/eevee_data.c
index 514953f3d51..e768a27e228 100644
--- a/source/blender/draw/engines/eevee/eevee_data.c
+++ b/source/blender/draw/engines/eevee/eevee_data.c
@@ -99,7 +99,7 @@ EEVEE_ObjectEngineData *EEVEE_object_data_get(Object *ob)
return *oedata;
}
-EEVEE_ProbeEngineData *EEVEE_probe_data_get(Object *ob)
+EEVEE_ProbeEngineData *EEVEE_lightprobe_data_get(Object *ob)
{
EEVEE_ProbeEngineData **pedata = (EEVEE_ProbeEngineData
**)DRW_object_engine_data_get(ob, &draw_engine_eevee_type,
&eevee_probe_data_free);
diff --git a/source/blender/draw/engines/eevee/eevee_engine.c
b/source/blender/draw/engines/eevee/eevee_engine.c
index 2f01023831e..2177d3d065c 100644
--- a/source/blender/draw/engines/eevee/eevee_engine.c
+++ b/source/blender/draw/engines/eevee/eevee_engine.c
@@ -57,7 +57,7 @@ static void EEVEE_engine_init(void *ved)
EEVEE_materials_init();
EEVEE_lights_init(sldata);
- EEVEE_probes_init(sldata);
+ EEVEE_lightprobes_init(sldata);
EEVEE_effects_init(vedata);
}
@@ -74,7 +74,7 @@ static void EEVEE_cache_init(void *vedata)
EEVEE_materials_cache_init(vedata);
EEVEE_lights_cache_init(sldata, psl);
- EEVEE_probes_cache_init(sldata, psl);
+ EEVEE_lightprobes_cache_init(sldata, psl);
EEVEE_effects_cache_init(vedata);
}
@@ -118,7 +118,7 @@ static void EEVEE_cache_finish(void *vedata)
EEVEE_materials_cache_finish(vedata);
EEVEE_lights_cache_finish(sldata);
- EEVEE_probes_cache_finish(sldata);
+ EEVEE_lightprobes_cache_finish(sldata);
}
static void EEVEE_draw_scene(void *vedata)
@@ -134,7 +134,7 @@ static void EEVEE_draw_scene(void *vedata)
EEVEE_draw_shadows(sldata, psl);
/* Refresh Probes */
- EEVEE_probes_refresh(sldata, psl);
+ EEVEE_lightprobes_refresh(sldata, psl);
/* Attach depth to the hdr buffer and bind it */
DRW_framebuffer_texture_detach(dtxl->depth);
@@ -162,7 +162,7 @@ static void EEVEE_engine_free(void)
EEVEE_materials_free();
EEVEE_effects_free();
EEVEE_lights_free();
- EEVEE_probes_free();
+ EEVEE_lightprobes_free();
}
static void EEVEE_layer_collection_settings_create(RenderEngine
*UNUSED(engine), IDProperty *props)
diff --git a/source/blender/draw/engines/eevee/eevee_probes.c
b/source/blender/draw/engines/eevee/eevee_lightprobes.c
similarity index 94%
rename from source/blender/draw/engines/eevee/eevee_probes.c
rename to source/blender/draw/engines/eevee/eevee_lightprobes.c
index 73d94d053a9..e6ff4a2dbde 100644
--- a/source/blender/draw/engines/eevee/eevee_probes.c
+++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c
@@ -62,10 +62,10 @@ static struct {
} e_data = {NULL}; /* Engine data */
extern char datatoc_default_world_frag_glsl[];
-extern char datatoc_probe_filter_frag_glsl[];
-extern char datatoc_probe_sh_frag_glsl[];
-extern char datatoc_probe_geom_glsl[];
-extern char datatoc_probe_vert_glsl[];
+extern char datatoc_lightprobe_filter_frag_glsl[];
+extern char datatoc_lightprobe_sh_frag_glsl[];
+extern char datatoc_lightprobe_geom_glsl[];
+extern char datatoc_lightprobe_vert_glsl[];
extern char datatoc_bsdf_common_lib_glsl[];
extern char datatoc_bsdf_sampling_lib_glsl[];
@@ -102,7 +102,7 @@ static struct GPUTexture
*create_hammersley_sample_texture(int samples)
return tex;
}
-void EEVEE_probes_init(EEVEE_SceneLayerData *sldata)
+void EEVEE_lightprobes_init(EEVEE_SceneLayerData *sldata)
{
if (!e_data.probe_filter_sh) {
char *shader_str = NULL;
@@ -110,17 +110,17 @@ void EEVEE_probes_init(EEVEE_SceneLayerData *sldata)
DynStr *ds_frag = BLI_dynstr_new();
BLI_dynstr_append(ds_frag, datatoc_bsdf_common_lib_glsl);
BLI_dynstr_append(ds_frag, datatoc_bsdf_sampling_lib_glsl);
- BLI_dynstr_append(ds_frag, datatoc_probe_filter_frag_glsl);
+ BLI_dynstr_append(ds_frag, datatoc_lightprobe_filter_frag_glsl);
shader_str = BLI_dynstr_get_cstring(ds_frag);
BLI_dynstr_free(ds_frag);
e_data.probe_filter_sh = DRW_shader_create(
- datatoc_probe_vert_glsl, datatoc_probe_geom_glsl,
shader_str,
+ datatoc_lightprobe_vert_glsl,
datatoc_lightprobe_geom_glsl, shader_str,
"#define HAMMERSLEY_SIZE 1024\n"
"#define NOISE_SIZE 64\n");
e_data.probe_default_sh = DRW_shader_create(
- datatoc_probe_vert_glsl, datatoc_probe_geom_glsl,
datatoc_default_world_frag_glsl, NULL);
+ datatoc_lightprobe_vert_glsl,
datatoc_lightprobe_geom_glsl, datatoc_default_world_frag_glsl, NULL);
MEM_freeN(shader_str);
}
@@ -128,7 +128,7 @@ void EEVEE_probes_init(EEVEE_SceneLayerData *sldata)
/* Shaders */
if (!e_data.hammersley) {
e_data.hammersley = create_hammersley_sample_texture(1024);
- e_data.probe_spherical_harmonic_sh =
DRW_shader_create_fullscreen(datatoc_probe_sh_frag_glsl, NULL);
+ e_data.probe_spherical_harmonic_sh =
DRW_shader_create_fullscreen(datatoc_lightprobe_sh_frag_glsl, NULL);
}
if (!sldata->probes) {
@@ -153,7 +153,7 @@ void EEVEE_probes_init(EEVEE_SceneLayerData *sldata)
DRW_framebuffer_init(&sldata->probe_sh_fb, &draw_engine_eevee_type, 9,
1, &tex_sh, 1);
}
-void EEVEE_probes_cache_init(EEVEE_SceneLayerData *sldata, EEVEE_PassList *psl)
+void EEVEE_lightprobes_cache_init(EEVEE_SceneLayerData *sldata, EEVEE_PassList
*psl)
{
EEVEE_LightProbesInfo *pinfo = sldata->probes;
@@ -255,7 +255,7 @@ void EEVEE_lightprobes_cache_add(EEVEE_SceneLayerData
*sldata, Object *ob)
pinfo->num_cube = MAX_PROBE;
}
else {
- EEVEE_ProbeEngineData *ped = EEVEE_probe_data_get(ob);
+ EEVEE_ProbeEngineData *ped = EEVEE_lightprobe_data_get(ob);
if ((ob->deg_update_flag & DEG_RUNTIME_DATA_UPDATE) != 0) {
ped->need_update = true;
@@ -270,7 +270,7 @@ void EEVEE_lightprobes_cache_add(EEVEE_SceneLayerData
*sldata, Object *ob)
}
}
-static void EEVEE_probes_updates(EEVEE_SceneLayerData *sldata)
+static void EEVEE_lightprobes_updates(EEVEE_SceneLayerData *sldata)
{
EEVEE_LightProbesInfo *pinfo = sldata->probes;
Object *ob;
@@ -306,7 +306,7 @@ static void EEVEE_probes_updates(EEVEE_SceneLayerData
*sldata)
}
}
-void EEVEE_probes_cache_finish(EEVEE_SceneLayerData *sldata)
+void EEVEE_lightprobes_cache_finish(EEVEE_SceneLayerData *sldata)
{
EEVEE_LightProbesInfo *pinfo = sldata->probes;
Object *ob;
@@ -332,7 +332,7 @@ void EEVEE_probes_cache_finish(EEVEE_SceneLayerData *sldata)
pinfo->cache_num_cube = pinfo->num_cube;
for (int i = 1; (ob = pinfo->probes_ref[i]) && (i < MAX_PROBE);
i++) {
- EEVEE_ProbeEngineData *ped = EEVEE_probe_data_get(ob);
+ EEVEE_ProbeEngineData *ped =
EEVEE_lightprobe_data_get(ob);
ped->need_update = true;
ped->ready_to_shade = false;
}
@@ -342,7 +342,7 @@ void EEVEE_probes_cache_finish(EEVEE_SceneLayerData *sldata)
DRW_framebuffer_init(&sldata->probe_filter_fb, &draw_engine_eevee_type,
PROBE_SIZE, PROBE_SIZE, &tex_filter, 1);
- EEVEE_probes_updates(sldata);
+ EEVEE_lightprobes_updates(sldata);
DRW_uniformbuffer_update(sldata->probe_ubo,
&sldata->probes->probe_data);
}
@@ -517,7 +517,7 @@ static void render_world_probe(EEVEE_SceneLayerData
*sldata, EEVEE_PassList *psl
filter_probe(eprobe, sldata, psl, 0);
}
-void EEVEE_probes_refresh(EEVEE_SceneLayerData *sldata, EEVEE_PassList *psl)
+void EEVEE_lightprobes_refresh(EEVEE_SceneLayerData *sldata, EEVEE_PassList
*psl)
{
EEVEE_LightProbesInfo *pinfo = sldata->probes;
Object *ob;
@@ -549,7 +549,7 @@ void EEVEE_probes_refresh(EEVEE_SceneLayerData *sldata,
EEVEE_PassList *psl)
}
for (int i = 1; (ob = pinfo->probes_ref[i]) && (i < MAX_PROBE);
i++) {
- EEVEE_ProbeEngineData *ped = EEVEE_probe_data_get(ob);
+ EEVEE_ProbeEngineData *ped =
EEVEE_lightprobe_data_get(ob);
if (ped->need_update) {
render_one_probe(sldata, psl, i);
@@ -571,7 +571,7 @@ void EEVEE_probes_refresh(EEVEE_SceneLayerData *sldata,
EEVEE_PassList *psl)
}
}
-void EEVEE_probes_free(void)
+void EEVEE_lightprobes_free(void)
{
DRW_SHADER_FREE_SAFE(e_data.probe_default_sh);
DRW_SHADER_FREE_SAFE(e_data.probe_filter_sh);
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c
b/source/blender/draw/engines/eevee/eevee_materials.c
index 029c9d7ced0..ece2b1c7707 100644
--- a/source/blender/draw/engines/eevee/eevee_materi
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
