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

[Video] Change GrBuffer_t to gfxBuffer_t

This commit is contained in:
zilmar 2017-08-07 08:22:12 +10:00
parent 81fbec9e42
commit d425d47778
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1114,7 +1114,7 @@ void updateTexture()
}
}
void gfxRenderBuffer(GrBuffer_t buffer)
void gfxRenderBuffer(gfxBuffer_t buffer)
{
#ifdef _WIN32
static HANDLE region = NULL;
@ -1234,7 +1234,7 @@ void gfxRenderBuffer(GrBuffer_t buffer)
}
}
void gfxAuxBufferExt(GrBuffer_t buffer)
void gfxAuxBufferExt(gfxBuffer_t buffer)
{
WriteTrace(TraceGlitch, TraceDebug, "buffer: %d", buffer);
//WriteTrace(TraceGlitch, TraceWarning, "gfxAuxBufferExt");
@ -1324,7 +1324,7 @@ void gfxBufferSwap(uint32_t swap_interval)
}
// frame buffer
bool gfxLfbLock(gfxLock_t type, GrBuffer_t buffer, GrLfbWriteMode_t writeMode, GrOriginLocation_t origin, bool pixelPipeline, GrLfbInfo_t *info)
bool gfxLfbLock(gfxLock_t type, gfxBuffer_t buffer, GrLfbWriteMode_t writeMode, GrOriginLocation_t origin, bool pixelPipeline, GrLfbInfo_t *info)
{
WriteTrace(TraceGlitch, TraceDebug, "type: %d buffer: %d writeMode: %d origin: %d pixelPipeline: %d", type, buffer, writeMode, origin, pixelPipeline);
if (type == GFX_LFB_WRITE_ONLY)
@ -1393,7 +1393,7 @@ bool gfxLfbLock(gfxLock_t type, GrBuffer_t buffer, GrLfbWriteMode_t writeMode, G
return FXTRUE;
}
bool gfxLfbUnlock(gfxLock_t type, GrBuffer_t buffer)
bool gfxLfbUnlock(gfxLock_t type, gfxBuffer_t buffer)
{
WriteTrace(TraceGlitch, TraceDebug, "type: %d, buffer: %d", type, buffer);
if (type == GFX_LFB_WRITE_ONLY)
@ -1403,7 +1403,7 @@ bool gfxLfbUnlock(gfxLock_t type, GrBuffer_t buffer)
return FXTRUE;
}
bool gfxLfbReadRegion(GrBuffer_t src_buffer, uint32_t src_x, uint32_t src_y, uint32_t src_width, uint32_t src_height, uint32_t dst_stride, void *dst_data)
bool gfxLfbReadRegion(gfxBuffer_t src_buffer, uint32_t src_x, uint32_t src_y, uint32_t src_width, uint32_t src_height, uint32_t dst_stride, void *dst_data)
{
unsigned char *buf;
unsigned int i, j;
@ -1464,7 +1464,7 @@ bool gfxLfbReadRegion(GrBuffer_t src_buffer, uint32_t src_x, uint32_t src_y, uin
return FXTRUE;
}
bool gfxLfbWriteRegion(GrBuffer_t dst_buffer, uint32_t dst_x, uint32_t dst_y, GrLfbSrcFmt_t src_format, uint32_t src_width, uint32_t src_height, bool pixelPipeline, FxI32 src_stride, void *src_data)
bool gfxLfbWriteRegion(gfxBuffer_t dst_buffer, uint32_t dst_x, uint32_t dst_y, GrLfbSrcFmt_t src_format, uint32_t src_width, uint32_t src_height, bool pixelPipeline, FxI32 src_stride, void *src_data)
{
unsigned char *buf;
unsigned int i, j;

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

@ -1405,7 +1405,7 @@ void updateTexture()
grDisplayGLError("updateTexture");
}
void gfxRenderBuffer(GrBuffer_t buffer)
void gfxRenderBuffer(gfxBuffer_t buffer)
{
#ifdef _WIN32
static HANDLE region = NULL;
@ -1525,7 +1525,7 @@ void gfxRenderBuffer(GrBuffer_t buffer)
grDisplayGLError("gfxRenderBuffer");
}
void gfxAuxBufferExt(GrBuffer_t buffer)
void gfxAuxBufferExt(gfxBuffer_t buffer)
{
WriteTrace(TraceGlitch, TraceDebug, "buffer: %d", buffer);
@ -1604,7 +1604,7 @@ void gfxBufferSwap(uint32_t swap_interval)
}
// frame buffer
bool gfxLfbLock(gfxLock_t type, GrBuffer_t buffer, GrLfbWriteMode_t writeMode, GrOriginLocation_t origin, bool pixelPipeline, GrLfbInfo_t *info)
bool gfxLfbLock(gfxLock_t type, gfxBuffer_t buffer, GrLfbWriteMode_t writeMode, GrOriginLocation_t origin, bool pixelPipeline, GrLfbInfo_t *info)
{
WriteTrace(TraceGlitch, TraceDebug, "type: %d buffer: %d writeMode: %d origin: %d pixelPipeline: %d", type, buffer, writeMode, origin, pixelPipeline);
if (type == GFX_LFB_WRITE_ONLY)
@ -1674,7 +1674,7 @@ bool gfxLfbLock(gfxLock_t type, GrBuffer_t buffer, GrLfbWriteMode_t writeMode, G
return FXTRUE;
}
bool gfxLfbUnlock(gfxLock_t type, GrBuffer_t buffer)
bool gfxLfbUnlock(gfxLock_t type, gfxBuffer_t buffer)
{
WriteTrace(TraceGlitch, TraceDebug, "type: %d, buffer: %d", type, buffer);
if (type == GFX_LFB_WRITE_ONLY)
@ -1684,7 +1684,7 @@ bool gfxLfbUnlock(gfxLock_t type, GrBuffer_t buffer)
return FXTRUE;
}
bool gfxLfbReadRegion(GrBuffer_t src_buffer, uint32_t src_x, uint32_t src_y, uint32_t src_width, uint32_t src_height, uint32_t dst_stride, void *dst_data)
bool gfxLfbReadRegion(gfxBuffer_t src_buffer, uint32_t src_x, uint32_t src_y, uint32_t src_width, uint32_t src_height, uint32_t dst_stride, void *dst_data)
{
unsigned char *buf;
unsigned int i, j;
@ -1746,7 +1746,7 @@ bool gfxLfbReadRegion(GrBuffer_t src_buffer, uint32_t src_x, uint32_t src_y, uin
return FXTRUE;
}
bool gfxLfbWriteRegion(GrBuffer_t dst_buffer, uint32_t dst_x, uint32_t dst_y, GrLfbSrcFmt_t src_format, uint32_t src_width, uint32_t src_height, bool pixelPipeline, FxI32 src_stride, void *src_data)
bool gfxLfbWriteRegion(gfxBuffer_t dst_buffer, uint32_t dst_x, uint32_t dst_y, GrLfbSrcFmt_t src_format, uint32_t src_width, uint32_t src_height, bool pixelPipeline, FxI32 src_stride, void *src_data)
{
unsigned char *buf;
unsigned int i, j;

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

@ -52,15 +52,15 @@ void gfxDrawVertexArray(uint32_t mode, uint32_t Count, void *pointers2);
void gfxDrawVertexArrayContiguous(uint32_t mode, uint32_t Count, void *pointers, uint32_t stride);
bool gfxSstWinOpen(gfxColorFormat_t color_format, GrOriginLocation_t origin_location, int nColBuffers, int nAuxBuffers);
void gfxAuxBufferExt(GrBuffer_t buffer);
void gfxAuxBufferExt(gfxBuffer_t buffer);
uint32_t gfxGet(uint32_t pname, uint32_t plength, FxI32 *params);
void gfxRenderBuffer(GrBuffer_t buffer);
void gfxRenderBuffer(gfxBuffer_t buffer);
void gfxBufferClear(gfxColor_t color, gfxAlpha_t alpha, uint32_t depth);
void gfxBufferSwap(uint32_t swap_interval);
bool gfxLfbLock(gfxLock_t type, GrBuffer_t buffer, GrLfbWriteMode_t writeMode, GrOriginLocation_t origin, bool pixelPipeline, GrLfbInfo_t *info);
bool gfxLfbUnlock(gfxLock_t type, GrBuffer_t buffer);
bool gfxLfbReadRegion(GrBuffer_t src_buffer, uint32_t src_x, uint32_t src_y, uint32_t src_width, uint32_t src_height, uint32_t dst_stride, void *dst_data);
bool gfxLfbWriteRegion(GrBuffer_t dst_buffer, uint32_t dst_x, uint32_t dst_y, GrLfbSrcFmt_t src_format, uint32_t src_width, uint32_t src_height, bool pixelPipeline, FxI32 src_stride, void *src_data);
bool gfxLfbLock(gfxLock_t type, gfxBuffer_t buffer, GrLfbWriteMode_t writeMode, GrOriginLocation_t origin, bool pixelPipeline, GrLfbInfo_t *info);
bool gfxLfbUnlock(gfxLock_t type, gfxBuffer_t buffer);
bool gfxLfbReadRegion(gfxBuffer_t src_buffer, uint32_t src_x, uint32_t src_y, uint32_t src_width, uint32_t src_height, uint32_t dst_stride, void *dst_data);
bool gfxLfbWriteRegion(gfxBuffer_t dst_buffer, uint32_t dst_x, uint32_t dst_y, GrLfbSrcFmt_t src_format, uint32_t src_width, uint32_t src_height, bool pixelPipeline, FxI32 src_stride, void *src_data);
uint32_t gfxTexCalcMemRequired(gfxLOD_t lodmin, gfxLOD_t lodmax, gfxAspectRatio_t aspect, gfxTextureFormat_t fmt);
void gfxLoadGammaTable(uint32_t nentries, uint32_t *red, uint32_t *green, uint32_t *blue);
void gfxGetGammaTableExt(uint32_t /*nentries*/, uint32_t *red, uint32_t *green, uint32_t *blue);

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

@ -581,7 +581,7 @@ static void copyWhiteToRDRAM()
}
}
static void CopyFrameBuffer(GrBuffer_t buffer = GFX_BUFFER_BACKBUFFER)
static void CopyFrameBuffer(gfxBuffer_t buffer = GFX_BUFFER_BACKBUFFER)
{
WriteTrace(TraceRDP, TraceDebug, "CopyFrameBuffer: %08lx... ", rdp.cimg);