diff --git a/source/blender/gpu/gawain/shader_interface.c b/source/blender/gpu/gawain/shader_interface.c index 22c45dec86f..93a1283d895 100644 --- a/source/blender/gpu/gawain/shader_interface.c +++ b/source/blender/gpu/gawain/shader_interface.c @@ -19,6 +19,8 @@ #include #endif +#if 0 + static const char* BuiltinUniform_name(BuiltinUniform u) { static const char* names[] = @@ -43,6 +45,8 @@ static const char* BuiltinUniform_name(BuiltinUniform u) return names[u]; } +#endif + static bool setup_builtin_uniform(ShaderInput* input, const char* name) { // TODO: reject DOUBLE, IMAGE, ATOMIC_COUNTER gl_types diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 0da52118324..d7b1d5b16ef 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -1687,7 +1687,7 @@ void GPU_end_dupli_object(void) } void GPU_begin_object_materials( - View3D *v3d, RegionView3D *rv3d, Scene *scene, SceneLayer *sl, Object *ob, + View3D *v3d, RegionView3D *rv3d, Scene *scene, SceneLayer *UNUSED(sl), Object *ob, bool glsl, bool *do_alpha_after) { Material *ma;