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.cpp | |
| 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.cpp')
| -rw-r--r-- | tools/emulator/opengl/shared/OpenglCodecCommon/GLClientState.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/emulator/opengl/shared/OpenglCodecCommon/GLClientState.cpp b/tools/emulator/opengl/shared/OpenglCodecCommon/GLClientState.cpp index a7e2ea008..dcfe9feed 100644 --- a/tools/emulator/opengl/shared/OpenglCodecCommon/GLClientState.cpp +++ b/tools/emulator/opengl/shared/OpenglCodecCommon/GLClientState.cpp @@ -70,7 +70,7 @@ void GLClientState::enable(int location, int state) m_states[location].enabled = state; } -void GLClientState::setState(int location, int size, GLenum type, GLboolean normalized, GLsizei stride, void *data) +void GLClientState::setState(int location, int size, GLenum type, GLboolean normalized, GLsizei stride, const void *data) { if (!validLocation(location)) { return; @@ -78,7 +78,7 @@ void GLClientState::setState(int location, int size, GLenum type, GLboolean norm m_states[location].size = size; m_states[location].type = type; m_states[location].stride = stride; - m_states[location].data = data; + m_states[location].data = (void*)data; m_states[location].bufferObject = m_currentArrayVbo; m_states[location].elementSize = glSizeof(type) * size; m_states[location].normalized = normalized; |
