as a first step, all appearently unused calls are commented outfrom DisplayDriver and derived classes, I moved many implementations arround to match the order of the declaration in the header, makes it easier to find stuff
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@11980 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -529,9 +529,9 @@ void BitmapDriver::VLinePatternThick(int32 x, int32 y1, int32 y2)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
void BitmapDriver::DrawBitmap(ServerBitmap *sourcebmp, const BRect &source,
|
void BitmapDriver::DrawBitmap(ServerBitmap *sourcebmp, const BRect &source,
|
||||||
const BRect &dest, DrawData *d)
|
const BRect &dest, const DrawData *d)
|
||||||
{
|
{
|
||||||
// Another internal function called from other functions.
|
// Another internal function called from other functions.
|
||||||
|
|
||||||
@@ -656,7 +656,7 @@ void BitmapDriver::DrawBitmap(ServerBitmap *sourcebmp, const BRect &source,
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
|
|
||||||
|
|
||||||
bool BitmapDriver::AcquireBuffer(FBBitmap *fbmp)
|
bool BitmapDriver::AcquireBuffer(FBBitmap *fbmp)
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ public:
|
|||||||
ServerBitmap *GetTarget(void) const { return fTarget; }
|
ServerBitmap *GetTarget(void) const { return fTarget; }
|
||||||
|
|
||||||
// Settings functions
|
// Settings functions
|
||||||
virtual void DrawBitmap(ServerBitmap *bmp, const BRect &src, const BRect &dest, DrawData *d);
|
// virtual void DrawBitmap(ServerBitmap *bmp, const BRect &src, const BRect &dest, const DrawData *d);
|
||||||
|
|
||||||
virtual void SetMode(const int32 &mode);
|
virtual void SetMode(const int32 &mode);
|
||||||
virtual void SetMode(const display_mode &mode);
|
virtual void SetMode(const display_mode &mode);
|
||||||
|
|||||||
@@ -163,7 +163,7 @@ void DirectDriver::Shutdown(void)
|
|||||||
if(fSavedScreenMode.space!=fCurrentScreenMode.space)
|
if(fSavedScreenMode.space!=fCurrentScreenMode.space)
|
||||||
BScreen().SetMode(&fSavedScreenMode);
|
BScreen().SetMode(&fSavedScreenMode);
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
void DirectDriver::DrawBitmap(ServerBitmap *bmp, const BRect &src, const BRect &dest, const DrawData *d)
|
void DirectDriver::DrawBitmap(ServerBitmap *bmp, const BRect &src, const BRect &dest, const DrawData *d)
|
||||||
{
|
{
|
||||||
STRACE(("DirectDriver::DrawBitmap\n"));
|
STRACE(("DirectDriver::DrawBitmap\n"));
|
||||||
@@ -190,7 +190,7 @@ void DirectDriver::DrawBitmap(ServerBitmap *bmp, const BRect &src, const BRect &
|
|||||||
screenwin->rectpipe.PutRect(dest);
|
screenwin->rectpipe.PutRect(dest);
|
||||||
Unlock();
|
Unlock();
|
||||||
delete mediator;
|
delete mediator;
|
||||||
}
|
}*/
|
||||||
|
|
||||||
void DirectDriver::InvertRect(const BRect &r)
|
void DirectDriver::InvertRect(const BRect &r)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ public:
|
|||||||
virtual bool Initialize(void);
|
virtual bool Initialize(void);
|
||||||
virtual void Shutdown(void);
|
virtual void Shutdown(void);
|
||||||
|
|
||||||
void DrawBitmap(ServerBitmap *bmp, const BRect &src, const BRect &dest, const DrawData *d);
|
// void DrawBitmap(ServerBitmap *bmp, const BRect &src, const BRect &dest, const DrawData *d);
|
||||||
|
|
||||||
virtual void InvertRect(const BRect &r);
|
virtual void InvertRect(const BRect &r);
|
||||||
|
|
||||||
|
|||||||
+660
-690
File diff suppressed because it is too large
Load Diff
@@ -43,7 +43,6 @@ PicturePlayer::PicturePlayer(DisplayDriver *d,void *data, int32 size)
|
|||||||
|
|
||||||
PicturePlayer::~PicturePlayer()
|
PicturePlayer::~PicturePlayer()
|
||||||
{
|
{
|
||||||
if(clipreg)
|
|
||||||
delete clipreg;
|
delete clipreg;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -255,7 +254,13 @@ status_t PicturePlayer::Play(int32 tableEntries,void *userData, LayerData *d)
|
|||||||
ServerBitmap sbmp(BRect(0,0,width-1,height-1), (color_space)pixelFormat, flags, bytesPerRow);
|
ServerBitmap sbmp(BRect(0,0,width-1,height-1), (color_space)pixelFormat, flags, bytesPerRow);
|
||||||
sbmp._AllocateBuffer();
|
sbmp._AllocateBuffer();
|
||||||
GetData(sbmp.Bits(), size - (fData.Position() - pos));
|
GetData(sbmp.Bits(), size - (fData.Position() - pos));
|
||||||
fdriver->DrawBitmap(&sbmp,src,dest,&fldata);
|
// TODO: what clipping region is DrawBitmap expecting?
|
||||||
|
// It appears to be in screen space. What space is clipreg in?
|
||||||
|
// We might pass a NULL pointer here, which would crash
|
||||||
|
// in DrawBitmap(), but I think this whole thing needs
|
||||||
|
// fixing...
|
||||||
|
fdriver->DrawBitmap(clipreg,
|
||||||
|
&sbmp,src,dest,&fldata);
|
||||||
sbmp._FreeBuffer();
|
sbmp._FreeBuffer();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// Copyright (c) 2001-2002, Haiku, Inc.
|
// Copyright (c) 2001-2005, Haiku, Inc.
|
||||||
//
|
//
|
||||||
// Permission is hereby granted, free of charge, to any person obtaining a
|
// Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
// copy of this software and associated documentation files (the "Software"),
|
// copy of this software and associated documentation files (the "Software"),
|
||||||
@@ -39,7 +39,6 @@
|
|||||||
#include <Screen.h>
|
#include <Screen.h>
|
||||||
#include <TranslatorRoster.h>
|
#include <TranslatorRoster.h>
|
||||||
|
|
||||||
#include "Angle.h"
|
|
||||||
#include "PortLink.h"
|
#include "PortLink.h"
|
||||||
#include "RectUtils.h"
|
#include "RectUtils.h"
|
||||||
#include "ServerProtocol.h"
|
#include "ServerProtocol.h"
|
||||||
@@ -595,14 +594,14 @@ void ViewDriver::SetMode(const display_mode &mode)
|
|||||||
screenwin->Unlock();
|
screenwin->Unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
void ViewDriver::DrawBitmap(ServerBitmap *bitmap, const BRect &src, const BRect &dest, const DrawData *d)
|
void ViewDriver::DrawBitmap(ServerBitmap *bitmap, const BRect &src, const BRect &dest, const DrawData *d)
|
||||||
{
|
{
|
||||||
if(!is_initialized)
|
if(!is_initialized)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
STRACE(("ViewDriver:: DrawBitmap unimplemented()\n"));
|
STRACE(("ViewDriver:: DrawBitmap unimplemented()\n"));
|
||||||
}
|
}*/
|
||||||
|
|
||||||
bool ViewDriver::DumpToFile(const char *path)
|
bool ViewDriver::DumpToFile(const char *path)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ public:
|
|||||||
virtual void Shutdown(void); // You never know when you'll need this
|
virtual void Shutdown(void); // You never know when you'll need this
|
||||||
|
|
||||||
// Drawing functions
|
// Drawing functions
|
||||||
void DrawBitmap(ServerBitmap *bmp, const BRect &src, const BRect &dest, const DrawData *d);
|
// void DrawBitmap(ServerBitmap *bmp, const BRect &src, const BRect &dest, const DrawData *d);
|
||||||
|
|
||||||
virtual void InvertRect(const BRect &r);
|
virtual void InvertRect(const BRect &r);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user