Skip to content

D
deprecated-irrlicht-mac
Commit 059490c6 authored by nadro's avatar nadro
Browse files
Options

- Fixed MacOSX memory leak issue in event handling. 

- Fixed MacOSX compilation errors.

This is the missing piece of commit r4107 (I'm sorry for two commits instead of one).

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4108 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 5834d4c1
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 18 deletions
source/Irrlicht/COpenGLSLMaterialRenderer.cpp
View file @ 059490c6
......@@ -148,12 +148,12 @@ void COpenGLSLMaterialRenderer::init(s32& outMaterialTypeNr,
#if defined(GL_ARB_geometry_shader4) || defined(GL_EXT_geometry_shader4) || defined(GL_NV_geometry_shader4)
if (Program2)
{
Driver->extGlProgramParameteri(Program2, GL_GEOMETRY_INPUT_TYPE_EXT, Driver->primitiveTypeToGL(inType));
Driver->extGlProgramParameteri(Program2, GL_GEOMETRY_OUTPUT_TYPE_EXT, Driver->primitiveTypeToGL(outType));
Driver->extGlProgramParameteri((GLhandleARB)Program2, GL_GEOMETRY_INPUT_TYPE_EXT, Driver->primitiveTypeToGL(inType));
Driver->extGlProgramParameteri((GLhandleARB)Program2, GL_GEOMETRY_OUTPUT_TYPE_EXT, Driver->primitiveTypeToGL(outType));
if (verticesOut==0)
Driver->extGlProgramParameteri(Program2, GL_GEOMETRY_VERTICES_OUT_EXT, Driver->MaxGeometryVerticesOut);
Driver->extGlProgramParameteri((GLhandleARB)Program2, GL_GEOMETRY_VERTICES_OUT_EXT, Driver->MaxGeometryVerticesOut);
else
Driver->extGlProgramParameteri(Program2, GL_GEOMETRY_VERTICES_OUT_EXT, core::min_(verticesOut, Driver->MaxGeometryVerticesOut));
Driver->extGlProgramParameteri((GLhandleARB)Program2, GL_GEOMETRY_VERTICES_OUT_EXT, core::min_(verticesOut, Driver->MaxGeometryVerticesOut));
}
else
{
......
source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm
View file @ 059490c6
......@@ -939,6 +939,8 @@ bool CIrrDeviceMacOSX::run()
os::Timer::tick();
storeMouseLocation();
NSAutoreleasePool* Pool = [[NSAutoreleasePool alloc] init];
event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES];
if (event != nil)
{
......@@ -1061,6 +1063,8 @@ bool CIrrDeviceMacOSX::run()
pollJoysticks();
[Pool release];
return (![[NSApp delegate] isQuit] && IsActive);
}
......
source/Irrlicht/MacOSX/MacOSX.xcodeproj/project.pbxproj
View file @ 059490c6
......@@ -5706,7 +5706,6 @@
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
GCC_VERSION = 4.0;
INFOPLIST_FILE = "DemoApp-Info.plist";
INSTALL_PATH = /;
ONLY_LINK_ESSENTIAL_SYMBOLS = YES;
......@@ -6065,7 +6064,6 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = MacOSX_Prefix.pch;
GCC_VERSION = 4.0;
INSTALL_PATH = /usr/local/lib;
PRODUCT_NAME = Irrlicht;
SHARED_PRECOMPS_DIR = "";
......@@ -6082,7 +6080,6 @@
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = MacOSX_Prefix.pch;
GCC_VERSION = 4.0;
INSTALL_PATH = /usr/local/lib;
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
PRODUCT_NAME = Irrlicht;
......@@ -6141,7 +6138,6 @@
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_VERSION = 4.0;
INFOPLIST_FILE = "IrrFramework-Info.plist";
INSTALL_PATH = "@executable_path/../Frameworks";
OTHER_CFLAGS = (
......@@ -6179,7 +6175,6 @@
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_VERSION = 4.0;
INFOPLIST_FILE = "IrrFramework-Info.plist";
INSTALL_PATH = "@executable_path/../Frameworks";
OTHER_CFLAGS = (
......@@ -6215,7 +6210,6 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
GCC_VERSION = 4.0;
INFOPLIST_FILE = "DemoApp-Info.plist";
INSTALL_PATH = /;
OTHER_LDFLAGS = (
......@@ -6244,7 +6238,6 @@
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
GCC_VERSION = 4.0;
INFOPLIST_FILE = "DemoApp-Info.plist";
INSTALL_PATH = /;
ONLY_LINK_ESSENTIAL_SYMBOLS = YES;
......@@ -6454,7 +6447,6 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
GCC_VERSION = 4.0;
INFOPLIST_FILE = "DemoApp-Info.plist";
INSTALL_PATH = /;
OTHER_LDFLAGS = (
......@@ -6483,7 +6475,6 @@
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
GCC_VERSION = 4.0;
INFOPLIST_FILE = "DemoApp-Info.plist";
INSTALL_PATH = /;
ONLY_LINK_ESSENTIAL_SYMBOLS = YES;
......@@ -6544,7 +6535,6 @@
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
GCC_VERSION = 4.0;
INFOPLIST_FILE = "DemoApp-Info.plist";
INSTALL_PATH = /;
ONLY_LINK_ESSENTIAL_SYMBOLS = YES;
......@@ -6637,7 +6627,6 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
GCC_VERSION = 4.0;
INFOPLIST_FILE = "DemoApp-Info.plist";
INSTALL_PATH = /;
LIBRARY_SEARCH_PATHS = (
......@@ -6673,7 +6662,6 @@
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
GCC_VERSION = 4.0;
INFOPLIST_FILE = "DemoApp-Info.plist";
INSTALL_PATH = /;
LIBRARY_SEARCH_PATHS = (
......@@ -6832,7 +6820,6 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
GCC_VERSION = 4.0;
INFOPLIST_FILE = "DemoApp-Info.plist";
INSTALL_PATH = /;
OTHER_LDFLAGS = (
......@@ -6863,7 +6850,6 @@
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
GCC_VERSION = 4.0;
INFOPLIST_FILE = "DemoApp-Info.plist";
INSTALL_PATH = /;
ONLY_LINK_ESSENTIAL_SYMBOLS = YES;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment