Blender Git Commits

Pass enumerants for new shader effect. WIP commit to continue later.

Depth of field: initialize textures for better algorithm.

Use nice switch statement instead of horrible chained ifs.

Merge branch 'master' into viewport_experiments

Making clamping correct fixes the issues of depth of field having a dark
fringe at the edges of the screen.

Fix SSAO artifacts at zero distance by using a small constant bias in
length comparison.

Merge branch 'master' into viewport_experiments

Conflicts:
source/blender/blenkernel/intern/camera.c

Add request for HDR targets - all compositing is done in HDR targets
now.

Disable bound textures just in case they come and bite us somewhere
unpleasant.

SSAO - use concentric mapping.

Concentric mapping is a nice way to create a circular distribution from
orthogonal 2D coordinates. Using this allows us to expose directly the
number of samples to the user instead of quality options.

Concentric mapping will likely be used for DOF sampling too later.

References:

[1] A Low Distortion Map Between Disk and Square - Peter Shirley,
Kenneth Chiu

[2] http://psgraphics.blogspot.nl/2011/01/improved-code-for-concentric-

Merge branch 'master' into viewport_experiments

cleanup diffusion dof names and add blade count (will possibly be used in high quality)

Merge branch 'master' into viewport_experiments

Replace magic quality numbers, add some cleanup code, deactivate high
quality mode dof.

Add quality settings for depth of field - still inactive.

Merge branch 'master' into viewport_experiments

Merge branch 'master' into viewport_experiments

Conflicts:
source/blender/editors/space_view3d/view3d_draw.c
source/blender/gpu/GPU_buffers.h
source/blender/gpu/intern/gpu_buffers.c

Revert "Hook up flags to request a specific sorting scheme from GPU buffer setup"

This reverts commit 827ad6075dcf144025db7c4319e9954dcf45b26c.

Merge branch 'master' into viewport_experiments

Conflicts:
source/blender/editors/space_view3d/view3d_draw.c
source/blender/gpu/intern/gpu_extensions.c

Merge branch 'master' into viewport_experiments

Merge branch 'master' into viewport_experiments

Conflicts:
source/blender/gpu/intern/gpu_extensions.c