commit 28a757c91e3ed7b7466337e51453d78f8f6252e4
author Lingfeng Yang <lfy@google.com> Fri Nov 08 21:37:59 2019 -0800
committer Lingfeng Yang <lfy@google.com> Fri Nov 08 21:37:59 2019 -0800
tree 8ec2b8760ebf84eaf3357d14b34000dfcf3daac6
parent 9a2fa6f8470d8954b8d16bf4f6525aaaba6deabd

Make the client array / enabled cache compatible with older C++

Change-Id: I48c74eae3f26bf1a94fdc03a3966ef802407d7e4

shared/OpenglCodecCommon/GLClientState.cpp

diff --git a/shared/OpenglCodecCommon/GLClientState.cpp b/shared/OpenglCodecCommon/GLClientState.cpp
index d25bd9d..e14d2f7 100644
--- a/shared/OpenglCodecCommon/GLClientState.cpp
+++ b/shared/OpenglCodecCommon/GLClientState.cpp
@@ -41,6 +41,12 @@
 
     m_arrayBuffer = 0;
     m_arrayBuffer_lastEncode = 0;
+
+    m_attribEnableCache = 0;
+    m_vaoAttribBindingCacheInvalid = 0xffff;
+    m_vaoAttribBindingHasClientArrayCache = 0;
+    m_vaoAttribBindingHasVboCache = 0;
+
     m_max_vertex_attrib_bindings = m_nLocations;
     addVertexArrayObject(0);
     setVertexArrayObject(0);

shared/OpenglCodecCommon/GLClientState.h

diff --git a/shared/OpenglCodecCommon/GLClientState.h b/shared/OpenglCodecCommon/GLClientState.h
index 42c0b09..0e346c9 100644
--- a/shared/OpenglCodecCommon/GLClientState.h
+++ b/shared/OpenglCodecCommon/GLClientState.h
@@ -452,10 +452,10 @@
     VAOStateMap m_vaoMap;
     VAOStateRef m_currVaoState;
 
-    uint16_t m_attribEnableCache = 0;
-    uint16_t m_vaoAttribBindingCacheInvalid = 0xffff;
-    uint16_t m_vaoAttribBindingHasClientArrayCache = 0;
-    uint16_t m_vaoAttribBindingHasVboCache = 0;
+    uint16_t m_attribEnableCache;
+    uint16_t m_vaoAttribBindingCacheInvalid;
+    uint16_t m_vaoAttribBindingHasClientArrayCache;
+    uint16_t m_vaoAttribBindingHasVboCache;
 
     // Other buffer id's, other targets
     GLuint m_copyReadBuffer;