X-Git-Url: https://git.cworth.org/git?p=apitrace-tests;a=blobdiff_plain;f=apps%2Fd3d10_1%2Ftri.cpp;h=7f128bcd0627adc7d75b2fedcf6302f3d4bbb689;hp=3efa49b78c4c19a975b064541e21da2ccdf8af52;hb=29bc86c9885156cfb998ae3aa42ddb026c300398;hpb=eda15ce2928c7ea9560d078581b7321b37b763cc

diff --git a/apps/d3d10_1/tri.cpp b/apps/d3d10_1/tri.cpp
index 3efa49b..7f128bc 100644
--- a/apps/d3d10_1/tri.cpp
+++ b/apps/d3d10_1/tri.cpp
@@ -34,15 +34,19 @@
 
 #include <d3d10_1.h>
 
-#include "tri_vs.h"
-#include "tri_ps.h"
+#include "tri_vs_4_0.h"
+#include "tri_ps_4_0.h"
 
 
+static IDXGIFactory1 *g_pFactory = NULL;
+static IDXGIAdapter *g_pAdapter = NULL;
 static IDXGISwapChain* g_pSwapChain = NULL;
 static ID3D10Device1 * g_pDevice = NULL;
 
 
-int main(int argc, char *argv[]){
+int
+main(int argc, char *argv[])
+{
     HRESULT hr;
 
     HINSTANCE hInstance = GetModuleHandle(NULL);
@@ -88,10 +92,34 @@ int main(int argc, char *argv[]){
 
     ShowWindow(hWnd, SW_SHOW);
 
+    UINT Flags = 0;
+    if (LoadLibraryA("d3d10sdklayers")) {
+        Flags |= D3D10_CREATE_DEVICE_DEBUG;
+    }
+
+    hr = CreateDXGIFactory1(IID_IDXGIFactory1, (void**)(&g_pFactory) );
+    if (FAILED(hr)) {
+        return 1;
+    }
+
+    hr = g_pFactory->EnumAdapters(0, &g_pAdapter);
+    if (FAILED(hr)) {
+        return 1;
+    }
+
+    hr = D3D10CreateDevice1(g_pAdapter,
+                            D3D10_DRIVER_TYPE_HARDWARE,
+                            NULL,
+                            Flags,
+                            D3D10_FEATURE_LEVEL_10_0,
+                            D3D10_1_SDK_VERSION,
+                            &g_pDevice);
+    if (FAILED(hr)) {
+        return 1;
+    }
+
     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;
@@ -101,16 +129,9 @@ int main(int argc, char *argv[]){
     SwapChainDesc.BufferCount = 2;
     SwapChainDesc.OutputWindow = hWnd;
     SwapChainDesc.Windowed = true;
+    SwapChainDesc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD;
 
-    hr = D3D10CreateDeviceAndSwapChain1(NULL,
-                                        D3D10_DRIVER_TYPE_HARDWARE,
-                                        NULL,
-                                        D3D10_CREATE_DEVICE_DEBUG,
-                                        D3D10_FEATURE_LEVEL_10_0,
-                                        D3D10_1_SDK_VERSION,
-                                        &SwapChainDesc,
-                                        &g_pSwapChain,
-                                        &g_pDevice);
+    hr = g_pFactory->CreateSwapChain(g_pDevice, &SwapChainDesc, &g_pSwapChain);
     if (FAILED(hr)) {
         return 1;
     }
@@ -121,7 +142,12 @@ int main(int argc, char *argv[]){
     if (FAILED(hr)) {
         return 1;
     }
-    hr = g_pDevice->CreateRenderTargetView(pBackBuffer, NULL, &pRenderTargetView);
+    D3D10_RENDER_TARGET_VIEW_DESC RenderTargetViewDesc;
+    ZeroMemory(&RenderTargetViewDesc, sizeof RenderTargetViewDesc);
+    RenderTargetViewDesc.Format = SwapChainDesc.BufferDesc.Format;
+    RenderTargetViewDesc.ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2D;
+    RenderTargetViewDesc.Texture2D.MipSlice = 0;
+    hr = g_pDevice->CreateRenderTargetView(pBackBuffer, &RenderTargetViewDesc, &pRenderTargetView);
     if (FAILED(hr)) {
         return 1;
     }
@@ -212,8 +238,12 @@ int main(int argc, char *argv[]){
     RasterizerDesc.CullMode = D3D10_CULL_NONE;
     RasterizerDesc.FillMode = D3D10_FILL_SOLID;
     RasterizerDesc.FrontCounterClockwise = true;
+    RasterizerDesc.DepthClipEnable = true;
     ID3D10RasterizerState* pRasterizerState = NULL;
-    g_pDevice->CreateRasterizerState(&RasterizerDesc, &pRasterizerState);
+    hr = g_pDevice->CreateRasterizerState(&RasterizerDesc, &pRasterizerState);
+    if (FAILED(hr)) {
+        return 1;
+    }
     g_pDevice->RSSetState(pRasterizerState);
 
     g_pDevice->IASetPrimitiveTopology(D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);