hedgewars/uStore.pas
changeset 4900 8ad0e23e6d63
parent 4894 efcea232bbf6
child 4901 d1e2d82d9ccc
--- a/hedgewars/uStore.pas	Tue Feb 01 08:15:01 2011 +0100
+++ b/hedgewars/uStore.pas	Tue Feb 01 15:30:08 2011 +0100
@@ -456,21 +456,17 @@
 function glLoadExtension(extension : shortstring) : boolean;
 begin
 {$IF GLunit = gles11}
-    // FreePascal doesn't come with OpenGL ES 1.1 Extension headers
+    // FreePascal doesnt come with OpenGL ES 1.1 Extension headers
     extension:= extension; // avoid hint
     glLoadExtension:= false;
-{$IFDEF DEBUGFILE}
     AddFileLog('OpenGL - "' + extension + '" skipped')
-{$ENDIF}
 {$ELSE}
     glLoadExtension:= glext_LoadExtension(extension);
-{$IFDEF DEBUGFILE}
     if glLoadExtension then
         AddFileLog('OpenGL - "' + extension + '" loaded')
     else
         AddFileLog('OpenGL - "' + extension + '" failed to load');
 {$ENDIF}
-{$ENDIF}
 end;
 
 procedure SetupOpenGL;
@@ -511,19 +507,15 @@
 
     glGetIntegerv(GL_MAX_TEXTURE_SIZE, @MaxTextureSize);
 
-{$IFDEF DEBUGFILE}
     AddFileLog('OpenGL-- Renderer: ' + shortstring(pchar(glGetString(GL_RENDERER))));
     AddFileLog('  |----- Vendor: ' + shortstring(pchar(glGetString(GL_VENDOR))));
     AddFileLog('  |----- Version: ' + shortstring(pchar(glGetString(GL_VERSION))));
     AddFileLog('  \----- GL_MAX_TEXTURE_SIZE: ' + inttostr(MaxTextureSize));
-{$ENDIF}
 
     if MaxTextureSize <= 0 then
     begin
         MaxTextureSize:= 1024;
-{$IFDEF DEBUGFILE}
         AddFileLog('OpenGL Warning - driver didn''t provide any valid max texture size; assuming 1024');
-{$ENDIF}
     end;
 
 {$IFDEF IPHONEOS}
@@ -579,13 +571,8 @@
     end;
 {$ENDIF}
 
-{$IFDEF DEBUGFILE}
     if cGPUVendor = gvUnknown then
         AddFileLog('OpenGL Warning - unknown hardware vendor; please report');
-{$ELSE}
-    // just avoid 'never used' compiler warning for now
-    if cGPUVendor = gvUnknown then cGPUVendor:= gvUnknown;
-{$ENDIF}
 
     // set view port to whole window
     if (rotationQt = 0) or (rotationQt = 180) then
@@ -856,18 +843,14 @@
 procedure chFullScr(var s: shortstring);
 var flags: Longword = 0;
     ico: PSDL_Surface;
-{$IFDEF DEBUGFILE}
     buf: array[byte] of char;
-{$ENDIF}
 begin
     s:= s; // avoid compiler hint
     if Length(s) = 0 then cFullScreen:= not cFullScreen
     else cFullScreen:= s = '1';
 
-{$IFDEF DEBUGFILE}
     buf[0]:= char(0); // avoid compiler hint
     AddFileLog('Prepare to change video parameters...');
-{$ENDIF}
 
     flags:= SDL_OPENGL;// or SDL_RESIZABLE;
 
@@ -896,9 +879,7 @@
 
     if SDLPrimSurface <> nil then
     begin
-{$IFDEF DEBUGFILE}
         AddFileLog('Freeing old primary surface...');
-{$ENDIF}
         SDL_FreeSurface(SDLPrimSurface);
         SDLPrimSurface:= nil;
     end;
@@ -921,10 +902,7 @@
     PixelFormat:= SDLPrimSurface^.format;
 {$ENDIF}
 
-{$IFDEF DEBUGFILE}
-    AddFileLog('Setting up OpenGL...');
-    AddFileLog('SDL video driver: ' + shortstring(SDL_VideoDriverName(buf, sizeof(buf))));
-{$ENDIF}
+    AddFileLog('Setting up OpenGL (using driver: ' + shortstring(SDL_VideoDriverName(buf, sizeof(buf))) + ')');
     SetupOpenGL();
 end;