summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/RenderBase.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-05-30 03:07:40 -0400
committerLioncash <mathew1800@gmail.com>2019-05-30 03:29:35 -0400
commite60268bd4274de510f5214d6eedafba30a253984 (patch)
treeb61f50ed4f35058192ab5d06ecada979edf1f1dc /Source/Core/VideoCommon/RenderBase.cpp
parent80d8173d29749b13ccdf84e75641e179ea34768b (diff)
VideoCommon/RenderBase: Use a std::string_view with CreateShaderFromSource()
Greatly simplifies the overall interface when it comes to compiling shaders. Also allows getting rid of a std::string overload of the same name. Now std::string and const char* both go through the same function.
Diffstat (limited to 'Source/Core/VideoCommon/RenderBase.cpp')
-rw-r--r--Source/Core/VideoCommon/RenderBase.cpp14
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");