From d25f39cc7d1f5152e7a393441480b9aa62483dc1 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 19 May 2012 09:28:02 +0900
Subject: [PATCH] Remove pskindesc from affinetridesc_t.

It's never used after being set.
---
 include/d_iface.h                      |  1 -
 include/d_ifacea.h                     | 17 ++++++++---------
 libs/video/renderer/sw/sw_ralias.c     |  1 -
 libs/video/renderer/sw/sw_riqm.c       |  2 --
 libs/video/renderer/sw32/sw32_ralias.c |  1 -
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/include/d_iface.h b/include/d_iface.h
index 58fd57e77..dcefa7bc6 100644
--- a/include/d_iface.h
+++ b/include/d_iface.h
@@ -109,7 +109,6 @@ typedef struct finalvert_s {
 typedef struct
 {
 	void				*pskin;
-	maliasskindesc_t	*pskindesc;
 	int					skinwidth;
 	int					skinheight;
 	mtriangle_t			*ptriangles;
diff --git a/include/d_ifacea.h b/include/d_ifacea.h
index fdb65ad1d..fa61655e0 100644
--- a/include/d_ifacea.h
+++ b/include/d_ifacea.h
@@ -94,15 +94,14 @@
 // affinetridesc_t structure
 // !!! if this is changed, it must be changed in d_iface.h too !!!
 #define atd_pskin			0
-#define atd_pskindesc		4
-#define atd_skinwidth		8
-#define atd_skinheight		12
-#define atd_ptriangles		16
-#define atd_pfinalverts		20
-#define atd_numtriangles	24
-#define atd_drawtype		28
-#define atd_seamfixupX16	32
-#define atd_size			36
+#define atd_skinwidth		4
+#define atd_skinheight		8
+#define atd_ptriangles		12
+#define atd_pfinalverts		16
+#define atd_numtriangles	20
+#define atd_drawtype		24
+#define atd_seamfixupX16	28
+#define atd_size			32
 
 #endif // _D_IFACE_H
 
diff --git a/libs/video/renderer/sw/sw_ralias.c b/libs/video/renderer/sw/sw_ralias.c
index 8d5b2b6dc..a275873d3 100644
--- a/libs/video/renderer/sw/sw_ralias.c
+++ b/libs/video/renderer/sw/sw_ralias.c
@@ -553,7 +553,6 @@ R_AliasSetupSkin (void)
 
 	a_skinwidth = pmdl->skinwidth;
 
-	r_affinetridesc.pskindesc = pskindesc;
 	r_affinetridesc.pskin = (void *) ((byte *) paliashdr + pskindesc->skin);
 	r_affinetridesc.skinwidth = a_skinwidth;
 	r_affinetridesc.seamfixupX16 = (a_skinwidth >> 1) << 16;
diff --git a/libs/video/renderer/sw/sw_riqm.c b/libs/video/renderer/sw/sw_riqm.c
index 23cc3c08c..260722bcb 100644
--- a/libs/video/renderer/sw/sw_riqm.c
+++ b/libs/video/renderer/sw/sw_riqm.c
@@ -106,9 +106,7 @@ static void
 iqm_setup_skin (swiqm_t *sw, int skinnum)
 {
 	tex_t      *skin = sw->skins[skinnum];
-	static maliasskindesc_t skindesc = {0, 0, 0, 0};
 
-	r_affinetridesc.pskindesc = &skindesc;
 	r_affinetridesc.pskin = skin->data;
 	r_affinetridesc.skinwidth = skin->width;
 	r_affinetridesc.skinheight = skin->height;
diff --git a/libs/video/renderer/sw32/sw32_ralias.c b/libs/video/renderer/sw32/sw32_ralias.c
index 5a6786397..04ed9b997 100644
--- a/libs/video/renderer/sw32/sw32_ralias.c
+++ b/libs/video/renderer/sw32/sw32_ralias.c
@@ -553,7 +553,6 @@ R_AliasSetupSkin (void)
 	pskindesc = R_AliasGetSkindesc (skinnum, paliashdr);
 	a_skinwidth = pmdl->skinwidth;
 
-	sw32_r_affinetridesc.pskindesc = pskindesc;
 	sw32_r_affinetridesc.pskin = (void *) ((byte *) paliashdr + pskindesc->skin);
 	sw32_r_affinetridesc.skinwidth = a_skinwidth;
 	sw32_r_affinetridesc.seamfixupX16 = (a_skinwidth >> 1) << 16;