mirror of
https://gitlab.com/shinovon/re3-symbian.git
synced 2026-05-23 01:57:21 +03:00
Merge gles1 and master
# Conflicts: # TODO.md # group/bld.inf # group/common.mmh # src/skel/symbian/symbian.cpp
This commit is contained in:
commit
55aecc66f3
82 changed files with 4082 additions and 129 deletions
1
vendor/librw/src/gl/gl3device.cpp
vendored
1
vendor/librw/src/gl/gl3device.cpp
vendored
|
|
@ -1565,7 +1565,6 @@ openSymbian(EngineOpenParams *openparams)
|
|||
{
|
||||
glGlobals.winWidth = openparams->width;
|
||||
glGlobals.winHeight = openparams->height;
|
||||
glGlobals.winTitle = openparams->windowtitle;
|
||||
|
||||
glGlobals.modes = (DisplayMode*)rwMalloc(sizeof(DisplayMode), ID_DRIVER | MEMDUR_EVENT);
|
||||
glGlobals.modes[0].width = openparams->width;
|
||||
|
|
|
|||
4
vendor/librw/src/gl/wdgl.cpp
vendored
4
vendor/librw/src/gl/wdgl.cpp
vendored
|
|
@ -14,9 +14,13 @@
|
|||
#include "rwwdgl.h"
|
||||
|
||||
#ifdef __SYMBIAN32__
|
||||
#ifdef RW_GL3
|
||||
#include <gles2/gl2.h>
|
||||
#include <gles2/gl2ext.h>
|
||||
#else
|
||||
#include <gles/gl.h>
|
||||
#endif
|
||||
#else
|
||||
#ifdef RW_OPENGL
|
||||
#include "glad/glad.h"
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue