1
0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-25 18:30:21 +00:00

Fixed a couple of incorrect references to horizontal constants or calculations where the intention is to use vertical.

This commit is contained in:
Thomas Harte 2015-08-13 18:29:07 +01:00
parent 323aa27e13
commit b440fed323

View File

@ -189,7 +189,7 @@ void CRT::advance_cycles(int number_of_cycles, bool hsync_requested, bool vsync_
vsync_requested = false;
uint8_t *next_run = (is_output_run && _current_frame_builder && next_run_length) ? _current_frame_builder->get_next_run() : nullptr;
int lengthMask = (_is_in_hsync ? kRetraceXMask : 0) | (_is_in_vsync ? kRetraceXMask : 0);
int lengthMask = (_is_in_hsync ? kRetraceXMask : 0) | (_is_in_vsync ? kRetraceYMask : 0);
#define position_x(v) (*(uint16_t *)&next_run[kCRTSizeOfVertex*v + kCRTVertexOffsetOfPosition + 0])
#define position_y(v) (*(uint16_t *)&next_run[kCRTSizeOfVertex*v + kCRTVertexOffsetOfPosition + 2])
@ -224,7 +224,7 @@ void CRT::advance_cycles(int number_of_cycles, bool hsync_requested, bool vsync_
_rasterPosition.x = (uint32_t)std::min((int64_t)kCRTFixedPointRange, end_position[0]);
if (_is_in_vsync)
_rasterPosition.y = (uint32_t)std::max((int64_t)0, end_position[0]);
_rasterPosition.y = (uint32_t)std::max((int64_t)0, end_position[1]);
else
_rasterPosition.y = (uint32_t)std::min((int64_t)kCRTFixedPointRange, end_position[1]);