From 07a69fb2c913d489510e384599ae63ed9e045c60 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Wed, 15 Sep 2021 21:52:13 +0300 Subject: [PATCH] Change the vertex group attribute to be an integer vector --- shaderlib/msp_interface.glsl | 2 +- source/core/vertexformat.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/shaderlib/msp_interface.glsl b/shaderlib/msp_interface.glsl index 959f9ba5..860b0c79 100644 --- a/shaderlib/msp_interface.glsl +++ b/shaderlib/msp_interface.glsl @@ -43,7 +43,7 @@ layout(location=0) in vec4 vertex; layout(location=1) in vec4 color; layout(location=2) in vec3 normal; layout(location=3) in vec3 tangent; -layout(location=4) in vec4 group; +layout(location=4) in ivec4 group; layout(location=5) in vec4 weight; layout(location=6) in vec4 texcoord; layout(location=7) in vec4 texcoord1; diff --git a/source/core/vertexformat.h b/source/core/vertexformat.h index 132d0b95..68c3e4c9 100644 --- a/source/core/vertexformat.h +++ b/source/core/vertexformat.h @@ -40,10 +40,10 @@ enum VertexAttribute COLOR4 = 0x05C4, NORMAL3 = 0x09C3, TANGENT3 = 0x0DC3, - GROUP1 = 0x11C1, - GROUP2 = 0x11C2, - GROUP3 = 0x11C3, - GROUP4 = 0x11C4, + GROUP1 = 0x10C9, + GROUP2 = 0x10CA, + GROUP3 = 0x10CB, + GROUP4 = 0x10CC, WEIGHT1 = 0x15C1, WEIGHT2 = 0x15C2, WEIGHT3 = 0x15C3, -- 2.43.0