From c9e469f8320af16307ad1dd6208e88457999bf3c Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Fri, 19 Dec 2014 12:48:23 +0100 Subject: [PATCH] D3DState: Remove wireframe rasterizer support. --- Source/Core/VideoBackends/D3D/D3DState.cpp | 2 +- Source/Core/VideoBackends/D3D/D3DState.h | 1 - Source/Core/VideoBackends/D3D/Render.cpp | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Source/Core/VideoBackends/D3D/D3DState.cpp b/Source/Core/VideoBackends/D3D/D3DState.cpp index d4d98e35b8..1f219fa2e2 100644 --- a/Source/Core/VideoBackends/D3D/D3DState.cpp +++ b/Source/Core/VideoBackends/D3D/D3DState.cpp @@ -407,7 +407,7 @@ ID3D11RasterizerState* StateCache::Get(RasterizerState state) if (it != m_raster.end()) return it->second; - D3D11_RASTERIZER_DESC rastdc = CD3D11_RASTERIZER_DESC(state.wireframe ? D3D11_FILL_WIREFRAME : D3D11_FILL_SOLID, + D3D11_RASTERIZER_DESC rastdc = CD3D11_RASTERIZER_DESC(D3D11_FILL_SOLID, state.cull_mode, false, 0, 0.f, 0, true, true, false, false); diff --git a/Source/Core/VideoBackends/D3D/D3DState.h b/Source/Core/VideoBackends/D3D/D3DState.h index 2910eb9358..a2bb4e61c9 100644 --- a/Source/Core/VideoBackends/D3D/D3DState.h +++ b/Source/Core/VideoBackends/D3D/D3DState.h @@ -22,7 +22,6 @@ namespace DX11 union RasterizerState { BitField<0, 2, D3D11_CULL_MODE> cull_mode; - BitField<2, 1, u32> wireframe; u32 packed; }; diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp index 5af7c988bd..9609fbf722 100644 --- a/Source/Core/VideoBackends/D3D/Render.cpp +++ b/Source/Core/VideoBackends/D3D/Render.cpp @@ -255,7 +255,6 @@ Renderer::Renderer(void *&window_handle) gx_state.zmode.func = ZMode::NEVER; gx_state.raster.cull_mode = D3D11_CULL_NONE; - gx_state.raster.wireframe = false; // Clear EFB textures float ClearColor[4] = { 0.f, 0.f, 0.f, 1.f };