summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/D3D/GfxState.cpp
diff options
context:
space:
mode:
authorMatthew Parlane <parlane@gmail.com>2014-03-10 09:24:09 +1300
committerMatthew Parlane <parlane@gmail.com>2014-03-10 09:24:09 +1300
commit633dc75e857d649ffab7c4398e92536bccc9e1de (patch)
treef9aa8831a0731ea246bd921d979f4bffa7f07bd0 /Source/Core/VideoBackends/D3D/GfxState.cpp
parentf4012638672472afdbd9956229f273a18a77fd77 (diff)
parentd802d392811be44d34ae9cd23f616db93e54c50f (diff)
Merge pull request #142 from Tilka/clang-modernize
Run clang-modernize and manually fix the result
Diffstat (limited to 'Source/Core/VideoBackends/D3D/GfxState.cpp')
-rw-r--r--Source/Core/VideoBackends/D3D/GfxState.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/VideoBackends/D3D/GfxState.cpp b/Source/Core/VideoBackends/D3D/GfxState.cpp
index c31c45e2ea..af85993e4d 100644
--- a/Source/Core/VideoBackends/D3D/GfxState.cpp
+++ b/Source/Core/VideoBackends/D3D/GfxState.cpp
@@ -30,10 +30,10 @@ template<typename T> AutoState<T>::AutoState(const AutoState<T> &source)
template<typename T> AutoState<T>::~AutoState()
{
if(state) ((T*)state)->Release();
- state = NULL;
+ state = nullptr;
}
-StateManager::StateManager() : cur_blendstate(NULL), cur_depthstate(NULL), cur_raststate(NULL) {}
+StateManager::StateManager() : cur_blendstate(nullptr), cur_depthstate(nullptr), cur_raststate(nullptr) {}
void StateManager::PushBlendState(const ID3D11BlendState* state) { blendstates.push(AutoBlendState(state)); }
void StateManager::PushDepthState(const ID3D11DepthStencilState* state) { depthstates.push(AutoDepthStencilState(state)); }
@@ -49,7 +49,7 @@ void StateManager::Apply()
if (cur_blendstate != blendstates.top().GetPtr())
{
cur_blendstate = (ID3D11BlendState*)blendstates.top().GetPtr();
- D3D::context->OMSetBlendState(cur_blendstate, NULL, 0xFFFFFFFF);
+ D3D::context->OMSetBlendState(cur_blendstate, nullptr, 0xFFFFFFFF);
}
}
else ERROR_LOG(VIDEO, "Tried to apply without blend state!");