[Bf-blender-cvs] [435f5017faf] blender2.8: GPUCompositing: Fix comment and component count.

[Clément Foucault]

Commit: 435f5017fafe81b90f59cb41be391f85b770e604
Author: Clément Foucault
Date:   Tue May 9 21:52:22 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB435f5017fafe81b90f59cb41be391f85b770e604

GPUCompositing: Fix comment and component count.

===================================================================

M	source/blender/gpu/intern/gpu_compositing.c
M	source/blender/gpu/shaders/gpu_shader_fx_dof_hq_frag.glsl

===================================================================

diff --git a/source/blender/gpu/intern/gpu_compositing.c b/source/blender/gpu/intern/gpu_compositing.c
index 6da71d17d33..f2ceb919a2d 100644
--- a/source/blender/gpu/intern/gpu_compositing.c
+++ b/source/blender/gpu/intern/gpu_compositing.c
@@ -557,7 +557,7 @@ bool GPU_fx_compositor_initialize_passes(
 				GPU_texture_unbind(fx->dof_nearfar_coc);
 
 				if (!(fx->dof_near_blur = GPU_texture_create_2D_custom(
-				    fx->dof_downsampled_w, fx->dof_downsampled_h, 2, GPU_RGBA16F, NULL, err_out)))
+				    fx->dof_downsampled_w, fx->dof_downsampled_h, 4, GPU_RGBA16F, NULL, err_out)))
 				{
 					printf("%.256s\n", err_out);
 					cleanup_fx_gl_data(fx, true);
@@ -565,7 +565,7 @@ bool GPU_fx_compositor_initialize_passes(
 				}
 
 				if (!(fx->dof_far_blur = GPU_texture_create_2D_custom(
-				    fx->dof_downsampled_w, fx->dof_downsampled_h, 2, GPU_RGBA16F, NULL, err_out)))
+				    fx->dof_downsampled_w, fx->dof_downsampled_h, 4, GPU_RGBA16F, NULL, err_out)))
 				{
 					printf("%.256s\n", err_out);
 					cleanup_fx_gl_data(fx, true);
diff --git a/source/blender/gpu/shaders/gpu_shader_fx_dof_hq_frag.glsl b/source/blender/gpu/shaders/gpu_shader_fx_dof_hq_frag.glsl
index 6ed9812eeec..22d56423bb8 100644
--- a/source/blender/gpu/shaders/gpu_shader_fx_dof_hq_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_fx_dof_hq_frag.glsl
@@ -14,7 +14,7 @@ uniform sampler2D depthbuffer;
 
 uniform sampler2D cocbuffer;
 
-/* this includes focal distance in x and aperture size in y */
+/* this includes aperture size in x and focal distance in y */
 uniform vec4 dof_params;
 
 /* viewvectors for reconstruction of world space */