[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[651] trunk/fuse/fusepb/views/DisplayOpenGLView .m

[<fr...@us...>]

Revision: 651
          http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=651&view=rev
Author:   fredm
Date:     2010-10-15 10:18:04 +0000 (Fri, 15 Oct 2010)

Log Message:
-----------
Disable fast texture upload extensions as they seem to give the ATI drivers
conniptions.

Modified Paths:
--------------
    trunk/fuse/fusepb/views/DisplayOpenGLView.m

Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.m	2010-10-08 13:06:33 UTC (rev 650)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.m	2010-10-15 10:18:04 UTC (rev 651)
@@ -594,6 +594,10 @@
     glEnable( GL_TEXTURE_RECTANGLE_ARB );
     glBindTexture( GL_TEXTURE_RECTANGLE_ARB, screenTexId[i] );
 
+#if 0
+    // These should increase texture upload performance, but instead seem to cause
+    // issues with some ATI drivers (and perhaps GMA too), so I'm disabling for now
+    // maybe revisit come 10.7
     glTextureRangeAPPLE( GL_TEXTURE_RECTANGLE_ARB,
                          screenTex[i].full_width * screenTex[i].pitch,
                          screenTex[i].pixels );
@@ -601,6 +605,7 @@
     glTexParameteri( GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_STORAGE_HINT_APPLE,
                      GL_STORAGE_CACHED_APPLE );
     glPixelStorei( GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE );
+#endif
     GLint filter = settings_current.bilinear_filter ? GL_LINEAR : GL_NEAREST;
     glTexParameteri( GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, filter );
     glTexParameteri( GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, filter );


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