pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

doomlegacy-devel: Remove patches for the software renderer



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Thu Aug 27 12:00:41 2020 +0200
Changeset:	aa69141770b38018efb5a4012a2f35a2c3555f11

Modified Files:
	doomlegacy-devel/distinfo
Removed Files:
	doomlegacy-devel/patches/patch-src_v__video.c

Log Message:
doomlegacy-devel: Remove patches for the software renderer

This part does not work as intended for single sided walls.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=aa69141770b38018efb5a4012a2f35a2c3555f11

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 doomlegacy-devel/distinfo                     |   1 -
 doomlegacy-devel/patches/patch-src_v__video.c | 167 --------------------------
 2 files changed, 168 deletions(-)

diffs:
diff --git a/doomlegacy-devel/distinfo b/doomlegacy-devel/distinfo
index 58efc044dd..b3182df46d 100644
--- a/doomlegacy-devel/distinfo
+++ b/doomlegacy-devel/distinfo
@@ -17,4 +17,3 @@ SHA1 (patch-src_r__data.c) = cee177a2af8d29c2e78019d17dbd53d256b34529
 SHA1 (patch-src_r__defs.h) = 91e6543674e3474c9afdb0ba19d6869b658d0543
 SHA1 (patch-src_r__things.c) = de1f80d48180783091bd665007a0ea2f4e54af5e
 SHA1 (patch-src_t__prepro.h) = 768fc3a87665a75a85ff4ff88b53091b13eab55e
-SHA1 (patch-src_v__video.c) = e67dd1f89379f57eddc496099da33515ac6ff969
diff --git a/doomlegacy-devel/patches/patch-src_v__video.c b/doomlegacy-devel/patches/patch-src_v__video.c
deleted file mode 100644
index 7a21d438b8..0000000000
--- a/doomlegacy-devel/patches/patch-src_v__video.c
+++ /dev/null
@@ -1,167 +0,0 @@
-$NetBSD$
-
-Support for DeePsea tall patches:
-https://doomwiki.org/wiki/Picture_format#Tall_patches
-
-This patch is for the software renderer.
-
---- src/v_video.c.orig	2020-07-07 09:01:36.000000000 +0000
-+++ src/v_video.c
-@@ -1422,12 +1422,24 @@ void V_DrawMappedPatch(int x, int y, pat
- 
-     for (col=0; col < wf; col += drawinfo.x_unitfrac)
-     {
-+        int  top = -1;  // [MB] 2020-08-21: Support for DeePsea tall patches
-+
-         column = (column_t *) ((byte *) patch + patch->columnofs[col >> FRACBITS]);
- 
-         while (column->topdelta != 0xff)
-         {
-+            // [MB] 2020-08-21: Support for DeePsea tall patches
-+            if (column->topdelta <= top)
-+            {
-+                top += column->topdelta;
-+            }
-+            else
-+            {
-+                top = column->topdelta;
-+            }
-             source = (byte *) column + 3;
--            dest = desttop + (column->topdelta * drawinfo.ybytes);
-+            dest = desttop + (top * drawinfo.ybytes);
-+            //dest = desttop + (column->topdelta * drawinfo.ybytes);
-             count = column->length * drawinfo.dupy;
- 
-             ofs = 0;
-@@ -1511,12 +1523,24 @@ void V_DrawMappedPatch_Box(int x, int y,
- 
-     for ( ; col < wf; col += drawinfo.x_unitfrac)
-     {
-+        int  top = -1;  // [MB] 2020-08-21: Support for DeePsea tall patches
-+
-         column = (column_t *) ((byte *) patch + patch->columnofs[col >> FRACBITS]);
- 
-         while (column->topdelta != 0xff)
-         {
-+            // [MB] 2020-08-21: Support for DeePsea tall patches
-+            if (column->topdelta <= top)
-+            {
-+                top += column->topdelta;
-+            }
-+            else
-+            {
-+                top = column->topdelta;
-+            }
-             source = (byte *) column + 3;
--            draw_y = draw_y1 + (column->topdelta * drawinfo.ybytes);
-+            draw_y = draw_y1 + (top * drawinfo.ybytes);
-+            //draw_y = draw_y1 + (column->topdelta * drawinfo.ybytes);
-             count = column->length * drawinfo.dupy;
-             column = (column_t *) ((byte *) column + column->length + 4);  // next column in patch
-             ofs = 0;
-@@ -1661,13 +1685,25 @@ void V_DrawScaledPatch(int x, int y, pat
- 
-     while( desttop < destend )
-     {
-+        int  top = -1;  // [MB] 2020-08-21: Support for DeePsea tall patches
-+
-         column = (column_t *) ((byte *) patch + patch->columnofs[col >> FRACBITS]);
-         col += colfrac;
- 
-         while (column->topdelta != 0xff)
-         {
-+            // [MB] 2020-08-21: Support for DeePsea tall patches
-+            if (column->topdelta <= top)
-+            {
-+                top += column->topdelta;
-+            }
-+            else
-+            {
-+                top = column->topdelta;
-+            }
-             source = (byte *) column + 3;
--            dest = desttop + (column->topdelta * drawinfo.ybytes);
-+            dest = desttop + (top * drawinfo.ybytes);
-+            //dest = desttop + (column->topdelta * drawinfo.ybytes);
-             count = column->length * drawinfo.dupy;
- 
-             ofs = 0;
-@@ -1794,12 +1830,24 @@ void V_DrawSmallScaledPatch(int x, int y
-     // [WDJ] Use same loop for normal and skippixels, with some predefined inc
-     for (  ; desttop < destend; desttop+=vid.bytepp)
-     {
-+        int  top = -1;  // [MB] 2020-08-21: Support for DeePsea tall patches
-+
-         column = (column_t *) ((byte *) patch + patch->columnofs[col >> FRACBITS]);
-         col += colfrac_inc;
-         while (column->topdelta != 0xff)
-         {
-+            // [MB] 2020-08-21: Support for DeePsea tall patches
-+            if (column->topdelta <= top)
-+            {
-+                top += column->topdelta;
-+            }
-+            else
-+            {
-+                top = column->topdelta;
-+            }
-             source = (byte *) column + 3;
--            dest = desttop + (column->topdelta * dup_ybytes);
-+            dest = desttop + (top * dup_ybytes);
-+            //dest = desttop + (column->topdelta * dup_ybytes);
-             count = (column->length * count_dupy) >> 1;  // dupy or dupy/2
-             ofs = 0;
-             while (count--)
-@@ -1860,12 +1908,24 @@ void V_DrawTranslucentPatch(int x, int y
- 
-     for ( col=0; col < wf; col += drawinfo.x_unitfrac)
-     {
-+        int  top = -1;  // [MB] 2020-08-21: Support for DeePsea tall patches
-+
-         column = (column_t *) ((byte *) patch + patch->columnofs[col >> FRACBITS]);
- 
-         while (column->topdelta != 0xff)
-         {
-+            // [MB] 2020-08-21: Support for DeePsea tall patches
-+            if (column->topdelta <= top)
-+            {
-+                top += column->topdelta;
-+            }
-+            else
-+            {
-+                top = column->topdelta;
-+            }
-             source = (byte *) column + 3;
--            dest = desttop + (column->topdelta * drawinfo.ybytes);
-+            dest = desttop + (top * drawinfo.ybytes);
-+            //dest = desttop + (column->topdelta * drawinfo.ybytes);
-             count = column->length * drawinfo.dupy;
- 
-             ofs = 0;
-@@ -1992,13 +2052,25 @@ void V_DrawPatch(int x, int y, int scrn,
- 
-     for ( col=0; col < wi; col++)
-     {
-+        int  top = -1;  // [MB] 2020-08-21: Support for DeePsea tall patches
-+
-         column = (column_t *) ((byte *) patch + patch->columnofs[col]);
- 
-         // step through the posts in a column
-         while (column->topdelta != 0xff)
-         {
-+            // [MB] 2020-08-21: Support for DeePsea tall patches
-+            if (column->topdelta <= top)
-+            {
-+                top += column->topdelta;
-+            }
-+            else
-+            {
-+                top = column->topdelta;
-+            }
-             source = (byte *) column + 3;
--            dest = desttop + (column->topdelta * vid.ybytes);
-+            dest = desttop + (top * vid.ybytes);
-+            //dest = desttop + (column->topdelta * vid.ybytes);
-             count = column->length;
- 
-             while (count--)


Home | Main Index | Thread Index | Old Index