# HG changeset patch # User Ritor1 # Date 1410435059 -21600 # Node ID ceda74e072016244f0f5bab906e2455a0a477283 # Parent e8130e8c116fd5e1e9ae910393c4b99d77b78b7b . diff -r e8130e8c116f -r ceda74e07201 RenderD3D11.cpp --- a/RenderD3D11.cpp Thu Sep 11 17:26:30 2014 +0600 +++ b/RenderD3D11.cpp Thu Sep 11 17:30:59 2014 +0600 @@ -1,4 +1,4 @@ -/*#include +#include #include // _com_error #include "ErrorHandling.h" @@ -231,7 +231,7 @@ unsigned int device_flags = 0;//D3D11_CREATE_DEVICE_DISABLE_GPU_TIMEOUT; #ifndef NODEBUG - device_flags |= 0/*D3D11_CREATE_DEVICE_DEBUG | D3D11_CREATE_DEVICE_DEBUGGABLE*//*; + device_flags |= 0/*D3D11_CREATE_DEVICE_DEBUG | D3D11_CREATE_DEVICE_DEBUGGABLE*/; #endif HRESULT (__stdcall *dll_D3D11CreateDeviceAndSwapChain)(IDXGIAdapter* pAdapter, D3D_DRIVER_TYPE DriverType, HMODULE Software, UINT Flags, CONST D3D_FEATURE_LEVEL* pFeatureLevels, UINT FeatureLevels, UINT SDKVersion, CONST DXGI_SWAP_CHAIN_DESC* pSwapChainDesc, IDXGISwapChain** ppSwapChain, ID3D11Device** ppDevice, D3D_FEATURE_LEVEL* pFeatureLevel, ID3D11DeviceContext** ppImmediateContext); @@ -242,7 +242,7 @@ { MessageBoxA(nullptr, "Received Direct3D 9 or lower", "", 0); __debugbreak(); - }*/ + } /*if (fullscreen) { extern void ChangeResolution(int new_dith, int new_height, int new_bpp); @@ -253,7 +253,7 @@ } ErrorD3D(pSwapChain->SetFullscreenState(fullscreen, nullptr));*/ -/* + ID3D11Texture2D *pSwapChainSurface; { ErrorD3D(pSwapChain->GetBuffer(0, __uuidof(ID3D11Texture2D), (void **)&pSwapChainSurface)); @@ -322,4 +322,4 @@ d3dc->RSSetViewports(1, &viewport); return true; -}*/ \ No newline at end of file +} \ No newline at end of file diff -r e8130e8c116f -r ceda74e07201 RenderD3D11.h --- a/RenderD3D11.h Thu Sep 11 17:26:30 2014 +0600 +++ b/RenderD3D11.h Thu Sep 11 17:30:59 2014 +0600 @@ -1,4 +1,4 @@ -/*#pragma once +#pragma once #include #include @@ -170,4 +170,3 @@ ID3D11RenderTargetView *primary_srv; ID3D11DepthStencilView *depth_srv; }; -*/ \ No newline at end of file