kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EGL context fix, minor Tizen cleanup

Browse Source
This commit is contained in:
Joshua Granick
2014-02-26 00:43:18 -08:00
parent 5f00c9fd69
commit c56e6cafeb
4 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
project/include/platform/tizen/TizenApplication.h
View File

@@ -10,7 +10,6 @@
#include <FUi.h>
#include <FUiIme.h>
#include <FGraphics.h>
#include <FGraphicsOpengl2.h>
//#include <FUix.h>
@@ -52,10 +51,6 @@ namespace lime {
void Cleanup (void);
Tizen::Graphics::Opengl::EGLDisplay mEGLDisplay;
Tizen::Graphics::Opengl::EGLSurface mEGLSurface;
Tizen::Graphics::Opengl::EGLConfig mEGLConfig;
Tizen::Graphics::Opengl::EGLContext mEGLContext;
Tizen::Ui::Controls::Form* mForm;
//Tizen::Uix::Sensor::SensorManager* mSensorManager;
Tizen::Base::Runtime::Timer* mTimer;

4
project/include/renderer/opengl/OGL.h
View File

@@ -23,9 +23,9 @@
//#include <osp/gl.h>
//#include <FGraphicsOpengl.h>
#include <FGraphicsOpengl2.h>
#include <gl2.h>
using namespace Tizen::Graphics::Opengl;
//using namespace Tizen::Graphics::Opengl;
//#include <osp/gl2.h>
#define ALLOW_OGL2

7
project/src/platform/tizen/TizenApplication.cpp
View File

@@ -1,9 +1,6 @@
#include "platform/tizen/TizenApplication.h"
using namespace Tizen::Graphics::Opengl;
namespace lime {
@@ -69,10 +66,6 @@ namespace lime {
//mAccelX = 0;
//mAccelY = 0;
//mAccelZ = 0;
mEGLDisplay = EGL_NO_DISPLAY;
mEGLSurface = EGL_NO_SURFACE;
mEGLConfig = null;
mEGLContext = EGL_NO_CONTEXT;
mForm = null;
mTimer = null;

2
project/src/renderer/opengl/Egl.cpp
View File

@@ -130,7 +130,7 @@ bool limeEGLResize(void *inWindow, int &ioWidth, int &ioHeight)
// Use GLES version 1.x
EGLint contextParams[] = {EGL_CONTEXT_CLIENT_VERSION, g_eglVersion, EGL_NONE};
g_eglContext = eglCreateContext(g_eglDisplay, g_eglConfig, NULL, NULL);
g_eglContext = eglCreateContext(g_eglDisplay, g_eglConfig, EGL_NO_CONTEXT, contextParams);
if (g_eglContext == EGL_NO_CONTEXT)
{
printf("Unable to create GLES context!\n");