diff --git a/Source/Project64-video/Renderer/OGLESglitchmain.cpp b/Source/Project64-video/Renderer/OGLESglitchmain.cpp index ba2c2f83c..de8783fc0 100644 --- a/Source/Project64-video/Renderer/OGLESglitchmain.cpp +++ b/Source/Project64-video/Renderer/OGLESglitchmain.cpp @@ -1391,16 +1391,12 @@ void gfxBufferSwap(FxU32 swap_interval) } // frame buffer - -FX_ENTRY FxBool FX_CALL -grLfbLock(GrLock_t type, GrBuffer_t buffer, GrLfbWriteMode_t writeMode, - GrOriginLocation_t origin, FxBool pixelPipeline, - GrLfbInfo_t *info) +FxBool gfxLfbLock(GrLock_t type, GrBuffer_t buffer, GrLfbWriteMode_t writeMode, GrOriginLocation_t origin, FxBool pixelPipeline, GrLfbInfo_t *info) { WriteTrace(TraceGlitch, TraceDebug, "type: %d buffer: %d writeMode: %d origin: %d pixelPipeline: %d", type, buffer, writeMode, origin, pixelPipeline); if (type == GR_LFB_WRITE_ONLY) { - WriteTrace(TraceGlitch, TraceWarning, "grLfbLock : write only"); + WriteTrace(TraceGlitch, TraceWarning, "gfxLfbLock : write only"); } else { @@ -1416,7 +1412,7 @@ grLfbLock(GrLock_t type, GrBuffer_t buffer, GrLfbWriteMode_t writeMode, //glReadBuffer(GL_BACK); break; default: - WriteTrace(TraceGlitch, TraceWarning, "grLfbLock : unknown buffer : %x", buffer); + WriteTrace(TraceGlitch, TraceWarning, "gfxLfbLock : unknown buffer : %x", buffer); } if (buffer != GR_BUFFER_AUXBUFFER) diff --git a/Source/Project64-video/Renderer/OGLglitchmain.cpp b/Source/Project64-video/Renderer/OGLglitchmain.cpp index 3387f38e8..e3d17eee8 100644 --- a/Source/Project64-video/Renderer/OGLglitchmain.cpp +++ b/Source/Project64-video/Renderer/OGLglitchmain.cpp @@ -1652,16 +1652,12 @@ void gfxBufferSwap(FxU32 swap_interval) } // frame buffer - -FX_ENTRY FxBool FX_CALL -grLfbLock(GrLock_t type, GrBuffer_t buffer, GrLfbWriteMode_t writeMode, - GrOriginLocation_t origin, FxBool pixelPipeline, - GrLfbInfo_t *info) +FxBool gfxLfbLock(GrLock_t type, GrBuffer_t buffer, GrLfbWriteMode_t writeMode, GrOriginLocation_t origin, FxBool pixelPipeline, GrLfbInfo_t *info) { WriteTrace(TraceGlitch, TraceDebug, "type: %d buffer: %d writeMode: %d origin: %d pixelPipeline: %d", type, buffer, writeMode, origin, pixelPipeline); if (type == GR_LFB_WRITE_ONLY) { - WriteTrace(TraceGlitch, TraceWarning, "grLfbLock : write only"); + WriteTrace(TraceGlitch, TraceWarning, "gfxLfbLock : write only"); } else { @@ -1677,7 +1673,7 @@ grLfbLock(GrLock_t type, GrBuffer_t buffer, GrLfbWriteMode_t writeMode, glReadBuffer(GL_BACK); break; default: - WriteTrace(TraceGlitch, TraceWarning, "grLfbLock : unknown buffer : %x", buffer); + WriteTrace(TraceGlitch, TraceWarning, "gfxLfbLock : unknown buffer : %x", buffer); } if (buffer != GR_BUFFER_AUXBUFFER) @@ -1722,7 +1718,7 @@ grLfbLock(GrLock_t type, GrBuffer_t buffer, GrLfbWriteMode_t writeMode, } } - grDisplayGLError("grLfbLock"); + grDisplayGLError("gfxLfbLock"); return FXTRUE; } diff --git a/Source/Project64-video/Renderer/Renderer.h b/Source/Project64-video/Renderer/Renderer.h index d7b8ec178..aceb32bb2 100644 --- a/Source/Project64-video/Renderer/Renderer.h +++ b/Source/Project64-video/Renderer/Renderer.h @@ -59,6 +59,7 @@ void gfxFramebufferCopyExt(int x, int y, int w, int h, int from, int to, int mod void gfxRenderBuffer(GrBuffer_t buffer); 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); 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 2881c9b89..a532a24d2 100644 --- a/Source/Project64-video/rdp.cpp +++ b/Source/Project64-video/rdp.cpp @@ -663,7 +663,7 @@ static void CopyFrameBuffer(GrBuffer_t buffer = GR_BUFFER_BACKBUFFER) GrLfbInfo_t info; info.size = sizeof(GrLfbInfo_t); - if (grLfbLock(GR_LFB_READ_ONLY, + if (gfxLfbLock(GR_LFB_READ_ONLY, buffer, GR_LFBWRITEMODE_565, GR_ORIGIN_UPPER_LEFT,