Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-06 21:03:47 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

-newport: Various fixes. [Ryan Holtz]

Browse Source 
* Fixed COLORI shift when cross-initialized by COLORRED.
 * Fixed RGB vs. CI fast-clear handling.
 * Fixed incorrect octant calculation for lines.
This commit is contained in:
mooglyguy 2019-05-29 00:22:33 +02:00 committed by MooglyGuy
parent f87487ff87
commit 2112658a05
2 changed files with 70 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/devices/bus/gio/newport.cpp
View File

@ -2253,7 +2253,7 @@ uint32_t newport_base_device::get_rgb_color(int16_t x, int16_t y)
}
}
uint8_t newport_base_device::get_octant(int16_t x1, int16_t y1, int16_t x2, int16_t y2, int16_t dx, int16_t dy)
uint8_t newport_base_device::get_octant(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t dx, uint16_t dy)
{
if (x1 < x2)
{
@ -2273,15 +2273,15 @@ uint8_t newport_base_device::get_octant(int16_t x1, int16_t y1, int16_t x2, int1
void newport_base_device::do_fline(uint32_t color)
{
const int32_t x1 = m_rex3.m_x_start >> 7;
const int32_t y1 = m_rex3.m_y_start >> 7;
const int32_t x2 = m_rex3.m_x_end >> 7;
const int32_t y2 = m_rex3.m_y_end >> 7;
const uint32_t x1 = m_rex3.m_x_start >> 7;
const uint32_t y1 = m_rex3.m_y_start >> 7;
const uint32_t x2 = m_rex3.m_x_end >> 7;
const uint32_t y2 = m_rex3.m_y_end >> 7;
const int16_t x10 = x1 & ~0xf;
const int16_t y10 = y1 & ~0xf;
const int16_t x20 = x2 & ~0xf;
const int16_t y20 = y2 & ~0xf;
const uint16_t x10 = x1 & ~0xf;
const uint16_t y10 = y1 & ~0xf;
const uint16_t x20 = x2 & ~0xf;
const uint16_t y20 = y2 & ~0xf;
const bool iterate_one = (m_rex3.m_draw_mode0 & 0x300) == 0;
const bool skip_first = BIT(m_rex3.m_draw_mode0, 10);
@ -2289,14 +2289,14 @@ void newport_base_device::do_fline(uint32_t color)
const bool shade = BIT(m_rex3.m_draw_mode0, 18);
const bool rgbmode = BIT(m_rex3.m_draw_mode1, 15);
int16_t x = x10;
int16_t y = y10;
uint16_t x = x10;
uint16_t y = y10;
int16_t x1_fract = m_rex3.m_x_start_frac;
int16_t y1_fract = m_rex3.m_y_start_frac;
uint16_t x1_fract = m_rex3.m_x_start_frac;
uint16_t y1_fract = m_rex3.m_y_start_frac;
int32_t dx = abs(x1 - x2);
int32_t dy = abs(y1 - y2);
int32_t dx = abs((int32_t)x1 - (int32_t)x2);
int32_t dy = abs((int32_t)y1 - (int32_t)y2);
const int16_t dx_i = abs(x10 - x20) - 1;
const int16_t dy_i = abs(y10 - y20) - 1;
@ -2470,10 +2470,10 @@ void newport_base_device::do_fline(uint32_t color)
void newport_base_device::do_iline(uint32_t color)
{
int16_t x1 = m_rex3.m_x_start_i;
int16_t y1 = m_rex3.m_y_start_i;
int16_t x2 = m_rex3.m_x_end_i;
int16_t y2 = m_rex3.m_y_end_i;
uint16_t x1 = m_rex3.m_x_start_i;
uint16_t y1 = m_rex3.m_y_start_i;
uint16_t x2 = m_rex3.m_x_end_i;
uint16_t y2 = m_rex3.m_y_end_i;
const bool iterate_one = (m_rex3.m_draw_mode0 & 0x300) == 0;
const bool skip_first = BIT(m_rex3.m_draw_mode0, 10);
@ -2481,11 +2481,10 @@ void newport_base_device::do_iline(uint32_t color)
const bool shade = BIT(m_rex3.m_draw_mode0, 18);
const bool rgbmode = BIT(m_rex3.m_draw_mode1, 15);
int16_t x = x1;
int16_t y = y1;
int16_t dx = abs(x1 - x2);
int16_t dy = abs(y1 - y2);
//const uint8_t coverage = 1;
uint16_t x = x1;
uint16_t y = y1;
uint16_t dx = abs(x1 - x2);
uint16_t dy = abs(y1 - y2);
static const bresenham_octant_info_t s_bresenham_infos[8] =
{
@ -2504,7 +2503,7 @@ void newport_base_device::do_iline(uint32_t color)
const int16_t incrx2 = s_bresenham_infos[octant].incrx2;
const int16_t incry1 = s_bresenham_infos[octant].incry1;
const int16_t incry2 = s_bresenham_infos[octant].incry2;
int16_t loop = s_bresenham_infos[octant].loop ? dy : dx;
uint16_t loop = s_bresenham_infos[octant].loop ? dy : dx;
if (BIT(m_rex3.m_draw_mode0, 15) && loop > 32)
loop = 32;
@ -2814,6 +2813,8 @@ void newport_base_device::do_rex3_command()
uint32_t color = m_rex3.m_color_i;
if (fastclear)
{
if (rgbmode)
{
switch (m_rex3.m_plane_depth)
{
@ -2833,6 +2834,11 @@ void newport_base_device::do_rex3_command()
break;
}
}
else
{
color = m_rex3.m_color_vram;
}
}
uint32_t bit = 31;
do
@ -2895,6 +2901,8 @@ void newport_base_device::do_rex3_command()
uint32_t color = m_rex3.m_color_i;
if (fastclear)
{
if (rgbmode)
{
switch (m_rex3.m_plane_depth)
{
@ -2914,6 +2922,11 @@ void newport_base_device::do_rex3_command()
break;
}
}
else
{
color = m_rex3.m_color_vram;
}
}
do
{
@ -3579,7 +3592,7 @@ WRITE64_MEMBER(newport_base_device::rex3_w)
{
LOGMASKED(LOG_REX3, "REX3 Red/CI Full State Write: %08x\n", (uint32_t)(data >> 32));
m_rex3.m_color_red = (int32_t)((data >> 32) & 0xffffff);
m_rex3.m_color_i = (uint32_t)(m_rex3.m_color_red >> 11) & 0x00000fff;
m_rex3.m_color_i = (uint32_t)(m_rex3.m_color_red >> 9) & 0x00000fff;
}
if (ACCESSING_BITS_0_31)
{

2
src/devices/bus/gio/newport.h
View File

@ -274,7 +274,7 @@ protected:
int16_t incry2;
uint8_t loop;
};
uint8_t get_octant(int16_t x1, int16_t y1, int16_t x2, int16_t y2, int16_t dx, int16_t dy);
uint8_t get_octant(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t dx, uint16_t dy);
void do_fline(uint32_t color);
void do_iline(uint32_t color);