Ticket #268: SDL-1.2-HG-2010-12-21_opengl_patch.diff

src/video/bwindow/SDL_BWin.h

@@ -113 +113 @@
                                 SDL_GLView = new BGLView(Bounds(), "SDL GLView",
                                                 B_FOLLOW_ALL_SIDES, (B_WILL_DRAW|B_FRAME_EVENTS),
                                                 gl_flags);
-                                SDL_GLView->EnableDirectMode(true);
+                                //TODO: Figure out why directmode isn't working
+                                //SDL_GLView->EnableDirectMode(true);
+                                SDL_GLView->EnableDirectMode(false);
                         }
                         if ( the_view != SDL_GLView ) {
                                 if ( the_view ) {
@@ -133 +135 @@
                         }
                         if ( the_view != SDL_View ) {
                                 if ( the_view ) {
-#if SDL_VIDEO_OPENGL
-                                        if ( the_view == SDL_GLView ) {
-                                                SDL_GLView->UnlockGL();
-                                        }
-#endif
                                         RemoveChild(the_view);
                                 }
                                 AddChild(SDL_View);
                                 the_view = SDL_View;
                         }
                 }
+#if SDL_VIDEO_OPENGL
+                if ( the_view == SDL_GLView ) {
+                        SDL_GLView->UnlockGL();
+                }
+#endif
                 Unlock();
                 return(retval);
         }