Skip to content

Commit f0b87ee

Browse files
committed
D3D11: silence null conversion warnings
1 parent b9830fc commit f0b87ee

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

RenderSystems/Direct3D11/src/OgreD3D11HLSLProgram.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ namespace Ogre {
317317
mEntryPoint.c_str(), // [in] Name of the shader-entrypoint function where shader execution begins.
318318
target, // [in] A string that specifies the shader model; can be any profile in shader model 4 or higher.
319319
compileFlags, // [in] Effect compile flags - no D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY at the first try...
320-
NULL, // [in] Effect compile flags
320+
0, // [in] Effect compile flags
321321
pMicroCode.GetAddressOf(),// [out] A pointer to an ID3DBlob Interface which contains the compiled shader, as well as any embedded debug and symbol-table information.
322322
errors.GetAddressOf() // [out] A pointer to an ID3DBlob Interface which contains a listing of errors and warnings that occurred during compilation. These errors and warnings are identical to the the debug output from a debugger.
323323
);

RenderSystems/Direct3D11/src/OgreD3D11RenderSystem.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2518,7 +2518,7 @@ namespace Ogre
25182518
{ 4, 0 }, // MSAA 4x
25192519
{ 2, 0 }, // MSAA 2x
25202520
{ 1, 0 }, // MSAA 1x
2521-
{ NULL },
2521+
{ 0 },
25222522
};
25232523

25242524
// Find matching AA mode

RenderSystems/Direct3D11/src/OgreD3D11RenderWindow.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,7 @@ namespace Ogre
812812

813813
_createSwapChain();
814814
_createSizeDependedD3DResources();
815-
mDevice.GetDXGIFactory()->MakeWindowAssociation(mHWnd, NULL);
815+
mDevice.GetDXGIFactory()->MakeWindowAssociation(mHWnd, 0);
816816
setHidden(mHidden);
817817

818818
D3D11RenderSystem* rsys = static_cast<D3D11RenderSystem*>(Root::getSingleton().getRenderSystem());
@@ -834,7 +834,7 @@ namespace Ogre
834834
void D3D11RenderWindowHwnd::notifyDeviceRestored(D3D11Device* device)
835835
{
836836
D3D11RenderWindowSwapChainBased::notifyDeviceRestored(device);
837-
mDevice.GetDXGIFactory()->MakeWindowAssociation(mHWnd, NULL);
837+
mDevice.GetDXGIFactory()->MakeWindowAssociation(mHWnd, 0);
838838
}
839839
//---------------------------------------------------------------------
840840
HRESULT D3D11RenderWindowHwnd::_createSwapChainImpl(IDXGIDeviceN* pDXGIDevice)

0 commit comments

Comments
 (0)