From d802d392811be44d34ae9cd23f616db93e54c50f Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sun, 9 Mar 2014 21:14:26 +0100 Subject: clang-modernize -use-nullptr and s/\bNULL\b/nullptr/g for *.cpp/h/mm files not compiled on my machine --- Source/Core/VideoBackends/D3D/GfxState.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/VideoBackends/D3D/GfxState.cpp') 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 AutoState::AutoState(const AutoState &source) template AutoState::~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!"); -- cgit v1.2.3