Navigation Menu

Skip to content

Commit

Permalink
[Video] Rename gfxTexClampMode to grTexClampMode
Browse files Browse the repository at this point in the history
  • Loading branch information
zilmar committed Jul 20, 2017
1 parent 2737a6b commit f740149
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 25 deletions.
2 changes: 1 addition & 1 deletion Source/Project64-video/FBtoScreen.cpp
View file
Expand Up @@ -60,7 +60,7 @@ static int SetupFBtoScreenCombiner(uint32_t texture_size, uint32_t opaque)
}
int filter = (rdp.filter_mode != 2) ? GR_TEXTUREFILTER_POINT_SAMPLED : GR_TEXTUREFILTER_BILINEAR;
grTexFilterMode(tmu, filter, filter);
grTexClampMode(tmu,
gfxTexClampMode(tmu,
GR_TEXTURECLAMP_CLAMP,
GR_TEXTURECLAMP_CLAMP);
// gfxConstantColorValue (0xFFFFFFFF);
Expand Down
4 changes: 2 additions & 2 deletions Source/Project64-video/Main.cpp
View file
Expand Up @@ -558,8 +558,8 @@ int InitGfx()
gfxDepthMask(FXFALSE);
grTexFilterMode(0, GR_TEXTUREFILTER_BILINEAR, GR_TEXTUREFILTER_BILINEAR);
grTexFilterMode(1, GR_TEXTUREFILTER_BILINEAR, GR_TEXTUREFILTER_BILINEAR);
grTexClampMode(0, GR_TEXTURECLAMP_CLAMP, GR_TEXTURECLAMP_CLAMP);
grTexClampMode(1, GR_TEXTURECLAMP_CLAMP, GR_TEXTURECLAMP_CLAMP);
gfxTexClampMode(0, GR_TEXTURECLAMP_CLAMP, GR_TEXTURECLAMP_CLAMP);
gfxTexClampMode(1, GR_TEXTURECLAMP_CLAMP, GR_TEXTURECLAMP_CLAMP);
gfxClipWindow(0, 0, g_scr_res_x, g_scr_res_y);
rdp.update |= UPDATE_SCISSOR | UPDATE_COMBINE | UPDATE_ZBUF_ENABLED | UPDATE_CULL_MODE;

Expand Down
15 changes: 5 additions & 10 deletions Source/Project64-video/Renderer/OGLEStextures.cpp
View file
Expand Up @@ -753,12 +753,7 @@ grTexFilterMode(
}
}

FX_ENTRY void FX_CALL
grTexClampMode(
GrChipID_t tmu,
GrTextureClampMode_t s_clampmode,
GrTextureClampMode_t t_clampmode
)
void gfxTexClampMode(GrChipID_t tmu, GrTextureClampMode_t s_clampmode, GrTextureClampMode_t t_clampmode)
{
WriteTrace(TraceGlitch, TraceDebug, "tmu = %d, s_clampmode: %d t_clampmode: %d", tmu, s_clampmode, t_clampmode);
if (tmu == GR_TMU1)
Expand All @@ -775,7 +770,7 @@ grTexClampMode(
wrap_s0 = GL_MIRRORED_REPEAT;
break;
default:
WriteTrace(TraceGlitch, TraceWarning, "grTexClampMode : unknown s_clampmode : %x", s_clampmode);
WriteTrace(TraceGlitch, TraceWarning, "gfxTexClampMode : unknown s_clampmode : %x", s_clampmode);
}
switch (t_clampmode)
{
Expand All @@ -789,7 +784,7 @@ grTexClampMode(
wrap_t0 = GL_MIRRORED_REPEAT;
break;
default:
WriteTrace(TraceGlitch, TraceWarning, "grTexClampMode : unknown t_clampmode : %x", t_clampmode);
WriteTrace(TraceGlitch, TraceWarning, "gfxTexClampMode : unknown t_clampmode : %x", t_clampmode);
}
glActiveTexture(GL_TEXTURE0);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap_s0);
Expand All @@ -809,7 +804,7 @@ grTexClampMode(
wrap_s1 = GL_MIRRORED_REPEAT;
break;
default:
WriteTrace(TraceGlitch, TraceWarning, "grTexClampMode : unknown s_clampmode : %x", s_clampmode);
WriteTrace(TraceGlitch, TraceWarning, "gfxTexClampMode : unknown s_clampmode : %x", s_clampmode);
}
switch (t_clampmode)
{
Expand All @@ -823,7 +818,7 @@ grTexClampMode(
wrap_t1 = GL_MIRRORED_REPEAT;
break;
default:
WriteTrace(TraceGlitch, TraceWarning, "grTexClampMode : unknown t_clampmode : %x", t_clampmode);
WriteTrace(TraceGlitch, TraceWarning, "gfxTexClampMode : unknown t_clampmode : %x", t_clampmode);
}
glActiveTexture(GL_TEXTURE1);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap_s1);
Expand Down
17 changes: 6 additions & 11 deletions Source/Project64-video/Renderer/OGLtextures.cpp
View file
Expand Up @@ -753,12 +753,7 @@ grTexFilterMode(
grDisplayGLError("grTexFilterMode");
}

FX_ENTRY void FX_CALL
grTexClampMode(
GrChipID_t tmu,
GrTextureClampMode_t s_clampmode,
GrTextureClampMode_t t_clampmode
)
void gfxTexClampMode(GrChipID_t tmu, GrTextureClampMode_t s_clampmode, GrTextureClampMode_t t_clampmode)
{
WriteTrace(TraceGlitch, TraceDebug, "tmu = %d, s_clampmode: %d t_clampmode: %d", tmu, s_clampmode, t_clampmode);
if (tmu == GR_TMU1 || nbTextureUnits <= 2)
Expand All @@ -776,7 +771,7 @@ grTexClampMode(
wrap_s0 = GL_MIRRORED_REPEAT_ARB;
break;
default:
WriteTrace(TraceGlitch, TraceWarning, "grTexClampMode : unknown s_clampmode : %x", s_clampmode);
WriteTrace(TraceGlitch, TraceWarning, "gfxTexClampMode : unknown s_clampmode : %x", s_clampmode);
}
switch (t_clampmode)
{
Expand All @@ -790,7 +785,7 @@ grTexClampMode(
wrap_t0 = GL_MIRRORED_REPEAT_ARB;
break;
default:
WriteTrace(TraceGlitch, TraceWarning, "grTexClampMode : unknown t_clampmode : %x", t_clampmode);
WriteTrace(TraceGlitch, TraceWarning, "gfxTexClampMode : unknown t_clampmode : %x", t_clampmode);
}
glActiveTextureARB(GL_TEXTURE0_ARB);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap_s0);
Expand All @@ -810,7 +805,7 @@ grTexClampMode(
wrap_s1 = GL_MIRRORED_REPEAT_ARB;
break;
default:
WriteTrace(TraceGlitch, TraceWarning, "grTexClampMode : unknown s_clampmode : %x", s_clampmode);
WriteTrace(TraceGlitch, TraceWarning, "gfxTexClampMode : unknown s_clampmode : %x", s_clampmode);
}
switch (t_clampmode)
{
Expand All @@ -824,11 +819,11 @@ grTexClampMode(
wrap_t1 = GL_MIRRORED_REPEAT_ARB;
break;
default:
WriteTrace(TraceGlitch, TraceWarning, "grTexClampMode : unknown t_clampmode : %x", t_clampmode);
WriteTrace(TraceGlitch, TraceWarning, "gfxTexClampMode : unknown t_clampmode : %x", t_clampmode);
}
glActiveTextureARB(GL_TEXTURE1_ARB);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap_s1);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap_t1);
}
grDisplayGLError("grTexClampMode");
grDisplayGLError("gfxTexClampMode");
}
1 change: 1 addition & 0 deletions Source/Project64-video/Renderer/Renderer.h
View file
Expand Up @@ -71,6 +71,7 @@ void gfxGammaCorrectionRGB(FxFloat gammaR, FxFloat gammaG, FxFloat gammaB);
void gfxTexDownloadMipMap(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrTexInfo *info);
void gfxTexSource(GrChipID_t tmu, FxU32 startAddress, FxU32 evenOdd, GrTexInfo *info);
void gfxTexDetailControl(GrChipID_t tmu, int lod_bias, FxU8 detail_scale, float detail_max);
void gfxTexClampMode(GrChipID_t tmu, GrTextureClampMode_t s_clampmode, GrTextureClampMode_t t_clampmode);

extern uint32_t nbTextureUnits;
extern uint32_t g_scr_res_x, g_scr_res_y, g_res_x, g_res_y;
2 changes: 1 addition & 1 deletion Source/Project64-video/TexCache.cpp
View file
Expand Up @@ -876,7 +876,7 @@ void TexCache()
mode_t = GR_TEXTURECLAMP_WRAP;
}

grTexClampMode(tmu,
gfxTexClampMode(tmu,
mode_s,
mode_t);
}
Expand Down

0 comments on commit f740149

Please sign in to comment.