ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vk, gl4: out of bound array index when sorting pixels

This commit is contained in:
flyinghead 2021-12-12 18:42:50 +01:00
parent 0478ec9696
commit 4c14a96888
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/rend/gl4/abuffer.cpp
View File

@ -42,9 +42,12 @@ uint pixel_list[MAX_PIXELS_PER_FRAGMENT];
int fillAndSortFragmentArray(ivec2 coords)
{
// Load fragments into a local memory array for sorting
uint idx = imageLoad(abufferPointerImg, coords).x;
int count = 0;
if (idx == EOL)
return 0;
int count = 1;
pixel_list[0] = idx;
idx = pixels[idx].next;
for (; idx != EOL && count < MAX_PIXELS_PER_FRAGMENT; count++)
{
const Pixel p = pixels[idx];
@ -56,11 +59,13 @@ int fillAndSortFragmentArray(ivec2 coords)
{
pixel_list[j + 1] = pixel_list[j];
j--;
jp = pixels[pixel_list[j]];
if (j >= 0)
jp = pixels[pixel_list[j]];
}
pixel_list[j + 1] = idx;
idx = p.next;
}
return count;
}

9
core/rend/vulkan/oit/oit_shaders.cpp
View File

@ -452,7 +452,11 @@ int fillAndSortFragmentArray(ivec2 coords)
{
// Load fragments into a local memory array for sorting
uint idx = abufferPointer.pointers[coords.x + coords.y * uniformBuffer.viewportWidth];
int count = 0;
if (idx == EOL)
return 0;
int count = 1;
pixel_list[0] = idx;
idx = PixelBuffer.pixels[idx].next;
for (; idx != EOL && count < MAX_PIXELS_PER_FRAGMENT; count++)
{
const Pixel p = PixelBuffer.pixels[idx];
@ -464,7 +468,8 @@ int fillAndSortFragmentArray(ivec2 coords)
{
pixel_list[j + 1] = pixel_list[j];
j--;
jp = PixelBuffer.pixels[pixel_list[j]];
if (j >= 0)
jp = PixelBuffer.pixels[pixel_list[j]];
}
pixel_list[j + 1] = idx;
idx = p.next;