csdopenglnet-cvs

[Kai R. <kre...@us...>]

Update of /cvsroot/csdopenglnet/csdOpenGL/generator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28410/generator

Modified Files:
	gtkArea.cs gtkContext.cs 
Log Message:
GtkGL running on NVidia at ATI


Index: gtkContext.cs
===================================================================
RCS file: /cvsroot/csdopenglnet/csdOpenGL/generator/gtkContext.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gtkContext.cs	27 Jul 2004 12:56:49 -0000	1.4
--- gtkContext.cs	27 Jul 2004 13:38:46 -0000	1.5
***************
*** 7,10 ****
--- 7,13 ----
  using System.Runtime.InteropServices;
  
+ public class NoGLContextException : Exception {}
+ public class NoXDisplayException : Exception {}
+ 
  public class GdkGLContext : csdGLXTokens {
  
***************
*** 51,59 ****
  
    protected static uint[] stdInitializer = { GLX_RGBA, GLX_DEPTH_SIZE, 16, GLX_DOUBLEBUFFER, 0 };
!   
    public GdkGLContext() : this ( stdInitializer ) {
      Debug.Indent();
      Debug.WriteLine( "Entering GdkGLContext()" );
!     
      Debug.WriteLine( "Exiting GdkGLContext()" );
      Debug.Unindent();
--- 54,62 ----
  
    protected static uint[] stdInitializer = { GLX_RGBA, GLX_DEPTH_SIZE, 16, GLX_DOUBLEBUFFER, 0 };
! 
    public GdkGLContext() : this ( stdInitializer ) {
      Debug.Indent();
      Debug.WriteLine( "Entering GdkGLContext()" );
!         
      Debug.WriteLine( "Exiting GdkGLContext()" );
      Debug.Unindent();
***************
*** 68,71 ****
--- 71,76 ----
      Debug.WriteLine( xdisplay.ToString() );
      xdisplay = gdk_x11_get_default_xdisplay();
+     if (xdisplay==IntPtr.Zero) throw new NoXDisplayException();
+     
      Debug.Write( "postX11get: " );
      Debug.WriteLine( xdisplay.ToString() );
***************
*** 73,76 ****
--- 78,82 ----
          
      IntPtr visualInfo = glXChooseVisual( xdisplay, gdk_x11_get_default_screen(), attributeList );
+     if (xdisplay==IntPtr.Zero) throw new NoGLContextException();
      
      try {
***************
*** 97,104 ****
      Debug.WriteLine( "Entering ~GdkGLContext(uint[])" );
      
-     Debug.WriteLine( "glXDestroyContext" );
      if (glxcontext==glXGetCurrentContext()) {
        glXMakeCurrent( xdisplay, 0, IntPtr.Zero );
      }
      glXDestroyContext( xdisplay, glxcontext );
      
--- 103,112 ----
      Debug.WriteLine( "Entering ~GdkGLContext(uint[])" );
      
      if (glxcontext==glXGetCurrentContext()) {
+       Debug.WriteLine( "glXMakeCurrent" );
        glXMakeCurrent( xdisplay, 0, IntPtr.Zero );
      }
+     
+     Debug.WriteLine( "glXDestroyContext" );
      glXDestroyContext( xdisplay, glxcontext );
      
***************
*** 133,142 ****
      Debug.WriteLine( "Entering GdkGLContext.SwapBuffers(Window)" );
      
!     if (window==null) Debug.WriteLine( "window not initialized" );    
!     
!     Debug.WriteLine( "gdk_x11_drawable_get_xid" );
!     int id = gdk_x11_drawable_get_xid( window.Handle );
!     Debug.WriteLine( "glXSwapBuffers" );
!     glXSwapBuffers( xdisplay, id );
      
      Debug.WriteLine( "Exiting GdkGLContext.SwapBuffers(Window)" );
--- 141,152 ----
      Debug.WriteLine( "Entering GdkGLContext.SwapBuffers(Window)" );
      
!     if (window==null) {
!       Debug.WriteLine( "window not initialized" );
!     } else {
!       Debug.WriteLine( "gdk_x11_drawable_get_xid" );
!       int id = gdk_x11_drawable_get_xid( window.Handle );
!       Debug.WriteLine( "glXSwapBuffers" );
!       glXSwapBuffers( xdisplay, id );
!     }
      
      Debug.WriteLine( "Exiting GdkGLContext.SwapBuffers(Window)" );

Index: gtkArea.cs
===================================================================
RCS file: /cvsroot/csdopenglnet/csdOpenGL/generator/gtkArea.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gtkArea.cs	27 Jul 2004 12:21:51 -0000	1.2
--- gtkArea.cs	27 Jul 2004 13:38:46 -0000	1.3
***************
*** 41,45 ****
      Debug.WriteLine( "Entering GtkGLArea.MakeCurrent()" );
      
!     bool result =  context.MakeCurrent( GdkWindow );
      
      Debug.WriteLine( "Entering GtkGLArea.MakeCurrent()*" );
--- 41,45 ----
      Debug.WriteLine( "Entering GtkGLArea.MakeCurrent()" );
      
!     bool result = context.MakeCurrent( GdkWindow );
      
      Debug.WriteLine( "Entering GtkGLArea.MakeCurrent()*" );