summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2020-10-03 02:24:22 +0200
committerReinUsesLisp <reinuseslisp@airmail.cc>2020-10-09 21:46:11 +0200
commite1600b0962c78302b05d4b98d75245b980a03831 (patch)
tree9bc2c41b51d84a016ce218040d650e1fa696d57f
parentMerge pull request #4771 from ReinUsesLisp/warn-unused-var (diff)
downloadyuzu-e1600b0962c78302b05d4b98d75245b980a03831.tar
yuzu-e1600b0962c78302b05d4b98d75245b980a03831.tar.gz
yuzu-e1600b0962c78302b05d4b98d75245b980a03831.tar.bz2
yuzu-e1600b0962c78302b05d4b98d75245b980a03831.tar.lz
yuzu-e1600b0962c78302b05d4b98d75245b980a03831.tar.xz
yuzu-e1600b0962c78302b05d4b98d75245b980a03831.tar.zst
yuzu-e1600b0962c78302b05d4b98d75245b980a03831.zip
-rw-r--r--src/video_core/CMakeLists.txt1
-rw-r--r--src/video_core/engines/shader_header.h13
2 files changed, 7 insertions, 7 deletions
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
index 2be455679..3df54816d 100644
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@@ -279,5 +279,6 @@ else()
-Werror=switch
-Werror=unused-variable
-Werror=unused-but-set-variable
+ -Werror=class-memaccess
)
endif()
diff --git a/src/video_core/engines/shader_header.h b/src/video_core/engines/shader_header.h
index 72e2a33d5..ceec05459 100644
--- a/src/video_core/engines/shader_header.h
+++ b/src/video_core/engines/shader_header.h
@@ -41,30 +41,30 @@ struct Header {
BitField<26, 1, u32> does_load_or_store;
BitField<27, 1, u32> does_fp64;
BitField<28, 4, u32> stream_out_mask;
- } common0{};
+ } common0;
union {
BitField<0, 24, u32> shader_local_memory_low_size;
BitField<24, 8, u32> per_patch_attribute_count;
- } common1{};
+ } common1;
union {
BitField<0, 24, u32> shader_local_memory_high_size;
BitField<24, 8, u32> threads_per_input_primitive;
- } common2{};
+ } common2;
union {
BitField<0, 24, u32> shader_local_memory_crs_size;
BitField<24, 4, OutputTopology> output_topology;
BitField<28, 4, u32> reserved;
- } common3{};
+ } common3;
union {
BitField<0, 12, u32> max_output_vertices;
BitField<12, 8, u32> store_req_start; // NOTE: not used by geometry shaders.
BitField<20, 4, u32> reserved;
BitField<24, 8, u32> store_req_end; // NOTE: not used by geometry shaders.
- } common4{};
+ } common4;
union {
struct {
@@ -145,7 +145,7 @@ struct Header {
}
} ps;
- std::array<u32, 0xF> raw{};
+ std::array<u32, 0xF> raw;
};
u64 GetLocalMemorySize() const {
@@ -153,7 +153,6 @@ struct Header {
(common2.shader_local_memory_high_size << 24));
}
};
-
static_assert(sizeof(Header) == 0x50, "Incorrect structure size");
} // namespace Tegra::Shader