mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed warnings

Browse Source
This commit is contained in:
Christophe Riccio
2017-08-08 23:19:16 +02:00
parent f445a24f82
commit 2cc0c53da7
7 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/core/core_func_common.cpp
View File

@@ -332,7 +332,7 @@ namespace mix_
T Result;
};
entry<float, bool> TestBool[] =
entry<float, bool> const TestBool[] =
{
{0.0f, 1.0f, false, 0.0f},
{0.0f, 1.0f, true, 1.0f},
@@ -340,7 +340,7 @@ namespace mix_
{-1.0f, 1.0f, true, 1.0f}
};
entry<float, float> TestFloat[] =
entry<float, float> const TestFloat[] =
{
{0.0f, 1.0f, 0.0f, 0.0f},
{0.0f, 1.0f, 1.0f, 1.0f},
@@ -348,7 +348,7 @@ namespace mix_
{-1.0f, 1.0f, 1.0f, 1.0f}
};
entry<glm::vec2, bool> TestVec2Bool[] =
entry<glm::vec2, bool> const TestVec2Bool[] =
{
{glm::vec2(0.0f), glm::vec2(1.0f), false, glm::vec2(0.0f)},
{glm::vec2(0.0f), glm::vec2(1.0f), true, glm::vec2(1.0f)},
@@ -356,7 +356,7 @@ namespace mix_
{glm::vec2(-1.0f), glm::vec2(1.0f), true, glm::vec2(1.0f)}
};
entry<glm::vec2, glm::bvec2> TestBVec2[] =
entry<glm::vec2, glm::bvec2> const TestBVec2[] =
{
{glm::vec2(0.0f), glm::vec2(1.0f), glm::bvec2(false), glm::vec2(0.0f)},
{glm::vec2(0.0f), glm::vec2(1.0f), glm::bvec2(true), glm::vec2(1.0f)},
@@ -365,7 +365,7 @@ namespace mix_
{glm::vec2(-1.0f), glm::vec2(1.0f), glm::bvec2(true, false), glm::vec2(1.0f, -1.0f)}
};
entry<glm::vec3, bool> TestVec3Bool[] =
entry<glm::vec3, bool> const TestVec3Bool[] =
{
{glm::vec3(0.0f), glm::vec3(1.0f), false, glm::vec3(0.0f)},
{glm::vec3(0.0f), glm::vec3(1.0f), true, glm::vec3(1.0f)},
@@ -373,7 +373,7 @@ namespace mix_
{glm::vec3(-1.0f), glm::vec3(1.0f), true, glm::vec3(1.0f)}
};
entry<glm::vec3, glm::bvec3> TestBVec3[] =
entry<glm::vec3, glm::bvec3> const TestBVec3[] =
{
{glm::vec3(0.0f), glm::vec3(1.0f), glm::bvec3(false), glm::vec3(0.0f)},
{glm::vec3(0.0f), glm::vec3(1.0f), glm::bvec3(true), glm::vec3(1.0f)},
@@ -382,7 +382,7 @@ namespace mix_
{glm::vec3(1.0f, 2.0f, 3.0f), glm::vec3(4.0f, 5.0f, 6.0f), glm::bvec3(true, false, true), glm::vec3(4.0f, 2.0f, 6.0f)}
};
entry<glm::vec4, bool> TestVec4Bool[] =
entry<glm::vec4, bool> const TestVec4Bool[] =
{
{glm::vec4(0.0f), glm::vec4(1.0f), false, glm::vec4(0.0f)},
{glm::vec4(0.0f), glm::vec4(1.0f), true, glm::vec4(1.0f)},
@@ -390,7 +390,7 @@ namespace mix_
{glm::vec4(-1.0f), glm::vec4(1.0f), true, glm::vec4(1.0f)}
};
entry<glm::vec4, glm::bvec4> TestBVec4[] =
entry<glm::vec4, glm::bvec4> const TestBVec4[] =
{
{glm::vec4(0.0f, 0.0f, 1.0f, 1.0f), glm::vec4(2.0f, 2.0f, 3.0f, 3.0f), glm::bvec4(false, true, false, true), glm::vec4(0.0f, 2.0f, 1.0f, 3.0f)},
{glm::vec4(0.0f), glm::vec4(1.0f), glm::bvec4(true), glm::vec4(1.0f)},

2
test/gtc/gtc_packing.cpp
View File

@@ -153,7 +153,7 @@ int test_U3x10_1x2()
}
glm::u8vec4 const v0(0xff, 0x77, 0x0, 0x33);
glm::uint32 const p0 = *(glm::uint32*)(&v0[0]);
glm::uint32 const p0 = *reinterpret_cast<glm::uint32 const*>(&v0[0]);
glm::uint32 const r0 = 0x330077ff;
Error += p0 == r0 ? 0 : 1;