mirror of
https://gitlab.com/shinovon/re3-symbian.git
synced 2026-05-22 17:47:20 +03:00
Fixes
This commit is contained in:
parent
6992f313a9
commit
dfdd037ed3
4 changed files with 61 additions and 61 deletions
2
vendor/librw/src/gl/rwgl3.h
vendored
2
vendor/librw/src/gl/rwgl3.h
vendored
|
|
@ -18,7 +18,7 @@
|
|||
#endif
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
#ifdef _DEBUG
|
||||
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 { \
|
||||
|
|
|
|||
21
vendor/librw/src/gles1/gl1raster.cpp
vendored
21
vendor/librw/src/gles1/gl1raster.cpp
vendored
|
|
@ -395,11 +395,8 @@ rasterLock(Raster *raster, int32 level, int32 lockMode)
|
|||
px = (uint8*)rwMalloc(allocSz, MEMDUR_EVENT | ID_DRIVER);
|
||||
assert(raster->pixels == nil);
|
||||
raster->pixels = px;
|
||||
#ifdef __SYMBIAN32__
|
||||
|
||||
memset(px, 0, allocSz);
|
||||
#else
|
||||
glReadBuffer(GL_BACK);
|
||||
#endif
|
||||
glReadPixels(0, 0, raster->width, raster->height, GL_RGB, GL_UNSIGNED_BYTE, px);
|
||||
|
||||
raster->privateFlags = lockMode;
|
||||
|
|
@ -501,11 +498,11 @@ void rasterUnlock(Raster *raster, int32 level){
|
|||
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
|
||||
|
|
@ -751,8 +748,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){
|
||||
|
|
@ -786,7 +783,7 @@ destroyNativeRaster(void *object, int32 offset, int32)
|
|||
natras->backingStore = nil;
|
||||
}
|
||||
#endif
|
||||
return object;
|
||||
return object;
|
||||
}
|
||||
|
||||
static void*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue