diff --git a/plugins/GSdx/Renderers/DX11/GSDevice11.cpp b/plugins/GSdx/Renderers/DX11/GSDevice11.cpp index 1caf0fa8ee..73bb87189b 100644 --- a/plugins/GSdx/Renderers/DX11/GSDevice11.cpp +++ b/plugins/GSdx/Renderers/DX11/GSDevice11.cpp @@ -30,9 +30,6 @@ GSDevice11::GSDevice11() { memset(&m_state, 0, sizeof(m_state)); - memset(&m_vs_cb_cache, 0, sizeof(m_vs_cb_cache)); - memset(&m_gs_cb_cache, 0, sizeof(m_gs_cb_cache)); - memset(&m_ps_cb_cache, 0, sizeof(m_ps_cb_cache)); FXAA_Compiled = false; ExShader_Compiled = false; @@ -42,7 +39,7 @@ GSDevice11::GSDevice11() m_mipmap = theApp.GetConfigI("mipmap"); m_upscale_multiplier = theApp.GetConfigI("upscale_multiplier"); - + const BiFiltering nearest_filter = static_cast(theApp.GetConfigI("filter")); const int aniso_level = theApp.GetConfigI("MaxAnisotropy"); if ((nearest_filter != BiFiltering::Nearest && !theApp.GetConfigB("paltex") && aniso_level)) @@ -1353,7 +1350,7 @@ void GSDevice11::OMSetBlendState(ID3D11BlendState* bs, float bf) m_state.bs = bs; m_state.bf = bf; - float BlendFactor[] = {bf, bf, bf, 0}; + const float BlendFactor[] = {bf, bf, bf, 0}; m_ctx->OMSetBlendState(bs, BlendFactor, 0xffffffff); } @@ -1429,7 +1426,7 @@ D3D_SHADER_MACRO* GSDevice11::ShaderMacro::GetPtr(void) return (D3D_SHADER_MACRO*)mout.data(); } -void GSDevice11::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 GSDevice11::CreateShader(const 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) { HRESULT hr; @@ -1452,7 +1449,7 @@ 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) +void GSDevice11::CreateShader(const std::vector& source, const char* fn, ID3DInclude* include, const char* entry, D3D_SHADER_MACRO* macro, ID3D11GeometryShader** gs) { HRESULT hr; @@ -1468,7 +1465,7 @@ 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, ID3D11PixelShader** ps) +void GSDevice11::CreateShader(const std::vector& source, const char* fn, ID3DInclude* include, const char* entry, D3D_SHADER_MACRO* macro, ID3D11PixelShader** ps) { HRESULT hr; @@ -1484,7 +1481,7 @@ void GSDevice11::CreateShader(std::vector source, const char* fn, ID3DIncl } } -void GSDevice11::CompileShader(std::vector source, const char* fn, ID3DInclude *include, const char* entry, D3D_SHADER_MACRO* macro, ID3DBlob** shader, std::string shader_model) +void GSDevice11::CompileShader(const std::vector& source, const char* fn, ID3DInclude* include, const char* entry, D3D_SHADER_MACRO* macro, ID3DBlob** shader, std::string shader_model) { CComPtr error; diff --git a/plugins/GSdx/Renderers/DX11/GSDevice11.h b/plugins/GSdx/Renderers/DX11/GSDevice11.h index 7231ffc788..a5099cf14a 100644 --- a/plugins/GSdx/Renderers/DX11/GSDevice11.h +++ b/plugins/GSdx/Renderers/DX11/GSDevice11.h @@ -562,10 +562,10 @@ public: operator ID3D11Device*() {return m_dev;} operator ID3D11DeviceContext*() {return m_ctx;} - 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, ID3D11PixelShader** ps); + void CreateShader(const 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(const std::vector& source, const char* fn, ID3DInclude* include, const char* entry, D3D_SHADER_MACRO* macro, ID3D11GeometryShader** gs); + void CreateShader(const 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); + void CompileShader(const std::vector& source, const char* fn, ID3DInclude* include, const char* entry, D3D_SHADER_MACRO* macro, ID3DBlob** shader, std::string shader_model); };