zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-11 15:22:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add linear filtering

Browse source
This commit is contained in:
Magnus Norddahl 2016-12-04 05:52:13 +01:00
parent 36f168040e
commit 2e1e202812
2 changed files with 109 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

154
tools/drawergen/fixedfunction/drawtrianglecodegen.cpp
View file

@ -334,6 +334,9 @@ void DrawTriangleCodegen::SetupAffineBlock()
AffineVaryingPosX[i] = SSAInt(AffineVaryingPosY[i] * rcpW0, false); AffineVaryingPosX[i] = SSAInt(AffineVaryingPosY[i] * rcpW0, false);
AffineVaryingStepX[i] = (SSAInt((AffineVaryingPosY[i] + gradVaryingX[i]) * rcpW1, false) - AffineVaryingPosX[i]) / q; AffineVaryingStepX[i] = (SSAInt((AffineVaryingPosY[i] + gradVaryingX[i]) * rcpW1, false) - AffineVaryingPosX[i]) / q;
} }
// Min filter = linear, Mag filter = nearest:
AffineLinear = (gradVaryingX[0] / AffineW) > SSAFloat(1.0f) || (gradVaryingX[0] / AffineW) < SSAFloat(-1.0f);
} }
void DrawTriangleCodegen::LoopFullBlock() void DrawTriangleCodegen::LoopFullBlock()
@ -739,32 +742,97 @@ void DrawTriangleCodegen::LoopMaskedStoreBlock()
} }
#endif #endif
SSAVec4i DrawTriangleCodegen::TranslateSample32(SSAInt uvoffset) SSAVec4i DrawTriangleCodegen::TranslateSample32(SSAInt *varying)
{ {
SSAInt ufrac = varying[0] << 8;
SSAInt vfrac = varying[1] << 8;
SSAInt upos = ((ufrac >> 16) * textureWidth) >> 16;
SSAInt vpos = ((vfrac >> 16) * textureHeight) >> 16;
SSAInt uvoffset = upos * textureHeight + vpos;
if (variant == TriDrawVariant::FillNormal || variant == TriDrawVariant::FillSubsector || variant == TriDrawVariant::FuzzSubsector) if (variant == TriDrawVariant::FillNormal || variant == TriDrawVariant::FillSubsector || variant == TriDrawVariant::FuzzSubsector)
return translation[color * 4].load_vec4ub(true); return translation[color * 4].load_vec4ub(true);
else else
return translation[texturePixels[uvoffset].load(true).zext_int() * 4].load_vec4ub(true); return translation[texturePixels[uvoffset].load(true).zext_int() * 4].load_vec4ub(true);
} }
SSAInt DrawTriangleCodegen::TranslateSample8(SSAInt uvoffset) SSAInt DrawTriangleCodegen::TranslateSample8(SSAInt *varying)
{ {
SSAInt ufrac = varying[0] << 8;
SSAInt vfrac = varying[1] << 8;
SSAInt upos = ((ufrac >> 16) * textureWidth) >> 16;
SSAInt vpos = ((vfrac >> 16) * textureHeight) >> 16;
SSAInt uvoffset = upos * textureHeight + vpos;
if (variant == TriDrawVariant::FillNormal || variant == TriDrawVariant::FillSubsector || variant == TriDrawVariant::FuzzSubsector) if (variant == TriDrawVariant::FillNormal || variant == TriDrawVariant::FillSubsector || variant == TriDrawVariant::FuzzSubsector)
return translation[color].load(true).zext_int(); return translation[color].load(true).zext_int();
else else
return translation[texturePixels[uvoffset].load(true).zext_int()].load(true).zext_int(); return translation[texturePixels[uvoffset].load(true).zext_int()].load(true).zext_int();
} }
SSAVec4i DrawTriangleCodegen::Sample32(SSAInt uvoffset) SSAVec4i DrawTriangleCodegen::Sample32(SSAInt *varying)
{ {
if (variant == TriDrawVariant::FillNormal || variant == TriDrawVariant::FillSubsector || variant == TriDrawVariant::FuzzSubsector) if (variant == TriDrawVariant::FillNormal || variant == TriDrawVariant::FillSubsector || variant == TriDrawVariant::FuzzSubsector)
return SSAVec4i::unpack(color); return SSAVec4i::unpack(color);
else
return texturePixels[uvoffset * 4].load_vec4ub(true); SSAInt ufrac = varying[0] << 8;
SSAInt vfrac = varying[1] << 8;
SSAVec4i nearest;
SSAVec4i linear;
{
SSAInt upos = ((ufrac >> 16) * textureWidth) >> 16;
SSAInt vpos = ((vfrac >> 16) * textureHeight) >> 16;
SSAInt uvoffset = upos * textureHeight + vpos;
nearest = texturePixels[uvoffset * 4].load_vec4ub(true);
}
{
SSAInt uone = (SSAInt(0x01000000) / textureWidth) << 8;
SSAInt vone = (SSAInt(0x01000000) / textureHeight) << 8;
ufrac = ufrac - (uone >> 1);
vfrac = vfrac - (vone >> 1);
SSAInt frac_x0 = (ufrac >> FRACBITS) * textureWidth;
SSAInt frac_x1 = ((ufrac + uone) >> FRACBITS) * textureWidth;
SSAInt frac_y0 = (vfrac >> FRACBITS) * textureHeight;
SSAInt frac_y1 = ((vfrac + vone) >> FRACBITS) * textureHeight;
SSAInt x0 = frac_x0 >> FRACBITS;
SSAInt x1 = frac_x1 >> FRACBITS;
SSAInt y0 = frac_y0 >> FRACBITS;
SSAInt y1 = frac_y1 >> FRACBITS;
SSAVec4i p00 = texturePixels[(x0 * textureHeight + y0) * 4].load_vec4ub(true);
SSAVec4i p01 = texturePixels[(x0 * textureHeight + y1) * 4].load_vec4ub(true);
SSAVec4i p10 = texturePixels[(x1 * textureHeight + y0) * 4].load_vec4ub(true);
SSAVec4i p11 = texturePixels[(x1 * textureHeight + y1) * 4].load_vec4ub(true);
SSAInt inv_b = (frac_x1 >> (FRACBITS - 4)) & 15;
SSAInt inv_a = (frac_y1 >> (FRACBITS - 4)) & 15;
SSAInt a = 16 - inv_a;
SSAInt b = 16 - inv_b;
linear = (p00 * (a * b) + p01 * (inv_a * b) + p10 * (a * inv_b) + p11 * (inv_a * inv_b) + 127) >> 8;
}
return AffineLinear.select(linear, nearest);
} }
SSAInt DrawTriangleCodegen::Sample8(SSAInt uvoffset) SSAInt DrawTriangleCodegen::Sample8(SSAInt *varying)
{ {
SSAInt ufrac = varying[0] << 8;
SSAInt vfrac = varying[1] << 8;
SSAInt upos = ((ufrac >> 16) * textureWidth) >> 16;
SSAInt vpos = ((vfrac >> 16) * textureHeight) >> 16;
SSAInt uvoffset = upos * textureHeight + vpos;
if (variant == TriDrawVariant::FillNormal || variant == TriDrawVariant::FillSubsector || variant == TriDrawVariant::FuzzSubsector) if (variant == TriDrawVariant::FillNormal || variant == TriDrawVariant::FillSubsector || variant == TriDrawVariant::FuzzSubsector)
return color; return color;
else else
@ -778,13 +846,6 @@ SSAInt DrawTriangleCodegen::Shade8(SSAInt c)
SSAVec4i DrawTriangleCodegen::ProcessPixel32(SSAVec4i bg, SSAInt *varying) SSAVec4i DrawTriangleCodegen::ProcessPixel32(SSAVec4i bg, SSAInt *varying)
{ {
SSAInt ufrac = varying[0] << 8;
SSAInt vfrac = varying[1] << 8;
SSAInt upos = ((ufrac >> 16) * textureWidth) >> 16;
SSAInt vpos = ((vfrac >> 16) * textureHeight) >> 16;
SSAInt uvoffset = upos * textureHeight + vpos;
SSAVec4i fg; SSAVec4i fg;
SSAVec4i output; SSAVec4i output;
@ -792,62 +853,62 @@ SSAVec4i DrawTriangleCodegen::ProcessPixel32(SSAVec4i bg, SSAInt *varying)
{ {
default: default:
case TriBlendMode::Copy: case TriBlendMode::Copy:
fg = Sample32(uvoffset); fg = Sample32(varying);
output = blend_copy(shade_bgra_simple(fg, currentlight)); output = blend_copy(shade_bgra_simple(fg, currentlight));
break; break;
case TriBlendMode::AlphaBlend: case TriBlendMode::AlphaBlend:
fg = Sample32(uvoffset); fg = Sample32(varying);
output = blend_alpha_blend(shade_bgra_simple(fg, currentlight), bg); output = blend_alpha_blend(shade_bgra_simple(fg, currentlight), bg);
break; break;
case TriBlendMode::AddSolid: case TriBlendMode::AddSolid:
fg = Sample32(uvoffset); fg = Sample32(varying);
output = blend_add(shade_bgra_simple(fg, currentlight), bg, srcalpha, destalpha); output = blend_add(shade_bgra_simple(fg, currentlight), bg, srcalpha, destalpha);
break; break;
case TriBlendMode::Add: case TriBlendMode::Add:
fg = Sample32(uvoffset); fg = Sample32(varying);
output = blend_add(shade_bgra_simple(fg, currentlight), bg, srcalpha, calc_blend_bgalpha(fg, destalpha)); output = blend_add(shade_bgra_simple(fg, currentlight), bg, srcalpha, calc_blend_bgalpha(fg, destalpha));
break; break;
case TriBlendMode::Sub: case TriBlendMode::Sub:
fg = Sample32(uvoffset); fg = Sample32(varying);
output = blend_sub(shade_bgra_simple(fg, currentlight), bg, srcalpha, calc_blend_bgalpha(fg, destalpha)); output = blend_sub(shade_bgra_simple(fg, currentlight), bg, srcalpha, calc_blend_bgalpha(fg, destalpha));
break; break;
case TriBlendMode::RevSub: case TriBlendMode::RevSub:
fg = Sample32(uvoffset); fg = Sample32(varying);
output = blend_revsub(shade_bgra_simple(fg, currentlight), bg, srcalpha, calc_blend_bgalpha(fg, destalpha)); output = blend_revsub(shade_bgra_simple(fg, currentlight), bg, srcalpha, calc_blend_bgalpha(fg, destalpha));
break; break;
case TriBlendMode::Stencil: case TriBlendMode::Stencil:
fg = Sample32(uvoffset); fg = Sample32(varying);
output = blend_stencil(shade_bgra_simple(SSAVec4i::unpack(color), currentlight), fg[3], bg, srcalpha, destalpha); output = blend_stencil(shade_bgra_simple(SSAVec4i::unpack(color), currentlight), fg[3], bg, srcalpha, destalpha);
break; break;
case TriBlendMode::Shaded: case TriBlendMode::Shaded:
output = blend_stencil(shade_bgra_simple(SSAVec4i::unpack(color), currentlight), Sample8(uvoffset), bg, srcalpha, destalpha); output = blend_stencil(shade_bgra_simple(SSAVec4i::unpack(color), currentlight), Sample8(varying), bg, srcalpha, destalpha);
break; break;
case TriBlendMode::TranslateCopy: case TriBlendMode::TranslateCopy:
fg = TranslateSample32(uvoffset); fg = TranslateSample32(varying);
output = blend_copy(shade_bgra_simple(fg, currentlight)); output = blend_copy(shade_bgra_simple(fg, currentlight));
break; break;
case TriBlendMode::TranslateAlphaBlend: case TriBlendMode::TranslateAlphaBlend:
fg = TranslateSample32(uvoffset); fg = TranslateSample32(varying);
output = blend_alpha_blend(shade_bgra_simple(fg, currentlight), bg); output = blend_alpha_blend(shade_bgra_simple(fg, currentlight), bg);
break; break;
case TriBlendMode::TranslateAdd: case TriBlendMode::TranslateAdd:
fg = TranslateSample32(uvoffset); fg = TranslateSample32(varying);
output = blend_add(shade_bgra_simple(fg, currentlight), bg, srcalpha, calc_blend_bgalpha(fg, destalpha)); output = blend_add(shade_bgra_simple(fg, currentlight), bg, srcalpha, calc_blend_bgalpha(fg, destalpha));
break; break;
case TriBlendMode::TranslateSub: case TriBlendMode::TranslateSub:
fg = TranslateSample32(uvoffset); fg = TranslateSample32(varying);
output = blend_sub(shade_bgra_simple(fg, currentlight), bg, srcalpha, calc_blend_bgalpha(fg, destalpha)); output = blend_sub(shade_bgra_simple(fg, currentlight), bg, srcalpha, calc_blend_bgalpha(fg, destalpha));
break; break;
case TriBlendMode::TranslateRevSub: case TriBlendMode::TranslateRevSub:
fg = TranslateSample32(uvoffset); fg = TranslateSample32(varying);
output = blend_revsub(shade_bgra_simple(fg, currentlight), bg, srcalpha, calc_blend_bgalpha(fg, destalpha)); output = blend_revsub(shade_bgra_simple(fg, currentlight), bg, srcalpha, calc_blend_bgalpha(fg, destalpha));
break; break;
case TriBlendMode::AddSrcColorOneMinusSrcColor: case TriBlendMode::AddSrcColorOneMinusSrcColor:
fg = Sample32(uvoffset); fg = Sample32(varying);
output = blend_add_srccolor_oneminussrccolor(shade_bgra_simple(fg, currentlight), bg); output = blend_add_srccolor_oneminussrccolor(shade_bgra_simple(fg, currentlight), bg);
break; break;
case TriBlendMode::Skycap: case TriBlendMode::Skycap:
fg = Sample32(uvoffset); fg = Sample32(varying);
output = FadeOut(varying[1], fg); output = FadeOut(varying[1], fg);
break; break;
} }
@ -869,13 +930,6 @@ SSAInt DrawTriangleCodegen::ToPal8(SSAVec4i c)
SSAInt DrawTriangleCodegen::ProcessPixel8(SSAInt bg, SSAInt *varying) SSAInt DrawTriangleCodegen::ProcessPixel8(SSAInt bg, SSAInt *varying)
{ {
SSAInt ufrac = varying[0] << 8;
SSAInt vfrac = varying[1] << 8;
SSAInt upos = ((ufrac >> 16) * textureWidth) >> 16;
SSAInt vpos = ((vfrac >> 16) * textureHeight) >> 16;
SSAInt uvoffset = upos * textureHeight + vpos;
SSAVec4i fg; SSAVec4i fg;
SSAInt alpha, inv_alpha; SSAInt alpha, inv_alpha;
SSAInt output; SSAInt output;
@ -885,80 +939,80 @@ SSAInt DrawTriangleCodegen::ProcessPixel8(SSAInt bg, SSAInt *varying)
{ {
default: default:
case TriBlendMode::Copy: case TriBlendMode::Copy:
output = Shade8(Sample8(uvoffset)); output = Shade8(Sample8(varying));
break; break;
case TriBlendMode::AlphaBlend: case TriBlendMode::AlphaBlend:
palindex = Sample8(uvoffset); palindex = Sample8(varying);
output = Shade8(palindex); output = Shade8(palindex);
output = (palindex == SSAInt(0)).select(bg, output); output = (palindex == SSAInt(0)).select(bg, output);
break; break;
case TriBlendMode::AddSolid: case TriBlendMode::AddSolid:
palindex = Sample8(uvoffset); palindex = Sample8(varying);
fg = ToBgra(Shade8(palindex)); fg = ToBgra(Shade8(palindex));
output = ToPal8(blend_add(fg, ToBgra(bg), srcalpha, destalpha)); output = ToPal8(blend_add(fg, ToBgra(bg), srcalpha, destalpha));
output = (palindex == SSAInt(0)).select(bg, output); output = (palindex == SSAInt(0)).select(bg, output);
break; break;
case TriBlendMode::Add: case TriBlendMode::Add:
palindex = Sample8(uvoffset); palindex = Sample8(varying);
fg = ToBgra(Shade8(palindex)); fg = ToBgra(Shade8(palindex));
output = ToPal8(blend_add(fg, ToBgra(bg), srcalpha, calc_blend_bgalpha(fg, destalpha))); output = ToPal8(blend_add(fg, ToBgra(bg), srcalpha, calc_blend_bgalpha(fg, destalpha)));
output = (palindex == SSAInt(0)).select(bg, output); output = (palindex == SSAInt(0)).select(bg, output);
break; break;
case TriBlendMode::Sub: case TriBlendMode::Sub:
palindex = Sample8(uvoffset); palindex = Sample8(varying);
fg = ToBgra(Shade8(palindex)); fg = ToBgra(Shade8(palindex));
output = ToPal8(blend_sub(fg, ToBgra(bg), srcalpha, calc_blend_bgalpha(fg, destalpha))); output = ToPal8(blend_sub(fg, ToBgra(bg), srcalpha, calc_blend_bgalpha(fg, destalpha)));
output = (palindex == SSAInt(0)).select(bg, output); output = (palindex == SSAInt(0)).select(bg, output);
break; break;
case TriBlendMode::RevSub: case TriBlendMode::RevSub:
palindex = Sample8(uvoffset); palindex = Sample8(varying);
fg = ToBgra(Shade8(palindex)); fg = ToBgra(Shade8(palindex));
output = ToPal8(blend_revsub(fg, ToBgra(bg), srcalpha, calc_blend_bgalpha(fg, destalpha))); output = ToPal8(blend_revsub(fg, ToBgra(bg), srcalpha, calc_blend_bgalpha(fg, destalpha)));
output = (palindex == SSAInt(0)).select(bg, output); output = (palindex == SSAInt(0)).select(bg, output);
break; break;
case TriBlendMode::Stencil: case TriBlendMode::Stencil:
output = ToPal8(blend_stencil(ToBgra(Shade8(color)), (Sample8(uvoffset) == SSAInt(0)).select(SSAInt(0), SSAInt(256)), ToBgra(bg), srcalpha, destalpha)); output = ToPal8(blend_stencil(ToBgra(Shade8(color)), (Sample8(varying) == SSAInt(0)).select(SSAInt(0), SSAInt(256)), ToBgra(bg), srcalpha, destalpha));
break; break;
case TriBlendMode::Shaded: case TriBlendMode::Shaded:
palindex = Sample8(uvoffset); palindex = Sample8(varying);
output = ToPal8(blend_stencil(ToBgra(Shade8(color)), palindex, ToBgra(bg), srcalpha, destalpha)); output = ToPal8(blend_stencil(ToBgra(Shade8(color)), palindex, ToBgra(bg), srcalpha, destalpha));
break; break;
case TriBlendMode::TranslateCopy: case TriBlendMode::TranslateCopy:
palindex = TranslateSample8(uvoffset); palindex = TranslateSample8(varying);
output = Shade8(palindex); output = Shade8(palindex);
output = (palindex == SSAInt(0)).select(bg, output); output = (palindex == SSAInt(0)).select(bg, output);
break; break;
case TriBlendMode::TranslateAlphaBlend: case TriBlendMode::TranslateAlphaBlend:
palindex = TranslateSample8(uvoffset); palindex = TranslateSample8(varying);
output = Shade8(palindex); output = Shade8(palindex);
output = (palindex == SSAInt(0)).select(bg, output); output = (palindex == SSAInt(0)).select(bg, output);
break; break;
case TriBlendMode::TranslateAdd: case TriBlendMode::TranslateAdd:
palindex = TranslateSample8(uvoffset); palindex = TranslateSample8(varying);
fg = ToBgra(Shade8(palindex)); fg = ToBgra(Shade8(palindex));
output = ToPal8(blend_add(fg, ToBgra(bg), srcalpha, calc_blend_bgalpha(fg, destalpha))); output = ToPal8(blend_add(fg, ToBgra(bg), srcalpha, calc_blend_bgalpha(fg, destalpha)));
output = (palindex == SSAInt(0)).select(bg, output); output = (palindex == SSAInt(0)).select(bg, output);
break; break;
case TriBlendMode::TranslateSub: case TriBlendMode::TranslateSub:
palindex = TranslateSample8(uvoffset); palindex = TranslateSample8(varying);
fg = ToBgra(Shade8(palindex)); fg = ToBgra(Shade8(palindex));
output = ToPal8(blend_sub(fg, ToBgra(bg), srcalpha, calc_blend_bgalpha(fg, destalpha))); output = ToPal8(blend_sub(fg, ToBgra(bg), srcalpha, calc_blend_bgalpha(fg, destalpha)));
output = (palindex == SSAInt(0)).select(bg, output); output = (palindex == SSAInt(0)).select(bg, output);
break; break;
case TriBlendMode::TranslateRevSub: case TriBlendMode::TranslateRevSub:
palindex = TranslateSample8(uvoffset); palindex = TranslateSample8(varying);
fg = ToBgra(Shade8(palindex)); fg = ToBgra(Shade8(palindex));
output = ToPal8(blend_revsub(fg, ToBgra(bg), srcalpha, calc_blend_bgalpha(fg, destalpha))); output = ToPal8(blend_revsub(fg, ToBgra(bg), srcalpha, calc_blend_bgalpha(fg, destalpha)));
output = (palindex == SSAInt(0)).select(bg, output); output = (palindex == SSAInt(0)).select(bg, output);
break; break;
case TriBlendMode::AddSrcColorOneMinusSrcColor: case TriBlendMode::AddSrcColorOneMinusSrcColor:
palindex = Sample8(uvoffset); palindex = Sample8(varying);
fg = ToBgra(Shade8(palindex)); fg = ToBgra(Shade8(palindex));
output = ToPal8(blend_add_srccolor_oneminussrccolor(fg, ToBgra(bg))); output = ToPal8(blend_add_srccolor_oneminussrccolor(fg, ToBgra(bg)));
output = (palindex == SSAInt(0)).select(bg, output); output = (palindex == SSAInt(0)).select(bg, output);
break; break;
case TriBlendMode::Skycap: case TriBlendMode::Skycap:
fg = ToBgra(Sample8(uvoffset)); fg = ToBgra(Sample8(varying));
output = ToPal8(FadeOut(varying[1], fg)); output = ToPal8(FadeOut(varying[1], fg));
break; break;
} }

9
tools/drawergen/fixedfunction/drawtrianglecodegen.h
View file

@ -50,10 +50,10 @@ private:
SSAVec4i ProcessPixel32(SSAVec4i bg, SSAInt *varying); SSAVec4i ProcessPixel32(SSAVec4i bg, SSAInt *varying);
SSAInt ProcessPixel8(SSAInt bg, SSAInt *varying); SSAInt ProcessPixel8(SSAInt bg, SSAInt *varying);
SSAVec4i TranslateSample32(SSAInt uvoffset); SSAVec4i TranslateSample32(SSAInt *varying);
SSAInt TranslateSample8(SSAInt uvoffset); SSAInt TranslateSample8(SSAInt *varying);
SSAVec4i Sample32(SSAInt uvoffset); SSAVec4i Sample32(SSAInt *varying);
SSAInt Sample8(SSAInt uvoffset); SSAInt Sample8(SSAInt *varying);
SSAInt Shade8(SSAInt c); SSAInt Shade8(SSAInt c);
SSAVec4i ToBgra(SSAInt index); SSAVec4i ToBgra(SSAInt index);
SSAInt ToPal8(SSAVec4i c); SSAInt ToPal8(SSAVec4i c);
@ -143,6 +143,7 @@ private:
SSAInt currentlight; SSAInt currentlight;
SSAUBytePtr currentcolormap; SSAUBytePtr currentcolormap;
SSAFloat AffineW; SSAFloat AffineW;
SSABool AffineLinear;
SSAFloat AffineVaryingPosY[TriVertex::NumVarying]; SSAFloat AffineVaryingPosY[TriVertex::NumVarying];
SSAInt AffineVaryingPosX[TriVertex::NumVarying]; SSAInt AffineVaryingPosX[TriVertex::NumVarying];
SSAInt AffineVaryingStepX[TriVertex::NumVarying]; SSAInt AffineVaryingStepX[TriVertex::NumVarying];