LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 19:23:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix windows build

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2017-10-25 23:23:41 -03:00
parent 15cc540e4c
commit 7ffb04f019
2 changed files with 1 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/vertex.cpp
-2
View File
@@ -37,8 +37,6 @@ static_assert(sizeof(XYf_STf_RGBAub) == sizeof(float)*2 + sizeof(float)*2 + size
static_assert(sizeof(XYf_STus_RGBAub) == sizeof(float)*2 + sizeof(uint16)*2 + sizeof(Color), "sizeof(XYf_STus_RGBAub) incorrect!"); static_assert(sizeof(XYf_STus_RGBAub) == sizeof(float)*2 + sizeof(uint16)*2 + sizeof(Color), "sizeof(XYf_STus_RGBAub) incorrect!");
static_assert(sizeof(XYf_STPf_RGBAub) == sizeof(float)*2 + sizeof(float)*3 + sizeof(Color), "sizeof(XYf_STPf_RGBAub) incorrect!"); static_assert(sizeof(XYf_STPf_RGBAub) == sizeof(float)*2 + sizeof(float)*3 + sizeof(Color), "sizeof(XYf_STPf_RGBAub) incorrect!");
static_assert(sizeof(AttributeInfo) == sizeof(uint64), "sizeof(AttributeInfo) incorrect!");
size_t getFormatStride(CommonFormat format) size_t getFormatStride(CommonFormat format)
{ {
switch (format) switch (format)
src/modules/graphics/vertex.h
+1 -27
View File
@@ -212,11 +212,7 @@ struct Attributes
uint32 enablebits = 0; uint32 enablebits = 0;
uint32 instancebits = 0; uint32 instancebits = 0;
union AttributeInfo attribs[MAX];
{
AttributeInfo attribs[MAX];
uint64 data[MAX];
};
Attributes() {} Attributes() {}
Attributes(CommonFormat format, uint8 bufferindex) Attributes(CommonFormat format, uint8 bufferindex)
@@ -263,28 +259,6 @@ struct Attributes
} }
void setCommonFormat(CommonFormat format, uint8 bufferindex); void setCommonFormat(CommonFormat format, uint8 bufferindex);
bool operator == (const Attributes &other) const
{
if (enablebits != other.enablebits)
return false;
uint32 instancediff = instancebits ^ other.instancebits;
for (unsigned int i = 0; i < MAX; i++)
{
if (isEnabled(i))
{
if (instancediff & (1u << i))
return false;
if (data[i] != other.data[i])
return false;
}
}
return true;
}
}; };
size_t getFormatStride(CommonFormat format); size_t getFormatStride(CommonFormat format);