From: José Fonseca Date: Wed, 9 May 2012 09:56:29 +0000 (+0100) Subject: Attempt of a d3d11.1 test. X-Git-Url: https://git.cworth.org/git?p=apitrace-tests;a=commitdiff_plain;h=7502b519d86575f6ffdd0c4552e54d1cd5808c99 Attempt of a d3d11.1 test. --- diff --git a/app_driver.py b/app_driver.py index 9d7a9f0..56d839c 100755 --- a/app_driver.py +++ b/app_driver.py @@ -181,6 +181,7 @@ class AppDriver(Driver): 'd3d10': 'd3d10', 'd3d10_1': 'd3d10_1', 'd3d11': 'd3d11', + 'd3d11_1': 'd3d11', } api_retrace_map = { diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt index 9b1e886..2098b5d 100644 --- a/apps/CMakeLists.txt +++ b/apps/CMakeLists.txt @@ -36,6 +36,10 @@ if (DirectX_FXC_EXECUTABLE) add_subdirectory (hlsl) endif () +if (DirectX_D3D11_1_FOUND) + add_subdirectory (d3d11_1) +endif () + if (DirectX_D3D11_FOUND) add_subdirectory (d3d11) endif () diff --git a/apps/d3d11/tri.cpp b/apps/d3d11/tri.cpp index 1649bbf..1ccf20c 100644 --- a/apps/d3d11/tri.cpp +++ b/apps/d3d11/tri.cpp @@ -250,6 +250,9 @@ int main(int argc, char *argv[]){ g_pSwapChain->Release(); g_pSwapChain = NULL; + g_pDeviceContext->Release(); + g_pDeviceContext = NULL; + g_pDevice->Release(); g_pDevice = NULL; diff --git a/apps/d3d11_1/CMakeLists.txt b/apps/d3d11_1/CMakeLists.txt new file mode 100644 index 0000000..adfde3a --- /dev/null +++ b/apps/d3d11_1/CMakeLists.txt @@ -0,0 +1,29 @@ +include_directories ( + ${CMAKE_CURRENT_SOURCE_DIR}/../hlsl + ${APITRACE_SOURCE_DIR}/dispatch + ${DirectX_D3D11_1_INCLUDE_DIR} +) + +link_libraries ( + ${DirectX_D3D11_LIBRARY} +) + +set (api d3d11_1) + +set (targets + tri +) + +foreach (target ${targets}) + add_executable (${api}_${target} ${target}.cpp) + set_target_properties (${api}_${target} PROPERTIES OUTPUT_NAME ${target}) + + if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${target}.ref.txt) + add_app_test( + NAME ${api}_${target} + TARGET ${api}_${target} + REF ${target}.ref.txt + ) + endif () +endforeach (target) + diff --git a/apps/d3d11_1/tri.cpp b/apps/d3d11_1/tri.cpp new file mode 100644 index 0000000..d3c3bff --- /dev/null +++ b/apps/d3d11_1/tri.cpp @@ -0,0 +1,288 @@ +/************************************************************************** + * + * Copyright 2012 Jose Fonseca + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + **************************************************************************/ + + +#include +#include + +#include +#include + +#include "compat.h" + +#include + +#include "tri_vs.h" +#include "tri_ps.h" + + +static IDXGISwapChain* g_pSwapChain = NULL; +static ID3D11Device * g_pDevice = NULL; +static ID3D11DeviceContext * g_pDeviceContext = NULL; +static ID3D11Device1 * g_pDevice1 = NULL; +static ID3D11DeviceContext1 * g_pDeviceContext1 = NULL; + + +int main(int argc, char *argv[]){ + HRESULT hr; + + HINSTANCE hInstance = GetModuleHandle(NULL); + + WNDCLASSEX wc = { + sizeof(WNDCLASSEX), + CS_CLASSDC, + DefWindowProc, + 0, + 0, + hInstance, + NULL, + NULL, + NULL, + NULL, + "SimpleDX10", + NULL + }; + RegisterClassEx(&wc); + + const int WindowWidth = 250; + const int WindowHeight = 250; + BOOL Windowed = TRUE; + + DWORD dwStyle = WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW; + + RECT rect = {0, 0, WindowWidth, WindowHeight}; + AdjustWindowRect(&rect, dwStyle, FALSE); + + HWND hWnd = CreateWindow(wc.lpszClassName, + "Simple example using DirectX10", + dwStyle, + CW_USEDEFAULT, CW_USEDEFAULT, + rect.right - rect.left, + rect.bottom - rect.top, + NULL, + NULL, + hInstance, + NULL); + if (!hWnd) { + return 1; + } + + ShowWindow(hWnd, SW_SHOW); + + 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; + SwapChainDesc.SampleDesc.Quality = 0; + SwapChainDesc.SampleDesc.Count = 1; + SwapChainDesc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + SwapChainDesc.BufferCount = 2; + SwapChainDesc.OutputWindow = hWnd; + SwapChainDesc.Windowed = true; + + D3D_FEATURE_LEVEL FeatureLevel = D3D_FEATURE_LEVEL_11_1; + + hr = D3D11CreateDeviceAndSwapChain(NULL, /* pAdapter */ + D3D_DRIVER_TYPE_HARDWARE, + NULL, /* Software */ + D3D11_CREATE_DEVICE_DEBUG, +#if 0 + &FeatureLevel, + 1, +#else + NULL, + 0, +#endif + D3D11_SDK_VERSION, + &SwapChainDesc, + &g_pSwapChain, + &g_pDevice, + NULL, /* pFeatureLevel */ + &g_pDeviceContext); /* ppImmediateContext */ + if (FAILED(hr)) { + return 1; + } + + hr = g_pDevice->QueryInterface(IID_ID3D11Device1, (void **)&g_pDevice1); + if (FAILED(hr)) { + return 1; + } + + hr = g_pDeviceContext->QueryInterface(IID_ID3D11DeviceContext1, (void **)&g_pDeviceContext1); + if (FAILED(hr)) { + return 1; + } + + ID3D11RenderTargetView *pRenderTargetView = NULL; + ID3D11Texture2D* pBackBuffer; + hr = g_pSwapChain->GetBuffer(0, IID_ID3D11Texture2D, (void **)&pBackBuffer); + if (FAILED(hr)) { + return 1; + } + hr = g_pDevice1->CreateRenderTargetView(pBackBuffer, NULL, &pRenderTargetView); + if (FAILED(hr)) { + return 1; + } + pBackBuffer->Release(); + + g_pDeviceContext1->OMSetRenderTargets(1, &pRenderTargetView, NULL); + + const float clearColor[4] = { 0.3f, 0.1f, 0.3f, 1.0f }; + g_pDeviceContext1->ClearRenderTargetView(pRenderTargetView, clearColor); + + ID3D11VertexShader * pVertexShader; + hr = g_pDevice1->CreateVertexShader(g_VS, sizeof g_VS, NULL, &pVertexShader); + if (FAILED(hr)) { + return 1; + } + + struct Vertex { + float position[4]; + float color[4]; + }; + + static const D3D11_INPUT_ELEMENT_DESC InputElementDescs[] = { + { "POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, offsetof(Vertex, position), D3D11_INPUT_PER_VERTEX_DATA, 0 }, + { "COLOR", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, offsetof(Vertex, color), D3D11_INPUT_PER_VERTEX_DATA, 0 } + }; + + ID3D11InputLayout *pVertexLayout = NULL; + hr = g_pDevice1->CreateInputLayout(InputElementDescs, + 2, + g_VS, + sizeof g_VS, + &pVertexLayout); + if (FAILED(hr)) { + return 1; + } + + g_pDeviceContext1->IASetInputLayout(pVertexLayout); + + ID3D11PixelShader * pPixelShader; + hr = g_pDevice1->CreatePixelShader(g_PS, sizeof g_PS, NULL, &pPixelShader); + if (FAILED(hr)) { + return 1; + } + + g_pDeviceContext1->VSSetShader(pVertexShader, NULL, 0); + g_pDeviceContext1->PSSetShader(pPixelShader, NULL, 0); + + static const Vertex vertices[] = { + { { -0.9f, -0.9f, 0.5f, 1.0f}, { 0.8f, 0.0f, 0.0f, 0.1f } }, + { { 0.9f, -0.9f, 0.5f, 1.0f}, { 0.0f, 0.9f, 0.0f, 0.1f } }, + { { 0.0f, 0.9f, 0.5f, 1.0f}, { 0.0f, 0.0f, 0.7f, 0.1f } }, + }; + + D3D11_BUFFER_DESC BufferDesc; + ZeroMemory(&BufferDesc, sizeof BufferDesc); + BufferDesc.Usage = D3D11_USAGE_DYNAMIC; + BufferDesc.ByteWidth = sizeof vertices; + BufferDesc.BindFlags = D3D11_BIND_VERTEX_BUFFER; + BufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; + BufferDesc.MiscFlags = 0; + + D3D11_SUBRESOURCE_DATA BufferData; + BufferData.pSysMem = vertices; + BufferData.SysMemPitch = 0; + BufferData.SysMemSlicePitch = 0; + + ID3D11Buffer *pVertexBuffer; + hr = g_pDevice1->CreateBuffer(&BufferDesc, &BufferData, &pVertexBuffer); + if (FAILED(hr)) { + return 1; + } + + UINT Stride = sizeof(Vertex); + UINT Offset = 0; + g_pDeviceContext1->IASetVertexBuffers(0, 1, &pVertexBuffer, &Stride, &Offset); + + D3D11_VIEWPORT ViewPort; + ViewPort.TopLeftX = 0; + ViewPort.TopLeftY = 0; + ViewPort.Width = WindowWidth; + ViewPort.Height = WindowHeight; + ViewPort.MinDepth = 0.0f; + ViewPort.MaxDepth = 1.0f; + g_pDeviceContext1->RSSetViewports(1, &ViewPort); + + D3D11_RASTERIZER_DESC RasterizerDesc; + ZeroMemory(&RasterizerDesc, sizeof RasterizerDesc); + RasterizerDesc.CullMode = D3D11_CULL_NONE; + RasterizerDesc.FillMode = D3D11_FILL_SOLID; + RasterizerDesc.FrontCounterClockwise = true; + ID3D11RasterizerState* pRasterizerState = NULL; + g_pDevice1->CreateRasterizerState(&RasterizerDesc, &pRasterizerState); + g_pDeviceContext1->RSSetState(pRasterizerState); + + g_pDeviceContext1->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + g_pDeviceContext1->Draw(3, 0); + + g_pSwapChain->Present(0, 0); + + + ID3D11Buffer *pNullBuffer = NULL; + UINT NullStride = 0; + UINT NullOffset = 0; + g_pDeviceContext1->IASetVertexBuffers(0, 1, &pNullBuffer, &NullStride, &NullOffset); + pVertexBuffer->Release(); + + g_pDeviceContext1->OMSetRenderTargets(0, NULL, NULL); + pRenderTargetView->Release(); + + g_pDeviceContext1->IASetInputLayout(NULL); + pVertexLayout->Release(); + + g_pDeviceContext1->VSSetShader(NULL, NULL, 0); + pVertexShader->Release(); + + g_pDeviceContext1->PSSetShader(NULL, NULL, 0); + pPixelShader->Release(); + + g_pDeviceContext1->RSSetState(NULL); + pRasterizerState->Release(); + + g_pSwapChain->Release(); + g_pSwapChain = NULL; + + g_pDeviceContext1->Release(); + g_pDeviceContext1 = NULL; + + g_pDevice1->Release(); + g_pDevice1 = NULL; + + g_pDeviceContext->Release(); + g_pDeviceContext = NULL; + + g_pDevice->Release(); + g_pDevice = NULL; + + DestroyWindow(hWnd); + + return 0; +} + diff --git a/apps/d3d11_1/tri.ref.txt b/apps/d3d11_1/tri.ref.txt new file mode 100644 index 0000000..e69de29