namcos22 cleanup: moved static functions/vars to class and converted 3d renderer to polynew

src/mame/includes/namcos22.h

@@ -1,12 +1,5 @@
-#include "video/poly.h"
+#include "video/rgbutil.h"
-
+#include "video/polynew.h"
-#define NAMCOS22_PALETTE_SIZE 0x8000
-#define MAX_LIT_SURFACES 0x80
-#define MAX_RENDER_CMD_SEQ 0x1c
-
-#define GFX_CHAR               0
-#define GFX_TEXTURE_TILE       1
-#define GFX_SPRITE             2
 
 enum
 {
@@ -29,6 +22,143 @@ enum
 	NAMCOS22_ARMADILLO_RACING
 };
 
+
+struct namcos22_polyvertex
+{
+	float x, y, z;
+	int u, v; /* 0..0xfff */
+	int bri;  /* 0..0xff */
+};
+
+enum namcos22_scenenode_type
+{
+	NAMCOS22_SCENENODE_NONLEAF,
+	NAMCOS22_SCENENODE_QUAD,
+	NAMCOS22_SCENENODE_SPRITE
+};
+
+#define NAMCOS22_RADIX_BITS 4
+#define NAMCOS22_RADIX_BUCKETS (1 << NAMCOS22_RADIX_BITS)
+#define NAMCOS22_RADIX_MASK (NAMCOS22_RADIX_BUCKETS - 1)
+
+struct namcos22_scenenode
+{
+	namcos22_scenenode_type type;
+	struct namcos22_scenenode *next;
+	union
+	{
+		struct
+		{
+			struct namcos22_scenenode *next[NAMCOS22_RADIX_BUCKETS];
+		} nonleaf;
+
+		struct
+		{
+			float vx, vy, vw, vh;
+			int texturebank;
+			int color;
+			int cmode;
+			int flags;
+			int cz_adjust;
+			int direct;
+			namcos22_polyvertex v[4];
+		} quad;
+
+		struct
+		{
+			int tile, color, pri;
+			int flipx, flipy;
+			int linktype;
+			int cols, rows;
+			int xpos, ypos;
+			int cx_min, cx_max;
+			int cy_min, cy_max;
+			int sizex, sizey;
+			int translucency;
+			int cz;
+		} sprite;
+	} data;
+};
+
+
+struct namcos22_object_data
+{
+	/* poly / sprites */
+	rgbint fogcolor;
+	rgbint fadecolor;
+	rgbint polycolor;
+	const pen_t *pens;
+	bitmap_rgb32 *destbase;
+	bitmap_ind8 *primap;
+	int bn;
+	int flags;
+	int prioverchar;
+	int cmode;
+	int fadefactor;
+	int pfade_enabled;
+	int fogfactor;
+	int zfog_enabled;
+	int cz_adjust;
+	int cz_sdelta;
+	const UINT8 *czram;
+
+	/* sprites */
+	const UINT8 *source;
+	int alpha;
+	int line_modulo;
+	int flipx;
+	int flipy;
+};
+
+
+class namcos22_state;
+
+class namcos22_renderer : public poly_manager<float, namcos22_object_data, 4, 8000>
+{
+public:
+	namcos22_renderer(namcos22_state &state);
+	
+	void render_scene(screen_device &screen, bitmap_rgb32 &bitmap);
+	struct namcos22_scenenode *new_scenenode(running_machine &machine, UINT32 zsort, namcos22_scenenode_type type);
+
+	void reset();
+
+private:
+	namcos22_state &m_state;
+
+	struct namcos22_scenenode m_scenenode_root;
+	struct namcos22_scenenode *m_scenenode_cur;
+
+	int m_clipx;
+	int m_clipy;
+	rectangle m_cliprect;
+
+	inline UINT8 nthbyte(const UINT32 *src, int n) { return (src[n / 4] << ((n & 3) * 8)) >> 24; }
+	inline UINT16 nthword(const UINT32 *src, int n) { return (src[n / 2] << ((n & 1) * 16)) >> 16; }
+
+	void render_scene_nodes(screen_device &screen, bitmap_rgb32 &bitmap, struct namcos22_scenenode *node);
+	void render_sprite(screen_device &screen, bitmap_rgb32 &bitmap, struct namcos22_scenenode *node);
+	void poly3d_drawquad(screen_device &screen, bitmap_rgb32 &bitmap, struct namcos22_scenenode *node);
+	void poly3d_drawsprite(screen_device &screen, bitmap_rgb32 &dest_bmp, UINT32 code, UINT32 color, int flipx, int flipy, int sx, int sy, int scalex, int scaley, int cz_factor, int prioverchar, int alpha);
+
+	void free_scenenode(struct namcos22_scenenode *node);
+	struct namcos22_scenenode *alloc_scenenode(running_machine &machine, struct namcos22_scenenode *node);
+
+	void renderscanline_uvi_full(INT32 scanline, const extent_t &extent, const namcos22_object_data &extra, int threadid);
+	void renderscanline_sprite(INT32 scanline, const extent_t &extent, const namcos22_object_data &extra, int threadid);
+};
+
+
+enum namcos22_dsp_upload_state
+{
+	NAMCOS22_DSP_UPLOAD_READY,
+	NAMCOS22_DSP_UPLOAD_DEST,
+	NAMCOS22_DSP_UPLOAD_DATA
+};
+
+#define NAMCOS22_MAX_LIT_SURFACES 0x80
+#define NAMCOS22_MAX_RENDER_CMD_SEQ 0x1c
+
 class namcos22_state : public driver_device
 {
 public:
@@ -41,19 +171,21 @@ public:
 		m_iomcu(*this, "iomcu"),
 		m_spriteram(*this, "spriteram"),
 		m_shareram(*this, "shareram"),
-		m_system_controller(*this,"syscontrol"),
 		m_nvmem(*this, "nvmem"),
 		m_pSlaveExternalRAM(*this, "slaveextram"),
 		m_pMasterExternalRAM(*this, "masterextram"),
+		m_paletteram(*this, "paletteram"),
 		m_cgram(*this, "cgram"),
 		m_textram(*this, "textram"),
 		m_polygonram(*this, "polygonram"),
-		m_gamma(*this,"gamma"),
+		m_mixer(*this, "video_mixer"),
+		m_gamma_proms(*this, "gamma_proms"),
 		m_vics_data(*this, "vics_data"),
 		m_vics_control(*this, "vics_control"),
 		m_czattr(*this, "czattr"),
 		m_tilemapattr(*this, "tilemapattr"),
 		m_czram(*this, "czram"),
+		m_motor_timer(*this, "motor_timer"),
 		m_pc_pedal_interrupt(*this, "pc_p_int")
 	{ }
 
@@ -64,46 +196,48 @@ public:
 	optional_device<cpu_device> m_iomcu;
 	optional_shared_ptr<UINT32> m_spriteram;
 	required_shared_ptr<UINT32> m_shareram;
-	required_shared_ptr<UINT32> m_system_controller;
 	required_shared_ptr<UINT32> m_nvmem;
 	required_shared_ptr<UINT16> m_pSlaveExternalRAM;
 	required_shared_ptr<UINT16> m_pMasterExternalRAM;
+	required_shared_ptr<UINT32> m_paletteram;
 	required_shared_ptr<UINT32> m_cgram;
 	required_shared_ptr<UINT32> m_textram;
 	required_shared_ptr<UINT32> m_polygonram;
-	required_shared_ptr<UINT32> m_gamma;
+	required_shared_ptr<UINT32> m_mixer;
+	optional_memory_region m_gamma_proms;
 	optional_shared_ptr<UINT32> m_vics_data;
 	optional_shared_ptr<UINT32> m_vics_control;
 	optional_shared_ptr<UINT32> m_czattr;
 	required_shared_ptr<UINT32> m_tilemapattr;
 	optional_shared_ptr<UINT32> m_czram;
+	optional_device<timer_device> m_motor_timer;
 	optional_device<timer_device> m_pc_pedal_interrupt;
 
-	int m_bEnableDspIrqs;
+	UINT8 m_syscontrol[0x20];
+	bool m_dsp_irq_enabled;
 	emu_timer *m_ar_tb_interrupt[2];
-	UINT16 m_MasterBIOZ;
+	UINT16 m_dsp_master_bioz;
-	UINT32 *m_pPointRAM;
+	UINT32 *m_pointram;
 	UINT32 m_old_coin_state;
 	UINT32 m_credits1;
 	UINT32 m_credits2;
-	UINT32 m_PointAddr;
+	UINT32 m_point_address;
-	UINT32 m_PointData;
+	UINT32 m_point_data;
 	UINT16 m_SerialDataSlaveToMasterNext;
 	UINT16 m_SerialDataSlaveToMasterCurrent;
 	int m_RenderBufSize;
-	UINT16 m_RenderBufData[MAX_RENDER_CMD_SEQ];
+	UINT16 m_RenderBufData[NAMCOS22_MAX_RENDER_CMD_SEQ];
 	UINT16 m_portbits[2];
 	int m_irq_state;
-	int m_DspUploadState;
+	namcos22_dsp_upload_state m_dsp_upload_state;
 	int m_UploadDestIdx;
-	UINT32 m_AlpineSurferProtData;
+	UINT32 m_alpinesa_protection;
 	int m_motor_status;
-	emu_timer *m_motor_timer;
 	int m_p4;
 	UINT16 m_su_82;
 	UINT16 m_keycus_id;
 	int m_gametype;
-	int m_bSuperSystem22;
+	int m_is_ss22;
 	int m_chipselect;
 	int m_spot_enable;
 	int m_spot_read_address;
@@ -113,37 +247,63 @@ public:
 	UINT8 *m_recalc_czram[4];
 	UINT32 m_cz_was_written[4];
 	int m_cz_adjust;
-	poly_manager *m_poly;
+	namcos22_renderer *m_poly;
-	UINT16 *m_pTextureTileMap16;
+	UINT16 *m_texture_tilemap;
-	UINT8 *m_pTextureTileMapAttr;
+	UINT8 *m_texture_tileattr;
-	UINT8 *m_pTextureTileData;
+	UINT8 *m_texture_tiledata;
-	UINT8 m_XYAttrToPixel[16][16][16];
+	UINT8 *m_texture_ayx_to_pixel;
 	UINT16 m_dspram_bank;
-	UINT16 m_UpperWordLatch;
+	UINT16 m_dspram16_latch;
-	int m_bDSPisActive;
+	bool m_slave_simulation_active;
-	INT32 m_AbsolutePriority;
+	INT32 m_absolute_priority;
-	INT32 m_ObjectShiftValue22;
+	INT32 m_objectshift;
 	UINT16 m_PrimitiveID;
-	float m_ViewMatrix[4][4];
+	float m_viewmatrix[4][4];
-	UINT8 m_LitSurfaceInfo[MAX_LIT_SURFACES];
+	UINT8 m_LitSurfaceInfo[NAMCOS22_MAX_LIT_SURFACES];
 	INT32 m_SurfaceNormalFormat;
 	unsigned m_LitSurfaceCount;
 	unsigned m_LitSurfaceIndex;
-	int m_PtRomSize;
+	int m_pointrom_size;
-	const UINT8 *m_pPolyH;
+	INT32 *m_pointrom;
-	const UINT8 *m_pPolyM;
-	const UINT8 *m_pPolyL;
 	UINT8 *m_dirtypal;
 	bitmap_ind16 *m_mix_bitmap;
 	tilemap_t *m_bgtilemap;
 
-	DECLARE_READ32_MEMBER(namcos22_gamma_r);
+	int m_mixer_flags;
-	DECLARE_WRITE32_MEMBER(namcos22_gamma_w);
+	int m_fog_r;
+	int m_fog_g;
+	int m_fog_b;
+	int m_fog_r_per_cztype[4];
+	int m_fog_g_per_cztype[4];
+	int m_fog_b_per_cztype[4];
+	UINT32 m_fog_colormask;
+	int m_poly_fade_r;
+	int m_poly_fade_g;
+	int m_poly_fade_b;
+	int m_poly_fade_enabled;
+	int m_screen_fade_r;
+	int m_screen_fade_g;
+	int m_screen_fade_b;
+	int m_screen_fade_factor;
+	int m_spot_limit;
+	int m_poly_translucency;
+	int m_text_palbase;
+
+	float m_camera_zoom;
+	float m_camera_vx;
+	float m_camera_vy;
+	float m_camera_vw;
+	float m_camera_vh;
+	float m_camera_lx; // unit vector for light direction
+	float m_camera_ly; // "
+	float m_camera_lz; // "
+	int m_camera_ambient; // 0.0..1.0
+	int m_camera_power;   // 0.0..1.0
+	
 	DECLARE_WRITE32_MEMBER(namcos22s_czram_w);
 	DECLARE_READ32_MEMBER(namcos22s_czram_r);
 	DECLARE_READ32_MEMBER(namcos22s_vics_control_r);
 	DECLARE_WRITE32_MEMBER(namcos22s_vics_control_w);
-	DECLARE_READ32_MEMBER(namcos22_textram_r);
 	DECLARE_WRITE32_MEMBER(namcos22_textram_w);
 	DECLARE_READ32_MEMBER(namcos22_tilemapattr_r);
 	DECLARE_WRITE32_MEMBER(namcos22_tilemapattr_w);
@@ -151,9 +311,7 @@ public:
 	DECLARE_WRITE32_MEMBER(namcos22s_spotram_w);
 	DECLARE_READ32_MEMBER(namcos22_dspram_r);
 	DECLARE_WRITE32_MEMBER(namcos22_dspram_w);
-	DECLARE_READ32_MEMBER(namcos22_cgram_r);
 	DECLARE_WRITE32_MEMBER(namcos22_cgram_w);
-	DECLARE_READ32_MEMBER(namcos22_paletteram_r);
 	DECLARE_WRITE32_MEMBER(namcos22_paletteram_w);
 	DECLARE_WRITE16_MEMBER(namcos22_dspram16_bank_w);
 	DECLARE_READ16_MEMBER(namcos22_dspram16_r);
@@ -163,14 +321,14 @@ public:
 	DECLARE_READ16_MEMBER(pdp_begin_r);
 	DECLARE_READ16_MEMBER(slave_external_ram_r);
 	DECLARE_WRITE16_MEMBER(slave_external_ram_w);
-	DECLARE_READ16_MEMBER(dsp_HOLD_signal_r);
+	DECLARE_READ16_MEMBER(dsp_hold_signal_r);
-	DECLARE_WRITE16_MEMBER(dsp_HOLD_ACK_w);
+	DECLARE_WRITE16_MEMBER(dsp_hold_ack_w);
-	DECLARE_WRITE16_MEMBER(dsp_XF_output_w);
+	DECLARE_WRITE16_MEMBER(dsp_xf_output_w);
-	DECLARE_WRITE16_MEMBER(point_ram_idx_w);
+	DECLARE_WRITE16_MEMBER(point_address_w);
-	DECLARE_WRITE16_MEMBER(point_ram_loword_iw);
+	DECLARE_WRITE16_MEMBER(point_loword_iw);
-	DECLARE_WRITE16_MEMBER(point_ram_hiword_w);
+	DECLARE_WRITE16_MEMBER(point_hiword_w);
-	DECLARE_READ16_MEMBER(point_ram_loword_r);
+	DECLARE_READ16_MEMBER(point_loword_r);
-	DECLARE_READ16_MEMBER(point_ram_hiword_ir);
+	DECLARE_READ16_MEMBER(point_hiword_ir);
 	DECLARE_WRITE16_MEMBER(dsp_unk2_w);
 	DECLARE_READ16_MEMBER(dsp_unk_port3_r);
 	DECLARE_WRITE16_MEMBER(upload_code_to_slave_dsp_w);
@@ -185,7 +343,7 @@ public:
 	DECLARE_WRITE16_MEMBER(dsp_led_w);
 	DECLARE_WRITE16_MEMBER(dsp_unk8_w);
 	DECLARE_WRITE16_MEMBER(master_render_device_w);
-	DECLARE_READ16_MEMBER(dsp_BIOZ_r);
+	DECLARE_READ16_MEMBER(dsp_bioz_r);
 	DECLARE_READ16_MEMBER(dsp_slave_port3_r);
 	DECLARE_READ16_MEMBER(dsp_slave_port4_r);
 	DECLARE_READ16_MEMBER(dsp_slave_port5_r);
@@ -194,18 +352,16 @@ public:
 	DECLARE_READ16_MEMBER(dsp_slave_port8_r);
 	DECLARE_READ16_MEMBER(dsp_slave_portb_r);
 	DECLARE_WRITE16_MEMBER(dsp_slave_portb_w);
-	DECLARE_READ32_MEMBER(namcos22_C139_SCI_r);
+	DECLARE_READ32_MEMBER(namcos22_sci_r);
-	DECLARE_WRITE32_MEMBER(namcos22_C139_SCI_w);
+	DECLARE_WRITE32_MEMBER(namcos22_sci_w);
-	DECLARE_READ32_MEMBER(namcos22_system_controller_r);
+	DECLARE_READ8_MEMBER(namcos22_system_controller_r);
-	DECLARE_WRITE32_MEMBER(namcos22s_system_controller_w);
+	DECLARE_WRITE8_MEMBER(namcos22s_system_controller_w);
-	DECLARE_WRITE32_MEMBER(namcos22_system_controller_w);
+	DECLARE_WRITE8_MEMBER(namcos22_system_controller_w);
 	DECLARE_READ32_MEMBER(namcos22_keycus_r);
 	DECLARE_WRITE32_MEMBER(namcos22_keycus_w);
 	DECLARE_READ16_MEMBER(namcos22_portbit_r);
 	DECLARE_WRITE16_MEMBER(namcos22_portbit_w);
 	DECLARE_READ16_MEMBER(namcos22_dipswitch_r);
-	DECLARE_READ32_MEMBER(namcos22_mcuram_r);
-	DECLARE_WRITE32_MEMBER(namcos22_mcuram_w);
 	DECLARE_READ32_MEMBER(namcos22_gun_r);
 	DECLARE_WRITE16_MEMBER(namcos22_cpuleds_w);
 	DECLARE_READ32_MEMBER(alpinesa_prot_r);
@@ -226,13 +382,65 @@ public:
 	DECLARE_WRITE8_MEMBER(propcycle_mcu_port5_w);
 	DECLARE_WRITE8_MEMBER(alpine_mcu_port5_w);
 	DECLARE_READ8_MEMBER(mcu_port4_s22_r);
+	DECLARE_READ8_MEMBER(iomcu_port4_s22_r);
 	DECLARE_READ16_MEMBER(mcu141_speedup_r);
 	DECLARE_WRITE16_MEMBER(mcu_speedup_w);
 	DECLARE_READ16_MEMBER(mcu130_speedup_r);
 	DECLARE_READ16_MEMBER(mcuc74_speedup_r);
-	UINT32 ReadFromCommRAM(offs_t offs );
+
-	void WriteToCommRAM(offs_t offs, UINT32 data );
+	inline UINT8 nthbyte(const UINT32 *src, int n) { return (src[n / 4] << ((n & 3) * 8)) >> 24; }
-	void WriteToPointRAM(offs_t offs, UINT32 data );
+	inline UINT16 nthword(const UINT32 *src, int n) { return (src[n / 2] << ((n & 1) * 16)) >> 16; }
+	
+	inline INT32 signed18(INT32 val) { return (val & 0x00020000) ? (INT32)(val | 0xfffc0000) : val & 0x0001ffff; }
+	inline INT32 signed24(INT32 val) { return (val & 0x00800000) ? (INT32)(val | 0xff000000) : val & 0x007fffff; }
+	
+	inline float dspfixed_to_nativefloat(INT16 val) { return val / (float)0x7fff; }
+	float dspfloat_to_nativefloat(UINT32 val);
+	
+	void handle_driving_io();
+	void handle_coinage(int slots, int address_is_odd);
+	void handle_cybrcomm_io();
+	UINT32 pdp_polygonram_read(offs_t offs);
+	void pdp_polygonram_write(offs_t offs, UINT32 data);
+	void point_write(offs_t offs, UINT32 data);
+	void slave_halt();
+	void slave_enable();
+	void enable_slave_simulation(bool enable);
+	
+	void matrix3d_multiply(float a[4][4], float b[4][4]);
+	void matrix3d_identity(float m[4][4]);
+	void transform_point(float *vx, float *vy, float *vz, float m[4][4]);
+	void transform_normal(float *nx, float *ny, float *nz, float m[4][4]);
+	void register_normals(INT32 addr, float m[4][4]);
+	
+	void blit_single_quad(bitmap_rgb32 &bitmap, UINT32 color, UINT32 addr, float m[4][4], INT32 polyshift, int flags, int packetformat);
+	void blit_quads(bitmap_rgb32 &bitmap, INT32 addr, float m[4][4], INT32 base);
+	void blit_polyobject(bitmap_rgb32 &bitmap, int code, float m[4][4]);
+	
+	void slavesim_handle_bb0003(const INT32 *src);
+	void slavesim_handle_200002(bitmap_rgb32 &bitmap, const INT32 *src);
+	void slavesim_handle_300000(const INT32 *src);
+	void slavesim_handle_233002(const INT32 *src);
+	void simulate_slavedsp(bitmap_rgb32 &bitmap);
+	
+	INT32 point_read(INT32 addr);
+	void init_tables();
+	void update_mixer();
+	void update_palette();
+	void recalc_czram();
+	void draw_direct_poly(const UINT16 *src);
+	void draw_polygons(bitmap_rgb32 &bitmap);
+	void draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect);
+	void draw_sprite_group(bitmap_rgb32 &bitmap, const rectangle &cliprect, const UINT32 *src, const UINT32 *attr, int num_sprites, int deltax, int deltay, int y_lowres);
+	void draw_text_layer(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+	void namcos22s_mix_text_layer(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int prival);
+	void namcos22_mix_text_layer(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+	
+	void install_c74_speedup();
+	void install_130_speedup();
+	void install_141_speedup();
+	void namcos22_init(int game_type);
+
 	DECLARE_DRIVER_INIT(acedrvr);
 	DECLARE_DRIVER_INIT(aquajet);
 	DECLARE_DRIVER_INIT(adillor);
@@ -250,7 +458,8 @@ public:
 	DECLARE_DRIVER_INIT(alpiner);
 	DECLARE_DRIVER_INIT(ridgeraj);
 	DECLARE_DRIVER_INIT(alpinesa);
-	TILE_GET_INFO_MEMBER(TextTilemapGetInfo);
+
+	TILE_GET_INFO_MEMBER(get_text_tile_info);
 	virtual void machine_reset();
 	virtual void machine_start();
 	DECLARE_MACHINE_START(adillor);
@@ -265,15 +474,8 @@ public:
 	TIMER_CALLBACK_MEMBER(adillor_trackball_interrupt);
 	TIMER_DEVICE_CALLBACK_MEMBER(propcycl_pedal_update);
 	TIMER_DEVICE_CALLBACK_MEMBER(propcycl_pedal_interrupt);
-	TIMER_CALLBACK_MEMBER(alpine_steplock_callback);
+	TIMER_DEVICE_CALLBACK_MEMBER(alpine_steplock_callback);
 	TIMER_DEVICE_CALLBACK_MEMBER(dsp_master_serial_irq);
 	TIMER_DEVICE_CALLBACK_MEMBER(dsp_slave_serial_irq);
 	TIMER_DEVICE_CALLBACK_MEMBER(mcu_irq);
-	void namcos22_reset();
-	void namcos22_exit();
 };
-
-/*----------- defined in video/namcos22.c -----------*/
-void namcos22_draw_direct_poly( running_machine &machine, const UINT16 *pSource );
-UINT32 namcos22_point_rom_r( running_machine &machine, offs_t offs );
-void namcos22_enable_slave_simulation( running_machine &machine, int enable );