[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43369] trunk/blender/source/blender/ render/intern/raytrace: tag unused function args in raytrace code.

Campbell Barton ideasman42 at gmail.com
Sat Jan 14 11:09:02 CET 2012


Revision: 43369
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43369
Author:   campbellbarton
Date:     2012-01-14 10:08:47 +0000 (Sat, 14 Jan 2012)
Log Message:
-----------
tag unused function args in raytrace code.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp
    trunk/blender/source/blender/render/intern/raytrace/rayobject_blibvh.cpp
    trunk/blender/source/blender/render/intern/raytrace/rayobject_empty.cpp
    trunk/blender/source/blender/render/intern/raytrace/rayobject_instance.cpp
    trunk/blender/source/blender/render/intern/raytrace/rayobject_octree.cpp
    trunk/blender/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
    trunk/blender/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
    trunk/blender/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
    trunk/blender/source/blender/render/intern/raytrace/vbvh.h

Modified: trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp	2012-01-14 08:59:11 UTC (rev 43368)
+++ trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp	2012-01-14 10:08:47 UTC (rev 43369)
@@ -50,7 +50,8 @@
    because function is too long. Since this is code that is called billions
    of times we really do want to inline. */
 
-MALWAYS_INLINE RayObject* rayface_from_coords(RayFace *rayface, void *ob, void *face, float *v1, float *v2, float *v3, float *v4)
+MALWAYS_INLINE RayObject* rayface_from_coords(RayFace *rayface, void *ob, void *face,
+                                              float *v1, float *v2, float *v3, float *v4)
 {
 	rayface->ob = ob;
 	rayface->face = face;
@@ -118,7 +119,7 @@
 		return (is->lay & obi->lay);
 }
 
-MALWAYS_INLINE int vlr_check_intersect_solid(Isect *is, ObjectInstanceRen* obi, VlakRen *vlr)
+MALWAYS_INLINE int vlr_check_intersect_solid(Isect *UNUSED(is), ObjectInstanceRen* UNUSED(obi), VlakRen *vlr)
 {
 	/* solid material types only */
 	if (vlr->mat->material_type == MA_TYPE_SURFACE)
@@ -127,7 +128,7 @@
 		return 0;
 }
 
-MALWAYS_INLINE int vlr_check_bake(Isect *is, ObjectInstanceRen* obi, VlakRen *vlr)
+MALWAYS_INLINE int vlr_check_bake(Isect *is, ObjectInstanceRen* obi, VlakRen *UNUSED(vlr))
 {
 	return (obi->obr->ob != is->userdata);
 }

Modified: trunk/blender/source/blender/render/intern/raytrace/rayobject_blibvh.cpp
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/rayobject_blibvh.cpp	2012-01-14 08:59:11 UTC (rev 43368)
+++ trunk/blender/source/blender/render/intern/raytrace/rayobject_blibvh.cpp	2012-01-14 10:08:47 UTC (rev 43369)
@@ -46,13 +46,14 @@
 static void RE_rayobject_blibvh_free(RayObject *o);
 static void RE_rayobject_blibvh_bb(RayObject *o, float *min, float *max);
 
-static float RE_rayobject_blibvh_cost(RayObject *o)
+static float RE_rayobject_blibvh_cost(RayObject *UNUSED(o))
 {
 	//TODO calculate the expected cost to raycast on this structure
 	return 1.0;
 }
 
-static void RE_rayobject_blibvh_hint_bb(RayObject *o, RayHint *hint, float *min, float *max)
+static void RE_rayobject_blibvh_hint_bb(RayObject *UNUSED(o), RayHint *UNUSED(hint),
+                                        float *UNUSED(min), float *UNUSED(max))
 {
 	return;
 }
@@ -95,7 +96,7 @@
 	RayObject **leafs;
 };
 
-static void bvh_callback(void *userdata, int index, const BVHTreeRay *ray, BVHTreeRayHit *hit)
+static void bvh_callback(void *userdata, int index, const BVHTreeRay *UNUSED(ray), BVHTreeRayHit *hit)
 {
 	struct BVHCallbackUserData *data = (struct BVHCallbackUserData*)userdata;
 	Isect *isec = data->isec;

Modified: trunk/blender/source/blender/render/intern/raytrace/rayobject_empty.cpp
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/rayobject_empty.cpp	2012-01-14 08:59:11 UTC (rev 43368)
+++ trunk/blender/source/blender/render/intern/raytrace/rayobject_empty.cpp	2012-01-14 10:08:47 UTC (rev 43369)
@@ -32,30 +32,33 @@
 
 #include "rayobject.h"
 
+#include "BLI_utildefines.h"
+
 /*
  * Empty raytree
  */
 
-static int RE_rayobject_empty_intersect(RayObject *o, Isect *is)
+static int RE_rayobject_empty_intersect(RayObject *UNUSED(o), Isect *UNUSED(is))
 {
 	return 0;
 }
 
-static void RE_rayobject_empty_free(RayObject *o)
+static void RE_rayobject_empty_free(RayObject *UNUSED(o))
 {
 }
 
-static void RE_rayobject_empty_bb(RayObject *o, float *min, float *max)
+static void RE_rayobject_empty_bb(RayObject *UNUSED(o), float *UNUSED(min), float *UNUSED(max))
 {
 	return;
 }
 
-static float RE_rayobject_empty_cost(RayObject *o)
+static float RE_rayobject_empty_cost(RayObject *UNUSED(o))
 {
 	return 0.0;
 }
 
-static void RE_rayobject_empty_hint_bb(RayObject *o, RayHint *hint, float *min, float *max)
+static void RE_rayobject_empty_hint_bb(RayObject *UNUSED(o), RayHint *UNUSED(hint),
+                                       float *UNUSED(min), float *UNUSED(max))
 {}
 
 static RayObjectAPI empty_api =

Modified: trunk/blender/source/blender/render/intern/raytrace/rayobject_instance.cpp
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/rayobject_instance.cpp	2012-01-14 08:59:11 UTC (rev 43368)
+++ trunk/blender/source/blender/render/intern/raytrace/rayobject_instance.cpp	2012-01-14 10:08:47 UTC (rev 43369)
@@ -47,7 +47,8 @@
 static void RE_rayobject_instance_bb(RayObject *o, float *min, float *max);
 static float RE_rayobject_instance_cost(RayObject *o);
 
-static void RE_rayobject_instance_hint_bb(RayObject *o, RayHint *hint, float *min, float *max)
+static void RE_rayobject_instance_hint_bb(RayObject *UNUSED(o), RayHint *UNUSED(hint),
+                                          float *UNUSED(min), float *UNUSED(max))
 {}
 
 static RayObjectAPI instance_api =

Modified: trunk/blender/source/blender/render/intern/raytrace/rayobject_octree.cpp
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/rayobject_octree.cpp	2012-01-14 08:59:11 UTC (rev 43368)
+++ trunk/blender/source/blender/render/intern/raytrace/rayobject_octree.cpp	2012-01-14 10:08:47 UTC (rev 43369)
@@ -96,12 +96,13 @@
 /*
  * This function is not expected to be called by current code state.
  */
-static float RE_rayobject_octree_cost(RayObject *o)
+static float RE_rayobject_octree_cost(RayObject *UNUSED(o))
 {
 	return 1.0;
 }
 
-static void RE_rayobject_octree_hint_bb(RayObject *o, RayHint *hint, float *min, float *max)
+static void RE_rayobject_octree_hint_bb(RayObject *UNUSED(o), RayHint *UNUSED(hint),
+                                        float *UNUSED(min), float *UNUSED(max))
 {
 	return;
 }
@@ -671,7 +672,7 @@
 }
 
 /* check all faces in this node */
-static int testnode(Octree *oc, Isect *is, Node *no, OcVal ocval)
+static int testnode(Octree *UNUSED(oc), Isect *is, Node *no, OcVal ocval)
 {
 	short nr=0;
 

Modified: trunk/blender/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/rayobject_qbvh.cpp	2012-01-14 08:59:11 UTC (rev 43368)
+++ trunk/blender/source/blender/render/intern/raytrace/rayobject_qbvh.cpp	2012-01-14 10:08:47 UTC (rev 43369)
@@ -110,7 +110,7 @@
 }
 
 template<class Tree>
-void bvh_hint_bb(Tree *tree, LCTSHint *hint, float *min, float *max)
+void bvh_hint_bb(Tree *tree, LCTSHint *hint, float *UNUSED(min), float *UNUSED(max))
 {
 	//TODO renable hint support
 	{

Modified: trunk/blender/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/rayobject_svbvh.cpp	2012-01-14 08:59:11 UTC (rev 43368)
+++ trunk/blender/source/blender/render/intern/raytrace/rayobject_svbvh.cpp	2012-01-14 10:08:47 UTC (rev 43369)
@@ -146,7 +146,7 @@
 }
 
 template<class Tree>
-void bvh_hint_bb(Tree *tree, LCTSHint *hint, float *min, float *max)
+void bvh_hint_bb(Tree *tree, LCTSHint *hint, float *UNUSED(min), float *UNUSED(max))
 {
 	//TODO renable hint support
 	{

Modified: trunk/blender/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/rayobject_vbvh.cpp	2012-01-14 08:59:11 UTC (rev 43368)
+++ trunk/blender/source/blender/render/intern/raytrace/rayobject_vbvh.cpp	2012-01-14 10:08:47 UTC (rev 43369)
@@ -148,7 +148,7 @@
 }
 
 template<class Tree>
-void bvh_hint_bb(Tree *tree, LCTSHint *hint, float *min, float *max)
+void bvh_hint_bb(Tree *tree, LCTSHint *hint, float *UNUSED(min), float *UNUSED(max))
 {
 	//TODO renable hint support
 	{

Modified: trunk/blender/source/blender/render/intern/raytrace/vbvh.h
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/vbvh.h	2012-01-14 08:59:11 UTC (rev 43368)
+++ trunk/blender/source/blender/render/intern/raytrace/vbvh.h	2012-01-14 10:08:47 UTC (rev 43369)
@@ -53,7 +53,7 @@
  * Push nodes (used on dfs)
  */
 template<class Node>
-inline static void bvh_node_push_childs(Node *node, Isect *isec, Node **stack, int &stack_pos)
+inline static void bvh_node_push_childs(Node *node, Isect *UNUSED(isec), Node **stack, int &stack_pos)
 {
 	Node *child = node->child;
 



More information about the Bf-blender-cvs mailing list