diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-08-24 02:23:54 +0200 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-08-24 02:23:54 +0200 |
commit | 0eaf7e1daafb6789d40fd760cc022f3ec91301c4 (patch) | |
tree | 4866fd69a9173fbd8f0ced29e3ddd7f87deb7b35 /src/video_core/renderer_opengl/gl_shader_util.cpp | |
parent | Merge pull request #4559 from lioncash/webresult (diff) | |
download | yuzu-0eaf7e1daafb6789d40fd760cc022f3ec91301c4.tar yuzu-0eaf7e1daafb6789d40fd760cc022f3ec91301c4.tar.gz yuzu-0eaf7e1daafb6789d40fd760cc022f3ec91301c4.tar.bz2 yuzu-0eaf7e1daafb6789d40fd760cc022f3ec91301c4.tar.lz yuzu-0eaf7e1daafb6789d40fd760cc022f3ec91301c4.tar.xz yuzu-0eaf7e1daafb6789d40fd760cc022f3ec91301c4.tar.zst yuzu-0eaf7e1daafb6789d40fd760cc022f3ec91301c4.zip |
Diffstat (limited to 'src/video_core/renderer_opengl/gl_shader_util.cpp')
-rw-r--r-- | src/video_core/renderer_opengl/gl_shader_util.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_util.cpp b/src/video_core/renderer_opengl/gl_shader_util.cpp index 9e74eda0d..4bf0d6090 100644 --- a/src/video_core/renderer_opengl/gl_shader_util.cpp +++ b/src/video_core/renderer_opengl/gl_shader_util.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include <string_view> #include <vector> #include <glad/glad.h> #include "common/assert.h" @@ -11,7 +12,8 @@ namespace OpenGL::GLShader { namespace { -const char* GetStageDebugName(GLenum type) { + +std::string_view StageDebugName(GLenum type) { switch (type) { case GL_VERTEX_SHADER: return "vertex"; @@ -25,12 +27,17 @@ const char* GetStageDebugName(GLenum type) { UNIMPLEMENTED(); return "unknown"; } + } // Anonymous namespace -GLuint LoadShader(const char* source, GLenum type) { - const char* debug_type = GetStageDebugName(type); +GLuint LoadShader(std::string_view source, GLenum type) { + const std::string_view debug_type = StageDebugName(type); const GLuint shader_id = glCreateShader(type); - glShaderSource(shader_id, 1, &source, nullptr); + + const GLchar* source_string = source.data(); + const GLint source_length = static_cast<GLint>(source.size()); + + glShaderSource(shader_id, 1, &source_string, &source_length); LOG_DEBUG(Render_OpenGL, "Compiling {} shader...", debug_type); glCompileShader(shader_id); |