Refactor GL extension getting part in checksum setup.

Change-Id: Ieb26ce5682a87821935a5b639e5242942d13ac21

diff --git a/system/OpenglSystemCommon/HostConnection.cpp b/system/OpenglSystemCommon/HostConnection.cpp
index 0a30d27..54b28e7 100644 (file)
--- a/system/OpenglSystemCommon/HostConnection.cpp
+++ b/system/OpenglSystemCommon/HostConnection.cpp
@@ -157,21 +157,26 @@ gl2_client_context_t *HostConnection::s_getGL2Context()
     return NULL;
 }
 
-void HostConnection::setChecksumHelper(renderControl_encoder_context_t *rcEnc) {
+std::string HostConnection::queryGLExtensions(renderControl_encoder_context_t *rcEnc) {
     std::unique_ptr<char[]> glExtensions;
     int extensionSize = rcEnc->rcGetGLString(rcEnc, GL_EXTENSIONS, NULL, 0);
     if (extensionSize < 0) {
-        glExtensions = std::unique_ptr<char[]>(new char[-extensionSize]);
+        glExtensions.reset(new char[-extensionSize]);
         extensionSize = rcEnc->rcGetGLString(rcEnc, GL_EXTENSIONS, glExtensions.get(), -extensionSize);
         if (extensionSize <= 0) {
             glExtensions.reset();
+            return std::string();
         }
     }
+    return std::string(glExtensions.get(), extensionSize);
+}
+
+void HostConnection::setChecksumHelper(renderControl_encoder_context_t *rcEnc) {
+    std::string glExtensions = queryGLExtensions(rcEnc);
     // check the host supported version
     uint32_t checksumVersion = 0;
     const char* checksumPrefix = ChecksumCalculator::getMaxVersionStrPrefix();
-    const char* glProtocolStr = glExtensions.get() ?
-            strstr(glExtensions.get(), checksumPrefix) : NULL;
+    const char* glProtocolStr = strstr(glExtensions.c_str(), checksumPrefix);
     if (glProtocolStr) {
         uint32_t maxVersion = ChecksumCalculator::getMaxVersion();
         sscanf(glProtocolStr+strlen(checksumPrefix), "%d", &checksumVersion);

diff --git a/system/OpenglSystemCommon/HostConnection.h b/system/OpenglSystemCommon/HostConnection.h
index a52fbfa..3896288 100644 (file)
--- a/system/OpenglSystemCommon/HostConnection.h
+++ b/system/OpenglSystemCommon/HostConnection.h
@@ -20,6 +20,8 @@
 #include "renderControl_enc.h"
 #include "ChecksumCalculator.h"
 
+#include <string>
+
 class GLEncoder;
 class gl_client_context_t;
 class GL2Encoder;
@@ -46,6 +48,8 @@ private:
     HostConnection();
     static gl_client_context_t  *s_getGLContext();
     static gl2_client_context_t *s_getGL2Context();
+
+    std::string queryGLExtensions(renderControl_encoder_context_t *rcEnc);
     // setProtocol initilizes GL communication protocol for checksums
     // should be called when m_rcEnc is created
     void setChecksumHelper(renderControl_encoder_context_t *rcEnc);