diff options
| author | Léo Lam <leo@innovatetechnologi.es> | 2019-05-30 14:12:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-30 14:12:18 +0200 |
| commit | 2ce587f781aa4257a17ea68938f9a6ce18c0bc38 (patch) | |
| tree | 21ae223b4cf1a4a4a8e4b0805621231cf2849144 /Source/Core/VideoCommon/RenderBase.cpp | |
| parent | 8d8ed37e275766beedf9ff2fb447c95acf7bb0eb (diff) | |
| parent | 1831dcbe6f3a2119bebc572654805045f0f0c473 (diff) | |
Merge pull request #8142 from lioncash/shader-view
VideoCommon/RenderBase: Use std::string_view with CreateShaderFromSource()
Diffstat (limited to 'Source/Core/VideoCommon/RenderBase.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/RenderBase.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index 222b1ba9ab..8c3f89de57 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -148,12 +148,6 @@ void Renderer::SetAndClearFramebuffer(AbstractFramebuffer* framebuffer, m_current_framebuffer = framebuffer; } -std::unique_ptr<AbstractShader> Renderer::CreateShaderFromSource(ShaderStage stage, - const std::string& source) -{ - return CreateShaderFromSource(stage, source.c_str(), source.size()); -} - bool Renderer::EFBHasAlphaChannel() const { return m_prev_efb_format == PEControl::RGBA6_Z24; @@ -980,10 +974,10 @@ bool Renderer::InitializeImGui() const std::string vertex_shader_source = GenerateImGuiVertexShader(); const std::string pixel_shader_source = GenerateImGuiPixelShader(); - std::unique_ptr<AbstractShader> vertex_shader = CreateShaderFromSource( - ShaderStage::Vertex, vertex_shader_source.c_str(), vertex_shader_source.size()); - std::unique_ptr<AbstractShader> pixel_shader = CreateShaderFromSource( - ShaderStage::Pixel, pixel_shader_source.c_str(), pixel_shader_source.size()); + std::unique_ptr<AbstractShader> vertex_shader = + CreateShaderFromSource(ShaderStage::Vertex, vertex_shader_source); + std::unique_ptr<AbstractShader> pixel_shader = + CreateShaderFromSource(ShaderStage::Pixel, pixel_shader_source); if (!vertex_shader || !pixel_shader) { PanicAlert("Failed to compile imgui shaders"); |
