Missing updates for the new IR function.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1734 dfc29bdd-3216-0410-991c-e03cc46cb475

source/Irrlicht/CSoftwareDriver2.cpp

@@ -701,9 +701,7 @@ inline void CBurningVideoDriver::ndc_2_dc_and_project ( s4DVertex *dest,s4DVerte
 	#endif
 
 		dest[g].Pos.w = iw;
-
 	}
-
 }
 
 
@@ -1263,6 +1261,9 @@ void CBurningVideoDriver::drawVertexPrimitiveList16(const void* vertices, u32 ve
 		ndc_2_dc_and_project ( CurrentOut.data + 1, CurrentOut.data, vOut );
 
 /*
+		// TODO: don't stick on 32 Bit Pointer
+		#define PointerAsValue(x) ( (u32) (u32*) (x) ) 
+
 		// if not complete inside clipping necessary
 		if ( ( test & VERTEX4D_INSIDE ) != VERTEX4D_INSIDE )
 		{
@@ -1276,7 +1277,6 @@ void CBurningVideoDriver::drawVertexPrimitiveList16(const void* vertices, u32 ve
 				v[0] ^= v[1];
 				v[1] ^= v[0];
 				v[0] ^= v[1];
-
 			}
 
 			if ( vOut < 3 )
@@ -1313,9 +1313,8 @@ void CBurningVideoDriver::drawVertexPrimitiveList16(const void* vertices, u32 ve
 		{
 			// rasterize
 			CurrentShader->drawTriangle ( CurrentOut.data + 0 + 1,
-													CurrentOut.data + g + 3,
-													CurrentOut.data + g + 5
-												);
+							CurrentOut.data + g + 3,
+							CurrentOut.data + g + 5);
 		}
 
 	}

source/Irrlicht/SoftwareDriver2_helper.h

@@ -118,7 +118,7 @@ REALINLINE void memcpy32_small ( void * dest, const void *source, u32 bytesize )
 // integer log2 of a float ieee 754. TODO: non ieee floating point
 static inline s32 s32_log2_f32( f32 f)
 {
-	u32 x = IR ( f );
+	u32 x = core::IR ( f );
 
 	return ((x & 0x7F800000) >> 23) - 127;
 }
@@ -135,10 +135,6 @@ static inline s32 s32_abs(s32 x)
 }
 
 
-// TODO: don't stick on 32 Bit Pointer
-#define PointerAsValue(x) ( (u32) (u32*) (x) ) 
-
-
 //! conditional set based on mask and arithmetic shift
 REALINLINE u32 if_mask_a_else_b ( const u32 mask, const u32 a, const u32 b )
 {