diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2018-12-04 22:23:30 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2018-12-05 04:51:48 +0300 |
commit | f4261cd2ed4a1e3bfcd12a6602abdaf717c349cd (patch) | |
tree | 53865475c553720410ed4067db91fa93d029b392 /source/blender | |
parent | 5c592442382e36f6a49c3a1381e4adbbcae1be52 (diff) |
Workbench: Remove unused framebuffer slot.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl | 4 | ||||
-rw-r--r-- | source/blender/draw/engines/workbench/workbench_deferred.c | 2 |
2 files changed, 2 insertions, 4 deletions
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, { |