diff --git a/kraken/KRPipeline.cpp b/kraken/KRPipeline.cpp
index 6ada7a0..a0b58b2 100644
--- a/kraken/KRPipeline.cpp
+++ b/kraken/KRPipeline.cpp
@@ -444,6 +444,35 @@ void KRPipeline::initPushConstantStage(ShaderStage stage, const SpvReflectShader
             if (stricmp(SHADER_VALUE_NAMES[iUniform], member.name) == 0) {
               pushConstants.offset[iUniform] = member.offset;
               pushConstants.size[iUniform] = member.size;
+              if (member.type_description->op == SpvOpTypeVector && member.numeric.scalar.width == 32) {
+                switch (member.numeric.vector.component_count) {
+                case 2:
+                  pushConstants.type[iUniform] = ShaderValueType::type_vector2;
+                  break;
+                case 3:
+                  pushConstants.type[iUniform] = ShaderValueType::type_vector3;
+                  break;
+                case 4:
+                  pushConstants.type[iUniform] = ShaderValueType::type_vector4;
+                  break;
+                }
+              }
+              if (member.type_description->op == SpvOpTypeFloat && member.numeric.scalar.width == 32) {
+                pushConstants.type[iUniform] = ShaderValueType::type_float32;
+              }
+              if (member.type_description->op == SpvOpTypeFloat && member.numeric.scalar.width == 64) {
+                pushConstants.type[iUniform] = ShaderValueType::type_float64;
+              }
+              if (member.type_description->op == SpvOpTypeInt && member.numeric.scalar.width == 32) {
+                pushConstants.type[iUniform] = ShaderValueType::type_int32;
+              }
+              if (member.type_description->op == SpvOpTypeInt && member.numeric.scalar.width == 64) {
+                pushConstants.type[iUniform] = ShaderValueType::type_int64;
+              }
+              if (member.type_description->op == SpvOpTypeMatrix && member.numeric.scalar.width == 32 && member.numeric.matrix.column_count == 4 && member.numeric.matrix.row_count == 4) {
+                pushConstants.type[iUniform] = ShaderValueType::type_matrix4;
+              }
+              // TODO: Support unsigned integer binding?
             }
           }
         }
diff --git a/kraken/KRPipeline.h b/kraken/KRPipeline.h
index 77b70f8..ff3976f 100644
--- a/kraken/KRPipeline.h
+++ b/kraken/KRPipeline.h
@@ -246,6 +246,7 @@ private:
   {
     int offset[kPushConstantCount];
     __uint8_t size[kPushConstantCount];
+    ShaderValueType type[kPushConstantCount];
     uint8_t* buffer;
     int bufferSize;
     VkPipelineLayout layout;
diff --git a/kraken/KRShaderReflection.h b/kraken/KRShaderReflection.h
index 80650ef..b402dab 100644
--- a/kraken/KRShaderReflection.h
+++ b/kraken/KRShaderReflection.h
@@ -34,6 +34,20 @@
 
 #include <map>
 
+enum class ShaderValueType : uint8_t
+{
+  type_null = 0,
+  type_int32,
+  type_int64,
+  type_float32,
+  type_float64,
+  type_vector2,
+  type_vector3,
+  type_vector4,
+  type_matrix4,
+  NUM_SHADER_VALUE_TYPES
+};
+
 enum class ShaderValue : uint8_t
 {
   material_ambient = 0,