[Bf-blender-cvs] [696ed6d3cae] blender2.8: Cleanup: warnings

[Campbell Barton]

Commit: 696ed6d3caef5ad81c011d435fd02f82f6c231d3
Author: Campbell Barton
Date:   Thu Mar 9 16:44:11 2017 +1100
Branches: blender2.8
https://developer.blender.org/rB696ed6d3caef5ad81c011d435fd02f82f6c231d3

Cleanup: warnings

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

M	source/blender/gpu/gawain/shader_interface.c
M	source/blender/gpu/intern/gpu_draw.c

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

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 <stdio.h>
 #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;