Merge "Translator 1.1 - fix glGetPointer"

This commit is contained in:
David Turner
2011-07-03 04:54:31 -07:00
committed by Android Code Review
2 changed files with 3 additions and 3 deletions

View File

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

View File

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