ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[video] rename grLfbLock to gfxLfbLock

This commit is contained in:
zilmar 2017-05-26 08:21:29 +10:00
parent 1fa4290605
commit ee26620dea
4 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Project64-video/Renderer/OGLESglitchmain.cpp
View File

@ -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)

12
Source/Project64-video/Renderer/OGLglitchmain.cpp
View File

@ -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;
}

1
Source/Project64-video/Renderer/Renderer.h
View File

@ -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;

2
Source/Project64-video/rdp.cpp
View File

@ -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,