diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-03-15 00:57:56 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-03-15 00:57:56 +0100 |
| commit | 8d679e76d299956a1521bc14502466be8d8b2df8 (patch) | |
| tree | 97db9ad6a45a8e5d711d7763199579e400a65bc8 /Source/Core/VideoBackends/OGL/GLUtil.cpp | |
| parent | 12c2e345a35a571aadc842e30c38b3b4d8f70dce (diff) | |
| parent | a82675b7d581421fa80d5d5c53253cf1d5c1a26d (diff) | |
Merge pull request #164 from lioncash/cstr-cull
Kill off some usages of c_str.
Diffstat (limited to 'Source/Core/VideoBackends/OGL/GLUtil.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/GLUtil.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/Core/VideoBackends/OGL/GLUtil.cpp b/Source/Core/VideoBackends/OGL/GLUtil.cpp index 9c5226309d..cafc157145 100644 --- a/Source/Core/VideoBackends/OGL/GLUtil.cpp +++ b/Source/Core/VideoBackends/OGL/GLUtil.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "Common/IniFile.h" +#include "Common/StringUtil.h" #include "Core/ConfigManager.h" #include "Core/Core.h" @@ -27,11 +28,9 @@ unsigned int VideoBackend::PeekMessages() } // Show the current FPS -void VideoBackend::UpdateFPSDisplay(const char *text) +void VideoBackend::UpdateFPSDisplay(const std::string& text) { - char temp[100]; - snprintf(temp, sizeof temp, "%s | %s | %s", scm_rev_str, GetDisplayName().c_str(), text); - return GLInterface->UpdateFPSDisplay(temp); + return GLInterface->UpdateFPSDisplay(StringFromFormat("%s | %s | %s", scm_rev_str, GetDisplayName().c_str(), text.c_str())); } } @@ -48,7 +47,7 @@ void InitInterface() #endif } -GLuint OpenGL_CompileProgram ( const char* vertexShader, const char* fragmentShader ) +GLuint OpenGL_CompileProgram(const char* vertexShader, const char* fragmentShader) { // generate objects GLuint vertexShaderID = glCreateShader(GL_VERTEX_SHADER); |