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

[Video] Rename grLfbReadRegion to gfxLfbReadRegion

This commit is contained in:
zilmar 2017-05-28 16:37:46 +10:00
parent 101ccb04cf
commit 10243f05b0
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1470,11 +1470,7 @@ FxBool gfxLfbUnlock(GrLock_t type, GrBuffer_t buffer)
return FXTRUE; return FXTRUE;
} }
FX_ENTRY FxBool FX_CALL FxBool gfxLfbReadRegion(GrBuffer_t src_buffer, FxU32 src_x, FxU32 src_y, FxU32 src_width, FxU32 src_height, FxU32 dst_stride, void *dst_data)
grLfbReadRegion(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 char *buf;
unsigned int i, j; unsigned int i, j;

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

@ -1732,11 +1732,7 @@ FxBool gfxLfbUnlock(GrLock_t type, GrBuffer_t buffer)
return FXTRUE; return FXTRUE;
} }
FX_ENTRY FxBool FX_CALL FxBool gfxLfbReadRegion(GrBuffer_t src_buffer, FxU32 src_x, FxU32 src_y, FxU32 src_width, FxU32 src_height, FxU32 dst_stride, void *dst_data)
grLfbReadRegion(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 char *buf;
unsigned int i, j; unsigned int i, j;
@ -1794,7 +1790,7 @@ grLfbReadRegion(GrBuffer_t src_buffer,
free(buf); free(buf);
} }
grDisplayGLError("grLfbReadRegion"); grDisplayGLError("gfxLfbReadRegion");
return FXTRUE; return FXTRUE;
} }

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

@ -61,6 +61,7 @@ void gfxBufferClear(GrColor_t color, gfxAlpha_t alpha, FxU32 depth);
void gfxBufferSwap(FxU32 swap_interval); 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 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 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 nbTextureUnits;
extern uint32_t g_scr_res_x, g_scr_res_y, g_res_x, g_res_y; 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

@ -608,7 +608,7 @@ static void CopyFrameBuffer(GrBuffer_t buffer = GR_BUFFER_BACKBUFFER)
if (rdp.scale_x < 1.1f) if (rdp.scale_x < 1.1f)
{ {
uint16_t * ptr_src = new uint16_t[width*height]; uint16_t * ptr_src = new uint16_t[width*height];
if (grLfbReadRegion(buffer, if (gfxLfbReadRegion(buffer,
(uint32_t)rdp.offset_x, (uint32_t)rdp.offset_x,
(uint32_t)rdp.offset_y,//rdp.ci_upper_bound, (uint32_t)rdp.offset_y,//rdp.ci_upper_bound,
width, width,