diff --git a/Source/Project64-video/Renderer/OGLESglitchmain.cpp b/Source/Project64-video/Renderer/OGLESglitchmain.cpp index 0a02cfc2d..098b555d0 100644 --- a/Source/Project64-video/Renderer/OGLESglitchmain.cpp +++ b/Source/Project64-video/Renderer/OGLESglitchmain.cpp @@ -1470,11 +1470,7 @@ FxBool gfxLfbUnlock(GrLock_t type, GrBuffer_t buffer) return FXTRUE; } -FX_ENTRY FxBool FX_CALL -grLfbReadRegion(GrBuffer_t src_buffer, - FxU32 src_x, FxU32 src_y, - FxU32 src_width, FxU32 src_height, - FxU32 dst_stride, void *dst_data) +FxBool gfxLfbReadRegion(GrBuffer_t src_buffer, FxU32 src_x, FxU32 src_y, FxU32 src_width, FxU32 src_height, FxU32 dst_stride, void *dst_data) { unsigned char *buf; unsigned int i, j; diff --git a/Source/Project64-video/Renderer/OGLglitchmain.cpp b/Source/Project64-video/Renderer/OGLglitchmain.cpp index 6ca1074c7..a3093d23c 100644 --- a/Source/Project64-video/Renderer/OGLglitchmain.cpp +++ b/Source/Project64-video/Renderer/OGLglitchmain.cpp @@ -1732,11 +1732,7 @@ FxBool gfxLfbUnlock(GrLock_t type, GrBuffer_t buffer) return FXTRUE; } -FX_ENTRY FxBool FX_CALL -grLfbReadRegion(GrBuffer_t src_buffer, - FxU32 src_x, FxU32 src_y, - FxU32 src_width, FxU32 src_height, - FxU32 dst_stride, void *dst_data) +FxBool gfxLfbReadRegion(GrBuffer_t src_buffer, FxU32 src_x, FxU32 src_y, FxU32 src_width, FxU32 src_height, FxU32 dst_stride, void *dst_data) { unsigned char *buf; unsigned int i, j; @@ -1794,7 +1790,7 @@ grLfbReadRegion(GrBuffer_t src_buffer, free(buf); } - grDisplayGLError("grLfbReadRegion"); + grDisplayGLError("gfxLfbReadRegion"); return FXTRUE; } diff --git a/Source/Project64-video/Renderer/Renderer.h b/Source/Project64-video/Renderer/Renderer.h index 4700f7529..562a327c5 100644 --- a/Source/Project64-video/Renderer/Renderer.h +++ b/Source/Project64-video/Renderer/Renderer.h @@ -61,6 +61,7 @@ void gfxBufferClear(GrColor_t color, gfxAlpha_t alpha, FxU32 depth); void gfxBufferSwap(FxU32 swap_interval); FxBool gfxLfbLock(GrLock_t type, GrBuffer_t buffer, GrLfbWriteMode_t writeMode, GrOriginLocation_t origin, FxBool pixelPipeline, GrLfbInfo_t *info); FxBool gfxLfbUnlock(GrLock_t type, GrBuffer_t buffer); +FxBool gfxLfbReadRegion(GrBuffer_t src_buffer, FxU32 src_x, FxU32 src_y, FxU32 src_width, FxU32 src_height, FxU32 dst_stride, void *dst_data); extern uint32_t nbTextureUnits; extern uint32_t g_scr_res_x, g_scr_res_y, g_res_x, g_res_y; diff --git a/Source/Project64-video/rdp.cpp b/Source/Project64-video/rdp.cpp index b6cf9c139..7e33cf8a5 100644 --- a/Source/Project64-video/rdp.cpp +++ b/Source/Project64-video/rdp.cpp @@ -608,7 +608,7 @@ static void CopyFrameBuffer(GrBuffer_t buffer = GR_BUFFER_BACKBUFFER) if (rdp.scale_x < 1.1f) { uint16_t * ptr_src = new uint16_t[width*height]; - if (grLfbReadRegion(buffer, + if (gfxLfbReadRegion(buffer, (uint32_t)rdp.offset_x, (uint32_t)rdp.offset_y,//rdp.ci_upper_bound, width,