summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/video/zeus2.h
diff options
context:
space:
mode:
author Ted Green <tedgreen99@inbox.com>2016-06-18 17:42:43 -0600
committer Ted Green <tedgreen99@inbox.com>2016-06-19 08:28:18 -0600
commite2bdb5ea3433d27460af4586bfd15d34d10933a7 (patch)
treeafc02fd45cec51399fdd36e15cae98e9de204fcc /src/devices/video/zeus2.h
parent2a16de421d9421ab60d91473f67f167ac24b9832 (diff)
atlantis: Minor update (nw)
dcs: Fix sound num channel check for denver (nw) zeus2: Adjust fast fill. Use pointer for accessing device root. Other stuff. (nw) midzeus: Use new zeus2 video device for midzeus2 driver. More clean-up probably needed :( (nw)
Diffstat (limited to 'src/devices/video/zeus2.h')
-rw-r--r--src/devices/video/zeus2.h23
1 files changed, 14 insertions, 9 deletions
diff --git a/src/devices/video/zeus2.h b/src/devices/video/zeus2.h
index f526c71d28c..f5949cceb4f 100644
--- a/src/devices/video/zeus2.h
+++ b/src/devices/video/zeus2.h
@@ -18,7 +18,7 @@
/*************************************
* Constants
*************************************/
-#define MIDZEUS_VIDEO_CLOCK XTAL_66_6667MHz
+#define ZEUS2_VIDEO_CLOCK XTAL_66_6667MHz
#define DUMP_WAVE_RAM 0
#define TRACK_REG_USAGE 0
@@ -51,8 +51,8 @@ struct zeus2_poly_extra_data
#define WAVERAM_BLOCK0(blocknum) ((void *)((UINT8 *)waveram[0] + 8 * (blocknum)))
#define WAVERAM_BLOCK1(blocknum) ((void *)((UINT8 *)waveram[1] + 12 * (blocknum)))
-#define WAVERAM_BLOCK0_EXT(blocknum) ((void *)((UINT8 *)m_state.waveram[0] + 8 * (blocknum)))
-#define WAVERAM_BLOCK1_EXT(blocknum) ((void *)((UINT8 *)m_state.waveram[1] + 12 * (blocknum)))
+#define WAVERAM_BLOCK0_EXT(blocknum) ((void *)((UINT8 *)m_state->waveram[0] + 8 * (blocknum)))
+#define WAVERAM_BLOCK1_EXT(blocknum) ((void *)((UINT8 *)m_state->waveram[1] + 12 * (blocknum)))
#define WAVERAM_PTR8(base, bytenum) ((UINT8 *)(base) + BYTE4_XOR_LE(bytenum))
#define WAVERAM_READ8(base, bytenum) (*WAVERAM_PTR8(base, bytenum))
@@ -85,17 +85,17 @@ class zeus2_device;
class zeus2_renderer : public poly_manager<float, zeus2_poly_extra_data, 4, 10000>
{
public:
- zeus2_renderer(zeus2_device &state);
+ zeus2_renderer(zeus2_device *state);
void render_poly_8bit(INT32 scanline, const extent_t& extent, const zeus2_poly_extra_data& object, int threadid);
void zeus2_draw_quad(const UINT32 *databuffer, UINT32 texoffs, int logit);
private:
- zeus2_device& m_state;
+ zeus2_device* m_state;
};
-typedef zeus2_renderer::vertex_t poly_vertex;
-typedef zeus2_renderer::extent_t poly_extent;
+typedef zeus2_renderer::vertex_t z2_poly_vertex;
+typedef zeus2_renderer::extent_t z2_poly_extent;
/*************************************
* Zeus2 Video Device
@@ -124,7 +124,7 @@ public:
devcb_write_line m_vblank;
devcb_write_line m_irq;
- UINT32 m_zeusbase[400];
+ UINT32 m_zeusbase[0x80];
zeus2_renderer* poly;
@@ -171,6 +171,11 @@ private:
UINT32 zeus_fifo[20];
UINT8 zeus_fifo_words;
+ UINT32 m_fill_dark_color;
+ UINT16 m_fill_dark_depth;
+ UINT32 m_fill_light_color;
+ UINT16 m_fill_light_depth;
+
#if TRACK_REG_USAGE
struct reg_info
{
@@ -216,7 +221,7 @@ public:
*************************************/
#ifdef UNUSED_FUNCTION
- inline void waveram_plot(int y, int x, UINT32 color)
+ inline void WAVERAM_plot(int y, int x, UINT32 color)
{
if (zeus_cliprect.contains(x, y))
WAVERAM_WRITEPIX(zeus_renderbase, y, x, color);