From 586d5cdf1eb5609fcd480aa0d69fc764c4fc0103 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Mon, 13 Jun 2016 23:33:52 +0200 Subject: [PATCH] Normalize naming convention a little --- src/r_draw.cpp | 136 +++++++++++++++++++++---------------------- src/r_draw_rgba.cpp | 80 ++++++++++++------------- src/r_draw_rgba.h | 128 ++++++++++++++++++++-------------------- src/r_drawt_rgba.cpp | 94 +++++++++++++++--------------- src/r_plane.cpp | 4 +- src/r_plane.h | 4 +- src/r_things.cpp | 2 +- src/r_things.h | 2 +- 8 files changed, 225 insertions(+), 225 deletions(-) diff --git a/src/r_draw.cpp b/src/r_draw.cpp index 552e5ff13a..ecb4441f8c 100644 --- a/src/r_draw.cpp +++ b/src/r_draw.cpp @@ -2296,82 +2296,82 @@ void R_InitColumnDrawers () domvline4_saved = domvline4; } - R_DrawColumnHoriz = R_DrawColumnHorizP_RGBA; - R_DrawColumn = R_DrawColumnP_RGBA; - R_DrawFuzzColumn = R_DrawFuzzColumnP_RGBA; - R_DrawTranslatedColumn = R_DrawTranslatedColumnP_RGBA; - R_DrawShadedColumn = R_DrawShadedColumnP_RGBA; - R_DrawSpanMasked = R_DrawSpanMaskedP_RGBA; - R_DrawSpan = R_DrawSpanP_RGBA; + R_DrawColumnHoriz = R_DrawColumnHoriz_rgba; + R_DrawColumn = R_DrawColumn_rgba; + R_DrawFuzzColumn = R_DrawFuzzColumn_rgba; + R_DrawTranslatedColumn = R_DrawTranslatedColumn_rgba; + R_DrawShadedColumn = R_DrawShadedColumn_rgba; + R_DrawSpanMasked = R_DrawSpanMasked_rgba; + R_DrawSpan = R_DrawSpan_rgba; - R_DrawSpanTranslucent = R_DrawSpanTranslucentP_RGBA; - R_DrawSpanMaskedTranslucent = R_DrawSpanMaskedTranslucentP_RGBA; - R_DrawSpanAddClamp = R_DrawSpanAddClampP_RGBA; - R_DrawSpanMaskedAddClamp = R_DrawSpanMaskedAddClampP_RGBA; - R_FillColumn = R_FillColumnP_RGBA; - R_FillAddColumn = R_FillAddColumn_RGBA; - R_FillAddClampColumn = R_FillAddClampColumn_RGBA; - R_FillSubClampColumn = R_FillSubClampColumn_RGBA; - R_FillRevSubClampColumn = R_FillRevSubClampColumn_RGBA; - R_DrawAddColumn = R_DrawAddColumnP_RGBA; - R_DrawTlatedAddColumn = R_DrawTlatedAddColumnP_RGBA; - R_DrawAddClampColumn = R_DrawAddClampColumnP_RGBA; - R_DrawAddClampTranslatedColumn = R_DrawAddClampTranslatedColumnP_RGBA; - R_DrawSubClampColumn = R_DrawSubClampColumnP_RGBA; - R_DrawSubClampTranslatedColumn = R_DrawSubClampTranslatedColumnP_RGBA; - R_DrawRevSubClampColumn = R_DrawRevSubClampColumnP_RGBA; - R_DrawRevSubClampTranslatedColumn = R_DrawRevSubClampTranslatedColumnP_RGBA; - R_FillSpan = R_FillSpan_RGBA; - R_DrawFogBoundary = R_DrawFogBoundary_RGBA; - R_FillColumnHoriz = R_FillColumnHorizP_RGBA; + R_DrawSpanTranslucent = R_DrawSpanTranslucent_rgba; + R_DrawSpanMaskedTranslucent = R_DrawSpanMaskedTranslucent_rgba; + R_DrawSpanAddClamp = R_DrawSpanAddClamp_rgba; + R_DrawSpanMaskedAddClamp = R_DrawSpanMaskedAddClamp_rgba; + R_FillColumn = R_FillColumn_rgba; + R_FillAddColumn = R_FillAddColumn_rgba; + R_FillAddClampColumn = R_FillAddClampColumn_rgba; + R_FillSubClampColumn = R_FillSubClampColumn_rgba; + R_FillRevSubClampColumn = R_FillRevSubClampColumn_rgba; + R_DrawAddColumn = R_DrawAddColumn_rgba; + R_DrawTlatedAddColumn = R_DrawTlatedAddColumn_rgba; + R_DrawAddClampColumn = R_DrawAddClampColumn_rgba; + R_DrawAddClampTranslatedColumn = R_DrawAddClampTranslatedColumn_rgba; + R_DrawSubClampColumn = R_DrawSubClampColumn_rgba; + R_DrawSubClampTranslatedColumn = R_DrawSubClampTranslatedColumn_rgba; + R_DrawRevSubClampColumn = R_DrawRevSubClampColumn_rgba; + R_DrawRevSubClampTranslatedColumn = R_DrawRevSubClampTranslatedColumn_rgba; + R_FillSpan = R_FillSpan_rgba; + R_DrawFogBoundary = R_DrawFogBoundary_rgba; + R_FillColumnHoriz = R_FillColumnHoriz_rgba; - R_DrawFogBoundary = R_DrawFogBoundary_RGBA; - R_MapTiltedPlane = R_MapTiltedPlane_RGBA; - R_MapColoredPlane = R_MapColoredPlane_RGBA; - R_DrawParticle = R_DrawParticle_RGBA; + R_DrawFogBoundary = R_DrawFogBoundary_rgba; + R_MapTiltedPlane = R_MapTiltedPlane_rgba; + R_MapColoredPlane = R_MapColoredPlane_rgba; + R_DrawParticle = R_DrawParticle_rgba; - tmvline1_add = tmvline1_add_RGBA; - tmvline4_add = tmvline4_add_RGBA; - tmvline1_addclamp = tmvline1_addclamp_RGBA; - tmvline4_addclamp = tmvline4_addclamp_RGBA; - tmvline1_subclamp = tmvline1_subclamp_RGBA; - tmvline4_subclamp = tmvline4_subclamp_RGBA; - tmvline1_revsubclamp = tmvline1_revsubclamp_RGBA; - tmvline4_revsubclamp = tmvline4_revsubclamp_RGBA; + tmvline1_add = tmvline1_add_rgba; + tmvline4_add = tmvline4_add_rgba; + tmvline1_addclamp = tmvline1_addclamp_rgba; + tmvline4_addclamp = tmvline4_addclamp_rgba; + tmvline1_subclamp = tmvline1_subclamp_rgba; + tmvline4_subclamp = tmvline4_subclamp_rgba; + tmvline1_revsubclamp = tmvline1_revsubclamp_rgba; + tmvline4_revsubclamp = tmvline4_revsubclamp_rgba; - rt_copy1col = rt_copy1col_RGBA; - rt_copy4cols = rt_copy4cols_RGBA; - rt_map1col = rt_map1col_RGBA; - rt_map4cols = rt_map4cols_RGBA; - rt_shaded1col = rt_shaded1col_RGBA; - rt_shaded4cols = rt_shaded4cols_RGBA; - rt_add1col = rt_add1col_RGBA; - rt_add4cols = rt_add4cols_RGBA; - rt_addclamp1col = rt_addclamp1col_RGBA; - rt_addclamp4cols = rt_addclamp4cols_RGBA; - rt_subclamp1col = rt_subclamp1col_RGBA; - rt_revsubclamp1col = rt_revsubclamp1col_RGBA; - rt_tlate1col = rt_tlate1col_RGBA; - rt_tlateadd1col = rt_tlateadd1col_RGBA; - rt_tlateaddclamp1col = rt_tlateaddclamp1col_RGBA; - rt_tlatesubclamp1col = rt_tlatesubclamp1col_RGBA; - rt_tlaterevsubclamp1col = rt_tlaterevsubclamp1col_RGBA; - rt_subclamp4cols = rt_subclamp4cols_RGBA; - rt_revsubclamp4cols = rt_revsubclamp4cols_RGBA; - rt_tlate4cols = rt_tlate4cols_RGBA; - rt_tlateadd4cols = rt_tlateadd4cols_RGBA; - rt_tlateaddclamp4cols = rt_tlateaddclamp4cols_RGBA; - rt_tlatesubclamp4cols = rt_tlatesubclamp4cols_RGBA; - rt_tlaterevsubclamp4cols = rt_tlaterevsubclamp4cols_RGBA; + rt_copy1col = rt_copy1col_rgba; + rt_copy4cols = rt_copy4cols_rgba; + rt_map1col = rt_map1col_rgba; + rt_map4cols = rt_map4cols_rgba; + rt_shaded1col = rt_shaded1col_rgba; + rt_shaded4cols = rt_shaded4cols_rgba; + rt_add1col = rt_add1col_rgba; + rt_add4cols = rt_add4cols_rgba; + rt_addclamp1col = rt_addclamp1col_rgba; + rt_addclamp4cols = rt_addclamp4cols_rgba; + rt_subclamp1col = rt_subclamp1col_rgba; + rt_revsubclamp1col = rt_revsubclamp1col_rgba; + rt_tlate1col = rt_tlate1col_rgba; + rt_tlateadd1col = rt_tlateadd1col_rgba; + rt_tlateaddclamp1col = rt_tlateaddclamp1col_rgba; + rt_tlatesubclamp1col = rt_tlatesubclamp1col_rgba; + rt_tlaterevsubclamp1col = rt_tlaterevsubclamp1col_rgba; + rt_subclamp4cols = rt_subclamp4cols_rgba; + rt_revsubclamp4cols = rt_revsubclamp4cols_rgba; + rt_tlate4cols = rt_tlate4cols_rgba; + rt_tlateadd4cols = rt_tlateadd4cols_rgba; + rt_tlateaddclamp4cols = rt_tlateaddclamp4cols_rgba; + rt_tlatesubclamp4cols = rt_tlatesubclamp4cols_rgba; + rt_tlaterevsubclamp4cols = rt_tlaterevsubclamp4cols_rgba; rt_initcols = rt_initcols_rgba; rt_span_coverage = rt_span_coverage_rgba; - dovline1 = vlinec1_RGBA; - doprevline1 = vlinec1_RGBA; - domvline1 = mvlinec1_RGBA; + dovline1 = vlinec1_rgba; + doprevline1 = vlinec1_rgba; + domvline1 = mvlinec1_rgba; - dovline4 = vlinec4_RGBA; - domvline4 = mvlinec4_RGBA; + dovline4 = vlinec4_rgba; + domvline4 = mvlinec4_rgba; } else { diff --git a/src/r_draw_rgba.cpp b/src/r_draw_rgba.cpp index a9dd2db322..2062609b41 100644 --- a/src/r_draw_rgba.cpp +++ b/src/r_draw_rgba.cpp @@ -3656,130 +3656,130 @@ void R_EndDrawerCommands() DrawerCommandQueue::End(); } -void R_DrawColumnP_RGBA() +void R_DrawColumn_rgba() { DrawerCommandQueue::QueueCommand(); } -void R_FillColumnP_RGBA() +void R_FillColumn_rgba() { DrawerCommandQueue::QueueCommand(); } -void R_FillAddColumn_RGBA() +void R_FillAddColumn_rgba() { DrawerCommandQueue::QueueCommand(); } -void R_FillAddClampColumn_RGBA() +void R_FillAddClampColumn_rgba() { DrawerCommandQueue::QueueCommand(); } -void R_FillSubClampColumn_RGBA() +void R_FillSubClampColumn_rgba() { DrawerCommandQueue::QueueCommand(); } -void R_FillRevSubClampColumn_RGBA() +void R_FillRevSubClampColumn_rgba() { DrawerCommandQueue::QueueCommand(); } -void R_DrawFuzzColumnP_RGBA() +void R_DrawFuzzColumn_rgba() { DrawerCommandQueue::QueueCommand(); fuzzpos = (fuzzpos + dc_yh - dc_yl) % FUZZTABLE; } -void R_DrawAddColumnP_RGBA() +void R_DrawAddColumn_rgba() { DrawerCommandQueue::QueueCommand(); } -void R_DrawTranslatedColumnP_RGBA() +void R_DrawTranslatedColumn_rgba() { DrawerCommandQueue::QueueCommand(); } -void R_DrawTlatedAddColumnP_RGBA() +void R_DrawTlatedAddColumn_rgba() { DrawerCommandQueue::QueueCommand(); } -void R_DrawShadedColumnP_RGBA() +void R_DrawShadedColumn_rgba() { DrawerCommandQueue::QueueCommand(); } -void R_DrawAddClampColumnP_RGBA() +void R_DrawAddClampColumn_rgba() { DrawerCommandQueue::QueueCommand(); } -void R_DrawAddClampTranslatedColumnP_RGBA() +void R_DrawAddClampTranslatedColumn_rgba() { DrawerCommandQueue::QueueCommand(); } -void R_DrawSubClampColumnP_RGBA() +void R_DrawSubClampColumn_rgba() { DrawerCommandQueue::QueueCommand(); } -void R_DrawSubClampTranslatedColumnP_RGBA() +void R_DrawSubClampTranslatedColumn_rgba() { DrawerCommandQueue::QueueCommand(); } -void R_DrawRevSubClampColumnP_RGBA() +void R_DrawRevSubClampColumn_rgba() { DrawerCommandQueue::QueueCommand(); } -void R_DrawRevSubClampTranslatedColumnP_RGBA() +void R_DrawRevSubClampTranslatedColumn_rgba() { DrawerCommandQueue::QueueCommand(); } -void R_DrawSpanP_RGBA() +void R_DrawSpan_rgba() { DrawerCommandQueue::QueueCommand(); } -void R_DrawSpanMaskedP_RGBA() +void R_DrawSpanMasked_rgba() { DrawerCommandQueue::QueueCommand(); } -void R_DrawSpanTranslucentP_RGBA() +void R_DrawSpanTranslucent_rgba() { DrawerCommandQueue::QueueCommand(); } -void R_DrawSpanMaskedTranslucentP_RGBA() +void R_DrawSpanMaskedTranslucent_rgba() { DrawerCommandQueue::QueueCommand(); } -void R_DrawSpanAddClampP_RGBA() +void R_DrawSpanAddClamp_rgba() { DrawerCommandQueue::QueueCommand(); } -void R_DrawSpanMaskedAddClampP_RGBA() +void R_DrawSpanMaskedAddClamp_rgba() { DrawerCommandQueue::QueueCommand(); } -void R_FillSpan_RGBA() +void R_FillSpan_rgba() { DrawerCommandQueue::QueueCommand(); } //extern FTexture *rw_pic; // For the asserts below -DWORD vlinec1_RGBA() +DWORD vlinec1_rgba() { /*DWORD fracstep = dc_iscale; DWORD frac = dc_texturefrac; @@ -3792,79 +3792,79 @@ DWORD vlinec1_RGBA() return dc_texturefrac + dc_count * dc_iscale; } -void vlinec4_RGBA() +void vlinec4_rgba() { DrawerCommandQueue::QueueCommand(); for (int i = 0; i < 4; i++) vplce[i] += vince[i] * dc_count; } -DWORD mvlinec1_RGBA() +DWORD mvlinec1_rgba() { DrawerCommandQueue::QueueCommand(); return dc_texturefrac + dc_count * dc_iscale; } -void mvlinec4_RGBA() +void mvlinec4_rgba() { DrawerCommandQueue::QueueCommand(); for (int i = 0; i < 4; i++) vplce[i] += vince[i] * dc_count; } -fixed_t tmvline1_add_RGBA() +fixed_t tmvline1_add_rgba() { DrawerCommandQueue::QueueCommand(); return dc_texturefrac + dc_count * dc_iscale; } -void tmvline4_add_RGBA() +void tmvline4_add_rgba() { DrawerCommandQueue::QueueCommand(); for (int i = 0; i < 4; i++) vplce[i] += vince[i] * dc_count; } -fixed_t tmvline1_addclamp_RGBA() +fixed_t tmvline1_addclamp_rgba() { DrawerCommandQueue::QueueCommand(); return dc_texturefrac + dc_count * dc_iscale; } -void tmvline4_addclamp_RGBA() +void tmvline4_addclamp_rgba() { DrawerCommandQueue::QueueCommand(); for (int i = 0; i < 4; i++) vplce[i] += vince[i] * dc_count; } -fixed_t tmvline1_subclamp_RGBA() +fixed_t tmvline1_subclamp_rgba() { DrawerCommandQueue::QueueCommand(); return dc_texturefrac + dc_count * dc_iscale; } -void tmvline4_subclamp_RGBA() +void tmvline4_subclamp_rgba() { DrawerCommandQueue::QueueCommand(); for (int i = 0; i < 4; i++) vplce[i] += vince[i] * dc_count; } -fixed_t tmvline1_revsubclamp_RGBA() +fixed_t tmvline1_revsubclamp_rgba() { DrawerCommandQueue::QueueCommand(); return dc_texturefrac + dc_count * dc_iscale; } -void tmvline4_revsubclamp_RGBA() +void tmvline4_revsubclamp_rgba() { DrawerCommandQueue::QueueCommand(); for (int i = 0; i < 4; i++) vplce[i] += vince[i] * dc_count; } -void R_DrawFogBoundarySection_RGBA(int y, int y2, int x1) +void R_DrawFogBoundarySection_rgba(int y, int y2, int x1) { for (; y < y2; ++y) { @@ -3873,7 +3873,7 @@ void R_DrawFogBoundarySection_RGBA(int y, int y2, int x1) } } -void R_DrawFogBoundary_RGBA(int x1, int x2, short *uclip, short *dclip) +void R_DrawFogBoundary_rgba(int x1, int x2, short *uclip, short *dclip) { // To do: we do not need to create new spans when using rgba output - instead we should calculate light on a per pixel basis @@ -3913,7 +3913,7 @@ void R_DrawFogBoundary_RGBA(int x1, int x2, short *uclip, short *dclip) if (t2 < b2 && rcolormap != 0) { // Colormap 0 is always the identity map, so rendering it is // just a waste of time. - R_DrawFogBoundarySection_RGBA(t2, b2, xr); + R_DrawFogBoundarySection_rgba(t2, b2, xr); } if (t1 < t2) t2 = t1; if (b1 > b2) b2 = b1; @@ -3965,6 +3965,6 @@ void R_DrawFogBoundary_RGBA(int x1, int x2, short *uclip, short *dclip) } if (t2 < b2 && rcolormap != 0) { - R_DrawFogBoundarySection_RGBA(t2, b2, x1); + R_DrawFogBoundarySection_rgba(t2, b2, x1); } } diff --git a/src/r_draw_rgba.h b/src/r_draw_rgba.h index 5d7402634b..9f07ff0bf0 100644 --- a/src/r_draw_rgba.h +++ b/src/r_draw_rgba.h @@ -36,76 +36,76 @@ void rt_initcols_rgba(BYTE *buffer); void rt_span_coverage_rgba(int x, int start, int stop); -void rt_copy1col_RGBA(int hx, int sx, int yl, int yh); -void rt_copy4cols_RGBA(int sx, int yl, int yh); -void rt_shaded1col_RGBA(int hx, int sx, int yl, int yh); -void rt_shaded4cols_RGBA(int sx, int yl, int yh); -void rt_map1col_RGBA(int hx, int sx, int yl, int yh); -void rt_add1col_RGBA(int hx, int sx, int yl, int yh); -void rt_addclamp1col_RGBA(int hx, int sx, int yl, int yh); -void rt_subclamp1col_RGBA(int hx, int sx, int yl, int yh); -void rt_revsubclamp1col_RGBA(int hx, int sx, int yl, int yh); -void rt_tlate1col_RGBA(int hx, int sx, int yl, int yh); -void rt_tlateadd1col_RGBA(int hx, int sx, int yl, int yh); -void rt_tlateaddclamp1col_RGBA(int hx, int sx, int yl, int yh); -void rt_tlatesubclamp1col_RGBA(int hx, int sx, int yl, int yh); -void rt_tlaterevsubclamp1col_RGBA(int hx, int sx, int yl, int yh); -void rt_map4cols_RGBA(int sx, int yl, int yh); -void rt_add4cols_RGBA(int sx, int yl, int yh); -void rt_addclamp4cols_RGBA(int sx, int yl, int yh); -void rt_subclamp4cols_RGBA(int sx, int yl, int yh); -void rt_revsubclamp4cols_RGBA(int sx, int yl, int yh); -void rt_tlate4cols_RGBA(int sx, int yl, int yh); -void rt_tlateadd4cols_RGBA(int sx, int yl, int yh); -void rt_tlateaddclamp4cols_RGBA(int sx, int yl, int yh); -void rt_tlatesubclamp4cols_RGBA(int sx, int yl, int yh); -void rt_tlaterevsubclamp4cols_RGBA(int sx, int yl, int yh); +void rt_copy1col_rgba(int hx, int sx, int yl, int yh); +void rt_copy4cols_rgba(int sx, int yl, int yh); +void rt_shaded1col_rgba(int hx, int sx, int yl, int yh); +void rt_shaded4cols_rgba(int sx, int yl, int yh); +void rt_map1col_rgba(int hx, int sx, int yl, int yh); +void rt_add1col_rgba(int hx, int sx, int yl, int yh); +void rt_addclamp1col_rgba(int hx, int sx, int yl, int yh); +void rt_subclamp1col_rgba(int hx, int sx, int yl, int yh); +void rt_revsubclamp1col_rgba(int hx, int sx, int yl, int yh); +void rt_tlate1col_rgba(int hx, int sx, int yl, int yh); +void rt_tlateadd1col_rgba(int hx, int sx, int yl, int yh); +void rt_tlateaddclamp1col_rgba(int hx, int sx, int yl, int yh); +void rt_tlatesubclamp1col_rgba(int hx, int sx, int yl, int yh); +void rt_tlaterevsubclamp1col_rgba(int hx, int sx, int yl, int yh); +void rt_map4cols_rgba(int sx, int yl, int yh); +void rt_add4cols_rgba(int sx, int yl, int yh); +void rt_addclamp4cols_rgba(int sx, int yl, int yh); +void rt_subclamp4cols_rgba(int sx, int yl, int yh); +void rt_revsubclamp4cols_rgba(int sx, int yl, int yh); +void rt_tlate4cols_rgba(int sx, int yl, int yh); +void rt_tlateadd4cols_rgba(int sx, int yl, int yh); +void rt_tlateaddclamp4cols_rgba(int sx, int yl, int yh); +void rt_tlatesubclamp4cols_rgba(int sx, int yl, int yh); +void rt_tlaterevsubclamp4cols_rgba(int sx, int yl, int yh); -void R_DrawColumnHorizP_RGBA(); -void R_DrawColumnP_RGBA(); -void R_DrawFuzzColumnP_RGBA(); -void R_DrawTranslatedColumnP_RGBA(); -void R_DrawShadedColumnP_RGBA(); +void R_DrawColumnHoriz_rgba(); +void R_DrawColumn_rgba(); +void R_DrawFuzzColumn_rgba(); +void R_DrawTranslatedColumn_rgba(); +void R_DrawShadedColumn_rgba(); -void R_FillColumnP_RGBA(); -void R_FillAddColumn_RGBA(); -void R_FillAddClampColumn_RGBA(); -void R_FillSubClampColumn_RGBA(); -void R_FillRevSubClampColumn_RGBA(); -void R_DrawAddColumnP_RGBA(); -void R_DrawTlatedAddColumnP_RGBA(); -void R_DrawAddClampColumnP_RGBA(); -void R_DrawAddClampTranslatedColumnP_RGBA(); -void R_DrawSubClampColumnP_RGBA(); -void R_DrawSubClampTranslatedColumnP_RGBA(); -void R_DrawRevSubClampColumnP_RGBA(); -void R_DrawRevSubClampTranslatedColumnP_RGBA(); +void R_FillColumn_rgba(); +void R_FillAddColumn_rgba(); +void R_FillAddClampColumn_rgba(); +void R_FillSubClampColumn_rgba(); +void R_FillRevSubClampColumn_rgba(); +void R_DrawAddColumn_rgba(); +void R_DrawTlatedAddColumn_rgba(); +void R_DrawAddClampColumn_rgba(); +void R_DrawAddClampTranslatedColumn_rgba(); +void R_DrawSubClampColumn_rgba(); +void R_DrawSubClampTranslatedColumn_rgba(); +void R_DrawRevSubClampColumn_rgba(); +void R_DrawRevSubClampTranslatedColumn_rgba(); -void R_DrawSpanP_RGBA(void); -void R_DrawSpanMaskedP_RGBA(void); -void R_DrawSpanTranslucentP_RGBA(); -void R_DrawSpanMaskedTranslucentP_RGBA(); -void R_DrawSpanAddClampP_RGBA(); -void R_DrawSpanMaskedAddClampP_RGBA(); -void R_FillSpan_RGBA(); +void R_DrawSpan_rgba(void); +void R_DrawSpanMasked_rgba(void); +void R_DrawSpanTranslucent_rgba(); +void R_DrawSpanMaskedTranslucent_rgba(); +void R_DrawSpanAddClamp_rgba(); +void R_DrawSpanMaskedAddClamp_rgba(); +void R_FillSpan_rgba(); -void R_DrawFogBoundary_RGBA(int x1, int x2, short *uclip, short *dclip); +void R_DrawFogBoundary_rgba(int x1, int x2, short *uclip, short *dclip); -DWORD vlinec1_RGBA(); -void vlinec4_RGBA(); -DWORD mvlinec1_RGBA(); -void mvlinec4_RGBA(); -fixed_t tmvline1_add_RGBA(); -void tmvline4_add_RGBA(); -fixed_t tmvline1_addclamp_RGBA(); -void tmvline4_addclamp_RGBA(); -fixed_t tmvline1_subclamp_RGBA(); -void tmvline4_subclamp_RGBA(); -fixed_t tmvline1_revsubclamp_RGBA(); -void tmvline4_revsubclamp_RGBA(); +DWORD vlinec1_rgba(); +void vlinec4_rgba(); +DWORD mvlinec1_rgba(); +void mvlinec4_rgba(); +fixed_t tmvline1_add_rgba(); +void tmvline4_add_rgba(); +fixed_t tmvline1_addclamp_rgba(); +void tmvline4_addclamp_rgba(); +fixed_t tmvline1_subclamp_rgba(); +void tmvline4_subclamp_rgba(); +fixed_t tmvline1_revsubclamp_rgba(); +void tmvline4_revsubclamp_rgba(); -void R_FillColumnHorizP_RGBA(); -void R_FillSpan_RGBA(); +void R_FillColumnHoriz_rgba(); +void R_FillSpan_rgba(); ///////////////////////////////////////////////////////////////////////////// // Multithreaded rendering infrastructure: diff --git a/src/r_drawt_rgba.cpp b/src/r_drawt_rgba.cpp index 32d5080c5f..8f6d2ca132 100644 --- a/src/r_drawt_rgba.cpp +++ b/src/r_drawt_rgba.cpp @@ -1629,171 +1629,171 @@ public: ///////////////////////////////////////////////////////////////////////////// // Copies one span at hx to the screen at sx. -void rt_copy1col_RGBA (int hx, int sx, int yl, int yh) +void rt_copy1col_rgba (int hx, int sx, int yl, int yh) { DrawerCommandQueue::QueueCommand(hx, sx, yl, yh); } // Copies all four spans to the screen starting at sx. -void rt_copy4cols_RGBA (int sx, int yl, int yh) +void rt_copy4cols_rgba (int sx, int yl, int yh) { // To do: we could do this with SSE using __m128i - rt_copy1col_RGBA(0, sx, yl, yh); - rt_copy1col_RGBA(1, sx + 1, yl, yh); - rt_copy1col_RGBA(2, sx + 2, yl, yh); - rt_copy1col_RGBA(3, sx + 3, yl, yh); + rt_copy1col_rgba(0, sx, yl, yh); + rt_copy1col_rgba(1, sx + 1, yl, yh); + rt_copy1col_rgba(2, sx + 2, yl, yh); + rt_copy1col_rgba(3, sx + 3, yl, yh); } // Maps one span at hx to the screen at sx. -void rt_map1col_RGBA (int hx, int sx, int yl, int yh) +void rt_map1col_rgba (int hx, int sx, int yl, int yh) { DrawerCommandQueue::QueueCommand(hx, sx, yl, yh); } // Maps all four spans to the screen starting at sx. -void rt_map4cols_RGBA (int sx, int yl, int yh) +void rt_map4cols_rgba (int sx, int yl, int yh) { DrawerCommandQueue::QueueCommand(sx, yl, yh); } -void rt_Translate1col_RGBA(const BYTE *translation, int hx, int yl, int yh) +void rt_Translate1col_rgba(const BYTE *translation, int hx, int yl, int yh) { DrawerCommandQueue::QueueCommand(translation, hx, yl, yh); } -void rt_Translate4cols_RGBA(const BYTE *translation, int yl, int yh) +void rt_Translate4cols_rgba(const BYTE *translation, int yl, int yh) { DrawerCommandQueue::QueueCommand(translation, yl, yh); } // Translates one span at hx to the screen at sx. -void rt_tlate1col_RGBA (int hx, int sx, int yl, int yh) +void rt_tlate1col_rgba (int hx, int sx, int yl, int yh) { - rt_Translate1col_RGBA(dc_translation, hx, yl, yh); + rt_Translate1col_rgba(dc_translation, hx, yl, yh); rt_map1col(hx, sx, yl, yh); } // Translates all four spans to the screen starting at sx. -void rt_tlate4cols_RGBA (int sx, int yl, int yh) +void rt_tlate4cols_rgba (int sx, int yl, int yh) { - rt_Translate4cols_RGBA(dc_translation, yl, yh); + rt_Translate4cols_rgba(dc_translation, yl, yh); rt_map4cols(sx, yl, yh); } // Adds one span at hx to the screen at sx without clamping. -void rt_add1col_RGBA (int hx, int sx, int yl, int yh) +void rt_add1col_rgba (int hx, int sx, int yl, int yh) { DrawerCommandQueue::QueueCommand(hx, sx, yl, yh); } // Adds all four spans to the screen starting at sx without clamping. -void rt_add4cols_RGBA (int sx, int yl, int yh) +void rt_add4cols_rgba (int sx, int yl, int yh) { DrawerCommandQueue::QueueCommand(sx, yl, yh); } // Translates and adds one span at hx to the screen at sx without clamping. -void rt_tlateadd1col_RGBA (int hx, int sx, int yl, int yh) +void rt_tlateadd1col_rgba (int hx, int sx, int yl, int yh) { - rt_Translate1col_RGBA(dc_translation, hx, yl, yh); + rt_Translate1col_rgba(dc_translation, hx, yl, yh); rt_add1col(hx, sx, yl, yh); } // Translates and adds all four spans to the screen starting at sx without clamping. -void rt_tlateadd4cols_RGBA(int sx, int yl, int yh) +void rt_tlateadd4cols_rgba(int sx, int yl, int yh) { - rt_Translate4cols_RGBA(dc_translation, yl, yh); + rt_Translate4cols_rgba(dc_translation, yl, yh); rt_add4cols(sx, yl, yh); } // Shades one span at hx to the screen at sx. -void rt_shaded1col_RGBA (int hx, int sx, int yl, int yh) +void rt_shaded1col_rgba (int hx, int sx, int yl, int yh) { DrawerCommandQueue::QueueCommand(hx, sx, yl, yh); } // Shades all four spans to the screen starting at sx. -void rt_shaded4cols_RGBA (int sx, int yl, int yh) +void rt_shaded4cols_rgba (int sx, int yl, int yh) { DrawerCommandQueue::QueueCommand(sx, yl, yh); } // Adds one span at hx to the screen at sx with clamping. -void rt_addclamp1col_RGBA (int hx, int sx, int yl, int yh) +void rt_addclamp1col_rgba (int hx, int sx, int yl, int yh) { DrawerCommandQueue::QueueCommand(hx, sx, yl, yh); } // Adds all four spans to the screen starting at sx with clamping. -void rt_addclamp4cols_RGBA (int sx, int yl, int yh) +void rt_addclamp4cols_rgba (int sx, int yl, int yh) { DrawerCommandQueue::QueueCommand(sx, yl, yh); } // Translates and adds one span at hx to the screen at sx with clamping. -void rt_tlateaddclamp1col_RGBA (int hx, int sx, int yl, int yh) +void rt_tlateaddclamp1col_rgba (int hx, int sx, int yl, int yh) { - rt_Translate1col_RGBA(dc_translation, hx, yl, yh); - rt_addclamp1col_RGBA(hx, sx, yl, yh); + rt_Translate1col_rgba(dc_translation, hx, yl, yh); + rt_addclamp1col_rgba(hx, sx, yl, yh); } // Translates and adds all four spans to the screen starting at sx with clamping. -void rt_tlateaddclamp4cols_RGBA (int sx, int yl, int yh) +void rt_tlateaddclamp4cols_rgba (int sx, int yl, int yh) { - rt_Translate4cols_RGBA(dc_translation, yl, yh); + rt_Translate4cols_rgba(dc_translation, yl, yh); rt_addclamp4cols(sx, yl, yh); } // Subtracts one span at hx to the screen at sx with clamping. -void rt_subclamp1col_RGBA (int hx, int sx, int yl, int yh) +void rt_subclamp1col_rgba (int hx, int sx, int yl, int yh) { DrawerCommandQueue::QueueCommand(hx, sx, yl, yh); } // Subtracts all four spans to the screen starting at sx with clamping. -void rt_subclamp4cols_RGBA (int sx, int yl, int yh) +void rt_subclamp4cols_rgba (int sx, int yl, int yh) { DrawerCommandQueue::QueueCommand(sx, yl, yh); } // Translates and subtracts one span at hx to the screen at sx with clamping. -void rt_tlatesubclamp1col_RGBA (int hx, int sx, int yl, int yh) +void rt_tlatesubclamp1col_rgba (int hx, int sx, int yl, int yh) { - rt_Translate1col_RGBA(dc_translation, hx, yl, yh); - rt_subclamp1col_RGBA(hx, sx, yl, yh); + rt_Translate1col_rgba(dc_translation, hx, yl, yh); + rt_subclamp1col_rgba(hx, sx, yl, yh); } // Translates and subtracts all four spans to the screen starting at sx with clamping. -void rt_tlatesubclamp4cols_RGBA (int sx, int yl, int yh) +void rt_tlatesubclamp4cols_rgba (int sx, int yl, int yh) { - rt_Translate4cols_RGBA(dc_translation, yl, yh); - rt_subclamp4cols_RGBA(sx, yl, yh); + rt_Translate4cols_rgba(dc_translation, yl, yh); + rt_subclamp4cols_rgba(sx, yl, yh); } // Subtracts one span at hx from the screen at sx with clamping. -void rt_revsubclamp1col_RGBA (int hx, int sx, int yl, int yh) +void rt_revsubclamp1col_rgba (int hx, int sx, int yl, int yh) { DrawerCommandQueue::QueueCommand(hx, sx, yl, yh); } // Subtracts all four spans from the screen starting at sx with clamping. -void rt_revsubclamp4cols_RGBA (int sx, int yl, int yh) +void rt_revsubclamp4cols_rgba (int sx, int yl, int yh) { DrawerCommandQueue::QueueCommand(sx, yl, yh); } // Translates and subtracts one span at hx from the screen at sx with clamping. -void rt_tlaterevsubclamp1col_RGBA (int hx, int sx, int yl, int yh) +void rt_tlaterevsubclamp1col_rgba (int hx, int sx, int yl, int yh) { - rt_Translate1col_RGBA(dc_translation, hx, yl, yh); - rt_revsubclamp1col_RGBA(hx, sx, yl, yh); + rt_Translate1col_rgba(dc_translation, hx, yl, yh); + rt_revsubclamp1col_rgba(hx, sx, yl, yh); } // Translates and subtracts all four spans from the screen starting at sx with clamping. -void rt_tlaterevsubclamp4cols_RGBA (int sx, int yl, int yh) +void rt_tlaterevsubclamp4cols_rgba (int sx, int yl, int yh) { - rt_Translate4cols_RGBA(dc_translation, yl, yh); - rt_revsubclamp4cols_RGBA(sx, yl, yh); + rt_Translate4cols_rgba(dc_translation, yl, yh); + rt_revsubclamp4cols_rgba(sx, yl, yh); } // Before each pass through a rendering loop that uses these routines, @@ -1816,7 +1816,7 @@ void rt_span_coverage_rgba(int x, int start, int stop) // Stretches a column into a temporary buffer which is later // drawn to the screen along with up to three other columns. -void R_DrawColumnHorizP_RGBA (void) +void R_DrawColumnHoriz_rgba (void) { if (dc_count <= 0) return; @@ -1831,7 +1831,7 @@ void R_DrawColumnHorizP_RGBA (void) } // [RH] Just fills a column with a given color -void R_FillColumnHorizP_RGBA (void) +void R_FillColumnHoriz_rgba (void) { if (dc_count <= 0) return; diff --git a/src/r_plane.cpp b/src/r_plane.cpp index 1cde16071c..1a08d1793d 100644 --- a/src/r_plane.cpp +++ b/src/r_plane.cpp @@ -477,7 +477,7 @@ void R_MapTiltedPlane_C (int y, int x1) #endif } -void R_MapTiltedPlane_RGBA (int y, int x1) +void R_MapTiltedPlane_rgba (int y, int x1) { int x2 = spanend[y]; @@ -509,7 +509,7 @@ void R_MapColoredPlane_C (int y, int x1) memset (ylookup[y] + x1 + dc_destorg, ds_color, (spanend[y] - x1 + 1)); } -void R_MapColoredPlane_RGBA(int y, int x1) +void R_MapColoredPlane_rgba(int y, int x1) { uint32_t *dest = ylookup[y] + x1 + (uint32_t*)dc_destorg; int count = (spanend[y] - x1 + 1); diff --git a/src/r_plane.h b/src/r_plane.h index 7505ac9957..b199d34776 100644 --- a/src/r_plane.h +++ b/src/r_plane.h @@ -97,9 +97,9 @@ extern void(*R_MapColoredPlane)(int y, int x1); extern void(*R_MapTiltedPlane)(int y, int x1); void R_MapTiltedPlane_C(int y, int x1); -void R_MapTiltedPlane_RGBA(int y, int x); +void R_MapTiltedPlane_rgba(int y, int x); void R_MapColoredPlane_C(int y, int x1); -void R_MapColoredPlane_RGBA(int y, int x1); +void R_MapColoredPlane_rgba(int y, int x1); visplane_t *R_FindPlane ( const secplane_t &height, diff --git a/src/r_things.cpp b/src/r_things.cpp index f1f29f160d..0858dce2f6 100644 --- a/src/r_things.cpp +++ b/src/r_things.cpp @@ -2676,7 +2676,7 @@ void R_DrawParticle_C (vissprite_t *vis) } } -void R_DrawParticle_RGBA(vissprite_t *vis) +void R_DrawParticle_rgba(vissprite_t *vis) { int spacing; uint32_t *dest; diff --git a/src/r_things.h b/src/r_things.h index 785729b098..f5cd30e003 100644 --- a/src/r_things.h +++ b/src/r_things.h @@ -98,7 +98,7 @@ struct particle_t; extern void(*R_DrawParticle)(vissprite_t *); void R_DrawParticle_C (vissprite_t *); -void R_DrawParticle_RGBA (vissprite_t *); +void R_DrawParticle_rgba (vissprite_t *); void R_ProjectParticle (particle_t *, const sector_t *sector, int shade, int fakeside);