Revert "Avoid branch prediction slowdowns in R_PointOnSide and R_PointOnSegSide"

This reverts commit c5476ff8f9.
This commit is contained in:
Alug committed 2023-10-09 07:39:52 +02:00
1 parent 869ddb0b35
commit b3509e46dd
1 file changed
+16 -17
+16 -17
View File
@@ -333,26 +333,25 @@ static void FlipCam4_OnChange(void)
//
// killough 5/2/98: reformatted
//
INT32 R_PointOnSide(fixed_t x, fixed_t y, node_t *restrict node)
INT32 R_PointOnSide(fixed_t x, fixed_t y, node_t *node)
{
if (!node->dx)
return x <= node->x ? node->dy > 0 : node->dy < 0;
if (!node->dy)
return y <= node->y ? node->dx < 0 : node->dx > 0;
fixed_t dx = (x) - (node->x);
fixed_t dy = (y) - (node->y);
x -= node->x;
y -= node->y;
// Try to quickly decide by looking at sign bits.
// also use a mask to avoid branch prediction
INT32 mask = (node->dy ^ node->dx ^ dx ^ dy) >> 31;
return (mask & ((node->dy ^ dx) < 0)) | // (left is negative)
(~mask & (FixedMul(dy, node->dx>>FRACBITS) >= FixedMul(node->dy>>FRACBITS, dx)));
if ((node->dy ^ node->dx ^ x ^ y) < 0)
return (node->dy ^ x) < 0; // (left is negative)
return FixedMul(y, node->dx>>FRACBITS) >= FixedMul(node->dy>>FRACBITS, x);
}
// killough 5/2/98: reformatted
INT32 R_PointOnSegSide(fixed_t x, fixed_t y, seg_t *restrict line)
INT32 R_PointOnSegSide(fixed_t x, fixed_t y, seg_t *line)
{
fixed_t lx = line->v1->x;
fixed_t ly = line->v1->y;
@@ -365,13 +364,13 @@ INT32 R_PointOnSegSide(fixed_t x, fixed_t y, seg_t *restrict line)
if (!ldy)
return y <= ly ? ldx < 0 : ldx > 0;
fixed_t dx = (x) - (lx);
fixed_t dy = (y) - (ly);
INT32 mask = (ldy ^ ldx ^ dx ^ dy) >> 31;
return (mask & ((ldy ^ dx) < 0)) | // (left is negative)
(~mask & (FixedMul(dy, ldx>>FRACBITS) >= FixedMul(ldy>>FRACBITS, dx)));
x -= lx;
y -= ly;
// Try to quickly decide by looking at sign bits.
if ((ldy ^ ldx ^ x ^ y) < 0)
return (ldy ^ x) < 0; // (left is negative)
return FixedMul(y, ldx>>FRACBITS) >= FixedMul(ldy>>FRACBITS, x);
}
//