OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Remove r_swtruecolor variable as it is redundant

Browse source
This commit is contained in:
Magnus Norddahl 2017-02-01 21:42:08 +01:00
commit 93166fa150
18 changed files with 49 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/polyrenderer/scene/poly_decal.cpp
View file

@ -151,7 +151,7 @@ void RenderPolyDecal::Render(const TriMatrix &worldToClip, const Vec4f &clipPlan
}
args.uniforms.subsectorDepth = subsectorDepth;
if (swrenderer::RenderViewport::Instance()->r_swtruecolor)
if (swrenderer::RenderViewport::Instance()->RenderTarget->IsBgra())
{
args.uniforms.color = 0xff000000 | decal->AlphaColor;
}

2
src/polyrenderer/scene/poly_particle.cpp
View file

@ -90,7 +90,7 @@ void RenderPolyParticle::Render(const TriMatrix &worldToClip, const Vec4f &clipP
uint32_t alpha = (uint32_t)clamp(particle->alpha * 255.0f + 0.5f, 0.0f, 255.0f);
if (swrenderer::RenderViewport::Instance()->r_swtruecolor)
if (swrenderer::RenderViewport::Instance()->RenderTarget->IsBgra())
{
args.uniforms.color = (alpha << 24) | (particle->color & 0xffffff);
}

2
src/polyrenderer/scene/poly_sky.cpp
View file

@ -94,7 +94,7 @@ void PolySkyDome::RenderRow(PolyDrawArgs &args, int row, uint32_t capcolor)
void PolySkyDome::RenderCapColorRow(PolyDrawArgs &args, FTexture *skytex, int row, bool bottomCap)
{
uint32_t solid = skytex->GetSkyCapColor(bottomCap);
if (!swrenderer::RenderViewport::Instance()->r_swtruecolor)
if (!swrenderer::RenderViewport::Instance()->RenderTarget->IsBgra())
solid = RGB32k.RGB[(RPART(solid) >> 3)][(GPART(solid) >> 3)][(BPART(solid) >> 3)];
args.vinput = &mVertices[mPrimStart[row]];

2
src/polyrenderer/scene/poly_sprite.cpp
View file

@ -250,7 +250,7 @@ void RenderPolySprite::Render(const TriMatrix &worldToClip, const Vec4f &clipPla
args.SetTexture(tex, thing->Translation, true);
}
if (!swrenderer::RenderViewport::Instance()->r_swtruecolor)
if (!swrenderer::RenderViewport::Instance()->RenderTarget->IsBgra())
{
uint32_t r = (args.uniforms.color >> 16) & 0xff;
uint32_t g = (args.uniforms.color >> 8) & 0xff;