mirror of
https://gitlab.com/shinovon/re3-symbian.git
synced 2026-05-22 17:47:20 +03:00
Now the TXD.img file is being created correctly, and the textures are reduced to half their size, saving a lot of memory and making the game run more smoothly. The game no longer crashes and it looks very good. That said, I still couldn’t increase the frame rate—it stays between 8 and 15 FPS, but usually runs around 8
This commit is contained in:
Dante Leoncini
parent
39c75bb8c5
commit
6d9929b7ce
4 changed files with 189 additions and 107 deletions
4
vendor/librw/src/gles1/gl1device.cpp
vendored
4
vendor/librw/src/gles1/gl1device.cpp
vendored
|
|
@ -308,9 +308,7 @@ flushGlRenderState(void)
|
|||
|
||||
|
||||
|
||||
void
|
||||
setAlphaBlend(bool32 enable)
|
||||
{
|
||||
void setAlphaBlend(bool32 enable){
|
||||
if(rwStateCache.blendEnable != enable){
|
||||
rwStateCache.blendEnable = enable;
|
||||
setGlRenderState(RWGL_BLEND, enable);
|
||||
|
|
|
|||
168
vendor/librw/src/gles1/gl1raster.cpp
vendored
168
vendor/librw/src/gles1/gl1raster.cpp
vendored
|
|
@ -416,86 +416,96 @@ rasterLock(Raster *raster, int32 level, int32 lockMode)
|
|||
#endif
|
||||
}
|
||||
|
||||
void
|
||||
rasterUnlock(Raster *raster, int32 level)
|
||||
{
|
||||
void rasterUnlock(Raster *raster, int32 level){
|
||||
#ifdef RW_GLES1
|
||||
Gl1Raster *natras = GETGL1RASTEREXT(raster);
|
||||
Gl1Raster *natras = GETGL1RASTEREXT(raster);
|
||||
|
||||
assert(raster->pixels);
|
||||
assert(raster->pixels);
|
||||
|
||||
switch(raster->type){
|
||||
case Raster::NORMAL:
|
||||
case Raster::TEXTURE:
|
||||
case Raster::CAMERATEXTURE:
|
||||
if(raster->privateFlags & Raster::LOCKWRITE){
|
||||
if (level != 0) break;
|
||||
uint32 prev = bindTexture(natras->texid);
|
||||
if(natras->isCompressed){
|
||||
glCompressedTexImage2D(GL_TEXTURE_2D, level, natras->internalFormat,
|
||||
raster->width, raster->height, 0,
|
||||
getLevelSize(raster, level),
|
||||
raster->pixels);
|
||||
}else{
|
||||
int stride = raster->width * natras->bpp;
|
||||
uint8_t* tmp = (uint8_t*)malloc(stride);
|
||||
for (int y = 0; y < raster->height / 2; y++) {
|
||||
uint8_t* a = (uint8_t*)raster->pixels + y * stride;
|
||||
uint8_t* b = (uint8_t*)raster->pixels + (raster->height - 1 - y) * stride;
|
||||
|
||||
memcpy(tmp, a, stride);
|
||||
memcpy(a, b, stride);
|
||||
memcpy(b, tmp, stride);
|
||||
}
|
||||
free(tmp);
|
||||
|
||||
if (raster->pixels != nil && natras->format == GL_RGBA && natras->type == GL_UNSIGNED_BYTE) {
|
||||
// convert to 16-bit
|
||||
uint16_t* pixels16 = (uint16_t*)malloc(raster->width * raster->height * sizeof(uint16_t));
|
||||
uint8_t* pixels8 = (uint8_t*)raster->pixels;
|
||||
|
||||
for (int i = 0; i < raster->width * raster->height; i++) {
|
||||
uint8_t r = pixels8[i * 4 + 0];
|
||||
uint8_t g = pixels8[i * 4 + 1];
|
||||
uint8_t b = pixels8[i * 4 + 2];
|
||||
uint8_t a = pixels8[i * 4 + 3];
|
||||
|
||||
pixels16[i] = ((r >> 4) << 12) | ((g >> 4) << 8) | ((b >> 4) << 4) | (a >> 4);
|
||||
}
|
||||
glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA, raster->width, raster->height, 0, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, pixels16);
|
||||
free(pixels16);
|
||||
} else
|
||||
{
|
||||
// glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
|
||||
glTexImage2D(GL_TEXTURE_2D, level, natras->internalFormat,
|
||||
raster->width, raster->height,
|
||||
0, natras->format, natras->type, raster->pixels);
|
||||
}
|
||||
}
|
||||
switch(raster->type){
|
||||
case Raster::NORMAL:
|
||||
case Raster::TEXTURE:
|
||||
case Raster::CAMERATEXTURE:
|
||||
if(raster->privateFlags & Raster::LOCKWRITE){
|
||||
if(level != 0) break;
|
||||
|
||||
if(natras->backingStore){
|
||||
assert(level < natras->backingStore->numlevels);
|
||||
memcpy(natras->backingStore->levels[level].data, raster->pixels,
|
||||
natras->backingStore->levels[level].size);
|
||||
}
|
||||
// === GUARDAR EN BACKING STORE ANTES DE SUBIR A GPU ===
|
||||
if(natras->backingStore == nil){
|
||||
int numLevels = natras->numLevels;
|
||||
// RasterLevels tiene: int numlevels; struct { uint32 size; uint8 *data; } levels[];
|
||||
natras->backingStore = (RasterLevels*)malloc(
|
||||
sizeof(RasterLevels) + sizeof(natras->backingStore->levels[0]) * numLevels);
|
||||
natras->backingStore->numlevels = numLevels;
|
||||
for(int i = 0; i < numLevels; i++){
|
||||
uint32 sz = getLevelSize(raster, i);
|
||||
natras->backingStore->levels[i].size = sz;
|
||||
natras->backingStore->levels[i].data = (uint8*)malloc(sz);
|
||||
memset(natras->backingStore->levels[i].data, 0, sz);
|
||||
}
|
||||
}
|
||||
// copiar píxeles actuales al backing store
|
||||
{
|
||||
uint32 sz = getLevelSize(raster, level);
|
||||
assert(level < natras->backingStore->numlevels);
|
||||
memcpy(natras->backingStore->levels[level].data, raster->pixels, sz);
|
||||
}
|
||||
// === FIN BACKING STORE ===
|
||||
|
||||
bindTexture(prev);
|
||||
}
|
||||
break;
|
||||
uint32 prev = bindTexture(natras->texid);
|
||||
|
||||
case Raster::CAMERA:
|
||||
// TODO: write?
|
||||
break;
|
||||
}
|
||||
// flip vertical (igual que antes)
|
||||
{
|
||||
int stride = raster->width * natras->bpp;
|
||||
uint8_t *tmp = (uint8_t*)malloc(stride);
|
||||
for(int y = 0; y < raster->height / 2; y++){
|
||||
uint8_t *a = (uint8_t*)raster->pixels + y * stride;
|
||||
uint8_t *b = (uint8_t*)raster->pixels + (raster->height - 1 - y) * stride;
|
||||
memcpy(tmp, a, stride);
|
||||
memcpy(a, b, stride);
|
||||
memcpy(b, tmp, stride);
|
||||
}
|
||||
free(tmp);
|
||||
}
|
||||
|
||||
rwFree(raster->pixels);
|
||||
raster->pixels = nil;
|
||||
if(!natras->isCompressed){
|
||||
if(natras->format == GL_RGBA && natras->type == GL_UNSIGNED_BYTE){
|
||||
// convertir RGBA8888 → RGBA4444
|
||||
uint16_t *pixels16 = (uint16_t*)malloc(raster->width * raster->height * 2);
|
||||
uint8_t *pixels8 = (uint8_t*)raster->pixels;
|
||||
for(int i = 0; i < raster->width * raster->height; i++){
|
||||
uint8_t r = pixels8[i*4+0];
|
||||
uint8_t g = pixels8[i*4+1];
|
||||
uint8_t b = pixels8[i*4+2];
|
||||
uint8_t a = pixels8[i*4+3];
|
||||
pixels16[i] = ((r>>4)<<12)|((g>>4)<<8)|((b>>4)<<4)|(a>>4);
|
||||
}
|
||||
glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA,
|
||||
raster->width, raster->height, 0,
|
||||
GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, pixels16);
|
||||
free(pixels16);
|
||||
} else {
|
||||
glTexImage2D(GL_TEXTURE_2D, level, natras->internalFormat,
|
||||
raster->width, raster->height, 0,
|
||||
natras->format, natras->type, raster->pixels);
|
||||
}
|
||||
}
|
||||
|
||||
bindTexture(prev);
|
||||
}
|
||||
break;
|
||||
|
||||
case Raster::CAMERA:
|
||||
break;
|
||||
}
|
||||
|
||||
rwFree(raster->pixels);
|
||||
raster->pixels = nil;
|
||||
#endif
|
||||
raster->width = raster->originalWidth;
|
||||
raster->height = raster->originalHeight;
|
||||
raster->stride = raster->originalStride;
|
||||
raster->pixels = raster->originalPixels;
|
||||
raster->privateFlags = 0;
|
||||
raster->width = raster->originalWidth;
|
||||
raster->height = raster->originalHeight;
|
||||
raster->stride = raster->originalStride;
|
||||
raster->pixels = raster->originalPixels;
|
||||
raster->privateFlags = 0;
|
||||
}
|
||||
|
||||
int32
|
||||
|
|
@ -741,8 +751,8 @@ void evictRaster(Raster *raster);
|
|||
static void*
|
||||
destroyNativeRaster(void *object, int32 offset, int32)
|
||||
{
|
||||
Raster *raster = (Raster*)object;
|
||||
Gl1Raster *natras = PLUGINOFFSET(Gl1Raster, object, offset);
|
||||
Raster *raster = (Raster*)object;
|
||||
Gl1Raster *natras = PLUGINOFFSET(Gl1Raster, object, offset);
|
||||
#ifdef RW_GLES1
|
||||
evictRaster(raster);
|
||||
switch(raster->type){
|
||||
|
|
@ -769,10 +779,14 @@ destroyNativeRaster(void *object, int32 offset, int32)
|
|||
natras->texid = 0;
|
||||
natras->fbo = 0;
|
||||
|
||||
free(natras->backingStore);
|
||||
|
||||
if(natras->backingStore){
|
||||
for(int i = 0; i < natras->backingStore->numlevels; i++)
|
||||
free(natras->backingStore->levels[i].data);
|
||||
free(natras->backingStore);
|
||||
natras->backingStore = nil;
|
||||
}
|
||||
#endif
|
||||
return object;
|
||||
return object;
|
||||
}
|
||||
|
||||
static void*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue