From 842c9aff1d3636053ca25d07d36d6bced14954e9 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 18 Apr 2016 14:41:24 -0700 Subject: [PATCH] Death to legacy NULL --- DDSView/ddsview.cpp | 84 ++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/DDSView/ddsview.cpp b/DDSView/ddsview.cpp index 2229879..639e94a 100644 --- a/DDSView/ddsview.cpp +++ b/DDSView/ddsview.cpp @@ -60,25 +60,25 @@ struct CBArrayControl #include "shaders\psCube.h" //-------------------------------------------------------------------------------------- -HINSTANCE g_hInst = NULL; -HWND g_hWnd = NULL; +HINSTANCE g_hInst = nullptr; +HWND g_hWnd = nullptr; D3D_DRIVER_TYPE g_driverType = D3D_DRIVER_TYPE_NULL; D3D_FEATURE_LEVEL g_featureLevel = D3D_FEATURE_LEVEL_11_0; -ID3D11Device* g_pd3dDevice = NULL; -ID3D11DeviceContext* g_pImmediateContext = NULL; -IDXGISwapChain* g_pSwapChain = NULL; -ID3D11RenderTargetView* g_pRenderTargetView = NULL; -ID3D11Texture2D* g_pDepthStencil = NULL; -ID3D11DepthStencilView* g_pDepthStencilView = NULL; -ID3D11VertexShader* g_pVertexShader = NULL; -ID3D11PixelShader* g_pPixelShader = NULL; -ID3D11InputLayout* g_pVertexLayout = NULL; -ID3D11Buffer* g_pVertexBuffer = NULL; -ID3D11Buffer* g_pIndexBuffer = NULL; -ID3D11Buffer* g_pCBArrayControl = NULL; -ID3D11ShaderResourceView* g_pSRV = NULL; -ID3D11BlendState* g_AlphaBlendState = NULL; -ID3D11SamplerState* g_pSamplerLinear = NULL; +ID3D11Device* g_pd3dDevice = nullptr; +ID3D11DeviceContext* g_pImmediateContext = nullptr; +IDXGISwapChain* g_pSwapChain = nullptr; +ID3D11RenderTargetView* g_pRenderTargetView = nullptr; +ID3D11Texture2D* g_pDepthStencil = nullptr; +ID3D11DepthStencilView* g_pDepthStencilView = nullptr; +ID3D11VertexShader* g_pVertexShader = nullptr; +ID3D11PixelShader* g_pPixelShader = nullptr; +ID3D11InputLayout* g_pVertexLayout = nullptr; +ID3D11Buffer* g_pVertexBuffer = nullptr; +ID3D11Buffer* g_pIndexBuffer = nullptr; +ID3D11Buffer* g_pCBArrayControl = nullptr; +ID3D11ShaderResourceView* g_pSRV = nullptr; +ID3D11BlendState* g_AlphaBlendState = nullptr; +ID3D11SamplerState* g_pSamplerLinear = nullptr; UINT g_iCurrentIndex = 0; UINT g_iMaxIndex = 1; @@ -102,7 +102,7 @@ int WINAPI wWinMain( _In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, if ( !*lpCmdLine ) { - MessageBox( NULL, L"Usage: ddsview ", L"DDSView", MB_OK | MB_ICONEXCLAMATION ); + MessageBox( nullptr, L"Usage: ddsview ", L"DDSView", MB_OK | MB_ICONEXCLAMATION ); return 0; } @@ -112,7 +112,7 @@ int WINAPI wWinMain( _In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, { WCHAR buff[2048] = { 0 }; swprintf_s( buff, L"Failed to open texture file\n\nFilename = %ls\nHRESULT %08X", lpCmdLine, hr ); - MessageBox( NULL, buff, L"DDSView", MB_OK | MB_ICONEXCLAMATION ); + MessageBox( nullptr, buff, L"DDSView", MB_OK | MB_ICONEXCLAMATION ); return 0; } @@ -133,7 +133,7 @@ int WINAPI wWinMain( _In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, { WCHAR buff[2048] = { 0 }; swprintf_s( buff, L"Arrays of volume textures are not supported\n\nFilename = %ls\nArray size %Iu", lpCmdLine, mdata.arraySize ); - MessageBox( NULL, buff, L"DDSView", MB_OK | MB_ICONEXCLAMATION ); + MessageBox( nullptr, buff, L"DDSView", MB_OK | MB_ICONEXCLAMATION ); return 0; } @@ -156,7 +156,7 @@ int WINAPI wWinMain( _In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, { WCHAR buff[2048] = { 0 }; swprintf_s( buff, L"BC6H/BC7 requires DirectX 11 hardware\n\nFilename = %ls\nDXGI Format %d\nFeature Level %d", lpCmdLine, mdata.format, g_featureLevel ); - MessageBox( NULL, buff, L"DDSView", MB_OK | MB_ICONEXCLAMATION ); + MessageBox( nullptr, buff, L"DDSView", MB_OK | MB_ICONEXCLAMATION ); return 0; } break; @@ -169,7 +169,7 @@ int WINAPI wWinMain( _In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, { WCHAR buff[2048] = { 0 }; swprintf_s( buff, L"Format not supported by DirectX hardware\n\nFilename = %ls\nDXGI Format %d\nFeature Level %d\nHRESULT = %08X", lpCmdLine, mdata.format, g_featureLevel, hr ); - MessageBox( NULL, buff, L"DDSView", MB_OK | MB_ICONEXCLAMATION ); + MessageBox( nullptr, buff, L"DDSView", MB_OK | MB_ICONEXCLAMATION ); return 0; } } @@ -182,7 +182,7 @@ int WINAPI wWinMain( _In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, { WCHAR buff[2048] = { 0 }; swprintf_s( buff, L"Failed to load texture file\n\nFilename = %ls\nHRESULT %08X", lpCmdLine, hr ); - MessageBox( NULL, buff, L"DDSView", MB_OK | MB_ICONEXCLAMATION ); + MessageBox( nullptr, buff, L"DDSView", MB_OK | MB_ICONEXCLAMATION ); return 0; } @@ -194,7 +194,7 @@ int WINAPI wWinMain( _In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, { WCHAR buff[2048] = { 0 }; swprintf_s( buff, L"Failed creating texture from file\n\nFilename = %ls\nHRESULT = %08X", lpCmdLine, hr ); - MessageBox( NULL, buff, L"DDSView", MB_OK | MB_ICONEXCLAMATION ); + MessageBox( nullptr, buff, L"DDSView", MB_OK | MB_ICONEXCLAMATION ); return 0; } @@ -202,7 +202,7 @@ int WINAPI wWinMain( _In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, MSG msg = {0}; while( WM_QUIT != msg.message ) { - if( PeekMessage( &msg, NULL, 0, 0, PM_REMOVE ) ) + if( PeekMessage( &msg, nullptr, 0, 0, PM_REMOVE ) ) { TranslateMessage( &msg ); DispatchMessage( &msg ); @@ -230,9 +230,9 @@ HRESULT InitWindow( HINSTANCE hInstance, int nCmdShow, const TexMetadata& mdata wcex.cbWndExtra = 0; wcex.hInstance = hInstance; wcex.hIcon = LoadIcon( hInstance, ( LPCTSTR )IDI_MAIN_ICON ); - wcex.hCursor = LoadCursor( NULL, IDC_ARROW ); + wcex.hCursor = LoadCursor( nullptr, IDC_ARROW ); wcex.hbrBackground = ( HBRUSH )( COLOR_WINDOW + 1 ); - wcex.lpszMenuName = NULL; + wcex.lpszMenuName = nullptr; wcex.lpszClassName = L"DDSViewWindowClass"; wcex.hIconSm = LoadIcon( wcex.hInstance, ( LPCTSTR )IDI_MAIN_ICON ); if( !RegisterClassEx( &wcex ) ) @@ -260,8 +260,8 @@ HRESULT InitWindow( HINSTANCE hInstance, int nCmdShow, const TexMetadata& mdata AdjustWindowRect( &rc, WS_OVERLAPPEDWINDOW, FALSE ); g_hWnd = CreateWindow( L"DDSViewWindowClass", L"DDS View", WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT, CW_USEDEFAULT, rc.right - rc.left, rc.bottom - rc.top, NULL, NULL, hInstance, - NULL ); + CW_USEDEFAULT, CW_USEDEFAULT, rc.right - rc.left, rc.bottom - rc.top, nullptr, nullptr, hInstance, + nullptr ); if( !g_hWnd ) return E_FAIL; @@ -307,7 +307,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam if ( index < g_iMaxIndex ) g_iCurrentIndex = index; } - InvalidateRect( hWnd, NULL, FALSE ); + InvalidateRect( hWnd, nullptr, FALSE ); break; default: @@ -366,7 +366,7 @@ HRESULT InitDevice( const TexMetadata& mdata ) for( UINT driverTypeIndex = 0; driverTypeIndex < numDriverTypes; driverTypeIndex++ ) { g_driverType = driverTypes[driverTypeIndex]; - hr = D3D11CreateDeviceAndSwapChain( NULL, g_driverType, NULL, createDeviceFlags, featureLevels, numFeatureLevels, + hr = D3D11CreateDeviceAndSwapChain( nullptr, g_driverType, nullptr, createDeviceFlags, featureLevels, numFeatureLevels, D3D11_SDK_VERSION, &sd, &g_pSwapChain, &g_pd3dDevice, &g_featureLevel, &g_pImmediateContext ); if( SUCCEEDED( hr ) ) break; @@ -375,12 +375,12 @@ HRESULT InitDevice( const TexMetadata& mdata ) return hr; // Create a render target view - ID3D11Texture2D* pBackBuffer = NULL; - hr = g_pSwapChain->GetBuffer( 0, __uuidof( ID3D11Texture2D ), ( LPVOID* )&pBackBuffer ); + ID3D11Texture2D* pBackBuffer = nullptr; + hr = g_pSwapChain->GetBuffer( 0, IID_PPV_ARGS(&pBackBuffer) ); if( FAILED( hr ) ) return hr; - hr = g_pd3dDevice->CreateRenderTargetView( pBackBuffer, NULL, &g_pRenderTargetView ); + hr = g_pd3dDevice->CreateRenderTargetView( pBackBuffer, nullptr, &g_pRenderTargetView ); pBackBuffer->Release(); if( FAILED( hr ) ) return hr; @@ -399,7 +399,7 @@ HRESULT InitDevice( const TexMetadata& mdata ) descDepth.BindFlags = D3D11_BIND_DEPTH_STENCIL; descDepth.CPUAccessFlags = 0; descDepth.MiscFlags = 0; - hr = g_pd3dDevice->CreateTexture2D( &descDepth, NULL, &g_pDepthStencil ); + hr = g_pd3dDevice->CreateTexture2D( &descDepth, nullptr, &g_pDepthStencil ); if( FAILED( hr ) ) return hr; @@ -426,7 +426,7 @@ HRESULT InitDevice( const TexMetadata& mdata ) g_pImmediateContext->RSSetViewports( 1, &vp ); // Create the vertex shader - hr = g_pd3dDevice->CreateVertexShader( g_VS, sizeof(g_VS), NULL, &g_pVertexShader ); + hr = g_pd3dDevice->CreateVertexShader( g_VS, sizeof(g_VS), nullptr, &g_pVertexShader ); if( FAILED( hr ) ) return hr; @@ -449,7 +449,7 @@ HRESULT InitDevice( const TexMetadata& mdata ) // Select the pixel shader bool isCubeMap = false; bool is1D = false; - const BYTE* pshader = NULL; + const BYTE* pshader = nullptr; size_t pshader_size = 0; switch ( mdata.dimension ) @@ -499,7 +499,7 @@ HRESULT InitDevice( const TexMetadata& mdata ) assert( pshader && pshader_size > 0 ); // Create the pixel shader - hr = g_pd3dDevice->CreatePixelShader( pshader, pshader_size, NULL, &g_pPixelShader ); + hr = g_pd3dDevice->CreatePixelShader( pshader, pshader_size, nullptr, &g_pPixelShader ); if( FAILED( hr ) ) return hr; @@ -649,7 +649,7 @@ HRESULT InitDevice( const TexMetadata& mdata ) bd.ByteWidth = sizeof(CBArrayControl); bd.BindFlags = D3D11_BIND_CONSTANT_BUFFER; bd.CPUAccessFlags = 0; - hr = g_pd3dDevice->CreateBuffer( &bd, NULL, &g_pCBArrayControl ); + hr = g_pd3dDevice->CreateBuffer( &bd, nullptr, &g_pCBArrayControl ); if( FAILED( hr ) ) return hr; @@ -702,10 +702,10 @@ void Render() CBArrayControl cb; cb.Index = (float)g_iCurrentIndex; - g_pImmediateContext->UpdateSubresource( g_pCBArrayControl, 0, NULL, &cb, 0, 0 ); + g_pImmediateContext->UpdateSubresource( g_pCBArrayControl, 0, nullptr, &cb, 0, 0 ); - g_pImmediateContext->VSSetShader( g_pVertexShader, NULL, 0 ); - g_pImmediateContext->PSSetShader( g_pPixelShader, NULL, 0 ); + g_pImmediateContext->VSSetShader( g_pVertexShader, nullptr, 0 ); + g_pImmediateContext->PSSetShader( g_pPixelShader, nullptr, 0 ); g_pImmediateContext->PSSetConstantBuffers( 0, 1, &g_pCBArrayControl ); g_pImmediateContext->PSSetShaderResources( 0, 1, &g_pSRV ); g_pImmediateContext->PSSetSamplers( 0, 1, &g_pSamplerLinear );