diff options
Diffstat (limited to 'emulator/opengl/host/libs/Translator/GLcommon')
| -rw-r--r-- | emulator/opengl/host/libs/Translator/GLcommon/GLDispatch.cpp | 8 | ||||
| -rw-r--r-- | emulator/opengl/host/libs/Translator/GLcommon/GLEScontext.cpp | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/emulator/opengl/host/libs/Translator/GLcommon/GLDispatch.cpp b/emulator/opengl/host/libs/Translator/GLcommon/GLDispatch.cpp index 54aa200..c0e3c5c 100644 --- a/emulator/opengl/host/libs/Translator/GLcommon/GLDispatch.cpp +++ b/emulator/opengl/host/libs/Translator/GLcommon/GLDispatch.cpp @@ -49,19 +49,19 @@ static GL_FUNC_PTR getGLFuncAddress(const char *funcName) { if(name == NULL){ \ funcAddrs = (void *)getGLFuncAddress(#name); \ if(funcAddrs){ \ - *(void**)(&name) = funcAddrs; \ + *(void**)(void*)(&name) = funcAddrs; \ } else { \ fprintf(stderr,"could not load func %s\n",#name); \ - *(void**)(&name) = (void *)dummy_##name; \ + *(void**)(void*)(&name) = (void *)dummy_##name; \ } \ } \ } -#define LOAD_GLEXT_FUNC(name) { void * funcAddrs = NULL; \ +#define LOAD_GLEXT_FUNC(name) { void * funcAddrs = NULL; \ if(name == NULL){ \ funcAddrs = (void *)getGLFuncAddress(#name); \ if(funcAddrs) \ - *(void**)(&name) = funcAddrs; \ + *(void**)(void*)(&name) = funcAddrs; \ } \ } diff --git a/emulator/opengl/host/libs/Translator/GLcommon/GLEScontext.cpp b/emulator/opengl/host/libs/Translator/GLcommon/GLEScontext.cpp index 46f039c..c0519c4 100644 --- a/emulator/opengl/host/libs/Translator/GLcommon/GLEScontext.cpp +++ b/emulator/opengl/host/libs/Translator/GLcommon/GLEScontext.cpp @@ -330,10 +330,8 @@ void GLEScontext::convertDirectVBO(GLESConversionArrays& cArrs,GLint first,GLsiz RangeList ranges; RangeList conversions; GLushort* indices = NULL; - GLenum type = p->getType(); int attribSize = p->getSize(); int stride = p->getStride()?p->getStride():sizeof(GLfixed)*attribSize; - unsigned int size = p->getStride()?p->getStride()*count:attribSize*count*sizeof(GLfixed); char* data = (char*)p->getBufferData() + (first*stride); if(p->bufferNeedConversion()) { @@ -389,7 +387,6 @@ void GLEScontext::convertIndirectVBO(GLESConversionArrays& cArrs,GLsizei count,G RangeList ranges; RangeList conversions; GLushort* conversionIndices = NULL; - GLenum type = p->getType(); int attribSize = p->getSize(); int stride = p->getStride()?p->getStride():sizeof(GLfixed)*attribSize; char* data = static_cast<char*>(p->getBufferData()); |