commit b79f8897472251589814b4690367a50e6ca20096
author Matt Wachowski <mattwach@google.com> Tue Aug 14 22:56:31 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 14 22:56:31 2018 +0000
tree 8097d801fe9f07bcf0ea1d3bc7692349774740af
parent bfc89ff6ab29ecd0cb9e6f3e60410f4bd61c4451
parent bce0f493ae53c3a8584c730dcce4d75ce07b49d9

Merge "Fix compile warnings in system/GLES." into pi-dev

system/GLESv1_enc/GLEncoder.cpp

diff --git a/system/GLESv1_enc/GLEncoder.cpp b/system/GLESv1_enc/GLEncoder.cpp
index b698fae..8db973f 100644
--- a/system/GLESv1_enc/GLEncoder.cpp
+++ b/system/GLESv1_enc/GLEncoder.cpp
@@ -752,8 +752,6 @@
         GLenum target, GLenum pname, GLfloat* params)
 {
     GLEncoder* ctx = (GLEncoder*)self;
-    const GLClientState* state = ctx->m_state;
-
     if (target == GL_TEXTURE_2D || target == GL_TEXTURE_EXTERNAL_OES) {
         ctx->override2DTextureTarget(target);
         ctx->m_glGetTexParameterfv_enc(ctx, GL_TEXTURE_2D, pname, params);
@@ -767,7 +765,6 @@
         GLenum target, GLenum pname, GLint* params)
 {
     GLEncoder* ctx = (GLEncoder*)self;
-    const GLClientState* state = ctx->m_state;
 
     switch (pname) {
     case GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES:
@@ -790,7 +787,6 @@
         GLenum target, GLenum pname, GLfixed* params)
 {
     GLEncoder* ctx = (GLEncoder*)self;
-    const GLClientState* state = ctx->m_state;
 
     if (target == GL_TEXTURE_2D || target == GL_TEXTURE_EXTERNAL_OES) {
         ctx->override2DTextureTarget(target);
@@ -824,7 +820,6 @@
         GLenum target, GLenum pname, GLfloat param)
 {
     GLEncoder* ctx = (GLEncoder*)self;
-    const GLClientState* state = ctx->m_state;
 
     SET_ERROR_IF((target == GL_TEXTURE_EXTERNAL_OES &&
             !isValidTextureExternalParam(pname, (GLenum)param)),
@@ -843,7 +838,6 @@
         GLenum target, GLenum pname, const GLfloat* params)
 {
     GLEncoder* ctx = (GLEncoder*)self;
-    const GLClientState* state = ctx->m_state;
 
     SET_ERROR_IF((target == GL_TEXTURE_EXTERNAL_OES &&
             !isValidTextureExternalParam(pname, (GLenum)params[0])),
@@ -862,7 +856,6 @@
         GLenum target, GLenum pname, GLint param)
 {
     GLEncoder* ctx = (GLEncoder*)self;
-    const GLClientState* state = ctx->m_state;
 
     SET_ERROR_IF((target == GL_TEXTURE_EXTERNAL_OES &&
             !isValidTextureExternalParam(pname, (GLenum)param)),
@@ -881,7 +874,6 @@
         GLenum target, GLenum pname, GLfixed param)
 {
     GLEncoder* ctx = (GLEncoder*)self;
-    const GLClientState* state = ctx->m_state;
 
     SET_ERROR_IF((target == GL_TEXTURE_EXTERNAL_OES &&
             !isValidTextureExternalParam(pname, (GLenum)param)),
@@ -900,7 +892,6 @@
         GLenum target, GLenum pname, const GLint* params)
 {
     GLEncoder* ctx = (GLEncoder*)self;
-    const GLClientState* state = ctx->m_state;
 
     SET_ERROR_IF((target == GL_TEXTURE_EXTERNAL_OES &&
             !isValidTextureExternalParam(pname, (GLenum)params[0])),
@@ -919,7 +910,6 @@
         GLenum target, GLenum pname, const GLfixed* params)
 {
     GLEncoder* ctx = (GLEncoder*)self;
-    const GLClientState* state = ctx->m_state;
 
     SET_ERROR_IF((target == GL_TEXTURE_EXTERNAL_OES &&
             !isValidTextureExternalParam(pname, (GLenum)params[0])),

system/GLESv2_enc/GLESv2Validation.cpp

diff --git a/system/GLESv2_enc/GLESv2Validation.cpp b/system/GLESv2_enc/GLESv2Validation.cpp
index c96d489..f736e23 100644
--- a/system/GLESv2_enc/GLESv2Validation.cpp
+++ b/system/GLESv2_enc/GLESv2Validation.cpp
@@ -55,7 +55,6 @@
 
 bool bufferParam(GL2Encoder* ctx, GLenum pname) {
     int glesMajorVersion = ctx->majorVersion();
-    int glesMinorVersion = ctx->minorVersion();
     switch (pname) {
     case GL_BUFFER_SIZE:
     case GL_BUFFER_USAGE:
@@ -289,7 +288,7 @@
     return retval;
 }
 
-bool readPixelsFboFormatMatch(GLenum format, GLenum type, GLenum fboTexType) {
+bool readPixelsFboFormatMatch(GLenum, GLenum type, GLenum fboTexType) {
 #define INVALID_TYPE_MATCH(x, y) \
     if (type == x && fboTexType == y) return false; \
     if (type == y && fboTexType == x) return false; \
@@ -591,7 +590,7 @@
     return false;
 }
 
-bool depthRenderableFormat(GL2Encoder* ctx, GLenum internalformat) {
+bool depthRenderableFormat(GL2Encoder*, GLenum internalformat) {
     switch (internalformat) {
     case GL_DEPTH_COMPONENT:
     case GL_DEPTH_STENCIL:
@@ -605,7 +604,7 @@
     return false;
 }
 
-bool stencilRenderableFormat(GL2Encoder* ctx, GLenum internalformat) {
+bool stencilRenderableFormat(GL2Encoder*, GLenum internalformat) {
     switch (internalformat) {
     case GL_DEPTH_STENCIL:
     case GL_STENCIL_INDEX8: