blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

GPUCompositing: Fix comment and component count.

This commit is contained in:
Clément Foucault 2017-05-09 21:52:22 +02:00
parent 1413bee158
commit 435f5017fa
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/gpu/intern/gpu_compositing.c
View File

@ -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);

2
source/blender/gpu/shaders/gpu_shader_fx_dof_hq_frag.glsl
View File

@ -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 */