diff options
Diffstat (limited to 'emulator/opengl/host/libs/Translator/GLES_V2')
-rw-r--r-- | emulator/opengl/host/libs/Translator/GLES_V2/GLESv2Context.cpp | 11 | ||||
-rw-r--r-- | emulator/opengl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp | 6 |
2 files changed, 6 insertions, 11 deletions
diff --git a/emulator/opengl/host/libs/Translator/GLES_V2/GLESv2Context.cpp b/emulator/opengl/host/libs/Translator/GLES_V2/GLESv2Context.cpp index 73acb61..1457cec 100644 --- a/emulator/opengl/host/libs/Translator/GLES_V2/GLESv2Context.cpp +++ b/emulator/opengl/host/libs/Translator/GLES_V2/GLESv2Context.cpp @@ -28,13 +28,10 @@ void GLESv2Context::init() { } setAttribute0value(0.0, 0.0, 0.0, 1.0); - const char* baseRenderer = (const char*)dispatcher().glGetString(GL_RENDERER); - size_t baseRendererLen = strlen(baseRenderer); - s_glRenderer.clear(); - s_glRenderer.reserve(16 + baseRendererLen); - s_glRenderer.append("OpenGL ES 2.0 (", 15); - 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 2.0"); } m_initialized = true; } diff --git a/emulator/opengl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp b/emulator/opengl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp index 412584d..7ae9427 100644 --- a/emulator/opengl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp +++ b/emulator/opengl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp @@ -1316,16 +1316,14 @@ GL_APICALL void GL_APIENTRY glGetShaderSource(GLuint shader, GLsizei bufsize, G GL_APICALL const GLubyte* GL_APIENTRY glGetString(GLenum name){ GET_CTX_RET(NULL) - static const GLubyte VENDOR[] = "Google"; - static const GLubyte VERSION[] = "OpenGL ES 2.0"; static const GLubyte SHADING[] = "OpenGL ES GLSL ES 1.0.17"; 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_SHADING_LANGUAGE_VERSION: return SHADING; case GL_EXTENSIONS: |