From c4ac04900760d8ce2d1164ded3b6a8184559c5a0 Mon Sep 17 00:00:00 2001 From: ahmad Date: Fri, 9 Oct 2026 23:40:06 +0300 Subject: [PATCH] feat(vkbridge): VK_EXT_depth_clip_enable emulation via depth clamp; D3D11 DepthClipEnable check Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01KZqR8XUE8czvGzEpgSCVQR --- app/src/main/cpp/vkbridge/server_emu.c | 3 +- app/src/main/cpp/vkbridge/server_emu.h | 4 ++- app/src/main/cpp/vkbridge/server_emu_layer.c | 23 ++++++++++++ tools/vkbridge/client/emu.c | 8 +++++ tools/vkbridge/host/mali_env.sh | 4 +-- tools/vkbridge/tests/d3d11_check.c | 37 ++++++++++++++++++++ 6 files changed, 75 insertions(+), 4 deletions(-) diff --git a/app/src/main/cpp/vkbridge/server_emu.c b/app/src/main/cpp/vkbridge/server_emu.c index 7e77a87b8..027019fec 100644 --- a/app/src/main/cpp/vkbridge/server_emu.c +++ b/app/src/main/cpp/vkbridge/server_emu.c @@ -99,7 +99,7 @@ void vkb_emu_device_create_info(vkb_srv_table *inst, VkPhysicalDevice pd, uint32 VkPhysicalDeviceFeatures real; inst->real.vkGetPhysicalDeviceFeatures(pd, &real); VkPhysicalDeviceFeatures *f = find_features(ci); - if ((emu & VKB_EMU_BCN) && !f) { + if ((emu & (VKB_EMU_BCN | VKB_EMU_DEPTH_CLIP)) && !f) { /* The BC decoder writes R8/RG8 storage images: it needs this feature on, so the request * gets a features structure if it had none. */ f = vkb_arena_alloc(a, sizeof(*f)); @@ -114,6 +114,7 @@ void vkb_emu_device_create_info(vkb_srv_table *inst, VkPhysicalDevice pd, uint32 if (want[i] && !have[i]) want[i] = VK_FALSE; } if (emu & VKB_EMU_BCN) f->shaderStorageImageExtendedFormats = VK_TRUE; + if (emu & VKB_EMU_DEPTH_CLIP) f->depthClamp = VK_TRUE; } if (emu & VKB_EMU_DIVISOR) chain_remove(ci, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT); if (emu & VKB_EMU_DEPTH_CLIP) chain_remove(ci, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT); diff --git a/app/src/main/cpp/vkbridge/server_emu.h b/app/src/main/cpp/vkbridge/server_emu.h index 0df55d990..042a9c99b 100644 --- a/app/src/main/cpp/vkbridge/server_emu.h +++ b/app/src/main/cpp/vkbridge/server_emu.h @@ -6,7 +6,7 @@ /* Emulations that are implemented (the rest are never offered to the client). */ #define VKB_EMU_IMPLEMENTED (VKB_EMU_MAINT5 | VKB_EMU_CLIP_DISTANCE | VKB_EMU_CULL_DISTANCE | VKB_EMU_POINT_SIZE | VKB_EMU_BCN | \ - VKB_EMU_DIVISOR) + VKB_EMU_DIVISOR | VKB_EMU_DEPTH_CLIP) #define VKB_EMU_BUCKETS 1024 @@ -63,6 +63,8 @@ void vkb_emu_bcn_buffer_usage(vkb_emu_device *e, VkBufferCreateInfo *ci); int vkb_emu_bcn_blocks_readback(vkb_emu_device *e, VkImage img); /* layer (server_emu_layer.c) */ +void vkb_emu_depth_clip_pipeline(vkb_emu_device *e, VkGraphicsPipelineCreateInfo *ci); +void vkb_emu_depth_clip_install(vkb_srv_table *dev); vkb_emu_device *vkb_emu_cur(void); const vkb_dispatch *vkb_emu_real(void); void *vkb_emu_chain_take(const void *head, VkStructureType t); diff --git a/app/src/main/cpp/vkbridge/server_emu_layer.c b/app/src/main/cpp/vkbridge/server_emu_layer.c index 3b3b248e3..74adc44ea 100644 --- a/app/src/main/cpp/vkbridge/server_emu_layer.c +++ b/app/src/main/cpp/vkbridge/server_emu_layer.c @@ -204,6 +204,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL emu_CreateGraphicsPipelines(VkDevice devic for (uint32_t i = 0; i < n; i++) { VkGraphicsPipelineCreateInfo *ci = (VkGraphicsPipelineCreateInfo *)&infos[i]; vkb_emu_divisor_pipeline(e, device, ci, (div_info *)(divs + i * dsz)); + vkb_emu_depth_clip_pipeline(e, ci); /* Shader rewrites first: they read inline SPIR-V before it becomes a module. */ vkb_emu_shader_pipeline(e, device, ci, mods, &nmods, 64); if (e->flags & VKB_EMU_MAINT5) { @@ -432,6 +433,7 @@ void vkb_emu_install(vkb_srv_table *dev) if (dev->real.vkCmdBindVertexBuffers2) dt->vkCmdBindVertexBuffers2 = emu_CmdBindVertexBuffers2; } vkb_emu_install_features(dev); + vkb_emu_depth_clip_install(dev); VKB_INFO("device %u: emulation 0x%x installed", dev->id, e->flags); } @@ -453,3 +455,24 @@ void vkb_emu_uninstall(vkb_srv_table *dev) } } } + +/* ------------------------------------------------------------------ depth clip enable */ + +/* VK_EXT_depth_clip_enable on a GPU without it. Without the extension Vulkan clips exactly when + * depth clamp is off, so a pipeline's clamp becomes "not clip" (D3D's DepthClipEnable = FALSE is + * clamping; clip + clamp only differs for fragments the clip removes anyway). The client hides + * dynamic depth clip/clamp while this is emulated, so both are static pipeline state here. */ +void vkb_emu_depth_clip_pipeline(vkb_emu_device *e, VkGraphicsPipelineCreateInfo *ci) +{ + if (!(e->flags & VKB_EMU_DEPTH_CLIP)) return; + VkPipelineRasterizationStateCreateInfo *rs = (VkPipelineRasterizationStateCreateInfo *)ci->pRasterizationState; + if (!rs) return; + VkPipelineRasterizationDepthClipStateCreateInfoEXT *dc = + vkb_emu_chain_take(rs, VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_DEPTH_CLIP_STATE_CREATE_INFO_EXT); + if (dc) rs->depthClampEnable = dc->depthClipEnable ? VK_FALSE : VK_TRUE; +} + +void vkb_emu_depth_clip_install(vkb_srv_table *dev) +{ + (void)dev; +} diff --git a/tools/vkbridge/client/emu.c b/tools/vkbridge/client/emu.c index 08320906a..4a57eaa97 100644 --- a/tools/vkbridge/client/emu.c +++ b/tools/vkbridge/client/emu.c @@ -71,6 +71,14 @@ void vkb_emu_patch_features_chain(vkb_physdev *pd, VkBaseOutStructure *b) set_feature(pd, VKB_EMU_DIVISOR, &d->vertexAttributeInstanceRateZeroDivisor); break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_3_FEATURES_EXT: + /* Emulated depth clip is pipeline state (clamp = not clip): neither may be dynamic. */ + if (MISSING(pd, VKB_EMU_DEPTH_CLIP) || EMU(pd, VKB_EMU_DEPTH_CLIP)) { + VkPhysicalDeviceExtendedDynamicState3FeaturesEXT *d3 = (void *)b; + d3->extendedDynamicState3DepthClipEnable = VK_FALSE; + if (EMU(pd, VKB_EMU_DEPTH_CLIP)) d3->extendedDynamicState3DepthClampEnable = VK_FALSE; + } + break; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT: set_feature(pd, VKB_EMU_DEPTH_CLIP, &((VkPhysicalDeviceDepthClipEnableFeaturesEXT *)b)->depthClipEnable); break; diff --git a/tools/vkbridge/host/mali_env.sh b/tools/vkbridge/host/mali_env.sh index 81addd97a..b272b8e4f 100755 --- a/tools/vkbridge/host/mali_env.sh +++ b/tools/vkbridge/host/mali_env.sh @@ -5,11 +5,11 @@ _vkb_host=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) export VKBRIDGE_SOCKET=${XDG_RUNTIME_DIR:-/tmp}/vkbridge-host.sock pgrep -x vkbridge-server >/dev/null && kill $(pgrep -x vkbridge-server) 2>/dev/null; sleep 0.3 rm -f "$VKBRIDGE_SOCKET" -VKBRIDGE_FAKE_MISSING=${VKB_MISSING:-bc,clip,cull,divisor,maint5} VK_DRIVER_FILES=${VKB_HOST_ICD:-/usr/share/vulkan/icd.d/radeon_icd.json} \ +VKBRIDGE_FAKE_MISSING=${VKB_MISSING:-bc,clip,cull,divisor,maint5,depthclip} VK_DRIVER_FILES=${VKB_HOST_ICD:-/usr/share/vulkan/icd.d/radeon_icd.json} \ nohup "$_vkb_host/out/vkbridge-server" --socket "$VKBRIDGE_SOCKET" --log "$_vkb_host/out/server.log" >/dev/null 2>&1 & for _i in $(seq 50); do [ -S "$VKBRIDGE_SOCKET" ] && break; sleep 0.1; done chmod 666 "$VKBRIDGE_SOCKET" export VK_DRIVER_FILES=$_vkb_host/out/vkbridge_icd.json -export VKBRIDGE_HIDE_EXTS=VK_KHR_maintenance5,VK_EXT_vertex_attribute_divisor,VK_KHR_vertex_attribute_divisor +export VKBRIDGE_HIDE_EXTS=VK_KHR_maintenance5,VK_EXT_vertex_attribute_divisor,VK_KHR_vertex_attribute_divisor,VK_EXT_depth_clip_enable export VKBRIDGE_MAX_API=1.3 echo "vkbridge server up, imitating Mali's gaps" diff --git a/tools/vkbridge/tests/d3d11_check.c b/tools/vkbridge/tests/d3d11_check.c index 30c564d7d..777676abc 100644 --- a/tools/vkbridge/tests/d3d11_check.c +++ b/tools/vkbridge/tests/d3d11_check.c @@ -302,6 +302,42 @@ static void test_step_rate(void) check(ok, "instance step rate 2", d); } +/* ------------------------------------------------------------------ depth clip */ + +static void test_depth_clip(void) +{ + /* A full-screen triangle at z = 1.5 (beyond the far plane): clipped away with depth clip on, + * visible (clamped to the far plane) with it off. */ + const char *vs = "float4 main(uint id : SV_VertexID) : SV_Position { float2 t = float2((id << 1) & 2, id & 2);" + "return float4(t * float2(2, -2) + float2(-1, 1), 1.5, 1); }"; + const char *ps = "float4 main() : SV_Target { return float4(1, 1, 1, 1); }"; + ID3DBlob *v = compile(vs, "main", "vs_5_0"), *p = compile(ps, "main", "ps_5_0"); + ID3D11VertexShader *vsh; + ID3D11PixelShader *psh; + ID3D11Device_CreateVertexShader(dev, ID3D10Blob_GetBufferPointer(v), ID3D10Blob_GetBufferSize(v), NULL, &vsh); + ID3D11Device_CreatePixelShader(dev, ID3D10Blob_GetBufferPointer(p), ID3D10Blob_GetBufferSize(p), NULL, &psh); + uint32_t got[2]; + for (int on = 1; on >= 0; on--) { + D3D11_RASTERIZER_DESC rd = {D3D11_FILL_SOLID, D3D11_CULL_NONE, FALSE, 0, 0, 0, on ? TRUE : FALSE, FALSE, FALSE, FALSE}; + ID3D11RasterizerState *rs; + ID3D11Device_CreateRasterizerState(dev, &rd, &rs); + ID3D11DeviceContext_RSSetState(ctx, rs); + bind_target(); + clear(0, 0, 0); + ID3D11DeviceContext_IASetInputLayout(ctx, NULL); + ID3D11DeviceContext_IASetPrimitiveTopology(ctx, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D11DeviceContext_VSSetShader(ctx, vsh, NULL, 0); + ID3D11DeviceContext_PSSetShader(ctx, psh, NULL, 0); + ID3D11DeviceContext_Draw(ctx, 3, 0); + const uint32_t *px = readback(); + got[on] = px ? px[TH / 2 * TW + TW / 2] : 0; + } + ID3D11DeviceContext_RSSetState(ctx, NULL); + char d[96]; + snprintf(d, sizeof d, "clip on 0x%08x (want black), off 0x%08x (want white)", got[1], got[0]); + check(close_to(got[1], 0xFF000000, 2) && close_to(got[0], 0xFFFFFFFF, 2), "DepthClipEnable", d); +} + int main(void) { D3D_FEATURE_LEVEL fl = D3D_FEATURE_LEVEL_11_0, got; @@ -324,6 +360,7 @@ int main(void) tests_bc(); test_clip(); test_step_rate(); + test_depth_clip(); printf("%s: %d of %d checks passed\n", failures ? "FAILED" : "OK", checks - failures, checks); return failures ? 1 : 0; }