diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-07-25 14:48:36 -0600 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-07-25 14:48:36 -0600 |
commit | 9d9076af5c7af6cce9ba8216c62eabbc629dda43 (patch) | |
tree | d912466ab41c3590762402872a8b8a3106e32c20 | |
parent | c72bc3f3722e17b30c91bb8b9d57cd0ecfd98e46 (diff) |
mesa: glsl: re-order some constructors
-rw-r--r-- | src/mesa/shader/slang/library/slang_core.gc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/mesa/shader/slang/library/slang_core.gc b/src/mesa/shader/slang/library/slang_core.gc index 2c3a5a6c45..1f57997051 100644 --- a/src/mesa/shader/slang/library/slang_core.gc +++ b/src/mesa/shader/slang/library/slang_core.gc @@ -110,6 +110,16 @@ int __constructor(const float f) __asm float_to_int __retVal, f; } +int __constructor(const bool b) +{ + __retVal = b; +} + +int __constructor(const int i) +{ + __retVal = i; +} + bool __constructor(const int i) { const float zero = 0.0; @@ -122,12 +132,7 @@ bool __constructor(const float f) __asm vec4_sne __retVal, f, zero; } -int __constructor(const bool b) -{ - __retVal = b; -} - -float __constructor(const bool b) +bool __constructor(const bool b) { __retVal = b; } @@ -137,16 +142,11 @@ float __constructor(const int i) __asm int_to_float __retVal, i; } -bool __constructor(const bool b) +float __constructor(const bool b) { __retVal = b; } -int __constructor(const int i) -{ - __retVal = i; -} - float __constructor(const float f) { __retVal = f; |