ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/stella-emu/stella

This commit is contained in:
Thomas Jentzsch 2019-08-04 08:43:06 +02:00
parent b3ca922706 4d75dcb462
commit 9a52aa9431
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libretro/FrameBufferLIBRETRO.cxx
View File

@ -18,6 +18,8 @@
#include "bspf.hxx" #include "bspf.hxx"
#include "OSystem.hxx" #include "OSystem.hxx"
#include "AtariNTSC.hxx"
#include "TIAConstants.hxx"
#include "FBSurfaceLIBRETRO.hxx" #include "FBSurfaceLIBRETRO.hxx"
#include "FrameBufferLIBRETRO.hxx" #include "FrameBufferLIBRETRO.hxx"
@ -47,7 +49,8 @@ unique_ptr<FBSurface>
unique_ptr<FBSurface> ptr = make_unique<FBSurfaceLIBRETRO> unique_ptr<FBSurface> ptr = make_unique<FBSurfaceLIBRETRO>
(const_cast<FrameBufferLIBRETRO&>(*this), w, h, data); (const_cast<FrameBufferLIBRETRO&>(*this), w, h, data);
if(w == 565 && h == 320) if(w == AtariNTSC::outWidth(TIAConstants::frameBufferWidth) &&
h == TIAConstants::frameBufferHeight)
{ {
uInt32 pitch; uInt32 pitch;
ptr.get()->basePtr(myRenderSurface, pitch); ptr.get()->basePtr(myRenderSurface, pitch);

2
src/libretro/libretro.cxx
View File

@ -450,7 +450,7 @@ void retro_get_system_av_info(struct retro_system_av_info *info)
info->geometry.base_width = stella.getRenderWidth() - crop_left * (stella.getVideoZoom() == 1 ? 2 : 1); info->geometry.base_width = stella.getRenderWidth() - crop_left * (stella.getVideoZoom() == 1 ? 2 : 1);
info->geometry.base_height = stella.getRenderHeight(); info->geometry.base_height = stella.getRenderHeight();
info->geometry.max_width = ((stella.getVideoWidthMax() + 3) / 4) * 4; info->geometry.max_width = stella.getVideoWidthMax();
info->geometry.max_height = stella.getVideoHeightMax(); info->geometry.max_height = stella.getVideoHeightMax();
info->geometry.aspect_ratio = stella.getVideoAspectPar() * (float) info->geometry.base_width / (float) info->geometry.base_height; info->geometry.aspect_ratio = stella.getVideoAspectPar() * (float) info->geometry.base_width / (float) info->geometry.base_height;