mrq/GLdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix broken merge

Browse Source
This commit is contained in:
Luke Benstead 2023-09-01 20:29:24 +01:00
parent 0e31aa3d27
commit 9cedc81850
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
GL/alloc/alloc.c
View File

@ -147,18 +147,6 @@ void* alloc_next_available_ex(void* pool, size_t required_size, size_t* start_su
uintptr_t offset = (it - pool_header.block_usage) * 8; uintptr_t offset = (it - pool_header.block_usage) * 8;
offset += (i + 1); offset += (i + 1);
offset -= required_subblocks; offset -= required_subblocks;
return pool_header.base_address + (offset * 256);
}
}
} else {
found_subblocks = 0;
} else {
found_subblocks++;
if(found_subblocks >= required_subblocks) {
/* We found space! Now calculate the address */
uintptr_t offset = (it - pool_header.block_usage) * 8;
offset += (i + 1);
offset -= required_subblocks;
if(start_subblock_out) { if(start_subblock_out) {
*start_subblock_out = offset; *start_subblock_out = offset;
@ -167,6 +155,9 @@ void* alloc_next_available_ex(void* pool, size_t required_size, size_t* start_su
return pool_header.base_address + (offset * 256); return pool_header.base_address + (offset * 256);
} }
} }
} else {
found_subblocks = 0;
}
t <<= 1; t <<= 1;
} }

5
tests/test_glteximage2d.h
View File

@ -10,7 +10,10 @@ public:
uint8_t image_data[8 * 8 * 4] = {0}; uint8_t image_data[8 * 8 * 4] = {0};
void set_up() { void set_up() {
glKosInit(); GLdcConfig config;
glKosInitConfig(&config);
config.texture_twiddle = false;
glKosInitEx(&config);
/* Init image data so each texel RGBA value matches the /* Init image data so each texel RGBA value matches the
* position in the array */ * position in the array */