Fix compile warnings found in shared/OpenglCodecCommon.
Bug: b/80194417
Test: Recompile and look for warnings.
Change-Id: Icd4ad776ffbe8daf3e6c3af821149cadf4657d78
diff --git a/shared/OpenglCodecCommon/GLClientState.h b/shared/OpenglCodecCommon/GLClientState.h
index 675cea4..491fb73 100644
--- a/shared/OpenglCodecCommon/GLClientState.h
+++ b/shared/OpenglCodecCommon/GLClientState.h
@@ -146,9 +146,9 @@
struct VAOState {
VAOState(GLuint ibo, int nLoc, int nBindings) :
- element_array_buffer_binding(ibo),
attribState(nLoc),
- bindingState(nBindings) { }
+ bindingState(nBindings),
+ element_array_buffer_binding(ibo) { }
VertexAttribStateVector attribState;
VertexAttribBindingVector bindingState;
GLuint element_array_buffer_binding;
diff --git a/shared/OpenglCodecCommon/IndexRangeCache.h b/shared/OpenglCodecCommon/IndexRangeCache.h
index f19bd24..5f77958 100644
--- a/shared/OpenglCodecCommon/IndexRangeCache.h
+++ b/shared/OpenglCodecCommon/IndexRangeCache.h
@@ -75,10 +75,8 @@
primitiveRestartEnabled(_primitiveRestart) { }
bool operator<(const IndexRangeKey& rhs) const {
- size_t start = offset;
size_t start_other = rhs.offset;
size_t end = offset + count * glSizeof(type);
- size_t end_other = rhs.offset + rhs.count * glSizeof(rhs.type);
if (end <= start_other) {
return true;
diff --git a/shared/OpenglCodecCommon/SocketStream.cpp b/shared/OpenglCodecCommon/SocketStream.cpp
index f7a2314..e813142 100644
--- a/shared/OpenglCodecCommon/SocketStream.cpp
+++ b/shared/OpenglCodecCommon/SocketStream.cpp
@@ -112,7 +112,6 @@
const unsigned char *SocketStream::readFully(void *buf, size_t len)
{
- const unsigned char* ret = NULL;
if (!valid()) return NULL;
if (!buf) {
return NULL; // do not allow NULL buf in that implementation
