rndtrash/re3-symbian
1
0
Fork 0
mirror of https://gitlab.com/shinovon/re3-symbian.git synced 2026-05-22 17:47:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

No more out of memory errors on VC3

Browse source
This commit is contained in:
Shinovon 2026-05-07 02:48:00 +05:00
parent 689c76b4c5
commit 30fff6bbab
5 changed files with 76 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

23
vendor/librw/src/gl/gl3raster.cpp vendored
View file

@ -64,6 +64,7 @@ getLevelSize(Raster *raster, int32 level)
static Raster*
rasterCreateTexture(Raster *raster)
{
CHECK_GL_ERROR("-rasterCreateTexture");
if(raster->format & (Raster::PAL4 | Raster::PAL8)){
RWERROR((ERR_NOTEXTURE));
return nil;
@ -138,11 +139,14 @@ rasterCreateTexture(Raster *raster)
natras->numLevels = 1;
glGenTextures(1, &natras->texid);
uint32 prev = bindTexture(natras->texid);
CHECK_GL_ERROR("glGenTextures");
// re3_debug("creating texture, format: %d, size: %d x %d", natras->internalFormat, raster->width, raster->height);
// uint32 prev = bindTexture(natras->texid);
// glTexImage2D(GL_TEXTURE_2D, 0, natras->internalFormat,
//// raster->width, raster->height,
// 1,1,
// raster->width, raster->height,
//// 1,1,
// 0, natras->format, natras->type, nil);
// CHECK_GL_ERROR("glTexImage2D");
// TODO: allocate other levels...probably
#ifndef __SYMBIAN32__
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, natras->numLevels-1);
@ -152,7 +156,7 @@ rasterCreateTexture(Raster *raster)
natras->addressV = 0;
natras->maxAnisotropy = 1;
bindTexture(prev);
// bindTexture(prev);
return raster;
}
@ -220,6 +224,7 @@ rasterCreateCameraTexture(Raster *raster)
// raster->width, raster->height,
1,1,
0, natras->format, natras->type, nil);
CHECK_GL_ERROR("glTexImage2D");
natras->filterMode = 0;
natras->addressU = 0;
natras->addressV = 0;
@ -488,6 +493,7 @@ uint8*
rasterLock(Raster *raster, int32 level, int32 lockMode)
{
#ifdef RW_OPENGL
CHECK_GL_ERROR("+rasterLock");
Gl3Raster *natras GETGL3RASTEREXT(raster);
uint8 *px;
uint32 allocSz;
@ -536,8 +542,10 @@ rasterLock(Raster *raster, int32 level, int32 lockMode)
glGenFramebuffers(1, &fbo);
bindFramebuffer(fbo);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, natras->texid, 0);
CHECK_GL_ERROR("glFramebufferTexture2D");
GLenum e = glCheckFramebufferStatus(GL_FRAMEBUFFER);
glReadPixels(0, 0, raster->width, raster->height, natras->format, natras->type, px);
CHECK_GL_ERROR("glReadPixels");
//e = glGetError(); printf("GL err4 %x (%x)\n", e, natras->format);
bindFramebuffer(0);
glDeleteFramebuffers(1, &fbo);
@ -571,6 +579,7 @@ rasterLock(Raster *raster, int32 level, int32 lockMode)
glReadBuffer(GL_BACK);
#endif
glReadPixels(0, 0, raster->width, raster->height, GL_RGB, GL_UNSIGNED_BYTE, px);
CHECK_GL_ERROR("glReadPixels");
raster->privateFlags = lockMode;
break;
@ -580,6 +589,7 @@ rasterLock(Raster *raster, int32 level, int32 lockMode)
return nil;
}
CHECK_GL_ERROR("-rasterLock");
return px;
#else
return nil;
@ -590,6 +600,7 @@ void
rasterUnlock(Raster *raster, int32 level)
{
#ifdef RW_OPENGL
CHECK_GL_ERROR("+rasterUnlock");
Gl3Raster *natras = GETGL3RASTEREXT(raster);
assert(raster->pixels);
@ -606,6 +617,7 @@ rasterUnlock(Raster *raster, int32 level)
raster->width, raster->height, 0,
getLevelSize(raster, level),
raster->pixels);
CHECK_GL_ERROR("glCompressedTexImage2D");
if(natras->backingStore){
assert(level < natras->backingStore->numlevels);
memcpy(natras->backingStore->levels[level].data, raster->pixels,
@ -631,12 +643,14 @@ rasterUnlock(Raster *raster, int32 level)
}
glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA, raster->width, raster->height, 0, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, pixels16);
free(pixels16);
CHECK_GL_ERROR("glTexImage2D 1");
} else
{
// glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
glTexImage2D(GL_TEXTURE_2D, level, natras->internalFormat,
raster->width, raster->height,
0, natras->format, natras->type, raster->pixels);
CHECK_GL_ERROR("glTexImage2D 2");
}
}
// if(level == 0 && natras->autogenMipmap)
@ -652,6 +666,7 @@ rasterUnlock(Raster *raster, int32 level)
rwFree(raster->pixels);
raster->pixels = nil;
CHECK_GL_ERROR("-rasterUnlock");
#endif
raster->width = raster->originalWidth;
raster->height = raster->originalHeight;

14
vendor/librw/src/gl/rwgl3.h vendored
View file

@ -18,6 +18,20 @@
#endif
#endif
#if 0
extern void re3_debug(const char *format, ...);
extern void re3_trace(const char *filename, unsigned int lineno, const char *func, const char *format, ...);
#define CHECK_GL_ERROR(trace) do { \
int glerror = glGetError(); \
if (glerror != 0) { \
re3_trace(__FILE__, __LINE__, __FUNCTION__, "GL Error %x on %s", glerror, trace); \
} \
} while(0);
#else
#define CHECK_GL_ERROR(a)
#endif
namespace rw {
#ifdef RW_GL3