1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
|
From e5e3702bdda5bdf477b2fe389f5a7f9039593bc7 Mon Sep 17 00:00:00 2001
From: Lubosz Sarnecki <lubosz@gmail.com>
Date: Tue, 22 Dec 2020 10:44:43 +0100
Subject: [PATCH 1/4] Mode: Add default cases.
Fixes a ton of warnings on gcc 10.2.0 like:
```
warning: control reaches end of non-void function [-Wreturn-type]
```
Also sorts switches and merges non-default cases.
---
src/Mode.h | 70 ++++++++++++++++--------------------------------------
1 file changed, 21 insertions(+), 49 deletions(-)
diff --git a/src/Mode.h b/src/Mode.h
index 63d0e34..c89d1b5 100644
--- a/src/Mode.h
+++ b/src/Mode.h
@@ -64,30 +64,28 @@ inline std::string mode(Mode mode) {
return std::string("pce");
case Mode::pce_sprite:
return std::string("pce_sprite");
- case Mode::none:
+ default:
return std::string("none");
}
}
constexpr unsigned default_bpp_for_mode(Mode mode) {
switch (mode) {
- case Mode::snes:
- return 4;
- case Mode::snes_mode7:
- return 8;
case Mode::gb:
case Mode::gbc:
return 2;
+ case Mode::snes:
case Mode::gba:
- return 4;
- case Mode::gba_affine:
- return 8;
case Mode::md:
case Mode::pce:
case Mode::pce_sprite:
- return 4;
case Mode::none:
return 4;
+ case Mode::snes_mode7:
+ case Mode::gba_affine:
+ return 8;
+ default:
+ return 4;
}
}
@@ -124,24 +122,19 @@ constexpr unsigned default_tile_size_for_mode(Mode mode) {
constexpr unsigned max_tile_count_for_mode(Mode mode) {
switch (mode) {
- case Mode::snes:
- return 1024;
case Mode::snes_mode7:
- return 256;
case Mode::gb:
+ case Mode::gba_affine:
return 256;
case Mode::gbc:
return 512;
+ case Mode::snes:
case Mode::gba:
return 1024;
- case Mode::gba_affine:
- return 256;
case Mode::md:
case Mode::pce:
return 2048;
- case Mode::pce_sprite:
- return 0;
- case Mode::none:
+ default:
return 0;
}
}
@@ -160,7 +153,7 @@ constexpr bool tile_width_allowed_for_mode(unsigned width, Mode mode) {
return width == 8;
case Mode::pce_sprite:
return width == 16;
- case Mode::none:
+ default:
return false;
}
}
@@ -179,7 +172,7 @@ constexpr bool tile_height_allowed_for_mode(unsigned height, Mode mode) {
return height == 8;
case Mode::pce_sprite:
return height == 16;
- case Mode::none:
+ default:
return false;
}
}
@@ -191,13 +184,7 @@ constexpr bool tile_flipping_allowed_for_mode(Mode mode) {
case Mode::gba:
case Mode::md:
return true;
- case Mode::snes_mode7:
- case Mode::gb:
- case Mode::gba_affine:
- case Mode::pce:
- case Mode::pce_sprite:
- return false;
- case Mode::none:
+ default:
return false;
}
}
@@ -214,52 +201,37 @@ constexpr unsigned default_map_size_for_mode(Mode mode) {
return 32;
case Mode::snes_mode7:
return 128;
- case Mode::pce_sprite:
- return 0;
- case Mode::none:
+ default:
return 0;
}
}
constexpr unsigned default_palette_count_for_mode(Mode mode) {
switch (mode) {
- case Mode::snes:
- return 8;
case Mode::snes_mode7:
- return 1;
case Mode::gb:
- return 1;
- case Mode::gbc:
- return 8;
- case Mode::gba:
- return 16;
case Mode::gba_affine:
return 1;
case Mode::md:
return 4;
+ case Mode::snes:
+ case Mode::gbc:
+ return 8;
+ case Mode::gba:
case Mode::pce:
case Mode::pce_sprite:
return 16;
- case Mode::none:
+ default:
return 0;
}
}
constexpr bool col0_is_shared_for_mode(Mode mode) {
switch (mode) {
- case Mode::snes:
- case Mode::snes_mode7:
- case Mode::gba:
- case Mode::gba_affine:
- case Mode::md:
- case Mode::pce_sprite:
- return true;
case Mode::gb:
case Mode::gbc:
return false;
- case Mode::pce:
- return true;
- case Mode::none:
+ default:
return true;
}
}
@@ -276,7 +248,7 @@ constexpr bool col0_is_shared_for_sprite_mode(Mode mode) {
case Mode::pce:
case Mode::pce_sprite:
return true;
- case Mode::none:
+ default:
return false;
}
}
--
2.29.2
|