summaryrefslogtreecommitdiff
path: root/src/common/bit_field.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-12-20 12:40:06 -0500
committerbunnei <bunneidev@gmail.com>2014-12-20 12:40:06 -0500
commitacabd7be82b4174a3adab0771df6320bdbc5a85b (patch)
treec47c2f68f50005bfb5c4003831f3977aec0be3ca /src/common/bit_field.h
parent2b0d7a1d293ca28f6a9022b220720bf8b57a47e8 (diff)
parent08f42c2b8c30d55f5c931f2260a0900ff902735c (diff)
Merge pull request #284 from neobrain/pica_progress
Pica progress: Texturing, shaders, cleanups & more
Diffstat (limited to 'src/common/bit_field.h')
-rw-r--r--src/common/bit_field.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/common/bit_field.h b/src/common/bit_field.h
index 9e02210f9..3ec061e63 100644
--- a/src/common/bit_field.h
+++ b/src/common/bit_field.h
@@ -142,7 +142,7 @@ public:
__forceinline BitField& operator=(T val)
{
- storage = (storage & ~GetMask()) | (((StorageType)val << position) & GetMask());
+ Assign(val);
return *this;
}
@@ -151,6 +151,10 @@ public:
return Value();
}
+ __forceinline void Assign(const T& value) {
+ storage = (storage & ~GetMask()) | (((StorageType)value << position) & GetMask());
+ }
+
__forceinline T Value() const
{
if (std::numeric_limits<T>::is_signed)