From dadd03fc115dcf3f5434e1b131b7b6392de4a47a Mon Sep 17 00:00:00 2001 From: ocornut Date: Thu, 3 Dec 2015 18:20:48 +0000 Subject: [PATCH] Examples: DirectX10: Fix warning, disable debug device, add ignore list (#424) --- examples/.gitignore | 4 ++++ examples/directx10_example/imgui_impl_dx10.cpp | 5 ++--- examples/directx10_example/main.cpp | 6 +----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/examples/.gitignore b/examples/.gitignore index 61704991..8157afff 100644 --- a/examples/.gitignore +++ b/examples/.gitignore @@ -7,6 +7,10 @@ directx9_example/Debug/* directx9_example/Release/* directx9_example/ipch/* directx9_example/x64/* +directx10_example/Debug/* +directx10_example/Release/* +directx10_example/ipch/* +directx10_example/x64/* directx11_example/Debug/* directx11_example/Release/* directx11_example/ipch/* diff --git a/examples/directx10_example/imgui_impl_dx10.cpp b/examples/directx10_example/imgui_impl_dx10.cpp index 3577e043..fe8d61bd 100644 --- a/examples/directx10_example/imgui_impl_dx10.cpp +++ b/examples/directx10_example/imgui_impl_dx10.cpp @@ -110,7 +110,6 @@ void ImGui_ImplDX10_RenderDrawLists(ImDrawData* draw_data) { (R + L) / (L - R), (T + B) / (B - T), 0.5f, 1.0f }, }; memcpy(&pConstantBuffer->mvp, mvp, sizeof(mvp)); - D3D10_MAPPED_TEXTURE2D texMap; g_pVertexConstantBuffer->Unmap(); } @@ -118,8 +117,8 @@ void ImGui_ImplDX10_RenderDrawLists(ImDrawData* draw_data) { D3D10_VIEWPORT vp; memset(&vp, 0, sizeof(D3D10_VIEWPORT)); - vp.Width = ImGui::GetIO().DisplaySize.x; - vp.Height = ImGui::GetIO().DisplaySize.y; + vp.Width = (UINT)ImGui::GetIO().DisplaySize.x; + vp.Height = (UINT)ImGui::GetIO().DisplaySize.y; vp.MinDepth = 0.0f; vp.MaxDepth = 1.0f; vp.TopLeftX = 0; diff --git a/examples/directx10_example/main.cpp b/examples/directx10_example/main.cpp index 9c71da28..967de1ee 100644 --- a/examples/directx10_example/main.cpp +++ b/examples/directx10_example/main.cpp @@ -58,11 +58,7 @@ HRESULT CreateDeviceD3D(HWND hWnd) } UINT createDeviceFlags = 0; -#ifdef _DEBUG - createDeviceFlags |= D3D10_CREATE_DEVICE_DEBUG; -#endif - D3D_FEATURE_LEVEL featureLevel; - const D3D_FEATURE_LEVEL featureLevelArray[1] = { D3D_FEATURE_LEVEL_10_1, }; + //createDeviceFlags |= D3D10_CREATE_DEVICE_DEBUG; if (D3D10CreateDeviceAndSwapChain(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, createDeviceFlags, D3D10_SDK_VERSION, &sd, &g_pSwapChain, &g_pd3dDevice) != S_OK) return E_FAIL;