diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2015-12-28 10:09:11 +0100 |
|---|---|---|
| committer | Markus Wick <degasus@users.noreply.github.com> | 2015-12-28 10:09:11 +0100 |
| commit | 281860eafa65d7f65b02cc449ac94397d0f111f4 (patch) | |
| tree | 23cfbe61f97089c1806eeb1e1d249d0b43fa622a /Source/Core/VideoBackends/OGL/ProgramShaderCache.h | |
| parent | cec1a759769bea2d7a224f99d6ee34ad9a602bed (diff) | |
| parent | c5f123a70b2bb9db5721383b07a7343b78693883 (diff) | |
Merge pull request #3400 from lioncash/shadergen
ShaderGen: Get rid of static buffers
Diffstat (limited to 'Source/Core/VideoBackends/OGL/ProgramShaderCache.h')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/ProgramShaderCache.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h index 32e84c07af..d20da70d2f 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h @@ -91,8 +91,8 @@ public: static SHADER* SetShader(DSTALPHA_MODE dstAlphaMode, u32 primitive_type); static void GetShaderId(SHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 primitive_type); - static bool CompileShader(SHADER &shader, const char* vcode, const char* pcode, const char* gcode = nullptr); - static GLuint CompileSingleShader(GLuint type, const char *code); + static bool CompileShader(SHADER &shader, const std::string& vcode, const std::string& pcode, const std::string& gcode = ""); + static GLuint CompileSingleShader(GLuint type, const std::string& code); static void UploadConstants(); static void Init(); |