summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/D3D/VertexManager.cpp
diff options
context:
space:
mode:
authorStenzek <stenzek@gmail.com>2018-02-25 01:15:35 +1000
committerStenzek <stenzek@gmail.com>2018-03-10 15:56:30 +1000
commitdec0c3bce85ceda89ea05f00b94aad00e675598d (patch)
tree8c967a47d8a531ae3f0245e419d7ec652535ee3a /Source/Core/VideoBackends/D3D/VertexManager.cpp
parent24df896eb8d1520706b086039743ef2dca7ce6df (diff)
Move shader caches to VideoCommon
Diffstat (limited to 'Source/Core/VideoBackends/D3D/VertexManager.cpp')
-rw-r--r--Source/Core/VideoBackends/D3D/VertexManager.cpp42
1 files changed, 12 insertions, 30 deletions
diff --git a/Source/Core/VideoBackends/D3D/VertexManager.cpp b/Source/Core/VideoBackends/D3D/VertexManager.cpp
index d4aec17bf4..f9861c08a8 100644
--- a/Source/Core/VideoBackends/D3D/VertexManager.cpp
+++ b/Source/Core/VideoBackends/D3D/VertexManager.cpp
@@ -11,6 +11,7 @@
#include "VideoBackends/D3D/BoundingBox.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/D3DState.h"
+#include "VideoBackends/D3D/FramebufferManager.h"
#include "VideoBackends/D3D/GeometryShaderCache.h"
#include "VideoBackends/D3D/PixelShaderCache.h"
#include "VideoBackends/D3D/Render.h"
@@ -135,42 +136,23 @@ void VertexManager::Draw(u32 stride)
void VertexManager::vFlush()
{
- if (!PixelShaderCache::SetShader())
- {
- GFX_DEBUGGER_PAUSE_LOG_AT(NEXT_ERROR, true, { printf("Fail to set pixel shader\n"); });
- return;
- }
-
- D3DVertexFormat* vertex_format =
- static_cast<D3DVertexFormat*>(VertexLoaderManager::GetCurrentVertexFormat());
- if (!VertexShaderCache::SetShader(vertex_format))
- {
- GFX_DEBUGGER_PAUSE_LOG_AT(NEXT_ERROR, true, { printf("Fail to set pixel shader\n"); });
- return;
- }
+ u32 stride = VertexLoaderManager::GetCurrentVertexFormat()->GetVertexStride();
+ PrepareDrawBuffers(stride);
- if (!GeometryShaderCache::SetShader(m_current_primitive_type))
- {
- GFX_DEBUGGER_PAUSE_LOG_AT(NEXT_ERROR, true, { printf("Fail to set pixel shader\n"); });
+ if (!m_current_pipeline_object)
return;
- }
- if (g_ActiveConfig.backend_info.bSupportsBBox && BoundingBox::active)
- {
- D3D::context->OMSetRenderTargetsAndUnorderedAccessViews(
- D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL, nullptr, nullptr, 2, 1, &BBox::GetUAV(),
- nullptr);
- }
+ FramebufferManager::SetIntegerEFBRenderTarget(
+ m_current_pipeline_config.blending_state.logicopenable);
+ g_renderer->SetPipeline(m_current_pipeline_object);
- u32 stride = VertexLoaderManager::GetCurrentVertexFormat()->GetVertexStride();
-
- PrepareDrawBuffers(stride);
-
- g_renderer->ApplyState();
+ ID3D11Buffer* vertexConstants = VertexShaderCache::GetConstantBuffer();
+ D3D::stateman->SetPixelConstants(PixelShaderCache::GetConstantBuffer(),
+ g_ActiveConfig.bEnablePixelLighting ? vertexConstants : nullptr);
+ D3D::stateman->SetVertexConstants(vertexConstants);
+ D3D::stateman->SetGeometryConstants(GeometryShaderCache::GetConstantBuffer());
Draw(stride);
-
- g_renderer->RestoreState();
}
void VertexManager::ResetBuffer(u32 stride)