rndtrash/re3-symbian
1
0
Fork 0
mirror of https://gitlab.com/shinovon/re3-symbian.git synced 2026-05-23 01:57:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix compilation with older sdk

Browse source
This commit is contained in:
Shinovon 2026-05-01 14:34:05 +05:00
parent 52e1b18729
commit 9adfa881b3
5 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/skel/symbian/symbian.cpp
View file

@ -456,9 +456,12 @@ public:
// CCoeControl::HandlePointerEventL(aPointerEvent); // CCoeControl::HandlePointerEventL(aPointerEvent);
// return; // return;
// } // }
#ifdef RW_GL3
const TAdvancedPointerEvent* advpointer = aPointerEvent.AdvancedPointerEvent(); const TAdvancedPointerEvent* advpointer = aPointerEvent.AdvancedPointerEvent();
int i = advpointer != NULL ? advpointer->PointerNumber() : 0; int i = advpointer != NULL ? advpointer->PointerNumber() : 0;
#else
int i = 0;
#endif
static int activeZone[10]; static int activeZone[10];
static int stickCenterX[10]; static int stickCenterX[10];

4
vendor/librw/src/gl/wdgl.cpp vendored
View file

@ -14,9 +14,13 @@
#include "rwwdgl.h" #include "rwwdgl.h"
#ifdef __SYMBIAN32__ #ifdef __SYMBIAN32__
#ifdef RW_GL3
#include <gles2/gl2.h> #include <gles2/gl2.h>
#include <gles2/gl2ext.h> #include <gles2/gl2ext.h>
#else #else
#include <gles/gl.h>
#endif
#else
#ifdef RW_OPENGL #ifdef RW_OPENGL
#include "glad/glad.h" #include "glad/glad.h"
#endif #endif

6
vendor/librw/src/gles1/gl1device.cpp vendored
View file

@ -457,7 +457,7 @@ setFilterMode(uint32 stage, int32 filter, int32 maxAniso = 1)
} }
if(natras->maxAnisotropy != maxAniso){ if(natras->maxAnisotropy != maxAniso){
setActiveTexture(stage); 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; natras->maxAnisotropy = maxAniso;
} }
} }
@ -1365,10 +1365,6 @@ initOpenGL(void)
resetRenderState(); resetRenderState();
#ifndef __SYMBIAN32__
glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &maxAnisotropy);
#endif
glEnable(GL_NORMALIZE); glEnable(GL_NORMALIZE);
openIm2D(); openIm2D();

2
vendor/librw/src/gles1/rwgles1.h vendored
View file

@ -1,6 +1,6 @@
#ifdef RW_GLES1 #ifdef RW_GLES1
#include <gles/gl.h> #include <gles/gl.h>
#include <gles/glext.h> //#include <gles/glext.h>
#include <gles/egl.h> #include <gles/egl.h>
#endif #endif

5
vendor/librw/src/rwbase.h vendored
View file

@ -112,6 +112,11 @@ struct LLLink
} }
}; };
#ifndef RW_GL3
#define __offsetof(type, field) (reinterpret_cast <size_t> \
(&reinterpret_cast <const volatile char &> \
(static_cast<type *> (0)->field)))
#endif
#define LLLinkGetData(linkvar,type,entry) \ #define LLLinkGetData(linkvar,type,entry) \
((type*)(((rw::uint8*)(linkvar))-offsetof(type,entry))) ((type*)(((rw::uint8*)(linkvar))-offsetof(type,entry)))