summaryrefslogtreecommitdiff
path: root/opengl/libagl/texture.cpp
diff options
context:
space:
mode:
author Mark Salyzyn <salyzyn@google.com> 2014-03-13 23:12:09 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-03-13 23:12:09 +0000
commit993146092f8205d9747f082ccd63c09b536caa4e (patch)
tree89d07eb2647268606632e10e6c9add64b30f7b84 /opengl/libagl/texture.cpp
parent49bfda1fbdf828a8ea63ae2c2fa25739f6e48527 (diff)
parentd4dabf872ac0a12e12aebae9032f7d62762c2aeb (diff)
am d4dabf87: am cdbf28b3: Merge "native frameworks: 64-bit compile issues"
* commit 'd4dabf872ac0a12e12aebae9032f7d62762c2aeb': native frameworks: 64-bit compile issues
Diffstat (limited to 'opengl/libagl/texture.cpp')
-rw-r--r--opengl/libagl/texture.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/opengl/libagl/texture.cpp b/opengl/libagl/texture.cpp
index 08536dfd25..9aa1c4f867 100644
--- a/opengl/libagl/texture.cpp
+++ b/opengl/libagl/texture.cpp
@@ -1223,10 +1223,10 @@ void glTexImage2D(
// ----------------------------------------------------------------------------
void glCompressedTexSubImage2D(
- GLenum target, GLint level, GLint xoffset,
- GLint yoffset, GLsizei width, GLsizei height,
- GLenum format, GLsizei imageSize,
- const GLvoid *data)
+ GLenum /*target*/, GLint /*level*/, GLint /*xoffset*/,
+ GLint /*yoffset*/, GLsizei /*width*/, GLsizei /*height*/,
+ GLenum /*format*/, GLsizei /*imageSize*/,
+ const GLvoid* /*data*/)
{
ogles_context_t* c = ogles_context_t::get();
ogles_error(c, GL_INVALID_ENUM);