Merge pull request #2782 from raven02/patch-2

Fix missing title screen in Growlanser & incorrect switch between buffered and non-buffered mode
This commit is contained in:
Henrik Rydgård 2013-07-15 05:52:00 -07:00
commit bb5a1e434c
3 changed files with 7 additions and 7 deletions

View File

@ -382,12 +382,12 @@ void GuessDrawingSize(int &drawing_width, int &drawing_height) {
int scissorY2 = (gstate.getScissorY2() + 1) & ~1;
GetViewportDimensions(viewport_width, viewport_height);
if (!g_Config.bBufferedRendering || g_iNumVideos || viewport_width <= 0 && viewport_height <= 0) {
if (viewport_width != 480 && viewport_height != 272) {
drawing_width = std::min(scissorX2, regionX2);
drawing_height = std::min(scissorY2, regionY2);
} else {
drawing_width = std::min(viewport_width, std::min(scissorX2, regionX2));
drawing_height = std::min(viewport_height, std::min(scissorY2, regionY2));
drawing_width = viewport_width;
drawing_height = viewport_height;
}
}
@ -454,8 +454,8 @@ void FramebufferManager::SetRenderFrameBuffer() {
vfb->fb_stride = fb_stride;
// Just hack the width/height and we should be fine. also hack renderwidth/renderheight?
// This hack gonna breaks Kingdom Heart and causing black bar on the left side.
//v->width = drawing_width;
//v->height = drawing_height;
v->width = drawing_width;
v->height = drawing_height;
break;
} else {
INFO_LOG(HLE, "Embiggening framebuffer (%i, %i) -> (%i, %i)", (int)v->width, (int)v->height, drawing_width, drawing_height);

2
lang

@ -1 +1 @@
Subproject commit 92e5e45e316f73710882bf82ef8fe43f5192d0f2
Subproject commit 955d9cde6c01a0950f76b1a6e92e2d972ca5c737

2
native

@ -1 +1 @@
Subproject commit 9ad07c3db082a88816bddff7218835208ee94adf
Subproject commit bd93cd2f1e02fbd25696a1ea21720d4fb3f48280