2 files changed, 6 insertions, 12 deletions
diff --git a/emulator/opengl/host/libs/Translator/GLES_CM/GLEScmContext.cpp b/emulator/opengl/host/libs/Translator/GLES_CM/GLEScmContext.cpp
index abf461c..ecf51bb 100644
--- a/emulator/opengl/host/libs/Translator/GLES_CM/GLEScmContext.cpp
+++ b/emulator/opengl/host/libs/Translator/GLES_CM/GLEScmContext.cpp
@@ -31,13 +31,10 @@ void GLEScmContext::init() {
         m_texCoords = new GLESpointer[s_glSupport.maxTexUnits];
         m_map[GL_TEXTURE_COORD_ARRAY]  = &m_texCoords[m_clientActiveTexture];
 
-        const char* baseRenderer = (const char*)dispatcher().glGetString(GL_RENDERER);
-        size_t baseRendererLen = strlen(baseRenderer);
-        s_glRenderer.clear();
-        s_glRenderer.reserve(19 + baseRendererLen);
-        s_glRenderer.append("OpenGL ES-CM 1.1 (", 18);
-        s_glRenderer.append(baseRenderer, baseRendererLen);
-        s_glRenderer.append(")", 1);
+        buildStrings((const char*)dispatcher().glGetString(GL_VENDOR),
+                     (const char*)dispatcher().glGetString(GL_RENDERER),
+                     (const char*)dispatcher().glGetString(GL_VERSION),
+                     "OpenGL ES-CM 1.1");
     }
     m_initialized = true;
 }
diff --git a/emulator/opengl/host/libs/Translator/GLES_CM/GLEScmImp.cpp b/emulator/opengl/host/libs/Translator/GLES_CM/GLEScmImp.cpp
index b78a022..3ae271f 100644
--- a/emulator/opengl/host/libs/Translator/GLES_CM/GLEScmImp.cpp
+++ b/emulator/opengl/host/libs/Translator/GLES_CM/GLEScmImp.cpp
@@ -248,16 +248,13 @@ GL_API GLenum GL_APIENTRY  glGetError(void) {
 GL_API const GLubyte * GL_APIENTRY  glGetString( GLenum name) {
 
     GET_CTX_RET(NULL)
-    static const GLubyte VENDOR[]  = "Google";
-    static const GLubyte VERSION[] = "OpenGL ES-CM 1.1";
-
     switch(name) {
         case GL_VENDOR:
-            return VENDOR;
+            return (const GLubyte*)ctx->getVendorString();
         case GL_RENDERER:
             return (const GLubyte*)ctx->getRendererString();
         case GL_VERSION:
-            return VERSION;
+            return (const GLubyte*)ctx->getVersionString();
         case GL_EXTENSIONS:
             return (const GLubyte*)ctx->getExtensionString();
         default: