Mercurial > mm7

changeset 2489:ceda74e07201

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
.
author Ritor1
date Thu, 11 Sep 2014 17:30:59 +0600
parents e8130e8c116f
children 0a0c6d75aabe
files RenderD3D11.cpp RenderD3D11.h
diffstat 2 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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 <d3dcompiler.h>
+#include <d3dcompiler.h>
 #include <comdef.h> // _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
--- 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 <cstdint>
 #include <cstdio>
@@ -170,4 +170,3 @@
     ID3D11RenderTargetView  *primary_srv;
     ID3D11DepthStencilView  *depth_srv;
 };
-*/
\ No newline at end of file