[Armagetronad-commits] SF.net SVN: armagetronad: [7386] armagetronad/trunk/armagetronad/src/render

[<z-...@us...>]

Revision: 7386
          http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7386&view=rev
Author:   z-man
Date:     2007-11-12 13:13:32 -0800 (Mon, 12 Nov 2007)

Log Message:
-----------
Whoops, fixed server compilation.

Modified Paths:
--------------
    armagetronad/trunk/armagetronad/src/render/rGL.h
    armagetronad/trunk/armagetronad/src/render/rTextureRenderTarget.cpp

Modified: armagetronad/trunk/armagetronad/src/render/rGL.h
===================================================================
--- armagetronad/trunk/armagetronad/src/render/rGL.h	2007-11-12 21:02:07 UTC (rev 7385)
+++ armagetronad/trunk/armagetronad/src/render/rGL.h	2007-11-12 21:13:32 UTC (rev 7386)
@@ -28,6 +28,8 @@
 #ifndef AT_GL_H
 #define AT_GL_H
 
+#include "aa_config.h"
+
 #ifndef DEDICATED
 
 #ifdef WIN32

Modified: armagetronad/trunk/armagetronad/src/render/rTextureRenderTarget.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/render/rTextureRenderTarget.cpp	2007-11-12 21:02:07 UTC (rev 7385)
+++ armagetronad/trunk/armagetronad/src/render/rTextureRenderTarget.cpp	2007-11-12 21:13:32 UTC (rev 7386)
@@ -68,6 +68,7 @@
 
 rTextureRenderTarget::rTextureRenderTarget( int width, int height )
 {
+#ifndef DEDICATED
     sr_CheckGLError();
     
     width_ = width;
@@ -123,10 +124,12 @@
     }
     
     throw tGenericException( "frame buffer extension not supported" );
+#endif
 }
 
 void rTextureRenderTarget::Push()
 {
+#ifndef DEDICATED
     previous = anchor;
     anchor = this;
     
@@ -135,10 +138,12 @@
     glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, frameBuffer_ );
     
     sr_CheckGLError();
+#endif
 }
 
 void rTextureRenderTarget::Pop()
 {
+#ifndef DEDICATED
     tASSERT( IsTarget() );
     
     sr_CheckGLError();
@@ -146,9 +151,12 @@
     sr_CheckGLError();
     
     anchor = previous;
+#endif
 }
 
 void rTextureRenderTarget::OnSelect(bool)
 {
+#ifndef DEDICATED
     glBindTexture( GL_TEXTURE_2D, texture_ );
+#endif
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.