zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-26 08:50:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- do not use the cache for loading voxel data

Browse source 
This stuff is software rendering only so should be made optional anyway.

But aside from that it was the last non-sound data, being loaded into the cache.

With this gone the sound cache can be redone as a dedicated object and the atrocious cache1d implementation be tossed out.
This commit is contained in:
Christoph Oelckers 2019-10-21 01:17:26 +02:00
parent 64959be33e
commit 0c4ffdea43
1 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
source/build/src/engine.cpp
View file

@ -90,6 +90,9 @@ uint8_t globalr = 255, globalg = 255, globalb = 255;
int16_t pskybits_override = -1; int16_t pskybits_override = -1;
// This was on the cache but is permanently allocated, so put it into something static. This needs some rethinking anyway
static TArray<TArray<uint8_t>> voxelmemory;
void (*loadvoxel_replace)(int32_t voxindex) = NULL; void (*loadvoxel_replace)(int32_t voxindex) = NULL;
int16_t tiletovox[MAXTILES]; int16_t tiletovox[MAXTILES];
int32_t usevoxels = 1; int32_t usevoxels = 1;
@ -110,7 +113,7 @@ int32_t novoxmips = 1;
#else #else
# define DISTRECIPSIZ 131072 # define DISTRECIPSIZ 131072
#endif #endif
static uint8_t voxlock[MAXVOXELS][MAXVOXMIPS];
int32_t voxscale[MAXVOXELS]; int32_t voxscale[MAXVOXELS];
static int32_t ggxinc[MAXXSIZ+1], ggyinc[MAXXSIZ+1]; static int32_t ggxinc[MAXXSIZ+1], ggyinc[MAXXSIZ+1];
@ -8173,12 +8176,8 @@ int32_t engineInit(void)
for (i=1; i<1024; i++) for (i=1; i<1024; i++)
lowrecip[i] = ((1<<24)-1)/i; lowrecip[i] = ((1<<24)-1)/i;
for (i=0; i<MAXVOXELS; i++) voxelmemory.Reset();
for (j=0; j<MAXVOXMIPS; j++)
{
voxoff[i][j] = 0L;
voxlock[i][j] = 200;
}
for (i=0; i<MAXTILES; i++) for (i=0; i<MAXTILES; i++)
tiletovox[i] = -1; tiletovox[i] = -1;
clearbuf(voxscale, sizeof(voxscale)>>2, 65536); clearbuf(voxscale, sizeof(voxscale)>>2, 65536);
@ -10568,33 +10567,31 @@ void videoNextPage(void)
// //
// qloadkvx // qloadkvx
// //
int32_t qloadkvx(int32_t voxindex, const char *filename) int32_t qloadkvx(int32_t voxindex, const char *filename)
{ {
const buildvfs_kfd fil = kopen4load(filename, 0); autofil = kopenFileReader(filename, 0);
if (fil == buildvfs_kfd_invalid) if (!fil.isOpen())
return -1; return -1;
int32_t lengcnt = 0; int32_t lengcnt = 0;
const int32_t lengtot = kfilelength(fil); const int32_t lengtot = fil.GetLength();
for (bssize_t i=0; i<MAXVOXMIPS; i++) for (bssize_t i=0; i<MAXVOXMIPS; i++)
{ {
int32_t dasiz; int32_t dasiz = fil.ReadInt32();
kread(fil, &dasiz, 4); dasiz = B_LITTLE32(dasiz);
//Must store filenames to use cacheing system :( voxelmemory.Reserve(1);
voxlock[voxindex][i] = 200; voxelmemory.Last() = fil.Read(dasiz);
cacheAllocateBlock(&voxoff[voxindex][i], dasiz, &voxlock[voxindex][i]); voxoff[voxindex][i] = (intptr)voxelmemoty.Last().Data();
char *ptr = (char *) voxoff[voxindex][i];
kread(fil, ptr, dasiz);
lengcnt += dasiz+4; lengcnt += dasiz+4;
if (lengcnt >= lengtot-768) if (lengcnt >= lengtot-768)
break; break;
} }
kclose(fil);
#ifdef USE_OPENGL #ifdef USE_OPENGL
if (voxmodels[voxindex]) if (voxmodels[voxindex])
@ -10630,7 +10627,6 @@ void vox_undefine(int32_t const tile)
for (ssize_t j = 0; j < MAXVOXMIPS; ++j) for (ssize_t j = 0; j < MAXVOXMIPS; ++j)
{ {
// CACHE1D_FREE // CACHE1D_FREE
voxlock[voxindex][j] = 1;
voxoff[voxindex][j] = 0; voxoff[voxindex][j] = 0;
} }
voxscale[voxindex] = 65536; voxscale[voxindex] = 65536;