Skip to content

Commit c10f4f2

Browse files
christophe-lunargchristophe-lunarg
committed
Fixing github C.I.
1 parent e771488 commit c10f4f2

File tree

7 files changed

+132
-115
lines changed

7 files changed

+132
-115
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,25 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
os: [windows-latest, windows-2019]
17+
os: [windows-latest, windows-2022]
1818
toolkit: [v143, v142, v141, v140]
1919
std: [98, 11, 14, 17, 20]
2020
config: [Debug, Release]
2121
exclude:
22-
- os: windows-2019
22+
- os: windows-2022
2323
toolkit: v143
24-
- os: windows-2019
24+
- os: windows-2022
2525
toolkit: v142
2626
- os: windows-latest
2727
toolkit: v140
2828
- os: windows-latest
2929
toolkit: v141
30-
- os: windows-2019
30+
- os: windows-2022
3131
std: 20
32-
- os: windows-2019
32+
- os: windows-2022
3333
toolkit: v140
3434
std: 17
35-
- os: windows-2019
35+
- os: windows-2022
3636
toolkit: v140
3737
std: 14
3838

@@ -49,7 +49,10 @@ jobs:
4949
ls ${{ github.workspace }}
5050
- run: echo "🍏 This job's status is ${{ job.status }}."
5151
- name: CMake Version
52-
run: cmake --version
52+
uses: lukka/get-cmake@latest
53+
with:
54+
cmakeVersion: 3.22.1
55+
- run: cmake --version
5356

5457
- name: Run with automagic detection
5558
run: |
@@ -110,11 +113,11 @@ jobs:
110113
strategy:
111114
fail-fast: false
112115
matrix:
113-
os: [ubuntu-latest, ubuntu-20.04]
116+
os: [ubuntu-latest, ubuntu-22.04]
114117
std: [98, 11, 14, 17, 20]
115118
config: [Debug, Release]
116119
exclude:
117-
- os: ubuntu-20.04
120+
- os: ubuntu-22.04
118121
std: 20
119122
- os: ubuntu-latest
120123
std: 98
@@ -132,7 +135,10 @@ jobs:
132135
ls ${{ github.workspace }}
133136
- run: echo "🍏 This job's status is ${{ job.status }}."
134137
- name: CMake Version
135-
run: cmake --version
138+
uses: lukka/get-cmake@latest
139+
with:
140+
cmakeVersion: 3.22.1
141+
- run: cmake --version
136142
- name: Run with automagic detection
137143
run: |
138144
cmake -S. -B ./build_auto -DGLM_BUILD_TESTS=ON
@@ -205,7 +211,10 @@ jobs:
205211
ls ${{ github.workspace }}
206212
- run: echo "🍏 This job's status is ${{ job.status }}."
207213
- name: CMake Version
208-
run: cmake --version
214+
uses: lukka/get-cmake@latest
215+
with:
216+
cmakeVersion: 3.22.1
217+
- run: cmake --version
209218
- name: Run with automagic detection
210219
run: |
211220
cmake -S. -B ./build_auto -DGLM_BUILD_TESTS=ON
@@ -267,7 +276,10 @@ jobs:
267276
ls ${{ github.workspace }}
268277
- run: echo "🍏 This job's status is ${{ job.status }}."
269278
- name: CMake Version
270-
run: cmake --version
279+
uses: lukka/get-cmake@latest
280+
with:
281+
cmakeVersion: 3.22.1
282+
- run: cmake --version
271283
- name: Run with automagic detection
272284
run: |
273285
cmake -S. -B ./build_auto -DGLM_BUILD_TESTS=ON

‎CMakeLists.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ if(GLM_ENABLE_CXX_20)
4242
message(STATUS "GLM: Disable -Wc++98-compat warnings")
4343
add_compile_options(-Wno-c++98-compat)
4444
add_compile_options(-Wno-c++98-compat-pedantic)
45+
add_compile_options(-Wno-switch-default)
4546
endif()
4647
if(NOT GLM_QUIET)
4748
message(STATUS "GLM: Build with C++20 features")
@@ -54,6 +55,7 @@ elseif(GLM_ENABLE_CXX_17)
5455
message(STATUS "GLM: Disable -Wc++98-compat warnings")
5556
add_compile_options(-Wno-c++98-compat)
5657
add_compile_options(-Wno-c++98-compat-pedantic)
58+
add_compile_options(-Wno-switch-default)
5759
endif()
5860
if(NOT GLM_QUIET)
5961
message(STATUS "GLM: Build with C++17 features")
@@ -66,6 +68,7 @@ elseif(GLM_ENABLE_CXX_14)
6668
message(STATUS "GLM: Disable -Wc++98-compat warnings")
6769
add_compile_options(-Wno-c++98-compat)
6870
add_compile_options(-Wno-c++98-compat-pedantic)
71+
add_compile_options(-Wno-switch-default)
6972
endif()
7073
if(NOT GLM_QUIET)
7174
message(STATUS "GLM: Build with C++14 features")
@@ -78,6 +81,7 @@ elseif(GLM_ENABLE_CXX_11)
7881
message(STATUS "GLM: Disable -Wc++98-compat warnings")
7982
add_compile_options(-Wno-c++98-compat)
8083
add_compile_options(-Wno-c++98-compat-pedantic)
84+
add_compile_options(-Wno-switch-default)
8185
endif()
8286
if(NOT GLM_QUIET)
8387
message(STATUS "GLM: Build with C++11 features")
@@ -86,6 +90,9 @@ elseif(GLM_ENABLE_CXX_11)
8690
elseif(GLM_ENABLE_CXX_98)
8791
set(CMAKE_CXX_STANDARD 98)
8892
add_definitions(-DGLM_FORCE_CXX98)
93+
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
94+
add_compile_options(-Wno-switch-default)
95+
endif()
8996
if(NOT GLM_QUIET)
9097
message(STATUS "GLM: Build with C++98 features")
9198
endif()
@@ -95,6 +102,7 @@ else()
95102
message(STATUS "GLM: Disable -Wc++98-compat warnings")
96103
add_compile_options(-Wno-c++98-compat)
97104
add_compile_options(-Wno-c++98-compat-pedantic)
105+
add_compile_options(-Wno-switch-default)
98106
endif()
99107
if(NOT GLM_QUIET)
100108
message(STATUS "GLM: Build with C++ features auto detection")

‎glm/detail/func_common_simd.inl‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -545,71 +545,71 @@ namespace detail
545545

546546
#if GLM_ARCH & GLM_ARCH_NEON_BIT
547547
namespace glm {
548-
namespace detail {
549-
550-
template<qualifier Q>
551-
struct convert_vec3_to_vec4W0<float, Q, true>
548+
namespace detail {
549+
template<qualifier Q>
550+
struct convert_vec3_to_vec4W0<float, Q, true>
551+
{
552+
GLM_FUNC_QUALIFIER static vec<4, float, Q> call(vec<3, float, Q> const& a)
552553
{
553-
GLM_FUNC_QUALIFIER static vec<4, float, Q> call(vec<3, float, Q> const& a)
554-
{
555-
vec<4, float, Q> v;
556-
static const uint32x4_t mask = { 0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF };
557-
v.data = vbslq_f32(mask, a.data, vdupq_n_f32(0));
558-
return v;
559-
}
560-
};
554+
vec<4, float, Q> v;
555+
static const uint32x4_t mask = { 0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF };
556+
v.data = vbslq_f32(mask, a.data, vdupq_n_f32(0));
557+
return v;
558+
}
559+
};
561560

562-
template<qualifier Q>
563-
struct convert_vec4_to_vec3<float, Q, true> {
564-
GLM_FUNC_QUALIFIER static vec<3, float, Q> call(vec<4, float, Q> const& a)
565-
{
566-
vec<3, float, Q> v;
567-
v.data = a.data;
568-
return v;
569-
}
570-
};
561+
template<qualifier Q>
562+
struct convert_vec4_to_vec3<float, Q, true> {
563+
GLM_FUNC_QUALIFIER static vec<3, float, Q> call(vec<4, float, Q> const& a)
564+
{
565+
vec<3, float, Q> v;
566+
v.data = a.data;
567+
return v;
568+
}
569+
};
571570

572-
template<length_t L, qualifier Q>
573-
struct compute_splat<L, float, Q, true> {
574-
template<int c>
575-
GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<L, float, Q> call(vec<L, float, Q> const& a)
576-
{
577-
(void)a;
578-
}
571+
/* compute_splat is never called?
572+
template<length_t L, qualifier Q>
573+
struct compute_splat<L, float, Q, true> {
574+
template<int c>
575+
GLM_FUNC_QUALIFIER static vec<L, float, Q> call(vec<L, float, Q> const& a)
576+
{
577+
(void)a;
578+
}
579579
580-
template<>
581-
GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<L, float, Q> call<0>(vec<L, float, Q> const& a)
582-
{
583-
vec<L, float, Q> Result;
584-
Result.data = vdupq_lane_f32(vget_low_f32(a.data), 0);
585-
return Result;
586-
}
580+
template<>
581+
GLM_FUNC_QUALIFIER static vec<L, float, Q> call<0>(vec<L, float, Q> const& a)
582+
{
583+
vec<L, float, Q> Result;
584+
Result.data = vdupq_lane_f32(vget_low_f32(a.data), 0);
585+
return Result;
586+
}
587587
588-
template<>
589-
GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<L, float, Q> call<1>(vec<L, float, Q> const& a)
590-
{
591-
vec<L, float, Q> Result;
592-
Result.data = vdupq_lane_f32(vget_low_f32(a.data), 1);
593-
return Result;
594-
}
588+
template<>
589+
GLM_FUNC_QUALIFIER static vec<L, float, Q> call<1>(vec<L, float, Q> const& a)
590+
{
591+
vec<L, float, Q> Result;
592+
Result.data = vdupq_lane_f32(vget_low_f32(a.data), 1);
593+
return Result;
594+
}
595595
596-
template<>
597-
GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<L, float, Q> call<2>(vec<L, float, Q> const& a)
598-
{
599-
vec<L, float, Q> Result;
600-
Result.data = vdupq_lane_f32(vget_high_f32(a.data), 0);
601-
return Result;
602-
}
596+
template<>
597+
GLM_FUNC_QUALIFIER static vec<L, float, Q> call<2>(vec<L, float, Q> const& a)
598+
{
599+
vec<L, float, Q> Result;
600+
Result.data = vdupq_lane_f32(vget_high_f32(a.data), 0);
601+
return Result;
602+
}
603603
604-
template<>
605-
GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<L, float, Q> call<3>(vec<L, float, Q> const& a)
606-
{
607-
vec<L, float, Q> Result;
608-
Result.data = vdupq_lane_f32(vget_high_f32(a.data), 1);
609-
return Result;
610-
}
604+
template<>
605+
GLM_FUNC_QUALIFIER static vec<L, float, Q> call<3>(vec<L, float, Q> const& a)
606+
{
607+
vec<L, float, Q> Result;
608+
Result.data = vdupq_lane_f32(vget_high_f32(a.data), 1);
609+
return Result;
610+
}
611611
};
612-
612+
*/
613613
}//namespace detail
614614
}//namespace glm
615615
#endif //GLM_ARCH & GLM_ARCH_NEON_BIT

‎glm/gtx/io.inl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,7 @@ namespace detail
394394

395395
switch(fmt.order)
396396
{
397+
default:
397398
case io::column_major:
398399
{
399400
for(length_t i(0); i < rows; ++i)

0 commit comments

Comments
 (0)