sinamas/gambatte
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- DirectDrawBlitter: Add triple buffering option.

Browse Source 
- Direct3DBlitter: Use D3DSWAPEFFECT_DISCARD in non-exclusive mode.
- Direct3DBlitter: Allow triple buffering and vblank-only updates in non-excusive mode.
- Rename "Page flipping" in Direct3D and DirectDraw blitters to "Exclusive full screen".


git-svn-id: https://gambatte.svn.sourceforge.net/svnroot/gambatte@209 9dfb2916-2d38-0410-aef4-c5fe6c9ffc24
This commit is contained in:
sinamas 2009-01-01 04:21:03 +00:00
parent beb4f51f5f
commit 10bcbfbcd0
4 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
gambatte_qt/src/framework/blitterwidgets/direct3dblitter.cpp
View File

@ -59,8 +59,8 @@ Direct3DBlitter::Direct3DBlitter(PixelBufferSetter setPixelBuffer, QWidget *pare
confWidget(new QWidget),
adapterSelector(new QComboBox),
vblankBox(new QCheckBox("Sync to vertical blank in 60 and 120 Hz modes")),
flippingBox(new QCheckBox("Page flipping")),
vblankflipBox(new QCheckBox("Only flip during vertical blank")),
flippingBox(new QCheckBox("Exclusive full screen")),
vblankblitBox(new QCheckBox("Only update during vertical blank")),
triplebufBox(new QCheckBox("Triple buffering")),
bfBox(new QCheckBox("Bilinear filtering")),
d3d9handle(NULL),
@ -83,8 +83,8 @@ Direct3DBlitter::Direct3DBlitter(PixelBufferSetter setPixelBuffer, QWidget *pare
drawn(false),
vblank(false),
flipping(false),
vblankflip(true),
triplebuf(true),
vblankblit(false),
triplebuf(false),
bf(true)
{
setAttribute(Qt::WA_PaintOnScreen, true);
@ -117,7 +117,7 @@ Direct3DBlitter::Direct3DBlitter(PixelBufferSetter setPixelBuffer, QWidget *pare
vblank = settings.value("vblank", vblank).toBool();
flipping = settings.value("flipping", flipping).toBool();
vblankflip = settings.value("vblankflip", vblankflip).toBool();
vblankblit = settings.value("vblankblit", vblankblit).toBool();
triplebuf = settings.value("triplebuf", triplebuf).toBool();
bf = settings.value("bf", bf).toBool();
settings.endGroup();
@ -135,31 +135,12 @@ Direct3DBlitter::Direct3DBlitter(PixelBufferSetter setPixelBuffer, QWidget *pare
mainLayout->addWidget(vblankBox);
mainLayout->addWidget(flippingBox);
{
QHBoxLayout *l = new QHBoxLayout;
l->addSpacing(QApplication::style()->pixelMetric(QStyle::PM_LayoutLeftMargin));
l->addWidget(vblankflipBox);
mainLayout->addLayout(l);
}
{
QHBoxLayout *l = new QHBoxLayout;
l->addSpacing(QApplication::style()->pixelMetric(QStyle::PM_LayoutLeftMargin));
l->addWidget(triplebufBox);
mainLayout->addLayout(l);
}
mainLayout->addWidget(vblankblitBox);
mainLayout->addWidget(triplebufBox);
mainLayout->addWidget(bfBox);
confWidget->setLayout(mainLayout);
}
vblankflipBox->setEnabled(false);
triplebufBox->setEnabled(false);
connect(flippingBox, SIGNAL(toggled(bool)), vblankflipBox, SLOT(setEnabled(bool)));
connect(flippingBox, SIGNAL(toggled(bool)), triplebufBox, SLOT(setEnabled(bool)));
rejectSettings();
}
@ -177,7 +158,7 @@ Direct3DBlitter::~Direct3DBlitter() {
settings.setValue("adapterIndex", adapterIndex);
settings.setValue("vblank", vblank);
settings.setValue("flipping", flipping);
settings.setValue("vblankflip", vblankflip);
settings.setValue("vblankblit", vblankblit);
settings.setValue("triplebuf", triplebuf);
settings.setValue("bf", bf);
settings.endGroup();
@ -200,10 +181,10 @@ void Direct3DBlitter::getPresentParams(D3DPRESENT_PARAMETERS *const presentParam
presentParams->BackBufferWidth = excl ? displayMode.Width : width();
presentParams->BackBufferHeight = excl ? displayMode.Height : height();
presentParams->BackBufferFormat = displayMode.Format;
presentParams->BackBufferCount = excl & triplebuf ? 2 : 1;
presentParams->BackBufferCount = triplebuf ? 2 : 1;
presentParams->MultiSampleType = D3DMULTISAMPLE_NONE;
presentParams->MultiSampleQuality = 0;
presentParams->SwapEffect = excl ? D3DSWAPEFFECT_FLIP : D3DSWAPEFFECT_COPY;
presentParams->SwapEffect = excl ? D3DSWAPEFFECT_FLIP : D3DSWAPEFFECT_DISCARD;
presentParams->hDeviceWindow = excl ? parentWidget()->parentWidget()->winId() : winId();
presentParams->Windowed = excl ? FALSE : TRUE;
presentParams->EnableAutoDepthStencil = FALSE;
@ -211,7 +192,7 @@ void Direct3DBlitter::getPresentParams(D3DPRESENT_PARAMETERS *const presentParam
presentParams->Flags = 0;
presentParams->FullScreen_RefreshRateInHz = excl ? displayMode.RefreshRate : 0;
presentParams->PresentationInterval = swapInterval == 2 ? D3DPRESENT_INTERVAL_TWO :
(swapInterval == 1 || excl & vblankflip ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE);
(swapInterval == 1 || vblankblit ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE);
}
void Direct3DBlitter::lockTexture() {
@ -375,7 +356,7 @@ void Direct3DBlitter::present() {
device->GetSwapChain(0, &swapChain);
if (swapChain) {
swapChain->Present(NULL, NULL, 0, NULL, ~windowed & vblankflip && !swapInterval ? 1 : 0);
swapChain->Present(NULL, NULL, 0, NULL, vblankblit && !swapInterval ? 1 : 0);
swapChain->Release();
} else
device->Present(NULL, NULL, 0, NULL);
@ -561,7 +542,7 @@ void Direct3DBlitter::acceptSettings() {
exclusiveChange();
}
vblankflip = vblankflipBox->isChecked();
vblankblit = vblankblitBox->isChecked();
triplebuf = triplebufBox->isChecked();
bf = bfBox->isChecked();
resetDevice();
@ -571,7 +552,7 @@ void Direct3DBlitter::rejectSettings() {
adapterSelector->setCurrentIndex(adapterIndex);
vblankBox->setChecked(vblank);
flippingBox->setChecked(flipping);
vblankflipBox->setChecked(vblankflip);
vblankblitBox->setChecked(vblankblit);
triplebufBox->setChecked(triplebuf);
bfBox->setChecked(bf);
}

4
gambatte_qt/src/framework/blitterwidgets/direct3dblitter.h
View File

@ -34,7 +34,7 @@ class Direct3DBlitter : public BlitterWidget {
QComboBox *const adapterSelector;
QCheckBox *const vblankBox;
QCheckBox *const flippingBox;
QCheckBox *const vblankflipBox;
QCheckBox *const vblankblitBox;
QCheckBox *const triplebufBox;
QCheckBox *const bfBox;
HMODULE d3d9handle;
@ -57,7 +57,7 @@ class Direct3DBlitter : public BlitterWidget {
bool drawn;
bool vblank;
bool flipping;
bool vblankflip;
bool vblankblit;
bool triplebuf;
bool bf;

28
gambatte_qt/src/framework/blitterwidgets/directdrawblitter.cpp
View File

@ -47,8 +47,9 @@ DirectDrawBlitter::DirectDrawBlitter(PixelBufferSetter setPixelBuffer, QWidget *
BlitterWidget(setPixelBuffer, "DirectDraw", parent),
confWidget(new QWidget),
vblankBox(new QCheckBox(QString("Sync to vertical blank in 60 Hz modes"))),
flippingBox(new QCheckBox(QString("Page flipping"))),
vblankflipBox(new QCheckBox("Only flip during vertical blank")),
flippingBox(new QCheckBox(QString("Exclusive full screen"))),
vblankflipBox(new QCheckBox("Only update during vertical blank")),
triplebufBox(new QCheckBox("Triple buffering")),
videoSurfaceBox(new QCheckBox(QString("Use video memory surface"))),
deviceSelector(new QComboBox),
lpDD(NULL),
@ -71,6 +72,7 @@ DirectDrawBlitter::DirectDrawBlitter(PixelBufferSetter setPixelBuffer, QWidget *
exclusive(false),
flipping(false),
vblankflip(true),
triplebuf(false),
blitted(false)
{
setAttribute(Qt::WA_PaintOnScreen, true);
@ -85,6 +87,7 @@ DirectDrawBlitter::DirectDrawBlitter(PixelBufferSetter setPixelBuffer, QWidget *
vblank = settings.value("vblank", vblank).toBool();
flipping = settings.value("flipping", flipping).toBool();
vblankflip = settings.value("vblankflip", vblankflip).toBool();
triplebuf = settings.value("triplebuf", triplebuf).toBool();
videoSurface = settings.value("videoSurface", videoSurface).toBool();
if ((deviceIndex = settings.value("deviceIndex", deviceIndex).toUInt()) >= static_cast<unsigned>(deviceSelector->count()))
@ -114,11 +117,21 @@ DirectDrawBlitter::DirectDrawBlitter(PixelBufferSetter setPixelBuffer, QWidget *
mainLayout->addLayout(l);
}
{
QHBoxLayout *l = new QHBoxLayout;
l->addSpacing(QApplication::style()->pixelMetric(QStyle::PM_LayoutLeftMargin));
l->addWidget(triplebufBox);
mainLayout->addLayout(l);
}
mainLayout->addWidget(videoSurfaceBox);
confWidget->setLayout(mainLayout);
vblankflipBox->setEnabled(false);
triplebufBox->setEnabled(false);
connect(flippingBox, SIGNAL(toggled(bool)), vblankflipBox, SLOT(setEnabled(bool)));
connect(flippingBox, SIGNAL(toggled(bool)), triplebufBox, SLOT(setEnabled(bool)));
rejectSettings();
}
@ -131,6 +144,7 @@ DirectDrawBlitter::~DirectDrawBlitter() {
settings.setValue("vblank", vblank);
settings.setValue("flipping", flipping);
settings.setValue("vblankflip", vblankflip);
settings.setValue("triplebuf", triplebuf);
settings.setValue("videoSurface", videoSurface);
settings.setValue("deviceIndex", deviceIndex);
settings.endGroup();
@ -203,7 +217,7 @@ void DirectDrawBlitter::initPrimarySurface() {
if (exclusive & flipping) {
ddsd.dwFlags |= DDSD_BACKBUFFERCOUNT;
ddsd.dwBackBufferCount = 1;
ddsd.dwBackBufferCount = triplebuf ? 2 : 1;
ddsd.ddsCaps.dwCaps |= DDSCAPS_COMPLEX | DDSCAPS_FLIP;
}
@ -272,7 +286,7 @@ void DirectDrawBlitter::initClearSurface() {
}
}
clear = 2;
clear = 2 + triplebuf;
}
void DirectDrawBlitter::init() {
@ -611,6 +625,11 @@ void DirectDrawBlitter::acceptSettings() {
vblankflip = vblankflipBox->isChecked();
if (triplebuf != triplebufBox->isChecked()) {
triplebuf = triplebufBox->isChecked();
needReinit |= exclusive & flipping;
}
if (videoSurface != videoSurfaceBox->isChecked()) {
videoSurface = videoSurfaceBox->isChecked();
@ -628,6 +647,7 @@ void DirectDrawBlitter::rejectSettings() {
vblankBox->setChecked(vblank);
flippingBox->setChecked(flipping);
vblankflipBox->setChecked(vblankflip);
triplebufBox->setChecked(triplebuf);
videoSurfaceBox->setChecked(videoSurface);
deviceSelector->setCurrentIndex(deviceIndex);
}

2
gambatte_qt/src/framework/blitterwidgets/directdrawblitter.h
View File

@ -33,6 +33,7 @@ class DirectDrawBlitter : public BlitterWidget {
QCheckBox *const vblankBox;
QCheckBox *const flippingBox;
QCheckBox *const vblankflipBox;
QCheckBox *const triplebufBox;
QCheckBox *const videoSurfaceBox;
QComboBox *const deviceSelector;
LPDIRECTDRAW7 lpDD;
@ -56,6 +57,7 @@ class DirectDrawBlitter : public BlitterWidget {
bool exclusive;
bool flipping;
bool vblankflip;
bool triplebuf;
bool blitted;
static BOOL WINAPI enumCallback(GUID FAR *, char*, char*, LPVOID, HMONITOR);