[Bf-blender-cvs] [4c835b9168d] blender2.8: Eevee: Fix double promotion.

Clément Foucault noreply at git.blender.org
Mon Jul 17 10:48:25 CEST 2017


Commit: 4c835b9168dbbe3ed956a41d05f786f6fb9a4208
Author: Clément Foucault
Date:   Thu Jul 13 12:18:39 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB4c835b9168dbbe3ed956a41d05f786f6fb9a4208

Eevee: Fix double promotion.

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

M	source/blender/draw/engines/eevee/eevee_private.h

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

diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h
index eb420e2a8c7..53605304e47 100644
--- a/source/blender/draw/engines/eevee/eevee_private.h
+++ b/source/blender/draw/engines/eevee/eevee_private.h
@@ -491,44 +491,44 @@ void EEVEE_effects_free(void);
 
 /* Shadow Matrix */
 static const float texcomat[4][4] = { /* From NDC to TexCo */
-	{0.5, 0.0, 0.0, 0.0},
-	{0.0, 0.5, 0.0, 0.0},
-	{0.0, 0.0, 0.5, 0.0},
-	{0.5, 0.5, 0.5, 1.0}
+	{0.5f, 0.0f, 0.0f, 0.0f},
+	{0.0f, 0.5f, 0.0f, 0.0f},
+	{0.0f, 0.0f, 0.5f, 0.0f},
+	{0.5f, 0.5f, 0.5f, 1.0f}
 };
 
 /* Cubemap Matrices */
 static const float cubefacemat[6][4][4] = {
 	/* Pos X */
-	{{0.0, 0.0, -1.0, 0.0},
-	 {0.0, -1.0, 0.0, 0.0},
-	 {-1.0, 0.0, 0.0, 0.0},
-	 {0.0, 0.0, 0.0, 1.0}},
+	{{0.0f, 0.0f, -1.0f, 0.0f},
+	 {0.0f, -1.0f, 0.0f, 0.0f},
+	 {-1.0f, 0.0f, 0.0f, 0.0f},
+	 {0.0f, 0.0f, 0.0f, 1.0f}},
 	/* Neg X */
-	{{0.0, 0.0, 1.0, 0.0},
-	 {0.0, -1.0, 0.0, 0.0},
-	 {1.0, 0.0, 0.0, 0.0},
-	 {0.0, 0.0, 0.0, 1.0}},
+	{{0.0f, 0.0f, 1.0f, 0.0f},
+	 {0.0f, -1.0f, 0.0f, 0.0f},
+	 {1.0f, 0.0f, 0.0f, 0.0f},
+	 {0.0f, 0.0f, 0.0f, 1.0f}},
 	/* Pos Y */
-	{{1.0, 0.0, 0.0, 0.0},
-	 {0.0, 0.0, -1.0, 0.0},
-	 {0.0, 1.0, 0.0, 0.0},
-	 {0.0, 0.0, 0.0, 1.0}},
+	{{1.0f, 0.0f, 0.0f, 0.0f},
+	 {0.0f, 0.0f, -1.0f, 0.0f},
+	 {0.0f, 1.0f, 0.0f, 0.0f},
+	 {0.0f, 0.0f, 0.0f, 1.0f}},
 	/* Neg Y */
-	{{1.0, 0.0, 0.0, 0.0},
-	 {0.0, 0.0, 1.0, 0.0},
-	 {0.0, -1.0, 0.0, 0.0},
-	 {0.0, 0.0, 0.0, 1.0}},
+	{{1.0f, 0.0f, 0.0f, 0.0f},
+	 {0.0f, 0.0f, 1.0f, 0.0f},
+	 {0.0f, -1.0f, 0.0f, 0.0f},
+	 {0.0f, 0.0f, 0.0f, 1.0f}},
 	/* Pos Z */
-	{{1.0, 0.0, 0.0, 0.0},
-	 {0.0, -1.0, 0.0, 0.0},
-	 {0.0, 0.0, -1.0, 0.0},
-	 {0.0, 0.0, 0.0, 1.0}},
+	{{1.0f, 0.0f, 0.0f, 0.0f},
+	 {0.0f, -1.0f, 0.0f, 0.0f},
+	 {0.0f, 0.0f, -1.0f, 0.0f},
+	 {0.0f, 0.0f, 0.0f, 1.0f}},
 	/* Neg Z */
-	{{-1.0, 0.0, 0.0, 0.0},
-	 {0.0, -1.0, 0.0, 0.0},
-	 {0.0, 0.0, 1.0, 0.0},
-	 {0.0, 0.0, 0.0, 1.0}},
+	{{-1.0f, 0.0f, 0.0f, 0.0f},
+	 {0.0f, -1.0f, 0.0f, 0.0f},
+	 {0.0f, 0.0f, 1.0f, 0.0f},
+	 {0.0f, 0.0f, 0.0f, 1.0f}},
 };
 
 #endif /* __EEVEE_PRIVATE_H__ */




More information about the Bf-blender-cvs mailing list