From a5564896ea4cc365843112c66577032627412cec Mon Sep 17 00:00:00 2001 From: Kojin Date: Mon, 24 Dec 2018 21:54:58 -0500 Subject: [PATCH] gsdx-d3d11: remove useless gs creation method --- plugins/GSdx/Renderers/DX11/GSDevice11.cpp | 16 ---------------- plugins/GSdx/Renderers/DX11/GSDevice11.h | 1 - 2 files changed, 17 deletions(-) diff --git a/plugins/GSdx/Renderers/DX11/GSDevice11.cpp b/plugins/GSdx/Renderers/DX11/GSDevice11.cpp index be0df73d3190a..44e2ad682325a 100644 --- a/plugins/GSdx/Renderers/DX11/GSDevice11.cpp +++ b/plugins/GSdx/Renderers/DX11/GSDevice11.cpp @@ -1470,22 +1470,6 @@ void GSDevice11::CreateShader(std::vector source, const char* fn, ID3DIncl } } -void GSDevice11::CreateShader(std::vector source, const char* fn, ID3DInclude *include, const char* entry, D3D_SHADER_MACRO* macro, ID3D11GeometryShader** gs, D3D11_SO_DECLARATION_ENTRY* layout, int count) -{ - HRESULT hr; - - CComPtr shader; - - CompileShader(source, fn, include, entry, macro, &shader, m_shader.gs); - - hr = m_dev->CreateGeometryShaderWithStreamOutput((void*)shader->GetBufferPointer(), shader->GetBufferSize(), layout, count, NULL, 0, D3D11_SO_NO_RASTERIZED_STREAM, NULL, gs); - - if(FAILED(hr)) - { - throw GSDXRecoverableError(); - } -} - void GSDevice11::CreateShader(std::vector source, const char* fn, ID3DInclude *include, const char* entry, D3D_SHADER_MACRO* macro, ID3D11PixelShader** ps) { HRESULT hr; diff --git a/plugins/GSdx/Renderers/DX11/GSDevice11.h b/plugins/GSdx/Renderers/DX11/GSDevice11.h index 5c72e2ef29bf9..2df92ea0bce2b 100644 --- a/plugins/GSdx/Renderers/DX11/GSDevice11.h +++ b/plugins/GSdx/Renderers/DX11/GSDevice11.h @@ -233,7 +233,6 @@ class GSDevice11 : public GSDeviceDX void CreateShader(std::vector source, const char* fn, ID3DInclude *include, const char* entry, D3D_SHADER_MACRO* macro, ID3D11VertexShader** vs, D3D11_INPUT_ELEMENT_DESC* layout, int count, ID3D11InputLayout** il); void CreateShader(std::vector source, const char* fn, ID3DInclude *include, const char* entry, D3D_SHADER_MACRO* macro, ID3D11GeometryShader** gs); - void CreateShader(std::vector source, const char* fn, ID3DInclude *include, const char* entry, D3D_SHADER_MACRO* macro, ID3D11GeometryShader** gs, D3D11_SO_DECLARATION_ENTRY* layout, int count); void CreateShader(std::vector source, const char* fn, ID3DInclude *include, const char* entry, D3D_SHADER_MACRO* macro, ID3D11PixelShader** ps); void CompileShader(std::vector source, const char* fn, ID3DInclude *include, const char* entry, D3D_SHADER_MACRO* macro, ID3DBlob** shader, std::string shader_model);