[Bf-blender-cvs] [b7d1621477e] blender2.8: Eevee: Remove unecessary planar_minmaxz
Clément Foucault
noreply at git.blender.org
Wed Nov 1 16:36:33 CET 2017
Commit: b7d1621477e351f8cef28536e6a55ac8c131bb7e
Author: Clément Foucault
Date: Wed Nov 1 16:19:07 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBb7d1621477e351f8cef28536e6a55ac8c131bb7e
Eevee: Remove unecessary planar_minmaxz
===================================================================
M source/blender/draw/engines/eevee/eevee_lightprobes.c
M source/blender/draw/intern/draw_manager.c
===================================================================
diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c
index 3f0bcc840d0..7b134ab4967 100644
--- a/source/blender/draw/engines/eevee/eevee_lightprobes.c
+++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c
@@ -58,7 +58,6 @@ static struct {
struct GPUShader *probe_cube_display_sh;
struct GPUTexture *hammersley;
- struct GPUTexture *planar_minmaxz;
struct GPUTexture *planar_pool_placeholder;
struct GPUTexture *depth_placeholder;
struct GPUTexture *depth_array_placeholder;
@@ -153,9 +152,7 @@ static void planar_pool_ensure_alloc(EEVEE_Data *vedata, int num_planar_ref)
* To overcome this, we bind the planar pool ourselves later */
/* XXX Do this one first so it gets it's mipmap done. */
- DRWFboTexture tex_minmaxz = {&e_data.planar_minmaxz, DRW_TEX_RG_32, DRW_TEX_MIPMAP | DRW_TEX_TEMP};
- DRW_framebuffer_init(&fbl->planarref_fb, &draw_engine_eevee_type,
- width / 2, height / 2, &tex_minmaxz, 1);
+ DRW_framebuffer_init(&fbl->planarref_fb, &draw_engine_eevee_type, 1, 1, NULL, 0);
}
}
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index f23bbd3af45..57489153ba0 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -2329,7 +2329,7 @@ void DRW_framebuffer_init(
}
}
- if (create_fb) {
+ if (create_fb && (textures_len > 0)) {
if (!GPU_framebuffer_check_valid(*fb, NULL)) {
printf("Error invalid framebuffer\n");
}
More information about the Bf-blender-cvs
mailing list