From 62ba684567e60f033059c1be20dd67431dc28868 Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 13 Dec 2018 18:27:43 +0000 Subject: [PATCH] Move Vec4u to a global struct next to Vec4f --- renderdoc/data/glsl/debuguniforms.h | 5 ----- renderdoc/maths/vec.h | 13 +++++++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/renderdoc/data/glsl/debuguniforms.h b/renderdoc/data/glsl/debuguniforms.h index 76939ccf9..3f5865cc7 100644 --- a/renderdoc/data/glsl/debuguniforms.h +++ b/renderdoc/data/glsl/debuguniforms.h @@ -42,11 +42,6 @@ #define BINDING(b) #define INST_NAME(name) -struct Vec4u -{ - uint32_t x, y, z, w; -}; - #define uvec4 Vec4u #if !defined(VULKAN) && !defined(OPENGL) diff --git a/renderdoc/maths/vec.h b/renderdoc/maths/vec.h index bb6023a31..d4b007f2e 100644 --- a/renderdoc/maths/vec.h +++ b/renderdoc/maths/vec.h @@ -26,6 +26,7 @@ #pragma once #include +#include struct Vec2f { @@ -104,3 +105,15 @@ inline Vec3f operator+=(Vec3f &a, const Vec3f &b) a = a + b; return a; } + +struct Vec4u +{ + Vec4u(uint32_t X = 0, uint32_t Y = 0, uint32_t Z = 0, uint32_t W = 0) + { + x = X; + y = Y; + z = Z; + w = W; + } + uint32_t x, y, z, w; +}; \ No newline at end of file