diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-03-22 20:47:16 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-03-22 20:47:16 +0300 |
| commit | b0a7e77700535a0fb021505f1920322d633926d4 (patch) | |
| tree | 1f4e0d5dabe3c922d578f29710e6efe884afe7a2 /source/blender/gpu | |
| parent | c31c53983eb71a7a130689afa8b4292781ebb236 (diff) | |
Cleanup: style
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/intern/gpu_compositing.c | 33 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_material.c | 2 |
2 files changed, 12 insertions, 23 deletions
diff --git a/source/blender/gpu/intern/gpu_compositing.c b/source/blender/gpu/intern/gpu_compositing.c index c22f3ed7ed8..7534d9d0fb9 100644 --- a/source/blender/gpu/intern/gpu_compositing.c +++ b/source/blender/gpu/intern/gpu_compositing.c @@ -61,8 +61,7 @@ static const float fullscreenuvs[4][2] = {{0.0f, 0.0f}, {1.0f, 0.0f}, {0.0f, 1.0 /* shader interfaces (legacy GL 2 style, without uniform buffer objects) */ -typedef struct -{ +typedef struct { int ssao_uniform; int ssao_color_uniform; int color_uniform; @@ -73,8 +72,7 @@ typedef struct int ssao_jitter_uniform; } GPUSSAOShaderInterface; -typedef struct -{ +typedef struct { int invrendertargetdim_uniform; int color_uniform; int dof_uniform; @@ -82,8 +80,7 @@ typedef struct int viewvecs_uniform; } GPUDOFHQPassOneInterface; -typedef struct -{ +typedef struct { int rendertargetdim_uniform; int color_uniform; int coc_uniform; @@ -91,8 +88,7 @@ typedef struct int dof_uniform; } GPUDOFHQPassTwoInterface; -typedef struct -{ +typedef struct { int dof_uniform; int invrendertargetdim_uniform; int color_uniform; @@ -102,8 +98,7 @@ typedef struct int depth_uniform; } GPUDOFHQPassThreeInterface; -typedef struct -{ +typedef struct { int dof_uniform; int invrendertargetdim_uniform; int color_uniform; @@ -111,8 +106,7 @@ typedef struct int viewvecs_uniform; } GPUDOFPassOneInterface; -typedef struct -{ +typedef struct { int dof_uniform; int invrendertargetdim_uniform; int color_uniform; @@ -120,20 +114,17 @@ typedef struct int viewvecs_uniform; } GPUDOFPassTwoInterface; -typedef struct -{ +typedef struct { int near_coc_downsampled; int near_coc_blurred; } GPUDOFPassThreeInterface; -typedef struct -{ +typedef struct { int near_coc_downsampled; int invrendertargetdim_uniform; } GPUDOFPassFourInterface; -typedef struct -{ +typedef struct { int medium_blurred_uniform; int high_blurred_uniform; int dof_uniform; @@ -143,8 +134,7 @@ typedef struct int viewvecs_uniform; } GPUDOFPassFiveInterface; -typedef struct -{ +typedef struct { int depth_uniform; } GPUDepthResolveInterface; @@ -1332,8 +1322,7 @@ void GPU_fx_shader_init_interface(struct GPUShader *shader, GPUFXShaderEffect ef if (!shader) return; - switch (effect) - { + switch (effect) { case GPU_SHADER_FX_SSAO: { GPUSSAOShaderInterface *interface = MEM_mallocN(sizeof(GPUSSAOShaderInterface), "GPUSSAOShaderInterface"); diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index fefc18d017e..587e6340450 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -1312,7 +1312,7 @@ static void do_material_tex(GPUShadeInput *shi) texture_rgb_blend(mat, tcol, shi->specrgb, tin, colspecfac, mtex->blendtype, &shi->specrgb); } - if(mtex->mapto & MAP_COLMIR) { + if (mtex->mapto & MAP_COLMIR) { GPUNodeLink *colmirfac; if (mtex->mirrfac == 1.0f) colmirfac = stencil; |