Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor tidying up.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2592 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2009-09-25 13:25:19 +00:00
parent 88a3a39750
commit 0889ca77a4
3 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Config/logcontrol.plist
View File

@ -43,7 +43,7 @@
general.error.inconsistentState = inherit;
exception = yes;
exception = yes;
files.notFound = $error; // Failure to load a file.

2
src/Cocoa/MyOpenGLView.m
View File

@ -64,7 +64,7 @@ static NSString * kOOLogKeyDown = @"input.keyMapping.keyPress.keyDown";
NSOpenGLPFAScreenMask, CGDisplayIDToOpenGLDisplayMask(kCGDirectMainDisplay),
// Specifying "NoRecovery" gives us a context that cannot fall back to the software renderer.
//This makes the View-based context a compatible with the fullscreen context, enabling us to use the "shareContext"
// This makes the View-based context a compatible with the fullscreen context, enabling us to use the "shareContext"
// feature to share textures, display lists, and other OpenGL objects between the two.
NSOpenGLPFANoRecovery,

20
src/Core/OOOpenGLExtensionManager.m
View File

@ -52,21 +52,13 @@ SOFTWARE.
#import "NSThreadOOExtensions.h"
/* If nonzero, disable shaders for OpenGL versions less than 1.5. It is my
contention that this isn't needed since we test for extensions. Enabling
this check disables shaders on Intel GMA 950 hardware under Mac OS
10.4.9; they seem to work fine otherwise. -- Ahruman
*/
#define SHADER_CHECK_FOR_VERSION 0
#if OOLITE_WINDOWS && !defined(NO_SHADERS)
/* Define the function pointers for the OpenGL extensions used in the game
(required for Windows only).
*/
#ifndef NO_SHADERS
void OOBadOpenGLExtensionUsed(void) GCC_ATTR((noreturn));
static void OOBadOpenGLExtensionUsed(void) GCC_ATTR((noreturn));
PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB = (PFNGLUSEPROGRAMOBJECTARBPROC)&OOBadOpenGLExtensionUsed;
PFNGLACTIVETEXTUREARBPROC glActiveTextureARB = (PFNGLACTIVETEXTUREARBPROC)&OOBadOpenGLExtensionUsed;
@ -285,14 +277,6 @@ static unsigned IntegerFromString(const GLubyte **ioString)
{
shadersAvailable = NO;
#if SHADER_CHECK_FOR_VERSION
if (major <= 1 && minor < 5)
{
OOLog(kOOLogOpenGLShaderSupport, @"Shaders will not be used (OpenGL version < 1.5).");
return;
}
#endif
NSString * const requiredExtension[] =
{
@"GL_ARB_shading_language_100",
@ -396,7 +380,7 @@ static unsigned IntegerFromString(const GLubyte **ioString)
#if OOLITE_WINDOWS && !defined(NO_SHADERS)
void OOBadOpenGLExtensionUsed(void)
static void OOBadOpenGLExtensionUsed(void)
{
OOLog(@"rendering.opengl.badExtension", @"***** An uninitialized OpenGL extension function has been called, terminating. This is a serious error, please report it. *****");
exit(EXIT_FAILURE);