zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 23:32:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix off-by-one bug

Browse source
This commit is contained in:
Magnus Norddahl 2016-10-16 13:08:06 +02:00
parent b3e4ba13ba
commit 1711f13eeb
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/r_compiler/fixedfunction/drawskycodegen.cpp
View file

@ -34,7 +34,8 @@ void DrawSkyCodegen::Generate(DrawSkyVariant variant, bool fourColumns, SSAValue
iscale[2] = args[0][18].load(true); iscale[2] = args[0][18].load(true);
iscale[3] = args[0][19].load(true); iscale[3] = args[0][19].load(true);
textureheight0 = args[0][20].load(true); textureheight0 = args[0][20].load(true);
textureheight1 = args[0][21].load(true); SSAInt textureheight1 = args[0][21].load(true);
maxtextureheight1 = textureheight1 - 1;
top_color = SSAVec4i::unpack(args[0][22].load(true)); top_color = SSAVec4i::unpack(args[0][22].load(true));
bottom_color = SSAVec4i::unpack(args[0][23].load(true)); bottom_color = SSAVec4i::unpack(args[0][23].load(true));
@ -105,7 +106,7 @@ SSAVec4i DrawSkyCodegen::Sample(SSAInt frac, int index, DrawSkyVariant variant)
} }
else else
{ {
SSAInt sample_index2 = SSAInt::MIN(sample_index, textureheight1); SSAInt sample_index2 = SSAInt::MIN(sample_index, maxtextureheight1);
SSAVec4i color0 = source0[index][sample_index * 4].load_vec4ub(false); SSAVec4i color0 = source0[index][sample_index * 4].load_vec4ub(false);
SSAVec4i color1 = source1[index][sample_index2 * 4].load_vec4ub(false); SSAVec4i color1 = source1[index][sample_index2 * 4].load_vec4ub(false);
return blend_alpha_blend(color0, color1); return blend_alpha_blend(color0, color1);

2
src/r_compiler/fixedfunction/drawskycodegen.h
View file

@ -30,7 +30,7 @@ private:
SSAInt texturefrac[4]; SSAInt texturefrac[4];
SSAInt iscale[4]; SSAInt iscale[4];
SSAInt textureheight0; SSAInt textureheight0;
SSAInt textureheight1; SSAInt maxtextureheight1;
SSAVec4i top_color; SSAVec4i top_color;
SSAVec4i bottom_color; SSAVec4i bottom_color;
SSAWorkerThread thread; SSAWorkerThread thread;