diff options
| author | Tillmann Karras <tilkax@gmail.com> | 2014-03-09 21:14:26 +0100 |
|---|---|---|
| committer | Tillmann Karras <tilkax@gmail.com> | 2014-03-09 21:14:26 +0100 |
| commit | d802d392811be44d34ae9cd23f616db93e54c50f (patch) | |
| tree | f9aa8831a0731ea246bd921d979f4bffa7f07bd0 /Source/Core/VideoBackends/D3D/PointGeometryShader.cpp | |
| parent | f28116b7da6aac6069084596dc4dbf866bdebfd8 (diff) | |
clang-modernize -use-nullptr
and s/\bNULL\b/nullptr/g for *.cpp/h/mm files not compiled on my machine
Diffstat (limited to 'Source/Core/VideoBackends/D3D/PointGeometryShader.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/PointGeometryShader.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/VideoBackends/D3D/PointGeometryShader.cpp b/Source/Core/VideoBackends/D3D/PointGeometryShader.cpp index 5e7cb5eda6..3d1d8077eb 100644 --- a/Source/Core/VideoBackends/D3D/PointGeometryShader.cpp +++ b/Source/Core/VideoBackends/D3D/PointGeometryShader.cpp @@ -119,7 +119,7 @@ static const char POINT_GS_COMMON[] = ; PointGeometryShader::PointGeometryShader() - : m_ready(false), m_paramsBuffer(NULL) + : m_ready(false), m_paramsBuffer(nullptr) { } void PointGeometryShader::Init() @@ -132,7 +132,7 @@ void PointGeometryShader::Init() D3D11_BUFFER_DESC bd = CD3D11_BUFFER_DESC(sizeof(PointGSParams_Padded), D3D11_BIND_CONSTANT_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE); - hr = D3D::device->CreateBuffer(&bd, NULL, &m_paramsBuffer); + hr = D3D::device->CreateBuffer(&bd, nullptr, &m_paramsBuffer); CHECK(SUCCEEDED(hr), "create point geometry shader params buffer"); D3D::SetDebugObjectName(m_paramsBuffer, "point geometry shader params buffer"); @@ -178,14 +178,14 @@ bool PointGeometryShader::SetShader(u32 components, float pointSize, const std::string& numTexCoordsStr = numTexCoordsStream.str(); D3D_SHADER_MACRO macros[] = { { "NUM_TEXCOORDS", numTexCoordsStr.c_str() }, - { NULL, NULL } + { nullptr, nullptr } }; ID3D11GeometryShader* newShader = D3D::CompileAndCreateGeometryShader(code.GetBuffer(), unsigned int(strlen(code.GetBuffer())), macros); if (!newShader) { WARN_LOG(VIDEO, "Point geometry shader for components 0x%.08X failed to compile", components); // Add dummy shader to prevent trying to compile again - m_shaders[components] = NULL; + m_shaders[components] = nullptr; return false; } @@ -217,7 +217,7 @@ bool PointGeometryShader::SetShader(u32 components, float pointSize, DEBUG_LOG(VIDEO, "Point params: size %f, texOffset %f, vpWidth %f, vpHeight %f", pointSize, texOffset, vpWidth, vpHeight); - D3D::context->GSSetShader(shaderIt->second, NULL, 0); + D3D::context->GSSetShader(shaderIt->second, nullptr, 0); D3D::context->GSSetConstantBuffers(0, 1, &m_paramsBuffer); return true; |
