From 6c3eed2dd74386a87fa3896c4efbc23284c2b507 Mon Sep 17 00:00:00 2001 From: vng Date: Sat, 3 Mar 2012 00:42:29 +0300 Subject: [PATCH] Factor out glGetString to separate function. --- yg/resource_manager.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/yg/resource_manager.cpp b/yg/resource_manager.cpp index 8b8f90ed83..9dac8f6f74 100644 --- a/yg/resource_manager.cpp +++ b/yg/resource_manager.cpp @@ -354,6 +354,21 @@ namespace yg m_debuggingFlags.push_back(false); } +namespace +{ + void GetGLStringSafe(GLenum name, string & str) + { + char const * s = reinterpret_cast(glGetString(name)); + if (s) + str = s; + else + { + OGLCHECKAFTER; + LOG(LWARNING, ("Can't get OpenGL name")); + } + } +} + ResourceManager::Params::Params() : m_rtFormat(yg::Data8Bpp), m_texFormat(yg::Data4Bpp), @@ -372,23 +387,8 @@ namespace yg m_styleCacheTexturesParams("styleCacheTexture"), m_guiThreadTexturesParams("guiThreadTexture") { - char const * s = reinterpret_cast(glGetString(GL_VENDOR)); - if (s) - m_vendorName = s; - else - { - OGLCHECKAFTER; - LOG(LWARNING, ("Can't get vendor name from OpenGL")); - } - - s = reinterpret_cast(glGetString(GL_RENDERER)); - if (s) - m_rendererName = s; - else - { - OGLCHECKAFTER; - LOG(LWARNING, ("Can't get renderer name from OpenGL")); - } + GetGLStringSafe(GL_VENDOR, m_vendorName); + GetGLStringSafe(GL_RENDERER, m_rendererName); } bool ResourceManager::Params::isGPU(char const * vendorName, char const * rendererName) const