Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The DisplayDriverPainter is now also the default on Haiku. The DisplayDriverImpl stuff is left out for now.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12340 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2005-04-12 08:22:16 +00:00
parent 5eec899752
commit b176b6b493
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/servers/app/Desktop.cpp
View File

@ -42,8 +42,8 @@
#include "Workspace.h" #include "Workspace.h"
#if DISPLAYDRIVER == HWDRIVER #if DISPLAYDRIVER == HWDRIVER
#include "AccelerantDriver.h" // #include "AccelerantDriver.h"
// #include "DisplayDriverPainter.h" #include "DisplayDriverPainter.h"
#elif DISPLAYDRIVER == DIRECTDRIVER #elif DISPLAYDRIVER == DIRECTDRIVER
#include "DirectDriver.h" #include "DirectDriver.h"
#elif DISPLAYDRIVER == PAINTERDRIVER #elif DISPLAYDRIVER == PAINTERDRIVER
@ -94,8 +94,8 @@ Desktop::Init(void)
bool initDrivers = true; bool initDrivers = true;
while (initDrivers) { while (initDrivers) {
driver = new AccelerantDriver(); // driver = new AccelerantDriver();
// driver = new DisplayDriverPainter(); driver = new DisplayDriverPainter();
AddDriver(driver); AddDriver(driver);
initDrivers = false; initDrivers = false;
} }
@ -133,11 +133,11 @@ Desktop::AddDriver(DisplayDriver *driver)
if (driver->Initialize()) { if (driver->Initialize()) {
// TODO: be careful of screen initialization - monitor may not support 640x480 // TODO: be careful of screen initialization - monitor may not support 640x480
Screen *sc = new Screen(driver, BPoint(640, 480), B_RGB32, fScreenList.CountItems()+1); Screen *sc = new Screen(driver, BPoint(640, 480), B_RGB32, fScreenList.CountItems()+1);
// Screen *sc = new Screen(driver, BPoint(1024, 768), B_RGB32, fScreenList.CountItems()+1);
// Screen *sc = new Screen(driver, BPoint(640, 480), B_CMAP8, fScreenList.CountItems()+1); // Screen *sc = new Screen(driver, BPoint(640, 480), B_CMAP8, fScreenList.CountItems()+1);
// Screen *sc = new Screen(driver, BPoint(640, 480), B_GRAY8, fScreenList.CountItems()+1); // Screen *sc = new Screen(driver, BPoint(640, 480), B_GRAY8, fScreenList.CountItems()+1);
// Screen *sc = new Screen(driver, BPoint(640, 480), B_RGB15, fScreenList.CountItems()+1); // Screen *sc = new Screen(driver, BPoint(640, 480), B_RGB15, fScreenList.CountItems()+1);
// Screen *sc = new Screen(driver, BPoint(640, 480), B_RGB16, fScreenList.CountItems()+1); // Screen *sc = new Screen(driver, BPoint(640, 480), B_RGB16, fScreenList.CountItems()+1);
// Screen *sc = new Screen(driver, BPoint(1024, 768), B_RGB32, fScreenList.CountItems()+1);
fScreenList.AddItem(sc); fScreenList.AddItem(sc);
} else { } else {
driver->Shutdown(); driver->Shutdown();

27
src/servers/app/Jamfile
View File

@ -22,20 +22,21 @@ if ( $(TARGET_PLATFORM) = haiku ) {
SubDirC++Flags $(defines) ; SubDirC++Flags $(defines) ;
VIEW_DRIVER_SOURCES = VIEW_DRIVER_SOURCES =
# AccelerantBuffer.cpp AccelerantBuffer.cpp
AccelerantDriver.cpp # AccelerantDriver.cpp
# AccelerantHWInterface.cpp AccelerantHWInterface.cpp
# DisplayDriverPainter.cpp DisplayDriverPainter.cpp
# HWInterface.cpp HWInterface.cpp
# UpdateQueue.cpp MallocBuffer.cpp
UpdateQueue.cpp
; ;
} else { } else {
VIEW_DRIVER_SOURCES = VIEW_DRIVER_SOURCES =
fake_input_server.cpp fake_input_server.cpp
AccelerantDriver.cpp # AccelerantDriver.cpp
BitmapDriver.cpp # BitmapDriver.cpp
ViewDriver.cpp # ViewDriver.cpp
DirectDriver.cpp # DirectDriver.cpp
# We'll just remove this from the build for a little while... # We'll just remove this from the build for a little while...
#ScreenDriver.cpp #ScreenDriver.cpp
# Painter based DisplayDriver Classes # Painter based DisplayDriver Classes
@ -77,7 +78,7 @@ SharedLibrary appserver :
PatternHandler.cpp PatternHandler.cpp
PixelRenderer.cpp PixelRenderer.cpp
DisplayDriver.cpp DisplayDriver.cpp
DisplayDriverImpl.cpp #DisplayDriverImpl.cpp
DisplaySupport.cpp DisplaySupport.cpp
; ;
@ -118,8 +119,8 @@ if $(TARGET_PLATFORM) = haiku {
LinkSharedOSLibs app_server : LinkSharedOSLibs app_server :
libroot.so libtranslation.so libz.so libpng.so libbe.so libroot.so libtranslation.so libz.so libpng.so libbe.so
libappserver.so libfreetype.so libtextencoding.so ; libappserver.so libpainter.a libagg.a libfreetype.so
# libagg.a libpainter.a ; libtextencoding.so ;
} else { } else {
# link as test application under R5 # link as test application under R5