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

update to 1.24.0-UNSTABLE

This commit is contained in:
zeromus 2020-04-06 03:23:46 -04:00
parent dadef68020
commit ca7c2d7d56
7 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
psx/octoshock/docs/upstreaminfo.txt
View File

@ -215,4 +215,12 @@
1.23.0 -> 1.24.0-UNSTABLE
(MDFN_HIDE litter all over)
[OK] psx/gpu : (c); ignored AR changes in GIT (TODO: reapply in bizhawk code). changed timing.
[OK] psx/gpu : (c); ignored AR changes in GIT (TODO: reapply in bizhawk code). changed timing.
[OK] psx/input/guncon : TransformInput changes to use GPU_GetGunXTranslation... IGNORED? IMPORTANT? also: hook updates.
[OK] psx/input/justifier : TransformInput changes to use GPU_GetGunXTranslation... IGNORED? IMPORTANT? also: hook updates.
[OK] psx/mdec : intrinsic macros changes
[NO] psx/psx : "psx.correct_aspect". we're not really using this.
[OK] psx/spu : casts on volumes
[NO] types : nothing important
[NO] video/Deinterlacer : IGNORE. we may have weak deinterlacing, but so be it
[NO] tests : intrinsic macros changes, threading API changes, stream tests

2
psx/octoshock/psx/gpu.cpp
View File

@ -20,6 +20,7 @@
*/
//#pragma GCC optimize ("unroll-loops")
#include <Windows.h>
#include <assert.h>
@ -152,6 +153,7 @@ void PS_GPU::SetRenderOptions(::ShockRenderOptions* opts)
CorrectAspect = false; //NOT USED? IMPORTANT?
HVis = ShowHOverscan ? HVisMax : HVisHideOS;
HVisOffs = (HVisMax - HVis) / 2;
NCABaseW = (HVis + 6) / 7;
LineVisFirst = opts->scanline_start;
LineVisLast = opts->scanline_end;

5
psx/octoshock/psx/input/guncon.cpp
View File

@ -200,7 +200,6 @@ pscpu_timestamp_t InputDevice_GunCon::GPULineHook(const pscpu_timestamp_t line_t
if(pixels && pix_clock)
{
const int avs = 16; // Not 16 for PAL, fixme.
int32 gx;
int32 gy;
@ -209,7 +208,7 @@ pscpu_timestamp_t InputDevice_GunCon::GPULineHook(const pscpu_timestamp_t line_t
for(int32 ix = gx; ix < (gx + (int32)(pix_clock / 762925)); ix++)
{
if(ix >= 0 && ix < (int)width && line_counter >= (avs + gy) && line_counter < (avs + gy + 8))
if(ix >= 0 && ix < (int)width && line_counter >= gy && line_counter < (gy + 8))
{
int r, g, b, a;
@ -224,7 +223,7 @@ pscpu_timestamp_t InputDevice_GunCon::GPULineHook(const pscpu_timestamp_t line_t
}
chair_x = gx;
chair_y = (avs + gy) - line_counter;
chair_y = gy - line_counter;
}
line_counter++;

5
psx/octoshock/psx/input/justifier.cpp
View File

@ -201,7 +201,6 @@ pscpu_timestamp_t InputDevice_Justifier::GPULineHook(const pscpu_timestamp_t tim
if(pixels && pix_clock)
{
const int avs = 16; // Not 16 for PAL, fixme.
int32 gx;
int32 gy;
int32 gxa;
@ -216,7 +215,7 @@ pscpu_timestamp_t InputDevice_Justifier::GPULineHook(const pscpu_timestamp_t tim
{
for(int32 ix = gxa; ix < (gxa + (int32)(pix_clock / 762925)); ix++)
{
if(ix >= 0 && ix < (int)width && line_counter >= (avs + gy - 6) && line_counter <= (avs + gy + 6))
if(ix >= 0 && ix < (int)width && line_counter >= (gy - 6) && line_counter <= (gy + 6))
{
int r, g, b, a;
@ -232,7 +231,7 @@ pscpu_timestamp_t InputDevice_Justifier::GPULineHook(const pscpu_timestamp_t tim
}
chair_x = gx;
chair_y = (avs + gy) - line_counter;
chair_y = gy - line_counter;
}
line_counter++;

2
psx/octoshock/psx/mdec.cpp
View File

@ -77,7 +77,7 @@
#include <arm_neon.h>
#endif
#if defined(ARCH_POWERPC_ALTIVEC) && defined(HAVE_ALTIVEC_H)
#if defined(HAVE_ALTIVEC_INTRINSICS) && defined(HAVE_ALTIVEC_H)
#include <altivec.h>
#endif

20
psx/octoshock/psx/spu.cpp
View File

@ -1067,16 +1067,16 @@ void PS_SPU::Write(pscpu_timestamp_t timestamp, uint32 A, uint16 V)
case 0x2C: PSX_WARNING("[SPU] Global reg 0x2c set: 0x%04x", V);
break;
case 0x30: CDVol[0] = V;
break;
case 0x32: CDVol[1] = V;
break;
case 0x34: ExternVol[0] = V;
break;
case 0x36: ExternVol[1] = V;
case 0x30: CDVol[0] = (int16)V;
break;
case 0x32: CDVol[1] = (int16)V;
break;
case 0x34: ExternVol[0] = (int16)V;
break;
case 0x36: ExternVol[1] = (int16)V;
break;
case 0x38:

6
psx/octoshock/tests.cpp
View File

@ -64,6 +64,10 @@
#include <atomic>
#if defined(HAVE_ALTIVEC_INTRINSICS) && defined(HAVE_ALTIVEC_H)
#include <altivec.h>
#endif
#ifdef __ARM_NEON__
#include <arm_neon.h>
#endif
@ -902,7 +906,7 @@ static void DoAlignmentChecks(void)
CheckAlignasType<__m128>();
#endif
#if defined(ARCH_POWERPC_ALTIVEC)
#if defined(HAVE_ALTIVEC_INTRINSICS)
CheckAlignasType<vector unsigned int>();
CheckAlignasType<vector unsigned short>();
#endif