diff --git a/renderdoc/driver/vulkan/vk_shaderdebug.cpp b/renderdoc/driver/vulkan/vk_shaderdebug.cpp index a4a8e4835..43ea1a35b 100644 --- a/renderdoc/driver/vulkan/vk_shaderdebug.cpp +++ b/renderdoc/driver/vulkan/vk_shaderdebug.cpp @@ -69,11 +69,6 @@ enum class ShaderDebugBind MathResult = 9, }; -struct Vec3i -{ - int32_t x, y, z; -}; - struct GatherOffsets { int32_t u0, v0, u1, v1, u2, v2, u3, v3; diff --git a/renderdoc/maths/vec.h b/renderdoc/maths/vec.h index 179cc6c36..9690db29d 100644 --- a/renderdoc/maths/vec.h +++ b/renderdoc/maths/vec.h @@ -188,6 +188,25 @@ struct Vec2u }; }; +struct Vec3u +{ + Vec3u(uint32_t X, uint32_t Y, uint32_t Z) + { + x = X; + y = Y; + z = Z; + } + Vec3u() { x = y = z = 0; } + union + { + struct + { + uint32_t x, y, z; + }; + uint32_t uv[3]; + }; +}; + struct Vec4u { Vec4u(uint32_t X, uint32_t Y, uint32_t Z, uint32_t W) @@ -208,22 +227,22 @@ struct Vec4u }; }; -struct Vec3u +struct Vec3i { - Vec3u(uint32_t X, uint32_t Y, uint32_t Z) + Vec3i(int32_t X, int32_t Y, int32_t Z) { x = X; y = Y; z = Z; } - Vec3u() { x = y = z = 0; } + Vec3i() { x = y = z = 0; } union { struct { - uint32_t x, y, z; + int32_t x, y, z; }; - uint32_t uv[3]; + int32_t uv[3]; }; };