Workbench: Remove unused framebuffer slot.
authorClément Foucault <foucault.clem@gmail.com>
Tue, 4 Dec 2018 19:23:30 +0000 (20:23 +0100)
committerClément Foucault <foucault.clem@gmail.com>
Wed, 5 Dec 2018 01:51:48 +0000 (02:51 +0100)
source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl
source/blender/draw/engines/workbench/workbench_deferred.c

index b9b21d576cb9c5e67376a24b736bedf80a05fb1a..93170037c4b0e4573e0a386c813f2936d19de95c 100644 (file)
@@ -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 */
 
index acea650b86a49aabda839e63ad64fb8bdda3f1f2..a07c9f37ac9958e890d8c60a42b2f2b8ef8c45f3 100644 (file)
@@ -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, {