summaryrefslogtreecommitdiff
path: root/Source/Core/Common
diff options
context:
space:
mode:
authorMarkus Wick <degasus@users.noreply.github.com>2017-09-11 13:28:09 +0200
committerGitHub <noreply@github.com>2017-09-11 13:28:09 +0200
commit002e01d0ede3bd0eeebebc09f8f6a813ebc8d444 (patch)
tree5fb17c3d07988499767c51908b49dac2d8d9c881 /Source/Core/Common
parent9d169449a7898cefab29a5e033f82560cfcdef5e (diff)
parent24ddea04ce3c843dd1de3d34d775e9a49d195225 (diff)
Merge pull request #5343 from stenzek/videocommon-states
Move depth, rasterization and sampler states to VideoCommon
Diffstat (limited to 'Source/Core/Common')
-rw-r--r--Source/Core/Common/BitField.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/Common/BitField.h b/Source/Core/Common/BitField.h
index 5832fbcc3f..c8a81a092a 100644
--- a/Source/Core/Common/BitField.h
+++ b/Source/Core/Common/BitField.h
@@ -136,7 +136,7 @@ public:
__forceinline BitField& operator=(T val)
{
- storage = (storage & ~GetMask()) | ((val << position) & GetMask());
+ storage = (storage & ~GetMask()) | ((static_cast<StorageType>(val) << position) & GetMask());
return *this;
}