am 525b5d50: am b2cbc353: Merge "Translator 1.1 - fix glGetPointer"

* commit '525b5d50f25efdbb894e6a2c9faa6da72834e501':
  Translator 1.1 - fix glGetPointer
This commit is contained in:
David Turner
2011-07-06 07:43:58 -07:00
committed by Android Git Automerger
2 changed files with 3 additions and 3 deletions

View File

@@ -41,9 +41,9 @@ public:
void setupArraysPointers(GLESConversionArrays& fArrs,GLint first,GLsizei count,GLenum type,const GLvoid* indices,bool direct);
void drawPointsArrs(GLESConversionArrays& arrs,GLint first,GLsizei count);
void drawPointsElems(GLESConversionArrays& arrs,GLsizei count,GLenum type,const GLvoid* indices);
const GLESpointer* getPointer(GLenum arrType);
virtual const GLESpointer* getPointer(GLenum arrType);
int getMaxTexUnits();
~GLEScmContext();
protected:

View File

@@ -109,7 +109,7 @@ public:
bool isArrEnabled(GLenum);
void enableArr(GLenum arr,bool enable);
const GLvoid* setPointer(GLenum arrType,GLint size,GLenum type,GLsizei stride,const GLvoid* data,bool normalize = false);
const GLESpointer* getPointer(GLenum arrType);
virtual const GLESpointer* getPointer(GLenum arrType);
virtual void setupArraysPointers(GLESConversionArrays& fArrs,GLint first,GLsizei count,GLenum type,const GLvoid* indices,bool direct) = 0;
void bindBuffer(GLenum target,GLuint buffer);
void unbindBuffer(GLuint buffer);