调整渲染文字内容

CMakeLists.txt

@@ -60,6 +60,15 @@ endif()
 
 find_package(Qt5 REQUIRED COMPONENTS ${QT_COMPONENTS})
 
+# FreeType support (for text rendering in Vulkan)
+find_package(Freetype)
+if(FREETYPE_FOUND)
+    message(STATUS "FreeType found: ${FREETYPE_LIBRARIES}")
+    message(STATUS "FreeType include: ${FREETYPE_INCLUDE_DIRS}")
+else()
+    message(WARNING "FreeType not found, text rendering may be limited")
+endif()
+
 # Vulkan support (optional) - only headers needed, volk loads dynamically
 option(ENABLE_VULKAN "Enable Vulkan support" ON)
 set(VULKAN_FOUND FALSE)
@@ -190,6 +199,13 @@ if(VULKAN_FOUND)
     target_link_libraries(${PROJECT_NAME}
         volk
     )
+
+    # Add FreeType support for text rendering in Vulkan
+    if(FREETYPE_FOUND)
+        target_include_directories(${PROJECT_NAME} PRIVATE ${FREETYPE_INCLUDE_DIRS})
+        target_link_libraries(${PROJECT_NAME} ${FREETYPE_LIBRARIES})
+        target_compile_definitions(${PROJECT_NAME} PRIVATE ENABLE_FREETYPE)
+    endif()
 endif()
 
 # Platform-specific linking
@@ -235,6 +251,12 @@ if(VULKAN_FOUND)
     message(STATUS "Vulkan headers: ${VULKAN_HEADERS_DIR}")
     message(STATUS "Volk directory: ${VOLK_DIR}")
     message(STATUS "Note: No Vulkan library linking - volk loads dynamically at runtime")
+    if(FREETYPE_FOUND)
+        message(STATUS "FreeType support: ENABLED (for text rendering)")
+        message(STATUS "FreeType libraries: ${FREETYPE_LIBRARIES}")
+    else()
+        message(STATUS "FreeType support: DISABLED")
+    endif()
 else()
     message(STATUS "Vulkan support: DISABLED")
 endif()

TEXT_RENDERING.md

@@ -0,0 +1,186 @@
+# Text Rendering Implementation in VulkanWidget
+
+## Overview
+
+This document describes the text rendering implementation added to the VulkanWidget using FreeType library.
+
+## Features Implemented
+
+### 1. FreeType Integration
+
+- **Library**: Uses system libfreetype.a (found at `/usr/local/lib/libfreetype.a`)
+- **Font Loading**: Automatically searches common font paths:
+  - `/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf`
+  - `/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf`
+  - `/usr/share/fonts/TTF/DejaVuSans.ttf`
+  - `/System/Library/Fonts/Helvetica.ttc` (macOS)
+  - `/usr/local/share/fonts/DejaVuSans.ttf`
+
+### 2. Font Atlas Generation
+
+- **Size**: 512x512 texture atlas
+- **Character Range**: ASCII 32-126 (95 printable characters)
+- **Format**: Single-channel R8_UNORM texture
+- **Packing**: Automatic row-based packing with 1-pixel padding
+- **Storage**: CharInfo map stores texture coordinates, size, bearing, and advance for each character
+
+### 3. Text Rendering Pipeline
+
+- **Shaders**: 
+  - `text.vert` - Converts pixel coordinates to NDC
+  - `text.frag` - Samples font atlas with alpha blending
+- **Blending**: Alpha blending enabled for smooth text rendering
+- **Descriptors**:
+  - Binding 0: Uniform Buffer (time, resolution, rotation, wavePhase)
+  - Binding 1: Font texture sampler
+
+### 4. Text Content (Matching CustomWidget)
+
+The text rendering displays the same information as CustomWidget:
+
+#### Active State:
+- **Title**: "Screen Lock Detector - Painting Active" (top center, white, scale 0.8)
+- **Statistics Box** (top left, green, scale 0.6):
+  - Frame Count
+  - FPS: ~60
+  - Rotation angle
+  - Running Time
+- **Lock Info Box** (below stats, magenta, scale 0.65/0.5):
+  - Last Lock Info title
+  - Lock time
+  - Duration
+  - Frame count at lock
+  - Total locks
+- **Hint**: "Lock your screen..." (bottom center, yellow, scale 0.65)
+
+#### Locked State:
+- **Title**: "PAINTING DISABLED" (center, white, scale 1.2)
+- **Subtitle**: "(Screen Locked)" (center, gray, scale 0.9)
+- **Stats**: Total frames painted (bottom left, gray, scale 0.7)
+
+## Implementation Details
+
+### Code Structure
+
+1. **VulkanRenderer::initializeTextRendering()**
+   - Initializes FreeType library
+   - Loads font face
+   - Generates character glyphs
+   - Creates font texture atlas
+   - Sets up Vulkan image, image view, and sampler
+
+2. **VulkanRenderer::createTextPipeline()**
+   - Loads text vertex and fragment shaders
+   - Sets up vertex input (position, color, texCoord)
+   - Configures alpha blending
+   - Creates descriptor set layout with texture sampler
+   - Builds graphics pipeline
+
+3. **VulkanRenderer::generateTextQuads()**
+   - Converts text string to quad vertices
+   - Handles newlines
+   - Uses pixel coordinates (shader converts to NDC)
+   - Sets texture coordinates from CharInfo map
+   - Applies scale and color
+
+4. **VulkanRenderer::drawText()**
+   - Binds text pipeline
+   - Binds descriptor sets (UBO + font texture)
+   - Generates text quads based on painting state
+   - Creates temporary vertex/index buffers
+   - Issues draw calls
+
+### Coordinate System
+
+- **Input**: Pixel coordinates (0,0 = top-left, width,height = bottom-right)
+- **Shader**: Converts to NDC (-1,-1 = bottom-left, 1,1 = top-right)
+- **Y-axis**: Flipped in shader (Vulkan Y-down → traditional Y-up)
+
+### Resource Management
+
+- Font texture and sampler are persistent (created once)
+- Text vertex/index buffers are recreated each frame (using static variables)
+- Old buffers are destroyed before creating new ones
+- Descriptor sets are updated after text rendering initialization
+
+## CMake Configuration
+
+```cmake
+# FreeType support (for text rendering in Vulkan)
+find_package(Freetype)
+if(FREETYPE_FOUND)
+    target_include_directories(${PROJECT_NAME} PRIVATE ${FREETYPE_INCLUDE_DIRS})
+    target_link_libraries(${PROJECT_NAME} ${FREETYPE_LIBRARIES})
+    target_compile_definitions(${PROJECT_NAME} PRIVATE ENABLE_FREETYPE)
+endif()
+```
+
+## Debugging
+
+Debug output is enabled every ~5 seconds (300 frames):
+
+```
+Initializing text rendering with FreeType...
+Text rendering initialized successfully with 95 characters
+Font texture: OK
+Font texture view: OK
+Font sampler: OK
+Creating text pipeline...
+Text pipeline created successfully
+Updating descriptor sets with font texture...
+Descriptor sets updated with font texture
+
+drawText called: charMap=95 pipeline=OK fontTexView=OK
+Drawing text with 572 vertices, 858 indices
+Window size: 756x425
+First vertex pos: (30.4, 1.2)
+First vertex color: (1, 1, 1, 1)
+```
+
+## Known Issues and Future Improvements
+
+### Current Limitations:
+1. Text buffers are recreated every frame (performance impact)
+2. No text caching or batching
+3. Limited to ASCII characters only
+4. Fixed font size (48pt base)
+
+### Potential Improvements:
+1. Implement text buffer caching for static text
+2. Add support for Unicode/UTF-8
+3. Multiple font sizes/styles
+4. Text layout system (word wrapping, alignment)
+5. Better memory management for text resources
+6. Dynamic font atlas resizing
+7. SDF (Signed Distance Field) rendering for scalable text
+
+## Testing
+
+To verify text rendering:
+
+1. Build project: `./build.sh`
+2. Run application: `./run.sh`
+3. Check console for text rendering initialization messages
+4. Verify text appears on screen matching CustomWidget layout
+5. Lock screen to test state changes
+
+## Dependencies
+
+- FreeType 2.x
+- Vulkan 1.x
+- Volk (for Vulkan function loading)
+- Qt 5.15.x (for window management)
+
+## Files Modified
+
+- `CMakeLists.txt` - Added FreeType support
+- `src/vulkanrenderer.h` - Added text rendering declarations
+- `src/vulkanrenderer.cpp` - Implemented text rendering functions
+- `shaders/text.vert` - Text vertex shader
+- `shaders/text.frag` - Text fragment shader
+
+## References
+
+- FreeType Documentation: https://freetype.org/freetype2/docs/
+- Vulkan Text Rendering: https://learnopengl.com/In-Practice/Text-Rendering
+- Font Atlas Generation: https://en.wikibooks.org/wiki/OpenGL_Programming/Modern_OpenGL_Tutorial_Text_Rendering_02

check_text_rendering.sh

@@ -0,0 +1,141 @@
+#!/bin/bash
+
+echo "========================================"
+echo "Text Rendering Diagnostic Script"
+echo "========================================"
+echo ""
+
+# Check if FreeType is installed
+echo "1. Checking FreeType installation..."
+if pkg-config --exists freetype2; then
+    echo "   ✓ FreeType found:"
+    pkg-config --modversion freetype2
+    echo "   Library: $(pkg-config --variable=libdir freetype2)/libfreetype.a"
+    echo "   Include: $(pkg-config --cflags freetype2)"
+else
+    echo "   ✗ FreeType not found via pkg-config"
+fi
+echo ""
+
+# Check for font files
+echo "2. Checking available fonts..."
+FONTS=(
+    "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"
+    "/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf"
+    "/usr/share/fonts/TTF/DejaVuSans.ttf"
+    "/usr/local/share/fonts/DejaVuSans.ttf"
+)
+
+FOUND_FONT=false
+for font in "${FONTS[@]}"; do
+    if [ -f "$font" ]; then
+        echo "   ✓ Found: $font"
+        FOUND_FONT=true
+    fi
+done
+
+if [ "$FOUND_FONT" = false ]; then
+    echo "   ✗ No fonts found in standard locations"
+    echo "   Installing DejaVu fonts might help:"
+    echo "   sudo apt-get install fonts-dejavu-core"
+fi
+echo ""
+
+# Check if shaders are compiled
+echo "3. Checking text shaders..."
+if [ -f "src/shaders_spirv/text.vert.spv" ]; then
+    echo "   ✓ text.vert.spv exists"
+else
+    echo "   ✗ text.vert.spv missing"
+fi
+
+if [ -f "src/shaders_spirv/text.frag.spv" ]; then
+    echo "   ✓ text.frag.spv exists"
+else
+    echo "   ✗ text.frag.spv missing"
+fi
+
+if [ -f "src/shaders_spirv/text_vert.inc" ]; then
+    echo "   ✓ text_vert.inc exists"
+else
+    echo "   ✗ text_vert.inc missing"
+fi
+
+if [ -f "src/shaders_spirv/text_frag.inc" ]; then
+    echo "   ✓ text_frag.inc exists"
+else
+    echo "   ✗ text_frag.inc missing"
+fi
+echo ""
+
+# Check build configuration
+echo "4. Checking build configuration..."
+if [ -f "build/CMakeCache.txt" ]; then
+    if grep -q "ENABLE_FREETYPE" build/CMakeCache.txt 2>/dev/null; then
+        echo "   ✓ ENABLE_FREETYPE is defined"
+    else
+        echo "   ✗ ENABLE_FREETYPE not found in build"
+    fi
+
+    if grep -q "FREETYPE_LIBRARY" build/CMakeCache.txt 2>/dev/null; then
+        FREETYPE_LIB=$(grep "FREETYPE_LIBRARY" build/CMakeCache.txt | cut -d= -f2)
+        echo "   ✓ FreeType library linked: $FREETYPE_LIB"
+    fi
+else
+    echo "   ⚠ Build directory not found - run ./build.sh first"
+fi
+echo ""
+
+# Check if executable exists and has FreeType symbols
+echo "5. Checking executable..."
+if [ -f "build/bin/ScreenLockDetector" ]; then
+    echo "   ✓ Executable exists"
+
+    # Check for FreeType symbols
+    if nm build/bin/ScreenLockDetector 2>/dev/null | grep -q "FT_Init_FreeType"; then
+        echo "   ✓ FreeType symbols found in executable"
+    else
+        echo "   ⚠ FreeType symbols not found (might be dynamically linked)"
+    fi
+
+    # Check for Vulkan symbols
+    if nm build/bin/ScreenLockDetector 2>/dev/null | grep -q "vkCreateGraphicsPipeline"; then
+        echo "   ✓ Vulkan symbols found"
+    fi
+else
+    echo "   ✗ Executable not found - build first with ./build.sh"
+fi
+echo ""
+
+# Run the application with text rendering debug output
+echo "6. Testing text rendering (5 seconds)..."
+echo "   Starting application..."
+if [ -f "build/bin/ScreenLockDetector" ]; then
+    timeout 5 ./run.sh 2>&1 | grep -E "Text|text|Font|font|FreeType|pipeline|charMap|Drawing text" | head -20
+    echo ""
+    echo "   If you see 'Drawing text with X vertices' above, text rendering is working!"
+else
+    echo "   ✗ Cannot test - executable not found"
+fi
+echo ""
+
+# Summary
+echo "========================================"
+echo "Summary"
+echo "========================================"
+echo ""
+echo "Text rendering requires:"
+echo "  1. FreeType library installed ✓"
+echo "  2. At least one font file available"
+echo "  3. Text shaders compiled (text.vert/frag.spv)"
+echo "  4. ENABLE_FREETYPE defined in build"
+echo "  5. Application successfully initializes text pipeline"
+echo ""
+echo "If text is not visible but pipeline is created:"
+echo "  - Check shader coordinate system"
+echo "  - Verify alpha blending is enabled"
+echo "  - Ensure text color contrasts with background"
+echo "  - Check if text is positioned within viewport"
+echo ""
+echo "For more details, see: TEXT_RENDERING.md"
+echo "========================================"

shaders/background.frag

@@ -20,13 +20,13 @@ void main() {
     // Create dynamic gradient based on time
     float t = ubo.time / 360.0;
 
-    // Calculate color components with sine waves
+    // Calculate color components matching Qt CustomWidget
-    float r = 0.39 + 0.20 * sin(t * 6.28318);
+    float r = 0.392 + 0.196 * sin(t * 6.28318);
-    float g = 0.59 + 0.20 * sin(t * 6.28318 + 1.047);
+    float g = 0.588 + 0.196 * sin(t * 6.28318 + 1.047);
-    float b = 0.78 + 0.22 * sin(t * 6.28318 + 2.094);
+    float b = 0.784 + 0.216 * sin(t * 6.28318 + 2.094);
 
     vec3 color1 = vec3(r, g, b);
-    vec3 color2 = vec3(0.12, 0.12, 0.24);
+    vec3 color2 = vec3(0.118, 0.118, 0.235);
 
     // Linear gradient from top-left to bottom-right
     float gradient = uv.x * 0.5 + uv.y * 0.5;

shaders/text.vert

@@ -7,24 +7,30 @@ layout(location = 2) in vec2 inTexCoord;
 layout(location = 0) out vec4 fragColor;
 layout(location = 1) out vec2 fragTexCoord;
 
-layout(binding = 0) uniform UniformBufferObject {
+// Use std140 layout and separate floats instead of vec2 to avoid alignment issues
-    float time;
+layout(binding = 0, std140) uniform UniformBufferObject {
-    vec2 resolution;
+    float time;           // offset 0
-    float rotation;
+    float resX;           // offset 4
-    float wavePhase;
+    float resY;           // offset 8
+    float rotation;       // offset 12
+    float wavePhase;      // offset 16
+    float padding1;       // offset 20
+    float padding2;       // offset 24
 } ubo;
 
 void main() {
-    // Transform position from pixel coordinates to normalized device coordinates
+    // Input position is in pixel coordinates (0,0 = top-left)
     vec2 pos = inPosition;
 
     // Convert to NDC: (0, 0) to (width, height) -> (-1, -1) to (1, 1)
-    vec2 ndc = (pos / ubo.resolution) * 2.0 - 1.0;
+    // Note: Vulkan NDC has Y pointing down, but we want traditional Y-up
+    float ndcX = (pos.x / ubo.resX) * 2.0 - 1.0;
+    float ndcY = (pos.y / ubo.resY) * 2.0 - 1.0;
 
-    // Flip Y axis (Vulkan has Y down, we want Y up for easier math)
+    // NO Y-flip needed here - text coordinates are already in screen space
-    ndc.y = -ndc.y;
+    // where (0,0) is top-left, which matches Vulkan's framebuffer coordinates
+    gl_Position = vec4(ndcX, ndcY, 0.0, 1.0);
 
-    gl_Position = vec4(ndc, 0.0, 1.0);
     fragColor = inColor;
     fragTexCoord = inTexCoord;
 }

src/shaders_spirv/background_frag.inc

@@ -29,13 +29,13 @@
     0x00000006u, 0x00000007u, 0x00000006u, 0x00000006u, 0x00040020u, 0x00000015u, 0x00000002u, 0x00000014u,
     0x0004003bu, 0x00000015u, 0x00000016u, 0x00000002u, 0x00040015u, 0x00000017u, 0x00000020u, 0x00000001u,
     0x0004002bu, 0x00000017u, 0x00000018u, 0x00000000u, 0x00040020u, 0x00000019u, 0x00000002u, 0x00000006u,
-    0x0004002bu, 0x00000006u, 0x0000001cu, 0x43b40000u, 0x0004002bu, 0x00000006u, 0x0000001fu, 0x3ec7ae14u,
+    0x0004002bu, 0x00000006u, 0x0000001cu, 0x43b40000u, 0x0004002bu, 0x00000006u, 0x0000001fu, 0x3ec8b439u,
-    0x0004002bu, 0x00000006u, 0x00000020u, 0x3e4ccccdu, 0x0004002bu, 0x00000006u, 0x00000022u, 0x40c90fd0u,
+    0x0004002bu, 0x00000006u, 0x00000020u, 0x3e48b439u, 0x0004002bu, 0x00000006u, 0x00000022u, 0x40c90fd0u,
-    0x0004002bu, 0x00000006u, 0x00000028u, 0x3f170a3du, 0x0004002bu, 0x00000006u, 0x0000002bu, 0x3f860419u,
+    0x0004002bu, 0x00000006u, 0x00000028u, 0x3f16872bu, 0x0004002bu, 0x00000006u, 0x0000002bu, 0x3f860419u,
-    0x0004002bu, 0x00000006u, 0x00000031u, 0x3f47ae14u, 0x0004002bu, 0x00000006u, 0x00000032u, 0x3e6147aeu,
+    0x0004002bu, 0x00000006u, 0x00000031u, 0x3f48b439u, 0x0004002bu, 0x00000006u, 0x00000032u, 0x3e5d2f1bu,
     0x0004002bu, 0x00000006u, 0x00000035u, 0x40060419u, 0x00040017u, 0x0000003au, 0x00000006u, 0x00000003u,
-    0x00040020u, 0x0000003bu, 0x00000007u, 0x0000003au, 0x0004002bu, 0x00000006u, 0x00000042u, 0x3df5c28fu,
+    0x00040020u, 0x0000003bu, 0x00000007u, 0x0000003au, 0x0004002bu, 0x00000006u, 0x00000042u, 0x3df1a9fcu,
-    0x0004002bu, 0x00000006u, 0x00000043u, 0x3e75c28fu, 0x0006002cu, 0x0000003au, 0x00000044u, 0x00000042u,
+    0x0004002bu, 0x00000006u, 0x00000043u, 0x3e70a3d7u, 0x0006002cu, 0x0000003au, 0x00000044u, 0x00000042u,
     0x00000042u, 0x00000043u, 0x00040015u, 0x00000046u, 0x00000020u, 0x00000000u, 0x0004002bu, 0x00000046u,
     0x00000047u, 0x00000000u, 0x0004002bu, 0x00000046u, 0x0000004bu, 0x00000001u, 0x00040017u, 0x00000056u,
     0x00000006u, 0x00000004u, 0x00040020u, 0x00000057u, 0x00000003u, 0x00000056u, 0x0004003bu, 0x00000057u,

src/shaders_spirv/text_vert.inc

@@ -1,60 +1,67 @@
 // Auto-generated from text.vert.spv
-// Size: 1840 bytes (460 words)
+// Size: 2080 bytes (520 words)
-    0x07230203u, 0x00010000u, 0x0008000bu, 0x00000039u, 0x00000000u, 0x00020011u, 0x00000001u, 0x0006000bu,
+    0x07230203u, 0x00010000u, 0x0008000bu, 0x0000003eu, 0x00000000u, 0x00020011u, 0x00000001u, 0x0006000bu,
     0x00000001u, 0x4c534c47u, 0x6474732eu, 0x3035342eu, 0x00000000u, 0x0003000eu, 0x00000000u, 0x00000001u,
-    0x000b000fu, 0x00000000u, 0x00000004u, 0x6e69616du, 0x00000000u, 0x0000000bu, 0x00000028u, 0x00000031u,
+    0x000b000fu, 0x00000000u, 0x00000004u, 0x6e69616du, 0x00000000u, 0x0000000bu, 0x0000002eu, 0x00000036u,
-    0x00000033u, 0x00000036u, 0x00000037u, 0x00030003u, 0x00000002u, 0x000001c2u, 0x00040005u, 0x00000004u,
+    0x00000038u, 0x0000003bu, 0x0000003cu, 0x00030003u, 0x00000002u, 0x000001c2u, 0x00040005u, 0x00000004u,
     0x6e69616du, 0x00000000u, 0x00030005u, 0x00000009u, 0x00736f70u, 0x00050005u, 0x0000000bu, 0x6f506e69u,
-    0x69746973u, 0x00006e6fu, 0x00030005u, 0x0000000du, 0x0063646eu, 0x00070005u, 0x0000000fu, 0x66696e55u,
+    0x69746973u, 0x00006e6fu, 0x00040005u, 0x0000000eu, 0x5863646eu, 0x00000000u, 0x00070005u, 0x00000013u,
-    0x426d726fu, 0x65666675u, 0x6a624f72u, 0x00746365u, 0x00050006u, 0x0000000fu, 0x00000000u, 0x656d6974u,
+    0x66696e55u, 0x426d726fu, 0x65666675u, 0x6a624f72u, 0x00746365u, 0x00050006u, 0x00000013u, 0x00000000u,
-    0x00000000u, 0x00060006u, 0x0000000fu, 0x00000001u, 0x6f736572u, 0x6974756cu, 0x00006e6fu, 0x00060006u,
+    0x656d6974u, 0x00000000u, 0x00050006u, 0x00000013u, 0x00000001u, 0x58736572u, 0x00000000u, 0x00050006u,
-    0x0000000fu, 0x00000002u, 0x61746f72u, 0x6e6f6974u, 0x00000000u, 0x00060006u, 0x0000000fu, 0x00000003u,
+    0x00000013u, 0x00000002u, 0x59736572u, 0x00000000u, 0x00060006u, 0x00000013u, 0x00000003u, 0x61746f72u,
-    0x65766177u, 0x73616850u, 0x00000065u, 0x00030005u, 0x00000011u, 0x006f6275u, 0x00060005u, 0x00000026u,
+    0x6e6f6974u, 0x00000000u, 0x00060006u, 0x00000013u, 0x00000004u, 0x65766177u, 0x73616850u, 0x00000065u,
-    0x505f6c67u, 0x65567265u, 0x78657472u, 0x00000000u, 0x00060006u, 0x00000026u, 0x00000000u, 0x505f6c67u,
+    0x00060006u, 0x00000013u, 0x00000005u, 0x64646170u, 0x31676e69u, 0x00000000u, 0x00060006u, 0x00000013u,
-    0x7469736fu, 0x006e6f69u, 0x00070006u, 0x00000026u, 0x00000001u, 0x505f6c67u, 0x746e696fu, 0x657a6953u,
+    0x00000006u, 0x64646170u, 0x32676e69u, 0x00000000u, 0x00030005u, 0x00000015u, 0x006f6275u, 0x00040005u,
-    0x00000000u, 0x00070006u, 0x00000026u, 0x00000002u, 0x435f6c67u, 0x4470696cu, 0x61747369u, 0x0065636eu,
+    0x00000020u, 0x5963646eu, 0x00000000u, 0x00060005u, 0x0000002cu, 0x505f6c67u, 0x65567265u, 0x78657472u,
-    0x00070006u, 0x00000026u, 0x00000003u, 0x435f6c67u, 0x446c6c75u, 0x61747369u, 0x0065636eu, 0x00030005u,
+    0x00000000u, 0x00060006u, 0x0000002cu, 0x00000000u, 0x505f6c67u, 0x7469736fu, 0x006e6f69u, 0x00070006u,
-    0x00000028u, 0x00000000u, 0x00050005u, 0x00000031u, 0x67617266u, 0x6f6c6f43u, 0x00000072u, 0x00040005u,
+    0x0000002cu, 0x00000001u, 0x505f6c67u, 0x746e696fu, 0x657a6953u, 0x00000000u, 0x00070006u, 0x0000002cu,
-    0x00000033u, 0x6f436e69u, 0x00726f6cu, 0x00060005u, 0x00000036u, 0x67617266u, 0x43786554u, 0x64726f6fu,
+    0x00000002u, 0x435f6c67u, 0x4470696cu, 0x61747369u, 0x0065636eu, 0x00070006u, 0x0000002cu, 0x00000003u,
-    0x00000000u, 0x00050005u, 0x00000037u, 0x65546e69u, 0x6f6f4378u, 0x00006472u, 0x00040047u, 0x0000000bu,
+    0x435f6c67u, 0x446c6c75u, 0x61747369u, 0x0065636eu, 0x00030005u, 0x0000002eu, 0x00000000u, 0x00050005u,
-    0x0000001eu, 0x00000000u, 0x00050048u, 0x0000000fu, 0x00000000u, 0x00000023u, 0x00000000u, 0x00050048u,
+    0x00000036u, 0x67617266u, 0x6f6c6f43u, 0x00000072u, 0x00040005u, 0x00000038u, 0x6f436e69u, 0x00726f6cu,
-    0x0000000fu, 0x00000001u, 0x00000023u, 0x00000008u, 0x00050048u, 0x0000000fu, 0x00000002u, 0x00000023u,
+    0x00060005u, 0x0000003bu, 0x67617266u, 0x43786554u, 0x64726f6fu, 0x00000000u, 0x00050005u, 0x0000003cu,
-    0x00000010u, 0x00050048u, 0x0000000fu, 0x00000003u, 0x00000023u, 0x00000014u, 0x00030047u, 0x0000000fu,
+    0x65546e69u, 0x6f6f4378u, 0x00006472u, 0x00040047u, 0x0000000bu, 0x0000001eu, 0x00000000u, 0x00050048u,
-    0x00000002u, 0x00040047u, 0x00000011u, 0x00000022u, 0x00000000u, 0x00040047u, 0x00000011u, 0x00000021u,
+    0x00000013u, 0x00000000u, 0x00000023u, 0x00000000u, 0x00050048u, 0x00000013u, 0x00000001u, 0x00000023u,
-    0x00000000u, 0x00050048u, 0x00000026u, 0x00000000u, 0x0000000bu, 0x00000000u, 0x00050048u, 0x00000026u,
+    0x00000004u, 0x00050048u, 0x00000013u, 0x00000002u, 0x00000023u, 0x00000008u, 0x00050048u, 0x00000013u,
-    0x00000001u, 0x0000000bu, 0x00000001u, 0x00050048u, 0x00000026u, 0x00000002u, 0x0000000bu, 0x00000003u,
+    0x00000003u, 0x00000023u, 0x0000000cu, 0x00050048u, 0x00000013u, 0x00000004u, 0x00000023u, 0x00000010u,
-    0x00050048u, 0x00000026u, 0x00000003u, 0x0000000bu, 0x00000004u, 0x00030047u, 0x00000026u, 0x00000002u,
+    0x00050048u, 0x00000013u, 0x00000005u, 0x00000023u, 0x00000014u, 0x00050048u, 0x00000013u, 0x00000006u,
-    0x00040047u, 0x00000031u, 0x0000001eu, 0x00000000u, 0x00040047u, 0x00000033u, 0x0000001eu, 0x00000001u,
+    0x00000023u, 0x00000018u, 0x00030047u, 0x00000013u, 0x00000002u, 0x00040047u, 0x00000015u, 0x00000022u,
-    0x00040047u, 0x00000036u, 0x0000001eu, 0x00000001u, 0x00040047u, 0x00000037u, 0x0000001eu, 0x00000002u,
+    0x00000000u, 0x00040047u, 0x00000015u, 0x00000021u, 0x00000000u, 0x00050048u, 0x0000002cu, 0x00000000u,
-    0x00020013u, 0x00000002u, 0x00030021u, 0x00000003u, 0x00000002u, 0x00030016u, 0x00000006u, 0x00000020u,
+    0x0000000bu, 0x00000000u, 0x00050048u, 0x0000002cu, 0x00000001u, 0x0000000bu, 0x00000001u, 0x00050048u,
-    0x00040017u, 0x00000007u, 0x00000006u, 0x00000002u, 0x00040020u, 0x00000008u, 0x00000007u, 0x00000007u,
+    0x0000002cu, 0x00000002u, 0x0000000bu, 0x00000003u, 0x00050048u, 0x0000002cu, 0x00000003u, 0x0000000bu,
-    0x00040020u, 0x0000000au, 0x00000001u, 0x00000007u, 0x0004003bu, 0x0000000au, 0x0000000bu, 0x00000001u,
+    0x00000004u, 0x00030047u, 0x0000002cu, 0x00000002u, 0x00040047u, 0x00000036u, 0x0000001eu, 0x00000000u,
-    0x0006001eu, 0x0000000fu, 0x00000006u, 0x00000007u, 0x00000006u, 0x00000006u, 0x00040020u, 0x00000010u,
+    0x00040047u, 0x00000038u, 0x0000001eu, 0x00000001u, 0x00040047u, 0x0000003bu, 0x0000001eu, 0x00000001u,
-    0x00000002u, 0x0000000fu, 0x0004003bu, 0x00000010u, 0x00000011u, 0x00000002u, 0x00040015u, 0x00000012u,
+    0x00040047u, 0x0000003cu, 0x0000001eu, 0x00000002u, 0x00020013u, 0x00000002u, 0x00030021u, 0x00000003u,
-    0x00000020u, 0x00000001u, 0x0004002bu, 0x00000012u, 0x00000013u, 0x00000001u, 0x00040020u, 0x00000014u,
+    0x00000002u, 0x00030016u, 0x00000006u, 0x00000020u, 0x00040017u, 0x00000007u, 0x00000006u, 0x00000002u,
-    0x00000002u, 0x00000007u, 0x0004002bu, 0x00000006u, 0x00000018u, 0x40000000u, 0x0004002bu, 0x00000006u,
+    0x00040020u, 0x00000008u, 0x00000007u, 0x00000007u, 0x00040020u, 0x0000000au, 0x00000001u, 0x00000007u,
-    0x0000001au, 0x3f800000u, 0x00040015u, 0x0000001du, 0x00000020u, 0x00000000u, 0x0004002bu, 0x0000001du,
+    0x0004003bu, 0x0000000au, 0x0000000bu, 0x00000001u, 0x00040020u, 0x0000000du, 0x00000007u, 0x00000006u,
-    0x0000001eu, 0x00000001u, 0x00040020u, 0x0000001fu, 0x00000007u, 0x00000006u, 0x00040017u, 0x00000024u,
+    0x00040015u, 0x0000000fu, 0x00000020u, 0x00000000u, 0x0004002bu, 0x0000000fu, 0x00000010u, 0x00000000u,
-    0x00000006u, 0x00000004u, 0x0004001cu, 0x00000025u, 0x00000006u, 0x0000001eu, 0x0006001eu, 0x00000026u,
+    0x0009001eu, 0x00000013u, 0x00000006u, 0x00000006u, 0x00000006u, 0x00000006u, 0x00000006u, 0x00000006u,
-    0x00000024u, 0x00000006u, 0x00000025u, 0x00000025u, 0x00040020u, 0x00000027u, 0x00000003u, 0x00000026u,
+    0x00000006u, 0x00040020u, 0x00000014u, 0x00000002u, 0x00000013u, 0x0004003bu, 0x00000014u, 0x00000015u,
-    0x0004003bu, 0x00000027u, 0x00000028u, 0x00000003u, 0x0004002bu, 0x00000012u, 0x00000029u, 0x00000000u,
+    0x00000002u, 0x00040015u, 0x00000016u, 0x00000020u, 0x00000001u, 0x0004002bu, 0x00000016u, 0x00000017u,
-    0x0004002bu, 0x00000006u, 0x0000002bu, 0x00000000u, 0x00040020u, 0x0000002fu, 0x00000003u, 0x00000024u,
+    0x00000001u, 0x00040020u, 0x00000018u, 0x00000002u, 0x00000006u, 0x0004002bu, 0x00000006u, 0x0000001cu,
-    0x0004003bu, 0x0000002fu, 0x00000031u, 0x00000003u, 0x00040020u, 0x00000032u, 0x00000001u, 0x00000024u,
+    0x40000000u, 0x0004002bu, 0x00000006u, 0x0000001eu, 0x3f800000u, 0x0004002bu, 0x0000000fu, 0x00000021u,
-    0x0004003bu, 0x00000032u, 0x00000033u, 0x00000001u, 0x00040020u, 0x00000035u, 0x00000003u, 0x00000007u,
+    0x00000001u, 0x0004002bu, 0x00000016u, 0x00000024u, 0x00000002u, 0x00040017u, 0x0000002au, 0x00000006u,
-    0x0004003bu, 0x00000035u, 0x00000036u, 0x00000003u, 0x0004003bu, 0x0000000au, 0x00000037u, 0x00000001u,
+    0x00000004u, 0x0004001cu, 0x0000002bu, 0x00000006u, 0x00000021u, 0x0006001eu, 0x0000002cu, 0x0000002au,
-    0x00050036u, 0x00000002u, 0x00000004u, 0x00000000u, 0x00000003u, 0x000200f8u, 0x00000005u, 0x0004003bu,
+    0x00000006u, 0x0000002bu, 0x0000002bu, 0x00040020u, 0x0000002du, 0x00000003u, 0x0000002cu, 0x0004003bu,
-    0x00000008u, 0x00000009u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x0000000du, 0x00000007u, 0x0004003du,
+    0x0000002du, 0x0000002eu, 0x00000003u, 0x0004002bu, 0x00000016u, 0x0000002fu, 0x00000000u, 0x0004002bu,
-    0x00000007u, 0x0000000cu, 0x0000000bu, 0x0003003eu, 0x00000009u, 0x0000000cu, 0x0004003du, 0x00000007u,
+    0x00000006u, 0x00000032u, 0x00000000u, 0x00040020u, 0x00000034u, 0x00000003u, 0x0000002au, 0x0004003bu,
-    0x0000000eu, 0x00000009u, 0x00050041u, 0x00000014u, 0x00000015u, 0x00000011u, 0x00000013u, 0x0004003du,
+    0x00000034u, 0x00000036u, 0x00000003u, 0x00040020u, 0x00000037u, 0x00000001u, 0x0000002au, 0x0004003bu,
-    0x00000007u, 0x00000016u, 0x00000015u, 0x00050088u, 0x00000007u, 0x00000017u, 0x0000000eu, 0x00000016u,
+    0x00000037u, 0x00000038u, 0x00000001u, 0x00040020u, 0x0000003au, 0x00000003u, 0x00000007u, 0x0004003bu,
-    0x0005008eu, 0x00000007u, 0x00000019u, 0x00000017u, 0x00000018u, 0x00050050u, 0x00000007u, 0x0000001bu,
+    0x0000003au, 0x0000003bu, 0x00000003u, 0x0004003bu, 0x0000000au, 0x0000003cu, 0x00000001u, 0x00050036u,
-    0x0000001au, 0x0000001au, 0x00050083u, 0x00000007u, 0x0000001cu, 0x00000019u, 0x0000001bu, 0x0003003eu,
+    0x00000002u, 0x00000004u, 0x00000000u, 0x00000003u, 0x000200f8u, 0x00000005u, 0x0004003bu, 0x00000008u,
-    0x0000000du, 0x0000001cu, 0x00050041u, 0x0000001fu, 0x00000020u, 0x0000000du, 0x0000001eu, 0x0004003du,
+    0x00000009u, 0x00000007u, 0x0004003bu, 0x0000000du, 0x0000000eu, 0x00000007u, 0x0004003bu, 0x0000000du,
-    0x00000006u, 0x00000021u, 0x00000020u, 0x0004007fu, 0x00000006u, 0x00000022u, 0x00000021u, 0x00050041u,
+    0x00000020u, 0x00000007u, 0x0004003du, 0x00000007u, 0x0000000cu, 0x0000000bu, 0x0003003eu, 0x00000009u,
-    0x0000001fu, 0x00000023u, 0x0000000du, 0x0000001eu, 0x0003003eu, 0x00000023u, 0x00000022u, 0x0004003du,
+    0x0000000cu, 0x00050041u, 0x0000000du, 0x00000011u, 0x00000009u, 0x00000010u, 0x0004003du, 0x00000006u,
-    0x00000007u, 0x0000002au, 0x0000000du, 0x00050051u, 0x00000006u, 0x0000002cu, 0x0000002au, 0x00000000u,
+    0x00000012u, 0x00000011u, 0x00050041u, 0x00000018u, 0x00000019u, 0x00000015u, 0x00000017u, 0x0004003du,
-    0x00050051u, 0x00000006u, 0x0000002du, 0x0000002au, 0x00000001u, 0x00070050u, 0x00000024u, 0x0000002eu,
+    0x00000006u, 0x0000001au, 0x00000019u, 0x00050088u, 0x00000006u, 0x0000001bu, 0x00000012u, 0x0000001au,
-    0x0000002cu, 0x0000002du, 0x0000002bu, 0x0000001au, 0x00050041u, 0x0000002fu, 0x00000030u, 0x00000028u,
+    0x00050085u, 0x00000006u, 0x0000001du, 0x0000001bu, 0x0000001cu, 0x00050083u, 0x00000006u, 0x0000001fu,
-    0x00000029u, 0x0003003eu, 0x00000030u, 0x0000002eu, 0x0004003du, 0x00000024u, 0x00000034u, 0x00000033u,
+    0x0000001du, 0x0000001eu, 0x0003003eu, 0x0000000eu, 0x0000001fu, 0x00050041u, 0x0000000du, 0x00000022u,
-    0x0003003eu, 0x00000031u, 0x00000034u, 0x0004003du, 0x00000007u, 0x00000038u, 0x00000037u, 0x0003003eu,
+    0x00000009u, 0x00000021u, 0x0004003du, 0x00000006u, 0x00000023u, 0x00000022u, 0x00050041u, 0x00000018u,
-    0x00000036u, 0x00000038u, 0x000100fdu, 0x00010038u
+    0x00000025u, 0x00000015u, 0x00000024u, 0x0004003du, 0x00000006u, 0x00000026u, 0x00000025u, 0x00050088u,
+    0x00000006u, 0x00000027u, 0x00000023u, 0x00000026u, 0x00050085u, 0x00000006u, 0x00000028u, 0x00000027u,
+    0x0000001cu, 0x00050083u, 0x00000006u, 0x00000029u, 0x00000028u, 0x0000001eu, 0x0003003eu, 0x00000020u,
+    0x00000029u, 0x0004003du, 0x00000006u, 0x00000030u, 0x0000000eu, 0x0004003du, 0x00000006u, 0x00000031u,
+    0x00000020u, 0x00070050u, 0x0000002au, 0x00000033u, 0x00000030u, 0x00000031u, 0x00000032u, 0x0000001eu,
+    0x00050041u, 0x00000034u, 0x00000035u, 0x0000002eu, 0x0000002fu, 0x0003003eu, 0x00000035u, 0x00000033u,
+    0x0004003du, 0x0000002au, 0x00000039u, 0x00000038u, 0x0003003eu, 0x00000036u, 0x00000039u, 0x0004003du,
+    0x00000007u, 0x0000003du, 0x0000003cu, 0x0003003eu, 0x0000003bu, 0x0000003du, 0x000100fdu, 0x00010038u

src/vulkanrenderer.h

@@ -263,6 +263,11 @@ private:
                            std::vector<uint16_t>& indices,
                            double wavePhase);
 
+    /**
+     * @brief 计算文本宽度（像素）
+     */
+    float calculateTextWidth(const std::string& text, float scale);
+
     /**
      * @brief 生成文本四边形顶点
      */

src/vulkanwidget.cpp

@@ -731,9 +731,11 @@ void VulkanWidget::recordCommandBuffer(VkCommandBuffer commandBuffer, uint32_t i
         // Build lock info string
         QString lockInfo;
         if (m_lastLockTime.isValid()) {
-            lockInfo = QString("Last Lock: %1\nDuration: %2s\nLock Count: %3")
+            lockInfo = QString("Last Lock: %1\nDuration: %2s\nFrame Count at Lock: %3\nFrames During Lock: %4\nLock Count: %5")
                 .arg(m_lastLockTime.toString("hh:mm:ss"))
                 .arg(m_lastLockDuration)
+                .arg(m_lastLockFrameCount)
+                .arg(m_lockPaintFrameCount)
                 .arg(m_lockCount);
         }