Merging r6145 through r6171 from trunk to ogl-es branch

[irrlicht.git] / source / Irrlicht / burning_shader_compile_fragment_start.h

diff --git a/source/Irrlicht/burning_shader_compile_fragment_start.h b/source/Irrlicht/burning_shader_compile_fragment_start.h
index 64a84633e8303f9d26c8ee47d6d7fadc046a7d1e..153064497d20e17c8c4971b5c31b2be6cbc5604d 100644 (file)
--- a/source/Irrlicht/burning_shader_compile_fragment_start.h
+++ b/source/Irrlicht/burning_shader_compile_fragment_start.h
@@ -40,7 +40,7 @@ void burning_shader_class::burning_shader_fragment()
                return;\r
 \r
        // slopes\r
-       const f32 invDeltaX = reciprocal_zero2(line.x[1] - line.x[0]);\r
+       const f32 invDeltaX = fill_step_x(line.x[1] - line.x[0]);\r
 \r
 #ifdef IPOL_Z\r
        slopeZ = (line.z[1] - line.z[0]) * invDeltaX;\r
@@ -96,9 +96,9 @@ void burning_shader_class::burning_shader_fragment()
        tFixPoint r1, g1, b1;\r
 #endif\r
 \r
-       for (s32 i = 0; i <= dx; ++i)\r
+       for (s32 i = 0; i <= dx; i+= SOFTWARE_DRIVER_2_STEP_X)\r
        {\r
-               if ((0 == EdgeTestPass) & i) break;\r
+               if ((0 == EdgeTestPass) & (i > line.x_edgetest)) break;\r
 \r
 #ifdef CMP_Z\r
                if (line.z[0] < z[i])\r