Merge pull request #1706 from Armada651/line-width

VideoCommon: Merge LineGeometryShader into GeometryShaderGen.

1 files changed, 3 insertions, 7 deletions

diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp
index 0f5aaa8853..95fa5e1e57 100644
--- a/Source/Core/VideoBackends/D3D/Render.cpp
+++ b/Source/Core/VideoBackends/D3D/Render.cpp
@@ -1105,13 +1105,14 @@ void Renderer::ApplyState(bool bUseDstAlpha)
 	}
 
 	ID3D11Buffer* vertexConstants = VertexShaderCache::GetConstantBuffer();
-	ID3D11Buffer* pixelConstants = PixelShaderCache::GetConstantBuffer();
 
-	D3D::stateman->SetPixelConstants(pixelConstants, g_ActiveConfig.bEnablePixelLighting ? vertexConstants : nullptr);
+	D3D::stateman->SetPixelConstants(PixelShaderCache::GetConstantBuffer(), g_ActiveConfig.bEnablePixelLighting ? vertexConstants : nullptr);
 	D3D::stateman->SetVertexConstants(vertexConstants);
+	D3D::stateman->SetGeometryConstants(GeometryShaderCache::GetConstantBuffer());
 
 	D3D::stateman->SetPixelShader(PixelShaderCache::GetActiveShader());
 	D3D::stateman->SetVertexShader(VertexShaderCache::GetActiveShader());
+	D3D::stateman->SetGeometryShader(GeometryShaderCache::GetActiveShader());
 }
 
 void Renderer::RestoreState()
@@ -1252,11 +1253,6 @@ void Renderer::SetDitherMode()
 	// TODO: Set dither mode to bpmem.blendmode.dither
 }
 
-void Renderer::SetLineWidth()
-{
-	// TODO
-}
-
 void Renderer::SetSamplerState(int stage, int texindex)
 {
 	const FourTexUnits &tex = bpmem.tex[texindex];