Ecere Software
/
sdk
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ecere: gfx/gui: support P/NaCl platform. add new Pepper interface driver for targetin...
[sdk]
/
ecere
/
src
/
gfx
/
drivers
/
OpenGLDisplayDriver.ec
diff --git
a/ecere/src/gfx/drivers/OpenGLDisplayDriver.ec
b/ecere/src/gfx/drivers/OpenGLDisplayDriver.ec
index
047ce1f
..
11a39d3
100644
(file)
--- a/
ecere/src/gfx/drivers/OpenGLDisplayDriver.ec
+++ b/
ecere/src/gfx/drivers/OpenGLDisplayDriver.ec
@@
-120,7
+120,7
@@
import "Display"
#if defined(__unix__) || defined(__APPLE__)
#if defined(__unix__) || defined(__APPLE__)
- #if !defined(__ANDROID__) && !defined(__EMSCRIPTEN__)
+ #if !defined(__ANDROID__) && !defined(__EMSCRIPTEN__)
&& !defined(__pnacl__)
import "XInterface"
#endif
import "XInterface"
#endif
@@
-1434,7
+1434,7
@@
class OGLDisplay : struct
int imageBuffers[2];
byte * pboMemory1, * pboMemory2;
*/
int imageBuffers[2];
byte * pboMemory1, * pboMemory2;
*/
-#elif !defined(__ANDROID__) && !defined(__EMSCRIPTEN__)
+#elif !defined(__ANDROID__) && !defined(__EMSCRIPTEN__)
&& !defined(__pnacl__)
GLXContext glContext;
Pixmap pixmap;
GLXContext glContext;
Pixmap pixmap;
@@
-1468,7
+1468,7
@@
class OGLSystem : struct
HDC hdc;
HGLRC glrc;
HWND hwnd;
HDC hdc;
HGLRC glrc;
HWND hwnd;
-#elif !defined(__ANDROID__) && !defined(__EMSCRIPTEN__)
+#elif !defined(__ANDROID__) && !defined(__EMSCRIPTEN__)
&& !defined(__pnacl__)
XVisualInfo * visualInfo;
GLXContext glContext;
GLXDrawable glxDrawable;
XVisualInfo * visualInfo;
GLXContext glContext;
GLXDrawable glxDrawable;
@@
-1511,7
+1511,7
@@
class OpenGLDisplayDriver : DisplayDriver
bool LockSystem(DisplaySystem displaySystem)
{
bool LockSystem(DisplaySystem displaySystem)
{
-#if !defined(__ANDROID__) && !defined(__EMSCRIPTEN__)
+#if !defined(__ANDROID__) && !defined(__EMSCRIPTEN__)
&& !defined(__pnacl__)
OGLSystem oglSystem = displaySystem.driverData;
if(useSingleGLContext) return true;
#if defined(__WIN32__)
OGLSystem oglSystem = displaySystem.driverData;
if(useSingleGLContext) return true;
#if defined(__WIN32__)
@@
-1543,7
+1543,7
@@
class OpenGLDisplayDriver : DisplayDriver
bool Lock(Display display)
{
bool Lock(Display display)
{
-#if !defined(__ANDROID__) && !defined(__EMSCRIPTEN__)
+#if !defined(__ANDROID__) && !defined(__EMSCRIPTEN__)
&& !defined(__pnacl__)
OGLDisplay oglDisplay = display.driverData;
if(useSingleGLContext) return true;
#if defined(__WIN32__)
OGLDisplay oglDisplay = display.driverData;
if(useSingleGLContext) return true;
#if defined(__WIN32__)
@@
-1877,7
+1877,7
@@
class OpenGLDisplayDriver : DisplayDriver
{
bool result = false;
OGLDisplay oglDisplay = display.driverData;
{
bool result = false;
OGLDisplay oglDisplay = display.driverData;
-#if !defined(__ANDROID__) && !defined(__EMSCRIPTEN__)
+#if !defined(__ANDROID__) && !defined(__EMSCRIPTEN__)
&& !defined(__pnacl__)
OGLSystem oglSystem = display.displaySystem.driverData;
#endif
if(!oglDisplay)
OGLSystem oglSystem = display.displaySystem.driverData;
#endif
if(!oglDisplay)