diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-10-31 15:06:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-31 15:06:40 +0000 |
| commit | 5a7d8f2d70c2c84f0f84c2b8d0ac3fc119935259 (patch) | |
| tree | cb37ea76401d6eeafa2c4fceb065554050d78028 /opengl/system/GLESv1_enc/GLEncoder.h | |
| parent | 7472654eec2594e6476b38cea396a3f213dedd1a (diff) | |
| parent | b7837c3c3378f45c500a1ce036fe3a3a2b83ed53 (diff) | |
| download | android_device_generic_goldfish-5a7d8f2d70c2c84f0f84c2b8d0ac3fc119935259.tar.gz android_device_generic_goldfish-5a7d8f2d70c2c84f0f84c2b8d0ac3fc119935259.tar.bz2 android_device_generic_goldfish-5a7d8f2d70c2c84f0f84c2b8d0ac3fc119935259.zip | |
Merge changes Ib282b31c,I19edce7c,Iea092bec,Iec649b61
* changes:
opengl: Regenerate GPU emulation encoder sources.
opengl: Remove compiler warnings.
opengl: Remove accessor functions from encoders.
opengl: Fix a few function name typos.
Diffstat (limited to 'opengl/system/GLESv1_enc/GLEncoder.h')
| -rw-r--r-- | opengl/system/GLESv1_enc/GLEncoder.h | 4 |
1 files changed, 2 insertions, 2 deletions
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); |