diff --git a/docs/PCPortResearch.md b/docs/PCPortResearch.md
index 41151e5f..1277b072 100644
--- a/docs/PCPortResearch.md
+++ b/docs/PCPortResearch.md
@@ -807,7 +807,8 @@ covers D24–D69; the log continues in §H (D32 procedure, D70–D121).
 | D159 | front-end wallet-Bond photo "interlaced"/combed (RC1 / D149) — `texSwapAltRowBytes` odd-row 8-byte pre-swap (N64 RDP odd-line TMEM XOR compensation) not reversed by fast3d | FIXED (`#ifdef PORT` no-op the swap in `image.c`) |
 | D161 | Depot (`-level_30`) ceiling = bright-blue speckle + radial rays (B2). A CI8 tile drawn with `gsDPSetTextureLUT(G_TT_NONE)` was decoded against the stale `rdp.palette` → garbage. Fix: `#ifdef`-free narrow route CI→I when `palette_fmt == G_TT_NONE` in `gfx_pc.cpp import_texture()`. | FIXED (`port/fast3d/gfx_pc.cpp`) |
 | D165 · D166 | input-layer polish (M-31, port-only, `port/src/input.c`): D165 front-end cursor is now a true ~1:1 pointer (P-controller estimating the game cursor via front.c's own integrator) instead of velocity²; D166 hipfire mouse pitch emits speed-proportional C-button pulses instead of a fixed digital threshold. | FIXED |
-| D167 | D152 addendum (M-31): static audit of every compiled-audio `osSetIntMask(OS_IM_NONE)` — **all balanced**, no unbalanced early-return. Real fixes: `sndSetSfxSlotVolume` now holds the mask across its list walk (matches its twin `sndDeactivateAllSfxByFlag`) + `sndApplyVolumeAllSfxSlot` batches the slot loop under one recursive hold (kills the fade-out lock-acquire storm); `portThreadWrapper` calls `imThreadExitRelease()` on thread exit (kills the "transient thread acquired `OS_IM_NONE` and died" leak + the pthread-id-reuse re-wedge). Steal-lock kept as backstop. | FIXED (`src/snd.c`, `port/src/libultra.c`, `#ifdef PORT`) — fade-out repro playtest-gated, not headless-verified |
+| D152+ | D152 addendum (M-31): static audit of every compiled-audio `osSetIntMask(OS_IM_NONE)` — **all balanced**, no unbalanced early-return. Real fixes: `sndSetSfxSlotVolume` now holds the mask across its list walk (matches its twin `sndDeactivateAllSfxByFlag`) + `sndApplyVolumeAllSfxSlot` batches the slot loop under one recursive hold (kills the fade-out lock-acquire storm); `portThreadWrapper` calls `imThreadExitRelease()` on thread exit (kills the "transient thread acquired `OS_IM_NONE` and died" leak + the pthread-id-reuse re-wedge). Steal-lock kept as backstop. | FIXED (`src/snd.c`, `port/src/libultra.c`, `#ifdef PORT`) — fade-out repro playtest-gated, not headless-verified |
+| RC3 · D167 | **Non-power-of-two texture wrap period (`docs/TEXTURE-GLITCH-ANALYSIS.md` §6 RC3 — "textures repeat oddly", residual Depot-ceiling noise after D161).** The N64 RDP masks the texel coordinate of a wrapping render tile at `1<<mask`, and GE sets `mask = texDimensionToMask(dim) = ceil(log2(dim))` (`src/game/tex.c:361`), so a non-PoT tile (Depot's 65×65 / 96×48 / 56×56 room surfaces) repeats at the **next power of two**, not at its image size the way GL `GL_REPEAT` does → the pattern is squashed/stretched and the seam lands in the wrong place. fast3d never stored `masks`/`maskt` at all (`gfx_dp_set_tile` dropped them) and wrapped purely at the uploaded image dimension. **Fix (`port/fast3d/gfx_pc.cpp`, behind the existing `Video.WrapFix` knob, default OFF):** store `masks`/`maskt` on the tile; in the hoisted per-texunit pre-wrap block in `gfx_sp_tri1` (D74 block — already lifted out of the vertex loop, indexed by texunit `t` not vertex `i`), when the tile is WRAP (no CLAMP/MIRROR bit) and `1<<mask != tex_width`, fold the UV at the N64 period `1<<mask` and clamp the `[dim, 1<<mask)` overflow band (which is a TMEM smear on console, no real texels) to the last texel so it reads as an edge streak instead of a bogus early image restart. `GE_WRAPFIX=0/1` env override added (env wins over the ini, matching `Debug.FrameDump`). **Per-level captures (`-level_09`/`-30`/`-34`/`-20`, WrapFix OFF vs ON, `GE_PCDUMP` 6-frame windows):** no crashes, 6/6 frames each; on settled/comparable frames Silo is ~pixel-identical (phash 0–11), Facility 180–260 pixel-identical, Depot shows small localized texel changes on ceiling/wall cells (dmean 5–9, no structural break); the large per-run deltas are all the D117 intro-camera-pan nondeterminism, not the fix. Default kept **OFF** — no regression, but a headless structural diff can't confirm the Depot ceiling actually looks *better*; needs a human eyeball with `Video.WrapFix=1`. Default-off is byte-identical to golden (all new behaviour is inside `if (g_wrap_fix)`). D74's dead in-vertex-loop wrap block was already reworked/hoisted at M-30; this only adds the mask-period trigger. Confidence: **medium** (mechanism correct; overflow-band handling is an approximation, not exact TMEM-smear emulation; visual win unconfirmed). PORT-LEARNINGS §D. | KNOB ADDED, default OFF (`port/fast3d/gfx_pc.cpp`). Needs user visual check on Depot. |
 | D85 | room primary/secondary DL → `texLoadFromGdl` garbage | OPEN (safety-netted; widen/pool fixes landed, geometry now renders) |
 | D86 · D87 | modelInitRwData truncated ptr · attract-demo BE `ramromfilestructure` | resolved |
 | D88.1–D88.3 · D88.5–D88.6 | `Usetup*Z` header + sub-table width/endian conversion (`d88_emit.py`) | resolved |
diff --git a/docs/PORT-LEARNINGS.md b/docs/PORT-LEARNINGS.md
index 2fcec869..b7dc0ce6 100644
--- a/docs/PORT-LEARNINGS.md
+++ b/docs/PORT-LEARNINGS.md
@@ -321,6 +321,18 @@ through a converter or a runtime bswap fixup reads scrambled.
   `import_texture()` dispatched purely on `tile.fmt` and did a palette lookup
   against a stale `rdp.palette` → garbage (D161, GE Depot ceiling = blue
   speckle). Fix: when `rdp.palette_fmt == G_TT_NONE`, route CI4/CI8 → I4/I8.
+- **RC3 / D167 — GL `GL_REPEAT` wraps at the uploaded image size; the N64 RDP
+  wraps a render tile at `1<<masks` (`= ceil(log2(dim))` for GE, `texDimensionToMask`).**
+  Equal for power-of-two textures, so this is invisible almost everywhere — but a
+  non-PoT wrapping surface (Depot's 65×65 / 96×48 room textures) repeats at the
+  next power of two on console and one image-width too soon in the port ("textures
+  repeat oddly", squashed pattern, wrong seam). fast3d didn't even keep `masks`/
+  `maskt`. Fix lives behind `Video.WrapFix` (default OFF, `GE_WRAPFIX` env
+  override): store the mask, fold the UV at `1<<mask` in the hoisted per-texunit
+  pre-wrap block, clamp the no-real-texels `[dim,1<<mask)` overflow band to the
+  edge. The overflow band is a TMEM smear on real hardware — not exactly emulable
+  in a fixed GL sampler, so this is an approximation. Any new fast3d UV/wrap work:
+  the tile `mask` fields are the wrap period, NOT the tile-window or image size.
 - K0 segment-address folds (`OS_K0_TO_PHYSICAL | 0x80000000`) and
   hand-inlined `BG_SEG_TO_PTR` need the `(u32)` 32-bit wrap the macro has
   (D58, D84).
@@ -332,8 +344,9 @@ through a converter or a runtime bswap fixup reads scrambled.
   it right with `cms == G_TX_WRAP`). And if it did run it indexes
   `tex_width2[i]` etc. (arrays `[2]`, per-texunit) with the *vertex* loop
   index `i` 0..2 → OOB. Latent; harmless for CLAMP glyphs, would matter
-  for wrapped textures on tris. Fix deferred (M-11) — logged in
-  `docs/GRAPHICS-BACKLOG.md`.
+  for wrapped textures on tris. Reworked M-30 (hoisted out of the vertex loop,
+  indexed by texunit, gated on `Video.WrapFix`); RC3/D167 adds the non-PoT
+  mask-period case to the same block. Still default OFF.
 
 ## D2. The HUD/model X-mirror (D114/D116) — DO NOT re-static-trace
 
diff --git a/docs/TEXTURE-GLITCH-ANALYSIS.md b/docs/TEXTURE-GLITCH-ANALYSIS.md
index 244e779b..5851aad1 100644
--- a/docs/TEXTURE-GLITCH-ANALYSIS.md
+++ b/docs/TEXTURE-GLITCH-ANALYSIS.md
@@ -18,7 +18,7 @@
 |---|-------|----------|----------|-----------|
 | RC1 | `G_SETTEX` (0xc0) is a **no-op** in fast3d | `port/fast3d/gfx_pc.cpp:2443` (`case G_NOOP`) | #3 character/model artifacts | implement the command |
 | RC2 | **Mip-chain contamination**: base + all LODs uploaded as one GL image | `src/game/tex.c:330` (`texGetDepthAndSize` sums all LODs) → `gfx_dp_load_block`/`import_texture_*` | #1, #2 noise bands, wrong scale, minification garbage | upload base level only; disable GL mips |
-| RC3 | **Wrong wrap period**: N64 wraps at `2^ceil(log2(dim))`, GL wraps at uploaded image size; D74 pre-wrap block is dead (`G_TX_WRAP == 0`, `include/PR/gbi.h:391`) | `port/fast3d/gfx_pc.cpp` UV math in `gfx_sp_tri1` + D74 guard | #1 "repeats oddly", squash/stretch on non-PoT dims | mask-based wrap period (fix D74 guard, extend to T axis) |
+| RC3 | **Wrong wrap period**: N64 wraps at `2^ceil(log2(dim))`, GL wraps at uploaded image size; D74 pre-wrap block is dead (`G_TX_WRAP == 0`, `include/PR/gbi.h:391`) | `port/fast3d/gfx_pc.cpp` UV math in `gfx_sp_tri1` + D74 guard | #1 "repeats oddly", squash/stretch on non-PoT dims | mask-based wrap period (fix D74 guard, extend to T axis) — **DONE, D167, behind `Video.WrapFix` default OFF; see §6d** |
 | RC4 | **Palette off-by-one** in `palette_to_rgba32` | `port/fast3d/gfx_pc.cpp:835` | subtle hue shift on all CI textures (grays survive; red→orange-ish, blue→cyan-ish) | 1-line-class fix per channel |
 
 ### RC1 — G_SETTEX no-op (character artifacts)
@@ -223,6 +223,28 @@ touches currently-garbage surfaces). Depot corridor + control-room ceilings now
 render as clean dark/grey industrial roofs; `-level_09/-30/-34` sweep PASS.
 Full write-up: §F D161.
 
+## 6d. RC3 non-PoT wrap period — IMPLEMENTED (D167, M-31), default OFF
+
+`gfx_dp_set_tile` now stores `masks`/`maskt` on the tile (was dropped). The
+hoisted per-texunit pre-wrap block in `gfx_sp_tri1` (the reworked D74 block —
+already lifted out of the vertex loop at M-30, indexed by texunit `t`) gained a
+branch: when the render tile is WRAP (no CLAMP/MIRROR) and `1<<mask != tex_width`,
+fold the UV at the N64 period `1<<mask`, then clamp the `[dim, 1<<mask)` overflow
+band (no real texels — a TMEM smear on console) to the last texel. All behind the
+existing `Video.WrapFix` knob (`GE_WRAPFIX` env overrides it for testing).
+
+**Captures** (`-level_09/-30/-34/-20`, WrapFix OFF vs ON, `GE_PCDUMP` 6-frame
+windows): no crashes, 6/6 frames each; Silo ~pixel-identical (phash 0–11),
+Facility 180–260 pixel-identical, Depot shows small localized texel changes on
+ceiling/wall cells (dmean 5–9, no structural break). Large per-run frame deltas
+are all D117 intro-camera-pan nondeterminism.
+
+**Default kept OFF** — no regression, but a headless structural diff can't confirm
+the Depot ceiling looks *better*. To finish RC3: run Depot with `Video.WrapFix=1`
+and eyeball the corrugated roof / repeating wall panels vs default; flip the
+default in `port/src/video.c` (`cfgWrapFix = 1`) if clean. The overflow-band clamp
+is an approximation of console TMEM-smear behaviour, not an exact emulation.
+
 ## 7. Artifacts (in `CAPTURES_DIR`, outside repo)
 
 | File | What it is |
diff --git a/port/fast3d/gfx_pc.cpp b/port/fast3d/gfx_pc.cpp
index 9874d20d..16d70136 100644
--- a/port/fast3d/gfx_pc.cpp
+++ b/port/fast3d/gfx_pc.cpp
@@ -167,6 +167,7 @@ static struct RDP {
         uint8_t fmt;
         uint8_t siz;
         uint8_t cms, cmt;
+        uint8_t masks, maskt; /* RC3: N64 tile mask; wrap period = 1<<mask */
         uint8_t shifts, shiftt;
         uint16_t uls, ult, lrs, lrt; // U10.2
         uint16_t width, height;      // in texels
@@ -1568,8 +1569,9 @@ static void gfx_sp_tri1(uint8_t vtx1_idx, uint8_t vtx2_idx, uint8_t vtx3_idx, bo
             uint32_t tex_height1 = tex_height[i] << (cmt & G_TX_MIRROR);
 
             if (g_wrap_fix && !(cms & G_TX_MIRROR)) {
-                /* wrap tile (clamp bit not set) whose window is smaller than
-                 * the uploaded image -> pre-fmod the UVs at the window size. */
+                /* (a) sub-tile window: wrap tile (clamp bit not set) whose
+                 * uls..lrs window is smaller than the uploaded image -> pre-fmod
+                 * the UVs at the window size. */
                 if (!(cms & G_TX_CLAMP) && tex_width2[i] > 0 && tex_width2[i] < tex_width[i]) {
                     wrap_s[i]   = true;
                     wrap_tw[i]  = (float)tex_width2[i];
@@ -1580,6 +1582,33 @@ static void gfx_sp_tri1(uint8_t vtx1_idx, uint8_t vtx2_idx, uint8_t vtx3_idx, bo
                     wrap_th[i]  = (float)tex_height2[i];
                     wrap_ult[i] = rdp.texture_tile[tile].ult / 4.0f;
                 }
+                /* (b) RC3 non-power-of-two wrap period: the N64 RDP masks the
+                 * texel coordinate at 1<<mask (GE sets mask = ceil(log2(dim)),
+                 * texDimensionToMask), so a non-PoT tile repeats at the NEXT
+                 * power of two, not at its image size the way GL GL_REPEAT does.
+                 * Fold the UV at the N64 period; the [dim, 1<<mask) overflow
+                 * band (TMEM smear on console) is clamped to the last texel so
+                 * it reads as an edge streak instead of a bogus early repeat. */
+                {
+                    uint8_t mks = rdp.texture_tile[tile].masks;
+                    uint8_t mkt = rdp.texture_tile[tile].maskt;
+                    if (!wrap_s[i] && !(cms & G_TX_CLAMP) && mks >= 1 && mks <= 14) {
+                        float period = (float)(1u << mks);
+                        if (period != (float)tex_width[i] && tex_width[i] > 0) {
+                            wrap_s[i]   = true;
+                            wrap_tw[i]  = period;
+                            wrap_uls[i] = 0.0f;
+                        }
+                    }
+                    if (!wrap_t[i] && !(cmt & G_TX_CLAMP) && mkt >= 1 && mkt <= 14) {
+                        float period = (float)(1u << mkt);
+                        if (period != (float)tex_height[i] && tex_height[i] > 0) {
+                            wrap_t[i]   = true;
+                            wrap_th[i]  = period;
+                            wrap_ult[i] = 0.0f;
+                        }
+                    }
+                }
             }
 
             if ((cms & G_TX_CLAMP) && ((cms & G_TX_MIRROR) || tex_width1 != tex_width2[i])) {
@@ -1681,11 +1710,18 @@ static void gfx_sp_tri1(uint8_t vtx1_idx, uint8_t vtx2_idx, uint8_t vtx3_idx, bo
                 u = fmodf(u, wrap_tw[t]);
                 if (u < 0.0f) u += wrap_tw[t];
                 u += wrap_uls[t];
+                /* RC3: when the N64 wrap period (wrap_tw) exceeds the uploaded
+                 * image width, the [width, period) band has no real texels --
+                 * clamp it to the edge rather than let GL_REPEAT restart the
+                 * image early. Never triggers for the sub-tile-window case
+                 * (wrap_tw + wrap_uls stay within tex_width). */
+                if (tex_width[t] > 0 && u > (float)tex_width[t]) u = (float)tex_width[t] - 0.5f;
             }
             if (wrap_t[t]) {
                 v = fmodf(v, wrap_th[t]);
                 if (v < 0.0f) v += wrap_th[t];
                 v += wrap_ult[t];
+                if (tex_height[t] > 0 && v > (float)tex_height[t]) v = (float)tex_height[t] - 0.5f;
             }
 
             if (!is_rect) {
@@ -2041,6 +2077,8 @@ static void gfx_dp_set_tile(uint8_t fmt, uint32_t siz, uint32_t line, uint32_t t
     rdp.texture_tile[tile].siz = siz;
     rdp.texture_tile[tile].cms = cms;
     rdp.texture_tile[tile].cmt = cmt;
+    rdp.texture_tile[tile].masks = masks; /* RC3 */
+    rdp.texture_tile[tile].maskt = maskt; /* RC3 */
     rdp.texture_tile[tile].shifts = shifts;
     rdp.texture_tile[tile].shiftt = shiftt;
     rdp.texture_tile[tile].line_size_bytes = line * 8;
@@ -3055,7 +3093,10 @@ extern "C" void gfx_set_mipmap_filter(enum MipmapFilteringMode mode) {
 }
 
 extern "C" void gfx_set_fix_mip_textures(int on) { g_fix_mip_textures = !!on; }
-extern "C" void gfx_set_wrap_fix(int on) { g_wrap_fix = !!on; }
+extern "C" void gfx_set_wrap_fix(int on) {
+    const char* e = getenv("GE_WRAPFIX"); /* RC3 test override */
+    g_wrap_fix = e ? (atoi(e) != 0) : !!on;
+}
 
 extern "C" int gfx_create_framebuffer(uint32_t width, uint32_t height, int upscale, int autoresize) {
     int fb = gfx_rapi->create_framebuffer();
diff --git a/port/src/video.c b/port/src/video.c
index 29906b52..8de2018c 100644
--- a/port/src/video.c
+++ b/port/src/video.c
@@ -56,7 +56,7 @@ static int cfgFpsCap        = 0;   /* frame cap in fps; 0 = uncapped (vsync)
 static int cfgMSAA          = 1;   /* 1/2/4/8 samples; 1 = off                  */
 static int cfgTexFilter     = 1;   /* 0 = nearest, 1 = bilinear (default), 2 = N64 3-point + trilinear */
 static int cfgFixMipTex     = 1;   /* RC2: clip mip-contaminated texture uploads to base height */
-static int cfgWrapFix       = 0;   /* D74: sub-tile UV pre-wrap (opt-in, never-run path) */
+static int cfgWrapFix       = 0;   /* D74 sub-tile UV pre-wrap + RC3/D167 non-PoT mask-period wrap (opt-in; GE_WRAPFIX env overrides) */
 static int cfgFullscreen    = 0;   /* 0 = windowed, 1 = borderless fullscreen   */
 
 /*