[Bf-blender-cvs] [f4261cd2ed4] blender2.8: Workbench: Remove unused framebuffer slot.
Clément Foucault
noreply at git.blender.org
Wed Dec 5 02:51:53 CET 2018
Commit: f4261cd2ed4a1e3bfcd12a6602abdaf717c349cd
Author: Clément Foucault
Date: Tue Dec 4 20:23:30 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBf4261cd2ed4a1e3bfcd12a6602abdaf717c349cd
Workbench: Remove unused framebuffer slot.
===================================================================
M source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl
M source/blender/draw/engines/workbench/workbench_deferred.c
===================================================================
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl
index b9b21d576cb..93170037c4b 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl
@@ -26,9 +26,9 @@ layout(location=0) out uint objectId;
layout(location=1) out vec4 materialData;
#ifdef NORMAL_VIEWPORT_PASS_ENABLED
# ifdef WORKBENCH_ENCODE_NORMALS
-layout(location=3) out vec2 normalViewport;
+layout(location=2) out vec2 normalViewport;
# else /* WORKBENCH_ENCODE_NORMALS */
-layout(location=3) out vec3 normalViewport;
+layout(location=2) out vec3 normalViewport;
# endif /* WORKBENCH_ENCODE_NORMALS */
#endif /* NORMAL_VIEWPORT_PASS_ENABLED */
diff --git a/source/blender/draw/engines/workbench/workbench_deferred.c b/source/blender/draw/engines/workbench/workbench_deferred.c
index acea650b86a..a07c9f37ac9 100644
--- a/source/blender/draw/engines/workbench/workbench_deferred.c
+++ b/source/blender/draw/engines/workbench/workbench_deferred.c
@@ -409,7 +409,6 @@ void workbench_deferred_engine_init(WORKBENCH_Data *vedata)
e_data.composite_buffer_tx = NULL;
e_data.normal_buffer_tx = NULL;
e_data.cavity_buffer_tx = NULL;
- e_data.metallic_buffer_tx = NULL;
e_data.color_buffer_tx = DRW_texture_pool_query_2D(size[0], size[1], GPU_RGBA8, &draw_engine_workbench_solid);
e_data.composite_buffer_tx = DRW_texture_pool_query_2D(size[0], size[1], comp_tex_format, &draw_engine_workbench_solid);
@@ -427,7 +426,6 @@ void workbench_deferred_engine_init(WORKBENCH_Data *vedata)
GPU_ATTACHMENT_TEXTURE(dtxl->depth),
GPU_ATTACHMENT_TEXTURE(e_data.object_id_tx),
GPU_ATTACHMENT_TEXTURE(e_data.color_buffer_tx),
- GPU_ATTACHMENT_TEXTURE(e_data.metallic_buffer_tx),
GPU_ATTACHMENT_TEXTURE(e_data.normal_buffer_tx),
});
GPU_framebuffer_ensure_config(&fbl->cavity_fb, {
More information about the Bf-blender-cvs
mailing list