Mesa (master): mesa: move ONE_DIV_SQRT_LN2 to prog_statevars.c

Brian Paul brianp at kemper.freedesktop.org
Sat Feb 28 20:46:11 UTC 2015


Module: Mesa
Branch: master
Commit: 20dc94ba3c7306f9e89cc8bf02fb2431418d48d4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=20dc94ba3c7306f9e89cc8bf02fb2431418d48d4

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Feb 26 11:34:23 2015 -0700

mesa: move ONE_DIV_SQRT_LN2 to prog_statevars.c

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/mesa/main/compiler.h          |    4 ----
 src/mesa/program/prog_statevars.c |    3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index 51d0eed..833d233 100644
--- a/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@ -188,10 +188,6 @@ static inline GLuint CPU_TO_LE32(GLuint x)
 # define LONGSTRING __extension__
 #endif
 
-#ifndef ONE_DIV_SQRT_LN2
-#define ONE_DIV_SQRT_LN2 (1.201122408786449815)
-#endif
-
 #ifndef FLT_MAX_EXP
 #define FLT_MAX_EXP 128
 #endif
diff --git a/src/mesa/program/prog_statevars.c b/src/mesa/program/prog_statevars.c
index 80708f4e..7e55371 100644
--- a/src/mesa/program/prog_statevars.c
+++ b/src/mesa/program/prog_statevars.c
@@ -41,6 +41,9 @@
 #include "main/samplerobj.h"
 
 
+#define ONE_DIV_SQRT_LN2 (1.201122408786449815)
+
+
 /**
  * Use the list of tokens in the state[] array to find global GL state
  * and return it in <value>.  Usually, four values are returned in <value>




More information about the mesa-commit mailing list