mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-06 16:18:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

D3D: Set the geometry shader for triangle primitives.

Browse source
This commit is contained in:
Jules Blok 2014-11-15 01:53:08 +01:00
commit 7c05b9a6d0
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Source/Core/VideoBackends/D3D/Render.cpp
View file

@ -21,6 +21,7 @@
#include "VideoBackends/D3D/D3DState.h" #include "VideoBackends/D3D/D3DState.h"
#include "VideoBackends/D3D/D3DUtil.h" #include "VideoBackends/D3D/D3DUtil.h"
#include "VideoBackends/D3D/FramebufferManager.h" #include "VideoBackends/D3D/FramebufferManager.h"
#include "VideoBackends/D3D/GeometryShaderCache.h"
#include "VideoBackends/D3D/PixelShaderCache.h" #include "VideoBackends/D3D/PixelShaderCache.h"
#include "VideoBackends/D3D/Render.h" #include "VideoBackends/D3D/Render.h"
#include "VideoBackends/D3D/Television.h" #include "VideoBackends/D3D/Television.h"

5
Source/Core/VideoBackends/D3D/VertexManager.cpp
View file

@ -140,11 +140,15 @@ void VertexManager::Draw(u32 stride)
if (current_primitive_type == PRIMITIVE_TRIANGLES) if (current_primitive_type == PRIMITIVE_TRIANGLES)
{ {
D3D::stateman->SetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); D3D::stateman->SetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
D3D::stateman->SetGeometryConstants(VertexShaderCache::GetConstantBuffer());
D3D::stateman->SetGeometryShader(g_ActiveConfig.iStereoMode > 0 ? GeometryShaderCache::GetActiveShader() : nullptr);
D3D::stateman->Apply(); D3D::stateman->Apply();
D3D::context->DrawIndexed(indices, startIndex, baseVertex); D3D::context->DrawIndexed(indices, startIndex, baseVertex);
INCSTAT(stats.thisFrame.numDrawCalls); INCSTAT(stats.thisFrame.numDrawCalls);
D3D::stateman->SetGeometryShader(nullptr);
} }
else if (current_primitive_type == PRIMITIVE_LINES) else if (current_primitive_type == PRIMITIVE_LINES)
{ {
@ -220,6 +224,7 @@ void VertexManager::vFlush(bool useDstAlpha)
if (!GeometryShaderCache::SetShader(components)) if (!GeometryShaderCache::SetShader(components))
{ {
GFX_DEBUGGER_PAUSE_LOG_AT(NEXT_ERROR, true, { printf("Fail to set pixel shader\n"); }); GFX_DEBUGGER_PAUSE_LOG_AT(NEXT_ERROR, true, { printf("Fail to set pixel shader\n"); });
return;
} }
} }