diff --git a/src/skel/symbian/symbian.cpp b/src/skel/symbian/symbian.cpp index 10fdf1e..00437f2 100644 --- a/src/skel/symbian/symbian.cpp +++ b/src/skel/symbian/symbian.cpp @@ -456,9 +456,12 @@ public: // CCoeControl::HandlePointerEventL(aPointerEvent); // return; // } - +#ifdef RW_GL3 const TAdvancedPointerEvent* advpointer = aPointerEvent.AdvancedPointerEvent(); int i = advpointer != NULL ? advpointer->PointerNumber() : 0; +#else + int i = 0; +#endif static int activeZone[10]; static int stickCenterX[10]; diff --git a/vendor/librw/src/gl/wdgl.cpp b/vendor/librw/src/gl/wdgl.cpp index 6474d2b..ee730fe 100644 --- a/vendor/librw/src/gl/wdgl.cpp +++ b/vendor/librw/src/gl/wdgl.cpp @@ -14,9 +14,13 @@ #include "rwwdgl.h" #ifdef __SYMBIAN32__ +#ifdef RW_GL3 #include #include #else +#include +#endif +#else #ifdef RW_OPENGL #include "glad/glad.h" #endif diff --git a/vendor/librw/src/gles1/gl1device.cpp b/vendor/librw/src/gles1/gl1device.cpp index 2722603..e782383 100644 --- a/vendor/librw/src/gles1/gl1device.cpp +++ b/vendor/librw/src/gles1/gl1device.cpp @@ -457,7 +457,7 @@ setFilterMode(uint32 stage, int32 filter, int32 maxAniso = 1) } if(natras->maxAnisotropy != maxAniso){ setActiveTexture(stage); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)maxAniso); +// glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)maxAniso); natras->maxAnisotropy = maxAniso; } } @@ -1365,10 +1365,6 @@ initOpenGL(void) resetRenderState(); -#ifndef __SYMBIAN32__ - glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &maxAnisotropy); -#endif - glEnable(GL_NORMALIZE); openIm2D(); diff --git a/vendor/librw/src/gles1/rwgles1.h b/vendor/librw/src/gles1/rwgles1.h index 33732fd..0c15375 100644 --- a/vendor/librw/src/gles1/rwgles1.h +++ b/vendor/librw/src/gles1/rwgles1.h @@ -1,6 +1,6 @@ #ifdef RW_GLES1 #include -#include +//#include #include #endif diff --git a/vendor/librw/src/rwbase.h b/vendor/librw/src/rwbase.h index 3011b65..83a49bb 100644 --- a/vendor/librw/src/rwbase.h +++ b/vendor/librw/src/rwbase.h @@ -112,8 +112,13 @@ struct LLLink } }; +#ifndef RW_GL3 +#define __offsetof(type, field) (reinterpret_cast \ + (&reinterpret_cast \ + (static_cast (0)->field))) +#endif #define LLLinkGetData(linkvar,type,entry) \ - ((type*)(((rw::uint8*)(linkvar))-offsetof(type,entry))) + ((type*)(((rw::uint8*)(linkvar))-offsetof(type,entry))) // Have to be careful since the link might be deleted. #define FORLIST(_link, _list) \