Merge branch 'master' of https://github.com/86Box/86Box
This commit is contained in:
@@ -314,7 +314,6 @@ RendererStack::createRenderer(Renderer renderer)
|
|||||||
connect(hw, &OpenGLRenderer::errorInitializing, [=]() {
|
connect(hw, &OpenGLRenderer::errorInitializing, [=]() {
|
||||||
/* Renderer not could initialize, fallback to software. */
|
/* Renderer not could initialize, fallback to software. */
|
||||||
imagebufs = {};
|
imagebufs = {};
|
||||||
endblit();
|
|
||||||
QTimer::singleShot(0, this, [this]() { switchRenderer(Renderer::Software); });
|
QTimer::singleShot(0, this, [this]() { switchRenderer(Renderer::Software); });
|
||||||
});
|
});
|
||||||
current.reset(this->createWindowContainer(hw, this));
|
current.reset(this->createWindowContainer(hw, this));
|
||||||
@@ -332,7 +331,6 @@ RendererStack::createRenderer(Renderer renderer)
|
|||||||
msgBox->setAttribute(Qt::WA_DeleteOnClose);
|
msgBox->setAttribute(Qt::WA_DeleteOnClose);
|
||||||
msgBox->show();
|
msgBox->show();
|
||||||
imagebufs = {};
|
imagebufs = {};
|
||||||
endblit();
|
|
||||||
QTimer::singleShot(0, this, [this]() { switchRenderer(Renderer::Software); });
|
QTimer::singleShot(0, this, [this]() { switchRenderer(Renderer::Software); });
|
||||||
});
|
});
|
||||||
connect(hw, &D3D9Renderer::initialized, this, [this]()
|
connect(hw, &D3D9Renderer::initialized, this, [this]()
|
||||||
@@ -356,7 +354,6 @@ RendererStack::createRenderer(Renderer renderer)
|
|||||||
msgBox->setAttribute(Qt::WA_DeleteOnClose);
|
msgBox->setAttribute(Qt::WA_DeleteOnClose);
|
||||||
msgBox->show();
|
msgBox->show();
|
||||||
imagebufs = {};
|
imagebufs = {};
|
||||||
endblit();
|
|
||||||
QTimer::singleShot(0, this, [this]() { switchRenderer(Renderer::Software); });
|
QTimer::singleShot(0, this, [this]() { switchRenderer(Renderer::Software); });
|
||||||
current.reset(nullptr);
|
current.reset(nullptr);
|
||||||
break;
|
break;
|
||||||
@@ -375,7 +372,6 @@ RendererStack::createRenderer(Renderer renderer)
|
|||||||
msgBox->setAttribute(Qt::WA_DeleteOnClose);
|
msgBox->setAttribute(Qt::WA_DeleteOnClose);
|
||||||
msgBox->show();
|
msgBox->show();
|
||||||
imagebufs = {};
|
imagebufs = {};
|
||||||
endblit();
|
|
||||||
QTimer::singleShot(0, this, [this]() { switchRenderer(Renderer::Software); });
|
QTimer::singleShot(0, this, [this]() { switchRenderer(Renderer::Software); });
|
||||||
});
|
});
|
||||||
current.reset(this->createWindowContainer(hw, this));
|
current.reset(this->createWindowContainer(hw, this));
|
||||||
|
Reference in New Issue
Block a user