summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2014-10-30 18:07:56 +0100
committerDavid 'Digit' Turner <digit@google.com>2014-10-30 21:07:49 +0100
commit1da62b8c565c544cb00863b531109d7db1a8801e (patch)
treec7e0bcdfdb3ff91ce7ef8464c12859d405460af9 /opengl
parent7472654eec2594e6476b38cea396a3f213dedd1a (diff)
downloadandroid_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')
-rw-r--r--opengl/system/GLESv1_enc/GLEncoder.cpp8
-rw-r--r--opengl/system/GLESv1_enc/GLEncoder.h4
-rw-r--r--opengl/system/GLESv2_enc/GL2Encoder.cpp8
-rw-r--r--opengl/system/GLESv2_enc/GL2Encoder.h6
4 files changed, 13 insertions, 13 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);
diff --git a/opengl/system/GLESv2_enc/GL2Encoder.cpp b/opengl/system/GLESv2_enc/GL2Encoder.cpp
index f6f61e6..eb253cb 100644
--- a/opengl/system/GLESv2_enc/GL2Encoder.cpp
+++ b/opengl/system/GLESv2_enc/GL2Encoder.cpp
@@ -61,12 +61,12 @@ GL2Encoder::GL2Encoder(IOStream *stream) : gl2_encoder_context_t(stream)
m_glGetIntegerv_enc = set_glGetIntegerv(s_glGetIntegerv);
m_glGetFloatv_enc = set_glGetFloatv(s_glGetFloatv);
m_glGetBooleanv_enc = set_glGetBooleanv(s_glGetBooleanv);
- m_glVertexAttribPointer_enc = set_glVertexAttribPointer(s_glVertexAtrribPointer);
+ m_glVertexAttribPointer_enc = set_glVertexAttribPointer(s_glVertexAttribPointer);
m_glEnableVertexAttribArray_enc = set_glEnableVertexAttribArray(s_glEnableVertexAttribArray);
m_glDisableVertexAttribArray_enc = set_glDisableVertexAttribArray(s_glDisableVertexAttribArray);
m_glGetVertexAttribiv_enc = set_glGetVertexAttribiv(s_glGetVertexAttribiv);
m_glGetVertexAttribfv_enc = set_glGetVertexAttribfv(s_glGetVertexAttribfv);
- m_glGetVertexAttribPointerv = set_glGetVertexAttribPointerv(s_glGetVertexAttribPointerv);
+ m_glGetVertexAttribPointerv_enc = set_glGetVertexAttribPointerv(s_glGetVertexAttribPointerv);
set_glShaderSource(s_glShaderSource);
set_glFinish(s_glFinish);
m_glGetError_enc = set_glGetError(s_glGetError);
@@ -214,7 +214,7 @@ void GL2Encoder::s_glDeleteBuffers(void * self, GLsizei n, const GLuint * buffer
}
}
-void GL2Encoder::s_glVertexAtrribPointer(void *self, GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid * ptr)
+void GL2Encoder::s_glVertexAttribPointer(void *self, GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid * ptr)
{
GL2Encoder *ctx = (GL2Encoder *)self;
assert(ctx->m_state != NULL);
@@ -638,7 +638,7 @@ static bool replaceSamplerExternalWith2D(char* const str, ShaderData* const data
return true;
}
-void GL2Encoder::s_glShaderSource(void *self, GLuint shader, GLsizei count, const GLchar *const *string, const GLint *length)
+void GL2Encoder::s_glShaderSource(void *self, GLuint shader, GLsizei count, const GLchar * const *string, const GLint *length)
{
GL2Encoder* ctx = (GL2Encoder*)self;
ShaderData* shaderData = ctx->m_shared->getShaderData(shader);
diff --git a/opengl/system/GLESv2_enc/GL2Encoder.h b/opengl/system/GLESv2_enc/GL2Encoder.h
index 8f6204c..2a19c3a 100644
--- a/opengl/system/GLESv2_enc/GL2Encoder.h
+++ b/opengl/system/GLESv2_enc/GL2Encoder.h
@@ -99,7 +99,7 @@ private:
static void s_glGetBooleanv(void *self, GLenum pname, GLboolean *ptr);
glVertexAttribPointer_client_proc_t m_glVertexAttribPointer_enc;
- static void s_glVertexAtrribPointer(void *self, GLuint indx, GLint size, GLenum type,
+ static void s_glVertexAttribPointer(void *self, GLuint indx, GLint size, GLenum type,
GLboolean normalized, GLsizei stride, const GLvoid * ptr);
glEnableVertexAttribArray_client_proc_t m_glEnableVertexAttribArray_enc;
@@ -114,10 +114,10 @@ private:
glGetVertexAttribfv_client_proc_t m_glGetVertexAttribfv_enc;
static void s_glGetVertexAttribfv(void *self, GLuint index, GLenum pname, GLfloat *params);
- glGetVertexAttribPointerv_client_proc_t m_glGetVertexAttribPointerv;
+ glGetVertexAttribPointerv_client_proc_t m_glGetVertexAttribPointerv_enc;
static void s_glGetVertexAttribPointerv(void *self, GLuint index, GLenum pname, GLvoid **pointer);
- static void s_glShaderSource(void *self, GLuint shader, GLsizei count, const GLchar *const *string, const GLint *length);
+ static void s_glShaderSource(void *self, GLuint shader, GLsizei count, const GLchar * const *string, const GLint *length);
static void s_glFinish(void *self);