zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix blending modes

This commit is contained in:
Magnus Norddahl 2016-10-16 15:41:47 +02:00
parent 42138a6ab9
commit 204c037017
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/r_compiler/fixedfunction/drawcolumncodegen.cpp
View File

@ -168,6 +168,7 @@ bool DrawColumnCodegen::IsPaletteInput(DrawColumnVariant variant)
SSAVec4i DrawColumnCodegen::ProcessPixel(SSAInt sample_index, SSAVec4i bgcolor, DrawColumnVariant variant, bool isSimpleShade) SSAVec4i DrawColumnCodegen::ProcessPixel(SSAInt sample_index, SSAVec4i bgcolor, DrawColumnVariant variant, bool isSimpleShade)
{ {
SSAInt alpha, inv_alpha; SSAInt alpha, inv_alpha;
SSAVec4i fg;
switch (variant) switch (variant)
{ {
default: default:
@ -177,24 +178,30 @@ SSAVec4i DrawColumnCodegen::ProcessPixel(SSAInt sample_index, SSAVec4i bgcolor,
return blend_copy(Shade(Sample(sample_index), isSimpleShade)); return blend_copy(Shade(Sample(sample_index), isSimpleShade));
case DrawColumnVariant::DrawAdd: case DrawColumnVariant::DrawAdd:
case DrawColumnVariant::DrawAddClamp: case DrawColumnVariant::DrawAddClamp:
return blend_add(Shade(Sample(sample_index), isSimpleShade), bgcolor, srcalpha, destalpha); fg = Shade(Sample(sample_index), isSimpleShade);
return blend_add(fg, bgcolor, srcalpha, calc_blend_bgalpha(fg, destalpha));
case DrawColumnVariant::DrawShaded: case DrawColumnVariant::DrawShaded:
alpha = SSAInt::MAX(SSAInt::MIN(ColormapSample(sample_index), SSAInt(64)), SSAInt(0)) * 4; alpha = SSAInt::MAX(SSAInt::MIN(ColormapSample(sample_index), SSAInt(64)), SSAInt(0)) * 4;
inv_alpha = 256 - alpha; inv_alpha = 256 - alpha;
return blend_add(color, bgcolor, alpha, inv_alpha); return blend_add(color, bgcolor, alpha, inv_alpha);
case DrawColumnVariant::DrawSubClamp: case DrawColumnVariant::DrawSubClamp:
return blend_sub(Shade(Sample(sample_index), isSimpleShade), bgcolor, srcalpha, destalpha); fg = Shade(Sample(sample_index), isSimpleShade);
return blend_sub(fg, bgcolor, srcalpha, calc_blend_bgalpha(fg, destalpha));
case DrawColumnVariant::DrawRevSubClamp: case DrawColumnVariant::DrawRevSubClamp:
return blend_revsub(Shade(Sample(sample_index), isSimpleShade), bgcolor, srcalpha, destalpha); fg = Shade(Sample(sample_index), isSimpleShade);
return blend_revsub(fg, bgcolor, srcalpha, calc_blend_bgalpha(fg, destalpha));
case DrawColumnVariant::DrawTranslated: case DrawColumnVariant::DrawTranslated:
return blend_copy(Shade(TranslateSample(sample_index), isSimpleShade)); return blend_copy(Shade(TranslateSample(sample_index), isSimpleShade));
case DrawColumnVariant::DrawTlatedAdd: case DrawColumnVariant::DrawTlatedAdd:
case DrawColumnVariant::DrawAddClampTranslated: case DrawColumnVariant::DrawAddClampTranslated:
return blend_add(Shade(TranslateSample(sample_index), isSimpleShade), bgcolor, srcalpha, destalpha); fg = Shade(TranslateSample(sample_index), isSimpleShade);
return blend_add(fg, bgcolor, srcalpha, calc_blend_bgalpha(fg, destalpha));
case DrawColumnVariant::DrawSubClampTranslated: case DrawColumnVariant::DrawSubClampTranslated:
return blend_sub(Shade(TranslateSample(sample_index), isSimpleShade), bgcolor, srcalpha, destalpha); fg = Shade(TranslateSample(sample_index), isSimpleShade);
return blend_sub(fg, bgcolor, srcalpha, calc_blend_bgalpha(fg, destalpha));
case DrawColumnVariant::DrawRevSubClampTranslated: case DrawColumnVariant::DrawRevSubClampTranslated:
return blend_revsub(Shade(TranslateSample(sample_index), isSimpleShade), bgcolor, srcalpha, destalpha); fg = Shade(TranslateSample(sample_index), isSimpleShade);
return blend_revsub(fg, bgcolor, srcalpha, calc_blend_bgalpha(fg, destalpha));
case DrawColumnVariant::Fill: case DrawColumnVariant::Fill:
return blend_copy(color); return blend_copy(color);
case DrawColumnVariant::FillAdd: case DrawColumnVariant::FillAdd:

3
src/r_compiler/fixedfunction/drawercodegen.cpp
View File

@ -55,8 +55,9 @@ SSAVec4i DrawerCodegen::shade_pal_index_advanced(SSAInt index, SSAInt light, con
SSAVec4i DrawerCodegen::shade_bgra_simple(SSAVec4i color, SSAInt light) SSAVec4i DrawerCodegen::shade_bgra_simple(SSAVec4i color, SSAInt light)
{ {
SSAInt alpha = color[3];
color = color * light / 256; color = color * light / 256;
return color.insert(3, 255); return color.insert(3, alpha);
} }
SSAVec4i DrawerCodegen::shade_bgra_advanced(SSAVec4i color, SSAInt light, const SSAShadeConstants &constants) SSAVec4i DrawerCodegen::shade_bgra_advanced(SSAVec4i color, SSAInt light, const SSAShadeConstants &constants)

6
src/r_compiler/fixedfunction/drawwallcodegen.cpp
View File

@ -182,10 +182,10 @@ SSAVec4i DrawWallCodegen::Blend(SSAVec4i fg, SSAVec4i bg, DrawWallVariant varian
return blend_alpha_blend(fg, bg); return blend_alpha_blend(fg, bg);
case DrawWallVariant::Add: case DrawWallVariant::Add:
case DrawWallVariant::AddClamp: case DrawWallVariant::AddClamp:
return blend_add(fg, bg, srcalpha, destalpha); return blend_add(fg, bg, srcalpha, calc_blend_bgalpha(fg, destalpha));
case DrawWallVariant::SubClamp: case DrawWallVariant::SubClamp:
return blend_sub(fg, bg, srcalpha, destalpha); return blend_sub(fg, bg, srcalpha, calc_blend_bgalpha(fg, destalpha));
case DrawWallVariant::RevSubClamp: case DrawWallVariant::RevSubClamp:
return blend_revsub(fg, bg, srcalpha, destalpha); return blend_revsub(fg, bg, srcalpha, calc_blend_bgalpha(fg, destalpha));
} }
} }