summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Turner <digit@google.com>2014-12-10 08:53:33 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-12-10 08:53:34 +0000
commit5f23bd4a95e854a2a7f01ddbda17bb858873ad44 (patch)
treedbdbbcad9d7c3bff9bd034c6977f719f9c2564ce
parent8e0631aab1cdc64d01d176cfaf5ca721cbe3f24d (diff)
parent2e74d05cf71810cd25ac69d656c3bfa01aef7907 (diff)
downloadgoldfish-lollipop-wear-release.tar.gz
Merge "Fix a missed function override in GLEncoder.cpp"android-wear-5.0.0_r1lollipop-wear-release
-rw-r--r--opengl/system/GLESv1_enc/GLEncoder.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/opengl/system/GLESv1_enc/GLEncoder.cpp b/opengl/system/GLESv1_enc/GLEncoder.cpp
index 0fe1d8e8..d6f45a89 100644
--- a/opengl/system/GLESv1_enc/GLEncoder.cpp
+++ b/opengl/system/GLESv1_enc/GLEncoder.cpp
@@ -933,6 +933,7 @@ GLEncoder::GLEncoder(IOStream *stream) : gl_encoder_context_t(stream)
OVERRIDE(glPixelStorei);
OVERRIDE(glVertexPointer);
OVERRIDE(glNormalPointer);
+ OVERRIDE(glColorPointer);
OVERRIDE(glPointSizePointerOES);
OVERRIDE(glClientActiveTexture);
OVERRIDE(glTexCoordPointer);