haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use size_t for sizes and offsets.

This commit is contained in:
Simon Richter 2016-06-10 17:06:00 +02:00 committed by Maciej Suminski
parent eb45f02138
commit 5ce4abd0ac
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/gal/opengl/vertex_common.h
View File

@ -54,24 +54,24 @@ typedef struct
} VERTEX; } VERTEX;
///< Data structure for vertices {X,Y,Z,R,G,B,A,shader&param} (@see VERTEX). ///< Data structure for vertices {X,Y,Z,R,G,B,A,shader&param} (@see VERTEX).
const unsigned int VertexSize = sizeof(VERTEX); const size_t VertexSize = sizeof(VERTEX);
const unsigned int VertexStride = VertexSize / sizeof(GLfloat); const size_t VertexStride = VertexSize / sizeof(GLfloat);
const unsigned int CoordSize = sizeof(VERTEX().x) + sizeof(VERTEX().y) + sizeof(VERTEX().z); const size_t CoordSize = sizeof(VERTEX().x) + sizeof(VERTEX().y) + sizeof(VERTEX().z);
const unsigned int CoordStride = CoordSize / sizeof(GLfloat); const size_t CoordStride = CoordSize / sizeof(GLfloat);
// Offset of color data from the beginning of each vertex data // Offset of color data from the beginning of each vertex data
const unsigned int ColorOffset = offsetof(VERTEX, r); const size_t ColorOffset = offsetof(VERTEX, r);
const unsigned int ColorSize = sizeof(VERTEX().r) + sizeof(VERTEX().g) + const size_t ColorSize = sizeof(VERTEX().r) + sizeof(VERTEX().g) +
sizeof(VERTEX().b) + sizeof(VERTEX().a); sizeof(VERTEX().b) + sizeof(VERTEX().a);
const unsigned int ColorStride = ColorSize / sizeof(GLubyte); const size_t ColorStride = ColorSize / sizeof(GLubyte);
// Shader attributes // Shader attributes
const unsigned int ShaderOffset = offsetof(VERTEX, shader); const size_t ShaderOffset = offsetof(VERTEX, shader);
const unsigned int ShaderSize = sizeof(VERTEX().shader); const size_t ShaderSize = sizeof(VERTEX().shader);
const unsigned int ShaderStride = ShaderSize / sizeof(GLfloat); const size_t ShaderStride = ShaderSize / sizeof(GLfloat);
const unsigned int IndexSize = sizeof(GLuint); const size_t IndexSize = sizeof(GLuint);
} // namespace KIGFX } // namespace KIGFX
#endif /* VERTEX_COMMON_H_ */ #endif /* VERTEX_COMMON_H_ */