From fcf01cb487b976a8abc681c5a07559711ff67cd7 Mon Sep 17 00:00:00 2001 From: starfrost013 Date: Mon, 24 Mar 2025 20:07:34 +0000 Subject: [PATCH] Remove even more redundant GDI-D code --- doc/nvidia_notes/status.xlsx | Bin 15459 -> 15504 bytes .../nv/nv3/render/nv3_render_primitives.c | 21 +++--------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/doc/nvidia_notes/status.xlsx b/doc/nvidia_notes/status.xlsx index f36ba573a387bc65b2c1cd642c0d77d58c5ef604..0b76f7036b788e2a4943c59f11902094edbef605 100644 GIT binary patch delta 4997 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 BLsI|% delta 4971 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

&uPDyu1cHL2VW=2q`rZs$+jNS`(R1`=TE z{+Z0+SJ=0T_1qZX&I>oZh{7zsI#=iBa4BhhD^`vW=Lx!;6*sA*m{*LnJe2mDb4q0n z!3a!AYi5?re9epvp)fHNT(((0NZt9*dHz@xCixi%Mtg=$r2*%A< z&zGB0o@8-U&{4tQB2Ra&m5yvxWUfbN|z(VHt;IhpHfCgxJwwI$ELp6yeJnH^fDwvIH(8;0`i- zswZX;X2o^W$t72L2NhG>n*airs1cke3*HB_-fo%P#QHzqhCB;T;>5=Y5l=9CCwriK znq7NKw?Q*lWLcb)P(Vd!Vwd(9ua?u0ma(ZqW&u5RTX{m;qSV3NRYTxeATg!TKicmk7K@wC$qKBQ z*R1D-Pl+Gq_ksdSF@xAScicEtGa z=Mw0JE}A(!=mihvpH3KF`+^D`K?rA}q=f%?K}r8_vjPB6KU4<)ju6tnAZAfY`hUx} z{|~yQcmUDDT}8RjIcfglYaZ}_D~gA5F97fVc0j_&D)c^nh diff --git a/src/video/nv/nv3/render/nv3_render_primitives.c b/src/video/nv/nv3/render/nv3_render_primitives.c index 52473f2d4..49684edc3 100644 --- a/src/video/nv/nv3/render/nv3_render_primitives.c +++ b/src/video/nv/nv3/render/nv3_render_primitives.c @@ -78,25 +78,10 @@ void nv3_render_text_1bpp(bool bit, nv3_grobj_t grobj) /* increment the position - the bitmap is stored horizontally backward */ nv3->pgraph.win95_gdi_text_current_position.x--; - if (nv3->pgraph.win95_gdi_text.size_in_d.w < 0x0010) + if (nv3->pgraph.win95_gdi_text_current_position.x <= nv3->pgraph.win95_gdi_text.point_d.x) { - if (nv3->pgraph.win95_gdi_text_current_position.x <= nv3->pgraph.win95_gdi_text.point_d.x) - { - nv3->pgraph.win95_gdi_text_current_position.x = nv3->pgraph.win95_gdi_text.point_d.x + nv3->pgraph.win95_gdi_text.size_in_d.w; - nv3->pgraph.win95_gdi_text_current_position.y++; - } - } - /* dumb hack but it never seems to be any other sizes. draw lines (7-0) and then (15-8) */ - else - { - uint16_t midpoint_x = nv3->pgraph.win95_gdi_text.point_d.x + (nv3->pgraph.win95_gdi_text.size_in_d.w << 1); - - /* let's hope NV never overflow the y */ - if (nv3->pgraph.win95_gdi_text_current_position.x <= nv3->pgraph.win95_gdi_text.point_d.x) - { - nv3->pgraph.win95_gdi_text_current_position.x = nv3->pgraph.win95_gdi_text.point_d.x + nv3->pgraph.win95_gdi_text.size_in_d.w; - nv3->pgraph.win95_gdi_text_current_position.y++; - } + nv3->pgraph.win95_gdi_text_current_position.x = nv3->pgraph.win95_gdi_text.point_d.x + nv3->pgraph.win95_gdi_text.size_in_d.w; + nv3->pgraph.win95_gdi_text_current_position.y++; } /* check if we are in the clipping rectangle */