pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use real pitch info for DispManX resource_write_data

Browse source
This commit is contained in:
Dimitris Panokostas 2017-09-21 18:31:38 +02:00
parent 46a85cd1fb
commit 3e837ec421
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -31,3 +31,6 @@ Amiberry/VisualGDB/Release-rpi2/Amiberry
VSLinux/obj/ARM/Debug/Amiberry.tlog/unsuccessfulbuild VSLinux/obj/ARM/Debug/Amiberry.tlog/unsuccessfulbuild
*.lastbuildstate *.lastbuildstate
*.tlog *.tlog
src/guisan/lib/libguisan.a
VisualGDB/VisualGDB/Debug/Amiberry-sdl2
VSLinux/obj/ARM/Debug/amiberry-sdl2

9
VSLinux/Amiberry.vcxproj
View file

@ -374,6 +374,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<ConfigurationType>Makefile</ConfigurationType>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
@ -396,8 +397,12 @@
<ImportGroup Label="PropertySheets" /> <ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<IncludePath>..\src\threaddep;..\src\osdep;..\src\include;..\src;C:\sysroot\opt\vc\include\interface\vcos\pthreads;C:\sysroot\opt\vc\include\interface\vmcs_host\linux;C:\sysroot\opt\vc\include;C:\sysroot\usr\include\SDL;C:\sysroot\usr\include\libxml2;$(IncludePath)</IncludePath> <IncludePath>..\src\threaddep;..\src\osdep;..\src\include;..\src;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vcos\pthreads;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vmcs_host\linux;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;$(IncludePath)</IncludePath>
<LibraryPath>C:\sysroot\opt\vc\lib;C:\sysroot\usr\lib\arm-linux-gnueabihf;$(LibraryPath)</LibraryPath> <LibraryPath>C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\lib;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\lib\arm-linux-gnueabihf;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<LibraryPath>C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\lib;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\lib\arm-linux-gnueabihf;$(LibraryPath)</LibraryPath>
<IncludePath>..\src\threaddep;..\src\osdep;..\src\include;..\src;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vcos\pthreads;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vmcs_host\linux;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;$(IncludePath)</IncludePath>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<ClCompile> <ClCompile>

6
src/osdep/rasp_gfx.cpp
View file

@ -233,7 +233,7 @@ static void open_screen(struct uae_prefs *p)
vc_dispmanx_rect_set(&blit_rect, 0, 0, width, height); vc_dispmanx_rect_set(&blit_rect, 0, 0, width, height);
vc_dispmanx_resource_write_data(dispmanxresource_amigafb_1, vc_dispmanx_resource_write_data(dispmanxresource_amigafb_1,
VC_IMAGE_RGB565, VC_IMAGE_RGB565,
width *2, prSDLScreen->pitch,
prSDLScreen->pixels, prSDLScreen->pixels,
&blit_rect); &blit_rect);
vc_dispmanx_rect_set(&src_rect, 0, 0, width << 16, height << 16); vc_dispmanx_rect_set(&src_rect, 0, 0, width << 16, height << 16);
@ -382,7 +382,7 @@ void flush_screen()
current_resource_amigafb = 0; current_resource_amigafb = 0;
vc_dispmanx_resource_write_data( dispmanxresource_amigafb_1, vc_dispmanx_resource_write_data( dispmanxresource_amigafb_1,
VC_IMAGE_RGB565, VC_IMAGE_RGB565,
gfxvidinfo.outwidth * 2, gfxvidinfo.rowbytes,
gfxvidinfo.bufmem, gfxvidinfo.bufmem,
&blit_rect); &blit_rect);
dispmanxupdate = vc_dispmanx_update_start(0); dispmanxupdate = vc_dispmanx_update_start(0);
@ -397,7 +397,7 @@ void flush_screen()
current_resource_amigafb = 1; current_resource_amigafb = 1;
vc_dispmanx_resource_write_data( dispmanxresource_amigafb_2, vc_dispmanx_resource_write_data( dispmanxresource_amigafb_2,
VC_IMAGE_RGB565, VC_IMAGE_RGB565,
gfxvidinfo.outwidth * 2, gfxvidinfo.rowbytes,
gfxvidinfo.bufmem, gfxvidinfo.bufmem,
&blit_rect); &blit_rect);
dispmanxupdate = vc_dispmanx_update_start(0); dispmanxupdate = vc_dispmanx_update_start(0);