[Bf-blender-cvs] [b069994] viewport_experiments: Pass enumerants for new shader effect. WIP commit to continue later.

Antony Riakiotakis noreply at git.blender.org
Mon Jan 5 19:25:36 CET 2015


Commit: b06999435a181f4e9e312288e79edf023bc1f932
Author: Antony Riakiotakis
Date:   Mon Jan 5 19:19:07 2015 +0100
Branches: viewport_experiments
https://developer.blender.org/rBb06999435a181f4e9e312288e79edf023bc1f932

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

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

M	source/blender/gpu/GPU_compositing.h

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

diff --git a/source/blender/gpu/GPU_compositing.h b/source/blender/gpu/GPU_compositing.h
index d1852f3..d219256 100644
--- a/source/blender/gpu/GPU_compositing.h
+++ b/source/blender/gpu/GPU_compositing.h
@@ -54,10 +54,16 @@ typedef enum GPUFXShaderEffect {
 	GPU_SHADER_FX_DEPTH_OF_FIELD_PASS_THREE = 4,
 	GPU_SHADER_FX_DEPTH_OF_FIELD_PASS_FOUR = 5,
 	GPU_SHADER_FX_DEPTH_OF_FIELD_PASS_FIVE = 6,
+
+	/* following are for high quality dof */
+	GPU_SHADER_FX_DEPTH_OF_FIELD_DOWNSAMPLE_HALF = 7, /* downsample to half render target */
+	GPU_SHADER_FX_DEPTH_OF_FIELD_DOWNSAMPLE_HALF_COC = 8, /* downsample coc (mainly near coc) */
+	GPU_SHADER_FX_DEPTH_OF_FIELD_BLUR = 9, /* combined calculation of near and far dof buffers */
+	GPU_SHADER_FX_DEPTH_OF_FIELD_FINAL_COMBINE = 10 /* final combination pass */
 } GPUFXShaderEffect;
 
 /* keep in synch with enum above! */
-#define MAX_FX_SHADERS 7
+#define MAX_FX_SHADERS 11
 
 /* generate a new FX compositor */
 GPUFX *GPU_create_fx_compositor(void);




More information about the Bf-blender-cvs mailing list