X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=apps%2Fd3d11_1%2Ftri.cpp;h=390561ad75f1ec726699abc790ea7f133b3e69e3;hb=8351c1e187d8f65477db05a07bacd5d184c2b950;hp=bf962fca9e6349f416d2f43cb60823341415a8c3;hpb=5a26553410dc781b71da75c163400b801dfbf34a;p=apitrace-tests

diff --git a/apps/d3d11_1/tri.cpp b/apps/d3d11_1/tri.cpp
index bf962fc..390561a 100644
--- a/apps/d3d11_1/tri.cpp
+++ b/apps/d3d11_1/tri.cpp
@@ -34,8 +34,8 @@
 
 #include <d3d11_1.h>
 
-#include "tri_vs.h"
-#include "tri_ps.h"
+#include "tri_vs_4_0.h"
+#include "tri_ps_4_0.h"
 
 
 static IDXGISwapChain* g_pSwapChain = NULL;
@@ -91,10 +91,13 @@ int main(int argc, char *argv[]){
 
     ShowWindow(hWnd, SW_SHOW);
 
+    UINT Flags = 0;
+    if (LoadLibraryA("d3d11sdklayers")) {
+        Flags |= D3D11_CREATE_DEVICE_DEBUG;
+    }
+
     DXGI_SWAP_CHAIN_DESC SwapChainDesc;
     ZeroMemory(&SwapChainDesc, sizeof SwapChainDesc);
-    SwapChainDesc.BufferDesc.Width = WindowWidth;
-    SwapChainDesc.BufferDesc.Height = WindowHeight;
     SwapChainDesc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;;
     SwapChainDesc.BufferDesc.RefreshRate.Numerator = 60;
     SwapChainDesc.BufferDesc.RefreshRate.Denominator = 1;
@@ -115,7 +118,7 @@ int main(int argc, char *argv[]){
     hr = D3D11CreateDeviceAndSwapChain(NULL, /* pAdapter */
                                        D3D_DRIVER_TYPE_HARDWARE,
                                        NULL, /* Software */
-                                       D3D11_CREATE_DEVICE_DEBUG,
+                                       Flags,
                                        FeatureLevels,
                                        sizeof FeatureLevels / sizeof FeatureLevels[0],
                                        D3D11_SDK_VERSION,
@@ -144,7 +147,12 @@ int main(int argc, char *argv[]){
     if (FAILED(hr)) {
         return 1;
     }
-    hr = g_pDevice1->CreateRenderTargetView(pBackBuffer, NULL, &pRenderTargetView);
+    D3D11_RENDER_TARGET_VIEW_DESC RenderTargetViewDesc;
+    ZeroMemory(&RenderTargetViewDesc, sizeof RenderTargetViewDesc);
+    RenderTargetViewDesc.Format = SwapChainDesc.BufferDesc.Format;
+    RenderTargetViewDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D;
+    RenderTargetViewDesc.Texture2D.MipSlice = 0;
+    hr = g_pDevice1->CreateRenderTargetView(pBackBuffer, &RenderTargetViewDesc, &pRenderTargetView);
     if (FAILED(hr)) {
         return 1;
     }
@@ -235,8 +243,12 @@ int main(int argc, char *argv[]){
     RasterizerDesc.CullMode = D3D11_CULL_NONE;
     RasterizerDesc.FillMode = D3D11_FILL_SOLID;
     RasterizerDesc.FrontCounterClockwise = true;
+    RasterizerDesc.DepthClipEnable = true;
     ID3D11RasterizerState* pRasterizerState = NULL;
-    g_pDevice1->CreateRasterizerState(&RasterizerDesc, &pRasterizerState);
+    hr = g_pDevice1->CreateRasterizerState(&RasterizerDesc, &pRasterizerState);
+    if (FAILED(hr)) {
+        return 1;
+    }
     g_pDeviceContext1->RSSetState(pRasterizerState);
 
     g_pDeviceContext1->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);