Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Richard Gobeille
EDuke32
Commits
0ce08032
Commit
0ce08032
authored
Jun 24, 2022
by
Richard Gobeille
Browse files
engine: slightly less terrible branching in gloadtile_art() and gloadtile_hi()
parent
fd598dfe
Changes
1
Hide whitespace changes
Inline
Side-by-side
source/build/src/polymost.cpp
View file @
0ce08032
...
...
@@ -2235,10 +2235,10 @@ void gloadtile_art(int32_t dapic, int32_t dapal, int32_t tintpalnum, int32_t das
}
uploadtexture
(
doalloc
,
siz
,
GL_BGRA
,
pic
,
tsiz
,
dameth
|
DAMETH_ARTIMMUNITY
|
(
dapic
>=
MAXUSERTILES
?
(
DAMETH_NOTEXCOMPRESS
|
DAMETH_NODOWNSIZE
)
:
0
)
|
/* never process these short-lived tiles */
(
hasfullbright
?
DAMETH_HASFULLBRIGHT
:
0
)
|
(
npoty
?
DAMETH_NPOTWALL
:
0
)
|
(
hasalpha
?
(
DAMETH_HASALPHA
|
DAMETH_ONEBITALPHA
)
:
0
));
(
(
dapic
>=
MAXUSERTILES
)
*
(
DAMETH_NOTEXCOMPRESS
|
DAMETH_NODOWNSIZE
))
|
/* never process these short-lived tiles */
(
hasfullbright
*
DAMETH_HASFULLBRIGHT
)
|
(
npoty
*
DAMETH_NPOTWALL
)
|
(
hasalpha
*
(
DAMETH_HASALPHA
|
DAMETH_ONEBITALPHA
)));
Xfree
(
pic
);
}
...
...
@@ -2599,8 +2599,8 @@ int32_t gloadtile_hi(int32_t dapic, int32_t dapalnum, int32_t facen, hicreplctyp
TO_DAMETH_NODOWNSIZE
(
hicr
->
flags
)
|
TO_DAMETH_NOTEXCOMPRESS
(
hicr
->
flags
)
|
TO_DAMETH_ARTIMMUNITY
(
hicr
->
flags
)
|
(
onebitalpha
?
DAMETH_ONEBITALPHA
:
0
)
|
(
hasalpha
?
DAMETH_HASALPHA
:
0
));
(
onebitalpha
*
DAMETH_ONEBITALPHA
)
|
(
hasalpha
*
DAMETH_HASALPHA
));
Xfree
(
pic
);
}
...
...
@@ -2622,10 +2622,10 @@ int32_t gloadtile_hi(int32_t dapic, int32_t dapalnum, int32_t facen, hicreplctyp
pth
->
effects
=
effect
;
pth
->
flags
=
TO_PTH_CLAMPED
(
dameth
)
|
TO_PTH_NOTRANSFIX
(
dameth
)
|
PTH_HIGHTILE
|
((
facen
>
0
)
*
PTH_SKYBOX
)
|
(
onebitalpha
?
PTH_ONEBITALPHA
:
0
)
|
(
hasalpha
?
PTH_HASALPHA
:
0
)
|
((
hicr
->
flags
&
HICR_FORCEFILTER
)
?
PTH_FORCEFILTER
:
0
)
|
(
indexed
?
PTH_INDEXED
:
0
);
(
onebitalpha
*
PTH_ONEBITALPHA
)
|
(
hasalpha
*
PTH_HASALPHA
)
|
((
!!
(
hicr
->
flags
&
HICR_FORCEFILTER
)
)
*
PTH_FORCEFILTER
)
|
(
indexed
*
PTH_INDEXED
);
pth
->
skyface
=
facen
;
pth
->
hicr
=
hicr
;
pth
->
siz
=
tsiz
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment