diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-19 09:06:37 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-19 09:06:37 +0300 |
| commit | 9df1e54079344ed4e2becef9e57cf1b925b46dff (patch) | |
| tree | 09014669c19f24015ab924f612d30a20ddb79939 /source/blender/gpu/intern/gpu_immediate.c | |
| parent | 34a45c54e00c18da06df97674e1d614c24ae58bf (diff) | |
Cleanup: style
Diffstat (limited to 'source/blender/gpu/intern/gpu_immediate.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_immediate.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/gpu/intern/gpu_immediate.c b/source/blender/gpu/intern/gpu_immediate.c index 06b487fbb25..66a467e339e 100644 --- a/source/blender/gpu/intern/gpu_immediate.c +++ b/source/blender/gpu/intern/gpu_immediate.c @@ -701,17 +701,17 @@ void immVertex2iv(uint attrib_id, const int data[2]) /* --- generic uniform functions --- */ #if 0 - #if TRUST_NO_ONE - #define GET_UNIFORM const GPUShaderInput* uniform = GPU_shaderinterface_uniform(imm.shader_interface, name); assert(uniform); - #else - #define GET_UNIFORM const GPUShaderInput* uniform = GPU_shaderinterface_uniform(imm.shader_interface, name); - #endif +# if TRUST_NO_ONE +# define GET_UNIFORM const GPUShaderInput* uniform = GPU_shaderinterface_uniform(imm.shader_interface, name); assert(uniform); +# else +# define GET_UNIFORM const GPUShaderInput* uniform = GPU_shaderinterface_uniform(imm.shader_interface, name); +# endif #else /* NOTE: It is possible to have uniform fully optimized out from the shader. * In this case we can't assert failure or allow NULL-pointer dereference. * TODO(sergey): How can we detect existing-but-optimized-out uniform but still * catch typos in uniform names passed to immUniform*() functions? */ - #define GET_UNIFORM const GPUShaderInput* uniform = GPU_shaderinterface_uniform(imm.shader_interface, name); if (uniform == NULL) return; +# define GET_UNIFORM const GPUShaderInput* uniform = GPU_shaderinterface_uniform(imm.shader_interface, name); if (uniform == NULL) return; #endif void immUniform1f(const char *name, float x) |