[haiku-commits] haiku: hrev43865 - in src: apps/glteapot add-ons/screen_savers/flurry apps/3dmov

From: kallisti5@xxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Fri, 16 Mar 2012 04:42:00 +0100 (CET)
hrev43865 adds 1 changeset to branch 'master'
old head: b2bcacdef607ffc33f3586422ead811471a2ed98
new head: 4f3b7115be13d663526ff6d95219cfe45abd9fb0

----------------------------------------------------------------------------

4f3b711: gl: Unify DirectConnected functions
  
  * Partial undo of hrev43864 - 3dmov
    I was using an old GL renderer. After my indirect
    GL fix, this started working well without direct
    rendering. (sorry for the spam)
  * Clean up the other GL DirectConnected functions
    Make it easy for know what to disable to toggle
    Direct Rendering.

                          [ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev43865
Commit:      4f3b7115be13d663526ff6d95219cfe45abd9fb0
URL:         http://cgit.haiku-os.org/haiku/commit/?id=4f3b711
Author:      Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date:        Fri Mar 16 03:39:31 2012 UTC

----------------------------------------------------------------------------

3 files changed, 14 insertions(+), 2 deletions(-)
src/add-ons/screen_savers/flurry/Flurry.cpp |    7 +++++--
src/apps/3dmov/MainWindow.cpp               |    4 ++++
src/apps/glteapot/TeapotWindow.cpp          |    5 +++++

----------------------------------------------------------------------------

diff --git a/src/add-ons/screen_savers/flurry/Flurry.cpp 
b/src/add-ons/screen_savers/flurry/Flurry.cpp
index f314dad..31c6a15 100644
--- a/src/add-ons/screen_savers/flurry/Flurry.cpp
+++ b/src/add-ons/screen_savers/flurry/Flurry.cpp
@@ -351,7 +351,7 @@ Flurry::StartSaver(BView* view, bool preview)
 void
 Flurry::StopSaver()
 {
-       if (fFlurryView)
+       if (fFlurryView != NULL)
                fFlurryView->EnableDirectMode(false);
 }
 
@@ -366,10 +366,13 @@ Flurry::DirectDraw(int32 frame)
 void
 Flurry::DirectConnected(direct_buffer_info* info)
 {
-       if (fFlurryView) {
+       // Enable or disable direct rendering
+       #if 1
+       if (fFlurryView != NULL) {
                fFlurryView->DirectConnected(info);
                fFlurryView->EnableDirectMode(true);
        }
+       #endif
 }
 
 
diff --git a/src/apps/3dmov/MainWindow.cpp b/src/apps/3dmov/MainWindow.cpp
index c2ace0c..155b094 100644
--- a/src/apps/3dmov/MainWindow.cpp
+++ b/src/apps/3dmov/MainWindow.cpp
@@ -200,10 +200,14 @@ bool MainWindow :: QuitRequested()
 */
 void MainWindow :: DirectConnected(direct_buffer_info *info)
 {
+       // TODO: Direct rendering causes mouse to flicker due to lack
+       // of a hardware cursor.
+       #if 0
        if (fCurrentView != NULL) {
                fCurrentView->DirectConnected(info);
                fCurrentView->EnableDirectMode(true);
        }
+       #endif
 }
 
 /*     FUNCTION:               animation_thread
diff --git a/src/apps/glteapot/TeapotWindow.cpp 
b/src/apps/glteapot/TeapotWindow.cpp
index 2df2260..659c805 100644
--- a/src/apps/glteapot/TeapotWindow.cpp
+++ b/src/apps/glteapot/TeapotWindow.cpp
@@ -213,10 +213,15 @@ TeapotWindow::QuitRequested()
 void
 TeapotWindow::DirectConnected(direct_buffer_info* info)
 {
+       // TODO: Direct rendering causes the mouse to flicker due
+       // to the lack of a Hardware Cursor, however without
+       // it the teapot freezes on mouse move. (bug?)
+       #if 1
        if (fObjectView != NULL) {
                fObjectView->DirectConnected(info);
                fObjectView->EnableDirectMode(true);
        }
+       #endif
 }
[haiku-commits] haiku: hrev43865 - in src: apps/glteapot add-ons/screen_savers/flurry apps/3dmov

Other related posts:
