diff options
| author | Stas Gurtovoy <stas@graphtech.co.il> | 2011-05-05 11:07:34 +0300 |
|---|---|---|
| committer | Guy Zadikario <guy@graphtech.co.il> | 2011-06-17 17:18:45 +0300 |
| commit | d32c2d9633c1b73089fe3eaeddbe2abf4b29881a (patch) | |
| tree | d59484e38fb76e7420eafdb4b09598105b0d1364 /tools/emulator/opengl/shared/OpenglCodecCommon/GLClientState.h | |
| parent | b7caa30ba29c81389a51f7d0ce38e7b89dd24367 (diff) | |
emulator opengl: system GLESv1 first commit.
This is the first commit for the GLESv1 implementation.
It also includes needed fixes in emugen to support const types.
Also, changed glFinish definition in gl.in to match the
definition as in gl.h.
Change-Id: I90262a1db6035a90af8db17984acecef6499847a
Diffstat (limited to 'tools/emulator/opengl/shared/OpenglCodecCommon/GLClientState.h')
| -rw-r--r-- | tools/emulator/opengl/shared/OpenglCodecCommon/GLClientState.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/emulator/opengl/shared/OpenglCodecCommon/GLClientState.h b/tools/emulator/opengl/shared/OpenglCodecCommon/GLClientState.h index 9e4c9160c..b7fcff565 100644 --- a/tools/emulator/opengl/shared/OpenglCodecCommon/GLClientState.h +++ b/tools/emulator/opengl/shared/OpenglCodecCommon/GLClientState.h @@ -79,7 +79,7 @@ public: GLuint currentArrayVbo() { return m_currentArrayVbo; } GLuint currentIndexVbo() { return m_currentIndexVbo; } void enable(int location, int state); - void setState(int location, int size, GLenum type, GLboolean normalized, GLsizei stride, void *data); + void setState(int location, int size, GLenum type, GLboolean normalized, GLsizei stride, const void *data); void setBufferObject(int location, GLuint id); const VertexAttribState *getState(int location); const VertexAttribState *getStateAndEnableDirty(int location, bool *enableChanged); |
