devices/video/k001006.cpp: removed alternate texture layout

src/mame/drivers/gticlub.cpp

@@ -993,13 +993,11 @@ void gticlub_state::gticlub(machine_config &config)
 
 	K001006(config, m_k001006_1, 0);
 	m_k001006_1->set_gfx_region("gfx1");
-	m_k001006_1->set_tex_layout(1);
 
 	// The second K001006 chip connects to the second K001005 chip.
 	// Hook this up when the K001005 separation is understood (seems the load balancing is done on hardware).
 	K001006(config, m_k001006_2, 0);
 	m_k001006_2->set_gfx_region("gfx1");
-	m_k001006_2->set_tex_layout(1);
 
 	K056800(config, m_k056800, XTAL(33'868'800)/2);
 	m_k056800->int_callback().set_inputline(m_audiocpu, M68K_IRQ_2);

src/mame/drivers/zr107.cpp

@@ -777,7 +777,6 @@ void zr107_state::zr107(machine_config &config)
 
 	K001006(config, m_k001006_1, 0);
 	m_k001006_1->set_gfx_region("gfx1");
-	m_k001006_1->set_tex_layout(1);
 
 	K056800(config, m_k056800, XTAL(18'432'000));
 	m_k056800->int_callback().set_inputline(m_audiocpu, M68K_IRQ_1);
@@ -837,13 +836,10 @@ void jetwave_state::jetwave(machine_config &config)
 	m_k001604->set_roz_mem_offset(0x4000);
 	m_k001604->set_palette(m_palette);
 
-	m_k001006_1->set_tex_layout(1);
-
 	// The second K001006 chip connects to the second K001005 chip.
 	// Hook this up when the K001005 separation is understood (seems the load balancing is done on hardware).
 	K001006(config, m_k001006_2, 0);
 	m_k001006_2->set_gfx_region("gfx1");
-	m_k001006_2->set_tex_layout(1);
 
 	m_konppc->set_cbboard_type(konppc_device::CGBOARD_TYPE_GTICLUB);
 }

src/mame/video/k001006.cpp

@@ -20,8 +20,7 @@ k001006_device::k001006_device(const machine_config &mconfig, const char *tag, d
 	m_unknown_ram(nullptr),
 	m_addr(0),
 	m_device_sel(0),
-	m_palette(nullptr), m_gfxrom(*this, finder_base::DUMMY_TAG),
+	m_palette(nullptr), m_gfxrom(*this, finder_base::DUMMY_TAG)
-	m_tex_layout(0)
 {
 }
 
@@ -37,7 +36,7 @@ void k001006_device::device_start()
 
 	m_texrom = std::make_unique<uint8_t[]>(0x800000);
 
-	preprocess_texture_data(m_texrom.get(), m_gfxrom, 0x800000, m_tex_layout);
+	preprocess_texture_data(m_texrom.get(), m_gfxrom, 0x800000);
 
 	save_pointer(NAME(m_pal_ram), 0x800*sizeof(uint16_t));
 	save_pointer(NAME(m_unknown_ram), 0x1000*sizeof(uint16_t));
@@ -150,39 +149,20 @@ uint32_t k001006_device::fetch_texel(int page, int pal_index, int u, int v)
 }
 
 
-void k001006_device::preprocess_texture_data(uint8_t *dst, uint8_t *src, int length, int layout)
+void k001006_device::preprocess_texture_data(uint8_t *dst, uint8_t *src, int length)
 {
-	static const int decode_x_gti[8] = {  0, 16, 2, 18, 4, 20, 6, 22 };
+	static const int decode_x[8] = {  0, 16, 2, 18, 4, 20, 6, 22 };
-	static const int decode_y_gti[16] = {  0, 8, 32, 40, 1, 9, 33, 41, 64, 72, 96, 104, 65, 73, 97, 105 };
+	static const int decode_y[16] = {  0, 8, 32, 40, 1, 9, 33, 41, 64, 72, 96, 104, 65, 73, 97, 105 };
 
-	static const int decode_x_zr107[8] = {  0, 16, 1, 17, 2, 18, 3, 19 };
-	static const int decode_y_zr107[16] = {  0, 8, 32, 40, 4, 12, 36, 44, 64, 72, 96, 104, 68, 76, 100, 108 };
-
-	int index;
-	int i, x, y;
 	uint8_t temp[0x40000];
 
-	const int *decode_x;
+	for (int index = 0; index < length; index += 0x40000)
-	const int *decode_y;
-
-	if (layout == 1)
-	{
-		decode_x = decode_x_gti;
-		decode_y = decode_y_gti;
-	}
-	else
-	{
-		decode_x = decode_x_zr107;
-		decode_y = decode_y_zr107;
-	}
-
-	for (index=0; index < length; index += 0x40000)
 	{
 		int offset = index;
 
 		memset(temp, 0, 0x40000);
 
-		for (i=0; i < 0x800; i++)
+		for (int i = 0; i < 0x800; i++)
 		{
 			int tx = ((i & 0x400) >> 5) | ((i & 0x100) >> 4) | ((i & 0x40) >> 3) | ((i & 0x10) >> 2) | ((i & 0x4) >> 1) | (i & 0x1);
 			int ty = ((i & 0x200) >> 5) | ((i & 0x80) >> 4) | ((i & 0x20) >> 3) | ((i & 0x8) >> 2) | ((i & 0x2) >> 1);
@@ -190,9 +170,9 @@ void k001006_device::preprocess_texture_data(uint8_t *dst, uint8_t *src, int len
 			tx <<= 3;
 			ty <<= 4;
 
-			for (y=0; y < 16; y++)
+			for (int y = 0; y < 16; y++)
 			{
-				for (x=0; x < 8; x++)
+				for (int x = 0; x < 8; x++)
 				{
 					uint8_t pixel = src[offset + decode_y[y] + decode_x[x]];
 

src/mame/video/k001006.h

@@ -15,10 +15,9 @@ public:
 
 	// configuration
 	template <typename T> void set_gfx_region(T &&tag) { m_gfxrom.set_tag(std::forward<T>(tag)); }
-	void set_tex_layout(int layout) { m_tex_layout = layout; }
 
 	uint32_t fetch_texel(int page, int pal_index, int u, int v);
-	void preprocess_texture_data(uint8_t *dst, uint8_t *src, int length, int gticlub);
+	void preprocess_texture_data(uint8_t *dst, uint8_t *src, int length);
 
 	uint32_t read(offs_t offset);
 	void write(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
@@ -44,7 +43,6 @@ private:
 	//int m_tex_height;
 	//int m_tex_mirror_x;
 	//int m_tex_mirror_y;
-	int m_tex_layout;
 };