diff --git a/docs/agents/symptoms.md b/docs/agents/symptoms.md index 5c9fb005..d17d6c75 100644 --- a/docs/agents/symptoms.md +++ b/docs/agents/symptoms.md @@ -26,6 +26,7 @@ GPU semantics behind the graphics rows: [maxwell.md](../maxwell.md). The method | no sun shadows, wrong lighting | unwritten vertex outputs read as zero instead of (0,0,0,1) | the shader's output map | | one flat ambient colour | a 1-layer 2D array sampled as 2D | the view type the shader expects | | upside-down text | lower-left window origin | origin mode in the log | +| puddles and still water flicker: the reflection turns on and off in patches from frame to frame while the camera stands still, more with DLAA | the game's water volume mask: a volume's top face lies on the water surface and is tested LEQUAL against a depth rebuilt at quarter size, so rounding and the camera's sub-millimetre motion decide it (fixed: `vk_pipeline.c` `vk_pipeline_volume_bias` gives such draws a depth bias toward the viewer) | a `--capture` run: the puddle's brightness swing (`capture.py` frames, a region's mean) with and without the fix; in a frame dump, the quarter-size mask after the volume draw changes from frame to frame | | flicker or a texture swapped with a similar one | the newest texture picked at shared storage instead of the one with the matching view | texture lookup by id in the dump | | with DLAA on, dust and small particles in fog (shrines) vanish, smear or behave oddly; the fog looks processed | DLSS ran at the bloom, after the fog and the particles, which have no motion vectors or jitter of their own (fixed: `vk_dlaa.c` effects_point runs DLSS at the first pass into the light target after the lighting, and the effects go over its picture) | `dlaa_effects_after = 0` (Screen tab) brings the old point back; the count "before the effects" in the `dlaa:` log line against the frames anti-aliased | | with DLAA on, the picture flickers from frame to frame: a little outdoors; the whole scene in a fogged shrine with an ability's targeting view (Ultrahand) open, where the fog also goes back under DLSS | DLSS ran before some effects in one frame and after them in the next: their order changes from frame to frame (the yard's half-size effects pass is in some frames only; the ability highlight, drawn into the light target with a D16 depth of its own, comes before or after the fog layer), and a rule that waited for one of them or took any D16 pass for the lighting followed it (fixed: `vk_dlaa.c` effects_point knows the lighting by its depth and runs DLSS right after it) | the `dlaa:` log line: "before the effects" must equal the frames anti-aliased in the world; a log of the passes into the light target per frame | diff --git a/runtime/vk.h b/runtime/vk.h index 39cf6ccf..0b105c78 100644 --- a/runtime/vk.h +++ b/runtime/vk.h @@ -678,6 +678,12 @@ int vk_pipeline_vertex_input_dynamic(void); // 1: vertex input is VK_EXT_vert void vk_pipeline_answers(const VkPipeState *s, GfxShaderAnswers *vs, GfxShaderAnswers *fs); int vk_pipeline_tex_type(int nvn_target); // NVN_TEXTURE_TARGET_* -> GFX_TEX_* (GfxShaderAnswers.tex_type) uint32_t vk_pipeline_target_wmask(const VkPipeState *s, int i); // colour write mask of target i the pipeline uses +// The sign of the depth bias a volume mask draw gets (vk_pipeline.c, see there), -1 toward smaller depth, 1 toward +// larger, 0 for any other draw. vk_pipeline_set_dynamic enables the bias for it; vk_exec_draw.c record_fixed sets the +// values, VOLUME_BIAS_UNITS and VOLUME_BIAS_SLOPE times the sign. +int vk_pipeline_volume_bias(const VkPipeState *s); +#define VOLUME_BIAS_UNITS 16.0f +#define VOLUME_BIAS_SLOPE 1.0f VkPrimitiveTopology vk_pipeline_topology(int nvn_prim); // quads -> triangle list, line loop -> strip: the replay // rewrites those draws; polygon -> fan VkFormat vk_vertex_format(int nvn_format, int *type); // attribute format (supported fallback), GFX_TYPE_* in *type diff --git a/runtime/vk_exec.h b/runtime/vk_exec.h index ff3e5907..9e475ccb 100644 --- a/runtime/vk_exec.h +++ b/runtime/vk_exec.h @@ -119,6 +119,7 @@ typedef struct VkExec { uint32_t st_vmask[2], st_wmask[2], st_ref[2]; // OP_STENCIL per face (0 front, 1 back): compare mask, write mask, ref float point_size; // OP_BIND_STATE kind 6: NVN point size for the support buffer; 0 = never set = 1 p_poly_offset poly_offset; // OP_POLY_OFFSET: depth bias factor, units, clamp + int8_t volume_bias; // the sign of the volume bias recorded in place of poly_offset (record_fixed) p_prim_restart prim_restart; // OP_PRIM_RESTART: applied to indexed strip and fan draws (op_draw_idx) float blend_color[4]; // OP_BLEND_COLOR int64_t copy_stride; // OP_COPY_STRIDE: row stride of buffer <-> texture copies (vk_exec_xfer.c) diff --git a/runtime/vk_exec_draw.c b/runtime/vk_exec_draw.c index 42513cc2..95c74f32 100644 --- a/runtime/vk_exec_draw.c +++ b/runtime/vk_exec_draw.c @@ -2784,8 +2784,11 @@ static VkViewport draw_viewport(VkExec *ex) { return v; } -static void record_fixed(VkExec *ex) { +// s: the draw's state. A volume mask draw records its own depth bias (vk_pipeline_volume_bias) in place of the game's. +static void record_fixed(VkExec *ex, const VkPipeState *s) { VkCommandBuffer cb = ex->cb; + int vb = vk_pipeline_volume_bias(s); + if (vb != ex->volume_bias) ex->dirty |= VK_EXEC_DIRTY_DEPTH_BIAS, ex->volume_bias = (int8_t)vb; if (ex->dirty & VK_EXEC_DIRTY_VIEWPORT) { VkViewport v = draw_viewport(ex); vkCmdSetViewportWithCount(cb, 1, &v); @@ -2797,7 +2800,8 @@ static void record_fixed(VkExec *ex) { ex->recorded++; } if (ex->dirty & VK_EXEC_DIRTY_DEPTH_BIAS) { - vkCmdSetDepthBias(cb, ex->poly_offset.units, ex->poly_offset.clamp, ex->poly_offset.factor); + if (vb) vkCmdSetDepthBias(cb, VOLUME_BIAS_UNITS * (float)vb, 0.0f, VOLUME_BIAS_SLOPE * (float)vb); + else vkCmdSetDepthBias(cb, ex->poly_offset.units, ex->poly_offset.clamp, ex->poly_offset.factor); ex->recorded++; } if (ex->dirty & VK_EXEC_DIRTY_BLEND_CONST) { @@ -3431,7 +3435,7 @@ static int prepare_draw(VkExec *ex, int prim, int32_t count, int restart) { vk_mvsurvey_draw(ex); vk_mvprev_draw(ex); if (mo) plat_mutex_unlock(&mo_lock); - record_fixed(ex); + record_fixed(ex, sp); repeat_stats(ex, info); if (bim) bi_gt(ex, bgt), bi_gb(ex, bgb); if (bim == 2) bi_census(ex, info, sp, bgt, bgb, bsg, sm_hit); // on counts nothing: it is what gets timed diff --git a/runtime/vk_pipeline.c b/runtime/vk_pipeline.c index 08e4c066..7b366d69 100644 --- a/runtime/vk_pipeline.c +++ b/runtime/vk_pipeline.c @@ -3234,7 +3234,7 @@ uint32_t vk_pipeline_set_dynamic(VkCommandBuffer cb, const VkPipeState *s) { compare_op(d->sf_b)); // NVN_POLYGON_OFFSET_ENABLE_* bit of the polygon mode in use: point 1, line 2, fill 4 unsigned mode = pl->mode <= NVN_POLYGON_MODE_FILL ? pl->mode : NVN_POLYGON_MODE_FILL; - vkCmdSetDepthBiasEnable(cb, (pl->offset_en >> mode & 1) != 0); + vkCmdSetDepthBiasEnable(cb, (pl->offset_en >> mode & 1) || vk_pipeline_volume_bias(s)); vkCmdSetRasterizerDiscardEnable(cb, s->raster_discard != 0); vkCmdSetPrimitiveRestartEnable(cb, s->prim_restart != 0); // The vertex bindings the draw reads: those of its vertex input, set here or made into the pipeline from the same @@ -3268,6 +3268,29 @@ uint32_t vk_pipeline_set_dynamic(VkCommandBuffer cb, const VkPipeState *s) { return streams; } +// TotK marks the pixels inside its water volumes (seen at puddles) in a quarter-size mask: it draws a volume's front +// faces with a LEQUAL depth test and no depth write, blending ONE/ONE with reverse subtract into one channel, against a +// depth it rebuilt at that size from its linear depth. The volume's top face lies on the water surface, so the test +// compares that surface with itself through two roundings and two sampling positions: on a puddle the face came out +// up to 7 ulp in front of or behind the rebuilt depth, and up to about 0.6 of a pixel of its depth slope (64 ulp) behind +// it. The camera's sub-millimetre idle motion moved that pattern every frame and the mask with it: the puddle's +// reflection, which the mask turns on, flickered over a few hundred pixels a frame, and more with DLAA, whose jitter +// moves the rebuilt depth but not the volume. Such a draw, when the game sets no polygon offset for it, gets a depth +// bias toward the viewer of VOLUME_BIAS_UNITS plus VOLUME_BIAS_SLOPE times its depth slope (one pixel of it), so a +// surface the face lies on counts as inside, as the test's equal case means; a surface farther from the face than a +// pixel of its slope is decided as before. +int vk_pipeline_volume_bias(const VkPipeState *s) { + const poly_st *pl = &s->poly; + const ds_st *d = &s->ds; + const blend_st *b = &s->blend[0]; + unsigned mode = pl->mode <= NVN_POLYGON_MODE_FILL ? pl->mode : NVN_POLYGON_MODE_FILL; + if (!d->dt || d->dw || (pl->offset_en >> mode & 1) || !(s->color.blend_en & 1) || + b->eq_rgb != NVN_BLEND_EQUATION_REVERSE_SUB || b->src_rgb != NVN_BLEND_FUNC_ONE || b->dst_rgb != NVN_BLEND_FUNC_ONE) + return 0; + if (d->df == NVN_DEPTH_FUNC_LESS || d->df == NVN_DEPTH_FUNC_LEQUAL) return -1; + return d->df == NVN_DEPTH_FUNC_GREATER || d->df == NVN_DEPTH_FUNC_GEQUAL; +} + // The values vk_pipeline_set_dynamic records for a state, as the commands take them. typedef struct { VkCullModeFlags cull; @@ -3296,7 +3319,7 @@ static void dyn_vals(const VkPipeState *s, DynVals *o) { o->sop[1][0] = stencil_op(d->fail_b), o->sop[1][1] = stencil_op(d->zpass_b), o->sop[1][2] = stencil_op(d->zfail_b); o->scmp[0] = compare_op(d->sf_f), o->scmp[1] = compare_op(d->sf_b); unsigned mode = pl->mode <= NVN_POLYGON_MODE_FILL ? pl->mode : NVN_POLYGON_MODE_FILL; - o->bias = (pl->offset_en >> mode & 1) != 0; + o->bias = (pl->offset_en >> mode & 1) || vk_pipeline_volume_bias(s); o->discard = s->raster_discard != 0, o->restart = s->prim_restart != 0; o->clamp = s->depth_clamp != 0, o->a2c = s->ms.a2c != 0; o->poly = polygon_mode(pl->mode);