diff options
author | David 'Digit' Turner <digit@google.com> | 2014-10-30 18:07:56 +0100 |
---|---|---|
committer | David 'Digit' Turner <digit@google.com> | 2014-10-30 21:07:49 +0100 |
commit | 1da62b8c565c544cb00863b531109d7db1a8801e (patch) | |
tree | c7e0bcdfdb3ff91ce7ef8464c12859d405460af9 /opengl/system/GLESv1_enc | |
parent | 7472654eec2594e6476b38cea396a3f213dedd1a (diff) | |
download | android_device_generic_goldfish-1da62b8c565c544cb00863b531109d7db1a8801e.tar.gz android_device_generic_goldfish-1da62b8c565c544cb00863b531109d7db1a8801e.tar.bz2 android_device_generic_goldfish-1da62b8c565c544cb00863b531109d7db1a8801e.zip |
opengl: Fix a few function name typos.
A small preliminary patch to make future patches slightly
simpler, easier to merge into the internal tree.
Change-Id: Iec649b61349106d4531a6e28141c0f0687a144c5
Diffstat (limited to 'opengl/system/GLESv1_enc')
-rw-r--r-- | opengl/system/GLESv1_enc/GLEncoder.cpp | 8 | ||||
-rw-r--r-- | opengl/system/GLESv1_enc/GLEncoder.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/opengl/system/GLESv1_enc/GLEncoder.cpp b/opengl/system/GLESv1_enc/GLEncoder.cpp index 989c26f..c283764 100644 --- a/opengl/system/GLESv1_enc/GLEncoder.cpp +++ b/opengl/system/GLESv1_enc/GLEncoder.cpp @@ -282,7 +282,7 @@ void GLEncoder::s_glColorPointer(void *self, int size, GLenum type, GLsizei stri ctx->m_state->setState(GLClientState::COLOR_LOCATION, size, type, false, stride, data); } -void GLEncoder::s_glPointsizePointer(void *self, GLenum type, GLsizei stride, const void *data) +void GLEncoder::s_glPointSizePointerOES(void *self, GLenum type, GLsizei stride, const void *data) { GLEncoder *ctx = (GLEncoder *)self; assert(ctx->m_state != NULL); @@ -296,7 +296,7 @@ void GLEncoder::s_glClientActiveTexture(void *self, GLenum texture) ctx->m_state->setActiveTexture(texture - GL_TEXTURE0); } -void GLEncoder::s_glTexcoordPointer(void *self, int size, GLenum type, GLsizei stride, const void *data) +void GLEncoder::s_glTexCoordPointer(void *self, int size, GLenum type, GLsizei stride, const void *data) { GLEncoder *ctx = (GLEncoder *)self; assert(ctx->m_state != NULL); @@ -929,9 +929,9 @@ GLEncoder::GLEncoder(IOStream *stream) : gl_encoder_context_t(stream) m_glVertexPointer_enc = set_glVertexPointer(s_glVertexPointer); m_glNormalPointer_enc = set_glNormalPointer(s_glNormalPointer); m_glColorPointer_enc = set_glColorPointer(s_glColorPointer); - m_glPointSizePointerOES_enc = set_glPointSizePointerOES(s_glPointsizePointer); + m_glPointSizePointerOES_enc = set_glPointSizePointerOES(s_glPointSizePointerOES); m_glClientActiveTexture_enc = set_glClientActiveTexture(s_glClientActiveTexture); - m_glTexCoordPointer_enc = set_glTexCoordPointer(s_glTexcoordPointer); + m_glTexCoordPointer_enc = set_glTexCoordPointer(s_glTexCoordPointer); m_glMatrixIndexPointerOES_enc = set_glMatrixIndexPointerOES(s_glMatrixIndexPointerOES); m_glWeightPointerOES_enc = set_glWeightPointerOES(s_glWeightPointerOES); diff --git a/opengl/system/GLESv1_enc/GLEncoder.h b/opengl/system/GLESv1_enc/GLEncoder.h index effc53f..3c794f2 100644 --- a/opengl/system/GLESv1_enc/GLEncoder.h +++ b/opengl/system/GLESv1_enc/GLEncoder.h @@ -111,9 +111,9 @@ private: static void s_glVertexPointer(void *self, int size, GLenum type, GLsizei stride, const void *data); static void s_glNormalPointer(void *self, GLenum type, GLsizei stride, const void *data); static void s_glColorPointer(void *self, int size, GLenum type, GLsizei stride, const void *data); - static void s_glPointsizePointer(void *self, GLenum type, GLsizei stride, const void *data); + static void s_glPointSizePointerOES(void *self, GLenum type, GLsizei stride, const void *data); static void s_glClientActiveTexture(void *self, GLenum texture); - static void s_glTexcoordPointer(void *self, int size, GLenum type, GLsizei stride, const void *data); + static void s_glTexCoordPointer(void *self, int size, GLenum type, GLsizei stride, const void *data); static void s_glMatrixIndexPointerOES(void *self, int size, GLenum type, GLsizei stride, const void * data); static void s_glWeightPointerOES(void *self, int size, GLenum type, GLsizei stride, const void * data); static void s_glDisableClientState(void *self, GLenum state); |