aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Wachowski <mattwach@google.com>2018-08-10 12:52:43 -0700
committerLingfeng Yang <lfy@google.com>2018-09-21 11:46:05 -0700
commit90e7680cf7d1d6e9065c4ca8b2c4cff5e9f2071a (patch)
tree579c88cd40bc05ebbbb0cb013240dfb1ab60f15c
parentdeb0a70b7a686c55b07c0acf3bb745d555dde8f7 (diff)
downloaddevice_generic_goldfish-opengl-90e7680cf7d1d6e9065c4ca8b2c4cff5e9f2071a.tar.gz
device_generic_goldfish-opengl-90e7680cf7d1d6e9065c4ca8b2c4cff5e9f2071a.tar.bz2
device_generic_goldfish-opengl-90e7680cf7d1d6e9065c4ca8b2c4cff5e9f2071a.zip
Fix compile warnings in system/GLES.
Bug: b/80194417 Test: Recompile and check for warnings. Change-Id: I9acd46ab6831ee12d59a602542d702c5beef63b4
-rw-r--r--system/GLESv1_enc/GLEncoder.cpp10
-rw-r--r--system/GLESv2_enc/GLESv2Validation.cpp7
2 files changed, 3 insertions, 14 deletions
diff --git a/system/GLESv1_enc/GLEncoder.cpp b/system/GLESv1_enc/GLEncoder.cpp
index b698faed..8db973f4 100644
--- a/system/GLESv1_enc/GLEncoder.cpp
+++ b/system/GLESv1_enc/GLEncoder.cpp
@@ -752,8 +752,6 @@ void GLEncoder::s_glGetTexParameterfv(void* self,
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 @@ void GLEncoder::s_glGetTexParameteriv(void* self,
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 @@ void GLEncoder::s_glGetTexParameterxv(void* self,
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 @@ void GLEncoder::s_glTexParameterf(void* self,
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 @@ void GLEncoder::s_glTexParameterfv(void* self,
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 @@ void GLEncoder::s_glTexParameteri(void* self,
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 @@ void GLEncoder::s_glTexParameterx(void* self,
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 @@ void GLEncoder::s_glTexParameteriv(void* self,
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 @@ void GLEncoder::s_glTexParameterxv(void* self,
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])),
diff --git a/system/GLESv2_enc/GLESv2Validation.cpp b/system/GLESv2_enc/GLESv2Validation.cpp
index c96d4898..f736e238 100644
--- a/system/GLESv2_enc/GLESv2Validation.cpp
+++ b/system/GLESv2_enc/GLESv2Validation.cpp
@@ -55,7 +55,6 @@ bool bufferTarget(GL2Encoder* ctx, GLenum target) {
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 @@ bool vertexAttribType(GL2Encoder* ctx, GLenum type)
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 @@ bool colorRenderableFormat(GL2Encoder* ctx, GLenum internalformat) {
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 @@ bool depthRenderableFormat(GL2Encoder* ctx, GLenum internalformat) {
return false;
}
-bool stencilRenderableFormat(GL2Encoder* ctx, GLenum internalformat) {
+bool stencilRenderableFormat(GL2Encoder*, GLenum internalformat) {
switch (internalformat) {
case GL_DEPTH_STENCIL:
case GL_STENCIL_INDEX8: