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

[Video] Rename grAuxBufferExt to gfxAuxBufferExt

This commit is contained in:
zilmar 2017-05-25 20:00:21 +10:00
parent a5f66567cc
commit 148bf3ebf4
9 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Project64-video/FBtoScreen.cpp
View File

@ -516,7 +516,7 @@ static void DrawHiresDepthBufferToScreen(FB_TO_SCREEN_INFO & fb_info)
GR_COMBINE_FACTOR_NONE, GR_COMBINE_FACTOR_NONE,
FXFALSE, FXFALSE,
FXFALSE); FXFALSE);
// grAuxBufferExt( GR_BUFFER_AUXBUFFER ); // gfxAuxBufferExt( GR_BUFFER_AUXBUFFER );
grTexSource(rdp.texbufs[0].tmu, rdp.texbufs[0].begin, GR_MIPMAPLEVELMASK_BOTH, &(t_info)); grTexSource(rdp.texbufs[0].tmu, rdp.texbufs[0].begin, GR_MIPMAPLEVELMASK_BOTH, &(t_info));
float ul_x = (float)rdp.scissor.ul_x; float ul_x = (float)rdp.scissor.ul_x;
float ul_y = (float)rdp.scissor.ul_y; float ul_y = (float)rdp.scissor.ul_y;
@ -535,7 +535,7 @@ static void DrawHiresDepthBufferToScreen(FB_TO_SCREEN_INFO & fb_info)
}; };
gfxDrawTriangle(&v[0], &v[2], &v[1]); gfxDrawTriangle(&v[0], &v[2], &v[1]);
gfxDrawTriangle(&v[2], &v[3], &v[1]); gfxDrawTriangle(&v[2], &v[3], &v[1]);
// grAuxBufferExt( GR_BUFFER_TEXTUREAUXBUFFER_EXT ); // gfxAuxBufferExt( GR_BUFFER_TEXTUREAUXBUFFER_EXT );
rdp.update |= UPDATE_COMBINE | UPDATE_ZBUF_ENABLED | UPDATE_CULL_MODE; rdp.update |= UPDATE_COMBINE | UPDATE_ZBUF_ENABLED | UPDATE_CULL_MODE;
} }

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

@ -1406,7 +1406,7 @@ void newSwapBuffers()
if (g_settings->fb_hwfbe_enabled() && !g_settings->hacks(CSettings::hack_RE2) && !evoodoo) if (g_settings->fb_hwfbe_enabled() && !g_settings->hacks(CSettings::hack_RE2) && !evoodoo)
{ {
grAuxBufferExt(GR_BUFFER_AUXBUFFER); gfxAuxBufferExt(GR_BUFFER_AUXBUFFER);
} }
WriteTrace(TraceGlide64, TraceDebug, "BUFFER SWAPPED"); WriteTrace(TraceGlide64, TraceDebug, "BUFFER SWAPPED");
grBufferSwap(g_settings->vsync()); grBufferSwap(g_settings->vsync());

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

@ -896,8 +896,6 @@ int CheckTextureBufferFormat(GrChipID_t tmu, FxU32 startAddress, GrTexInfo *info
return 0; return 0;
} }
FX_ENTRY void FX_CALL grAuxBufferExt(GrBuffer_t buffer);
FX_ENTRY FxU32 FX_CALL FX_ENTRY FxU32 FX_CALL
grGet(FxU32 pname, FxU32 plength, FxI32 *params) grGet(FxU32 pname, FxU32 plength, FxI32 *params)
{ {
@ -1306,11 +1304,10 @@ grRenderBuffer(GrBuffer_t buffer)
} }
} }
FX_ENTRY void FX_CALL void gfxAuxBufferExt(GrBuffer_t buffer)
grAuxBufferExt(GrBuffer_t buffer)
{ {
WriteTrace(TraceGlitch, TraceDebug, "buffer: %d", buffer); WriteTrace(TraceGlitch, TraceDebug, "buffer: %d", buffer);
//WriteTrace(TraceGlitch, TraceWarning, "grAuxBufferExt"); //WriteTrace(TraceGlitch, TraceWarning, "gfxAuxBufferExt");
if (buffer == GR_BUFFER_AUXBUFFER) { if (buffer == GR_BUFFER_AUXBUFFER) {
invtex[0] = 0; invtex[0] = 0;

9
Source/Project64-video/Renderer/OGLEStextures.cpp
View File

@ -709,15 +709,6 @@ grTexSource(GrChipID_t tmu,
need_to_compile = 1; need_to_compile = 1;
} }
} }
#if 0
extern int auxbuffer;
static int oldbuffer;
FX_ENTRY void FX_CALL grAuxBufferExt(GrBuffer_t buffer);
if (auxbuffer == GR_BUFFER_AUXBUFFER && auxbuffer != oldbuffer)
grAuxBufferExt(auxbuffer);
oldbuffer = auxbuffer;
#endif
} }
FX_ENTRY void FX_CALL FX_ENTRY void FX_CALL

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

@ -1179,8 +1179,6 @@ int CheckTextureBufferFormat(GrChipID_t tmu, FxU32 startAddress, GrTexInfo *info
return 0; return 0;
} }
FX_ENTRY void FX_CALL grAuxBufferExt(GrBuffer_t buffer);
FX_ENTRY FxU32 FX_CALL FX_ENTRY FxU32 FX_CALL
grGet(FxU32 pname, FxU32 plength, FxI32 *params) grGet(FxU32 pname, FxU32 plength, FxI32 *params)
{ {
@ -1578,8 +1576,7 @@ grRenderBuffer(GrBuffer_t buffer)
grDisplayGLError("grRenderBuffer"); grDisplayGLError("grRenderBuffer");
} }
FX_ENTRY void FX_CALL void gfxAuxBufferExt(GrBuffer_t buffer)
grAuxBufferExt(GrBuffer_t buffer)
{ {
WriteTrace(TraceGlitch, TraceDebug, "buffer: %d", buffer); WriteTrace(TraceGlitch, TraceDebug, "buffer: %d", buffer);
@ -1601,7 +1598,7 @@ grAuxBufferExt(GrBuffer_t buffer)
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
need_to_compile = 1; need_to_compile = 1;
} }
grDisplayGLError("grAuxBufferExt"); grDisplayGLError("gfxAuxBufferExt");
} }
FX_ENTRY void FX_CALL FX_ENTRY void FX_CALL

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

@ -53,6 +53,7 @@ void gfxDrawVertexArray(FxU32 mode, FxU32 Count, void *pointers2);
void gfxDrawVertexArrayContiguous(FxU32 mode, FxU32 Count, void *pointers, FxU32 stride); void gfxDrawVertexArrayContiguous(FxU32 mode, FxU32 Count, void *pointers, FxU32 stride);
GrContext_t gfxSstWinOpen(GrColorFormat_t color_format, GrOriginLocation_t origin_location, int nColBuffers, int nAuxBuffers); GrContext_t gfxSstWinOpen(GrColorFormat_t color_format, GrOriginLocation_t origin_location, int nColBuffers, int nAuxBuffers);
void gfxAuxBufferExt(GrBuffer_t buffer);
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;

4
Source/Project64-video/TexBuffer.cpp
View File

@ -537,7 +537,7 @@ int CopyDepthBuffer()
{ lr_x, lr_y, 1, 1, lr_u, lr_v, lr_u, lr_v, { lr_u, lr_v, lr_u, lr_v } } { lr_x, lr_y, 1, 1, lr_u, lr_v, lr_u, lr_v, { lr_u, lr_v, lr_u, lr_v } }
}; };
grAuxBufferExt(GR_BUFFER_AUXBUFFER); gfxAuxBufferExt(GR_BUFFER_AUXBUFFER);
grTexSource(rdp.texbufs[0].tmu, rdp.texbufs[0].begin, GR_MIPMAPLEVELMASK_BOTH, &(rdp.tbuff_tex->info)); grTexSource(rdp.texbufs[0].tmu, rdp.texbufs[0].begin, GR_MIPMAPLEVELMASK_BOTH, &(rdp.tbuff_tex->info));
grRenderBuffer(GR_BUFFER_TEXTUREBUFFER_EXT); grRenderBuffer(GR_BUFFER_TEXTUREBUFFER_EXT);
gfxTextureBufferExt(rdp.texbufs[1].tmu, rdp.texbufs[1].begin, LOD, LOD, gfxTextureBufferExt(rdp.texbufs[1].tmu, rdp.texbufs[1].begin, LOD, LOD,
@ -545,7 +545,7 @@ int CopyDepthBuffer()
gfxDrawTriangle(&v[0], &v[2], &v[1]); gfxDrawTriangle(&v[0], &v[2], &v[1]);
gfxDrawTriangle(&v[2], &v[3], &v[1]); gfxDrawTriangle(&v[2], &v[3], &v[1]);
grRenderBuffer(GR_BUFFER_BACKBUFFER); grRenderBuffer(GR_BUFFER_BACKBUFFER);
grAuxBufferExt(GR_BUFFER_TEXTUREAUXBUFFER_EXT); gfxAuxBufferExt(GR_BUFFER_TEXTUREAUXBUFFER_EXT);
rdp.update |= UPDATE_ZBUF_ENABLED | UPDATE_COMBINE | UPDATE_TEXTURE | UPDATE_ALPHA_COMPARE; rdp.update |= UPDATE_ZBUF_ENABLED | UPDATE_COMBINE | UPDATE_TEXTURE | UPDATE_ALPHA_COMPARE;
if (g_settings->fog() && (rdp.flags & FOG_ENABLED)) if (g_settings->fog() && (rdp.flags & FOG_ENABLED))

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

@ -2906,7 +2906,7 @@ void rdp_setcolorimage()
if (g_settings->fb_hwfbe_enabled() && !rdp.copy_ci_index && (rdp.copy_zi_index || g_settings->hacks(CSettings::hack_BAR))) if (g_settings->fb_hwfbe_enabled() && !rdp.copy_ci_index && (rdp.copy_zi_index || g_settings->hacks(CSettings::hack_BAR)))
{ {
GrLOD_t LOD = g_scr_res_x > 1024 ? GFX_LOD_LOG2_1024 : GFX_LOD_LOG2_2048; GrLOD_t LOD = g_scr_res_x > 1024 ? GFX_LOD_LOG2_1024 : GFX_LOD_LOG2_2048;
grAuxBufferExt(GR_BUFFER_TEXTUREAUXBUFFER_EXT); gfxAuxBufferExt(GR_BUFFER_TEXTUREAUXBUFFER_EXT);
WriteTrace(TraceRDP, TraceDebug, "rdp_setcolorimage - set texture depth buffer to TMU0"); WriteTrace(TraceRDP, TraceDebug, "rdp_setcolorimage - set texture depth buffer to TMU0");
} }
} }

4
Source/Project64-video/ucode06.cpp
View File

@ -196,12 +196,12 @@ void DrawHiresDepthImage(const DRAWIMAGE & d)
gfxTextureBufferExt(rdp.texbufs[0].tmu, rdp.texbufs[0].begin, LOD, LOD, gfxTextureBufferExt(rdp.texbufs[0].tmu, rdp.texbufs[0].begin, LOD, LOD,
GR_ASPECT_LOG2_1x1, GFX_TEXFMT_RGB_565, GR_MIPMAPLEVELMASK_BOTH); GR_ASPECT_LOG2_1x1, GFX_TEXFMT_RGB_565, GR_MIPMAPLEVELMASK_BOTH);
grRenderBuffer(GR_BUFFER_TEXTUREBUFFER_EXT); grRenderBuffer(GR_BUFFER_TEXTUREBUFFER_EXT);
grAuxBufferExt(GR_BUFFER_AUXBUFFER); gfxAuxBufferExt(GR_BUFFER_AUXBUFFER);
grBufferClear(0, 0, 0xFFFF); grBufferClear(0, 0, 0xFFFF);
gfxDrawTriangle(&v[0], &v[2], &v[1]); gfxDrawTriangle(&v[0], &v[2], &v[1]);
gfxDrawTriangle(&v[2], &v[3], &v[1]); gfxDrawTriangle(&v[2], &v[3], &v[1]);
grRenderBuffer(GR_BUFFER_BACKBUFFER); grRenderBuffer(GR_BUFFER_BACKBUFFER);
grAuxBufferExt(GR_BUFFER_TEXTUREAUXBUFFER_EXT); gfxAuxBufferExt(GR_BUFFER_TEXTUREAUXBUFFER_EXT);
gfxDepthMask(FXTRUE); gfxDepthMask(FXTRUE);
} }