h264: V3D shaders for the 4 bS=4 intra deblock variants — deblock QPU complete
Closes the H.264 deblock QPU coverage matrix. Adds the 4 intra
(bS=4) variants — luma_v/h_intra + chroma_v/h_intra.
Algorithmically distinct from the bS<4 path:
- Per-side strong/weak filter selector
strong_p = (|p2-p0| < β) AND (|p0-q0| < (α>>2) + 2)
strong_q = (|q2-q0| < β) AND (|p0-q0| < (α>>2) + 2)
- Strong-p updates p0/p1/p2 with 5-/4-/3-tap blends (reads p3)
- Weak-p updates p0 only with (2*p1 + p0 + q1 + 2) >> 2
- Mirror for q-side; no tc0 (bS=4 hardcodes the strength)
- Chroma always weak, only p0/q0 updated (same as bS<4 chroma)
Per H.264 §8.3.2.3. Transcribed from PR #11's C reference
(tests/h264_intra_loop_filter_ref.c).
Shaders:
- v3d_h264deblock_luma_v_intra.comp (luma 16-cell + strong/weak)
- v3d_h264deblock_luma_h_intra.comp (transpose of luma_v_intra)
- v3d_h264deblock_chroma_v_intra.comp (8-cell, always weak)
- v3d_h264deblock_chroma_h_intra.comp (transpose of chroma_v_intra)
Dispatch wiring:
- 4 new pipeline pairs in daedalus_ctx
- dispatch_h264_deblock_luma_intra_qpu helper (parameterised by
orient_h for V vs H) — 2 wrappers
- chroma intra reuses the existing dispatch_h264_deblock_chroma_qpu
helper (same WG geometry as bS<4 chroma) — 2 wrappers
- DEFINE_INTRA_DISPATCH macro extended with qpu_fn parameter,
routes CPU/QPU per recipe table
- Recipe table flips DAEDALUS_KERNEL_H264_DEBLOCK_*_INTRA from CPU
to QPU
Verified on hertz:
$ ./build/test_api_h264 | grep intra
H.264 deblock luma v intra: 1024/1024 bytes bit-exact
H.264 deblock luma h intra: 1024/1024 bytes bit-exact
H.264 deblock chroma v intra: 256/256 bytes bit-exact
H.264 deblock chroma h intra: 256/256 bytes bit-exact
All 4 PASS first try. Strong/weak quad-tree selector + per-side
asymmetry would have surfaced any sign/shift/index mistake; passing
on all 4 (including the asymmetric writes-3-cells cases) means the
transcription from C is clean.
Deblock QPU coverage matrix — COMPLETE (8 of 8):
bS<4 (non-intra):
luma_v ✓ cycle 8
luma_h ✓ PR #28
chroma_v ✓ PR #29
chroma_h ✓ PR #29
bS=4 (intra, this PR):
luma_v ✓
luma_h ✓
chroma_v ✓
chroma_h ✓
The full H.264 8-bit 4:2:0 hot-path pixel-math layer is now on QPU
when daedalus is initialised with a QPU-capable context:
- IDCT 4x4 / 8x8 ✓
- All 8 deblock variants ✓
- All 30 qpel positions (15 put_ + 15 avg_) ✓
This commit is contained in:
+21
-1
@@ -317,6 +317,22 @@ if (DAEDALUS_BUILD_VULKAN)
|
||||
VERBATIM
|
||||
)
|
||||
|
||||
# Intra (bS=4) deblock shaders — strong/weak filter selector per
|
||||
# H.264 §8.3.2.3. 4 variants (luma_v/h + chroma_v/h).
|
||||
foreach(_kind luma_v_intra luma_h_intra chroma_v_intra chroma_h_intra)
|
||||
set(_spv ${CMAKE_BINARY_DIR}/v3d_h264deblock_${_kind}.spv)
|
||||
add_custom_command(
|
||||
OUTPUT ${_spv}
|
||||
COMMAND ${GLSLANG_VALIDATOR} -V --target-env vulkan1.3
|
||||
-o ${_spv}
|
||||
${CMAKE_SOURCE_DIR}/src/v3d_h264deblock_${_kind}.comp
|
||||
DEPENDS ${CMAKE_SOURCE_DIR}/src/v3d_h264deblock_${_kind}.comp
|
||||
COMMENT "glslang: v3d_h264deblock_${_kind}.comp -> .spv"
|
||||
VERBATIM
|
||||
)
|
||||
set(H264DEBLOCK_${_kind}_SPV ${_spv})
|
||||
endforeach()
|
||||
|
||||
set(H264_IDCT4_SPV ${CMAKE_BINARY_DIR}/v3d_h264_idct4.spv)
|
||||
add_custom_command(
|
||||
OUTPUT ${H264_IDCT4_SPV}
|
||||
@@ -406,7 +422,7 @@ if (DAEDALUS_BUILD_VULKAN)
|
||||
set(H264_QPEL_avg_${_mc}_SPV ${_spv})
|
||||
endforeach()
|
||||
|
||||
add_custom_target(daedalus_shaders ALL DEPENDS ${NOOP_SPV} ${IDCT8_SPV} ${LPF_SPV} ${MC_SPV} ${LPF8_SPV} ${CDEF_SPV} ${H264DEBLOCK_SPV} ${H264DEBLOCK_H_SPV} ${H264DEBLOCK_CHROMA_V_SPV} ${H264DEBLOCK_CHROMA_H_SPV} ${H264_IDCT4_SPV} ${H264_IDCT8_SPV} ${H264_QPEL_MC20_SPV} ${H264_QPEL_MC02_SPV} ${H264_QPEL_MC22_SPV} ${H264_QPEL_mc10_SPV} ${H264_QPEL_mc30_SPV} ${H264_QPEL_mc01_SPV} ${H264_QPEL_mc03_SPV} ${H264_QPEL_mc11_SPV} ${H264_QPEL_mc12_SPV} ${H264_QPEL_mc13_SPV} ${H264_QPEL_mc21_SPV} ${H264_QPEL_mc23_SPV} ${H264_QPEL_mc31_SPV} ${H264_QPEL_mc32_SPV} ${H264_QPEL_mc33_SPV} ${H264_QPEL_avg_mc20_SPV} ${H264_QPEL_avg_mc02_SPV} ${H264_QPEL_avg_mc22_SPV} ${H264_QPEL_avg_mc10_SPV} ${H264_QPEL_avg_mc30_SPV} ${H264_QPEL_avg_mc01_SPV} ${H264_QPEL_avg_mc03_SPV} ${H264_QPEL_avg_mc11_SPV} ${H264_QPEL_avg_mc12_SPV} ${H264_QPEL_avg_mc13_SPV} ${H264_QPEL_avg_mc21_SPV} ${H264_QPEL_avg_mc23_SPV} ${H264_QPEL_avg_mc31_SPV} ${H264_QPEL_avg_mc32_SPV} ${H264_QPEL_avg_mc33_SPV})
|
||||
add_custom_target(daedalus_shaders ALL DEPENDS ${NOOP_SPV} ${IDCT8_SPV} ${LPF_SPV} ${MC_SPV} ${LPF8_SPV} ${CDEF_SPV} ${H264DEBLOCK_SPV} ${H264DEBLOCK_H_SPV} ${H264DEBLOCK_CHROMA_V_SPV} ${H264DEBLOCK_CHROMA_H_SPV} ${H264DEBLOCK_luma_v_intra_SPV} ${H264DEBLOCK_luma_h_intra_SPV} ${H264DEBLOCK_chroma_v_intra_SPV} ${H264DEBLOCK_chroma_h_intra_SPV} ${H264_IDCT4_SPV} ${H264_IDCT8_SPV} ${H264_QPEL_MC20_SPV} ${H264_QPEL_MC02_SPV} ${H264_QPEL_MC22_SPV} ${H264_QPEL_mc10_SPV} ${H264_QPEL_mc30_SPV} ${H264_QPEL_mc01_SPV} ${H264_QPEL_mc03_SPV} ${H264_QPEL_mc11_SPV} ${H264_QPEL_mc12_SPV} ${H264_QPEL_mc13_SPV} ${H264_QPEL_mc21_SPV} ${H264_QPEL_mc23_SPV} ${H264_QPEL_mc31_SPV} ${H264_QPEL_mc32_SPV} ${H264_QPEL_mc33_SPV} ${H264_QPEL_avg_mc20_SPV} ${H264_QPEL_avg_mc02_SPV} ${H264_QPEL_avg_mc22_SPV} ${H264_QPEL_avg_mc10_SPV} ${H264_QPEL_avg_mc30_SPV} ${H264_QPEL_avg_mc01_SPV} ${H264_QPEL_avg_mc03_SPV} ${H264_QPEL_avg_mc11_SPV} ${H264_QPEL_avg_mc12_SPV} ${H264_QPEL_avg_mc13_SPV} ${H264_QPEL_avg_mc21_SPV} ${H264_QPEL_avg_mc23_SPV} ${H264_QPEL_avg_mc31_SPV} ${H264_QPEL_avg_mc32_SPV} ${H264_QPEL_avg_mc33_SPV})
|
||||
|
||||
# v3d_runner — reusable Vulkan plumbing.
|
||||
add_library(v3d_runner STATIC src/v3d_runner.c)
|
||||
@@ -542,6 +558,10 @@ if (DAEDALUS_BUILD_VULKAN)
|
||||
${H264DEBLOCK_H_SPV}
|
||||
${H264DEBLOCK_CHROMA_V_SPV}
|
||||
${H264DEBLOCK_CHROMA_H_SPV}
|
||||
${H264DEBLOCK_luma_v_intra_SPV}
|
||||
${H264DEBLOCK_luma_h_intra_SPV}
|
||||
${H264DEBLOCK_chroma_v_intra_SPV}
|
||||
${H264DEBLOCK_chroma_h_intra_SPV}
|
||||
${H264_IDCT4_SPV}
|
||||
${H264_IDCT8_SPV}
|
||||
${H264_QPEL_MC20_SPV}
|
||||
|
||||
Reference in New Issue
Block a user