Skip to content

Commit 668dabb

Browse files
brendanzabbrendanzab
committed
Reduce duplicate parsing of registry in no_warnings test
1 parent 6ac7277 commit 668dabb

File tree

1 file changed

+44
-60
lines changed

1 file changed

+44
-60
lines changed

‎gl_tests/test_no_warnings/build.rs

Lines changed: 44 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
extern crate gl_generator;
1616

1717
use gl_generator::*;
18+
use gl_generator::generators::Generator;
19+
use gl_generator::registry::Registry;
1820
use std::env;
1921
use std::fs::File;
2022
use std::io::prelude::*;
@@ -26,164 +28,146 @@ fn main() {
2628

2729
// Gl
2830

31+
let gl_registry = Registry::new(Api::Gl, Fallbacks::All, vec![], "4.5", Profile::Core);
32+
2933
writeln!(&mut file, "mod gl_global {{").unwrap();
30-
gl_generator::generate_bindings(GlobalGenerator, Api::Gl, Fallbacks::All,
31-
vec![], "4.5", Profile::Core, &mut file).unwrap();
34+
GlobalGenerator.write(&gl_registry, &mut file).unwrap();
3235
writeln!(&mut file, "}}").unwrap();
3336

3437
writeln!(&mut file, "mod gl_static {{").unwrap();
35-
gl_generator::generate_bindings(StaticGenerator, Api::Gl, Fallbacks::All,
36-
vec![], "4.5", Profile::Core, &mut file).unwrap();
38+
StaticGenerator.write(&gl_registry, &mut file).unwrap();
3739
writeln!(&mut file, "}}").unwrap();
3840

3941
writeln!(&mut file, "mod gl_struct {{").unwrap();
40-
gl_generator::generate_bindings(StructGenerator, Api::Gl, Fallbacks::All,
41-
vec![], "4.5", Profile::Core, &mut file).unwrap();
42+
StructGenerator.write(&gl_registry, &mut file).unwrap();
4243
writeln!(&mut file, "}}").unwrap();
4344

4445
writeln!(&mut file, "mod gl_static_struct {{").unwrap();
45-
gl_generator::generate_bindings(StaticStructGenerator, Api::Gl, Fallbacks::All,
46-
vec![], "4.5", Profile::Core, &mut file).unwrap();
46+
StaticStructGenerator.write(&gl_registry, &mut file).unwrap();
4747
writeln!(&mut file, "}}").unwrap();
4848

4949
writeln!(&mut file, "mod gl_debug_struct {{").unwrap();
50-
gl_generator::generate_bindings(DebugStructGenerator, Api::Gl, Fallbacks::All,
51-
vec![], "4.5", Profile::Core, &mut file).unwrap();
50+
DebugStructGenerator.write(&gl_registry, &mut file).unwrap();
5251
writeln!(&mut file, "}}").unwrap();
5352

5453
// Glx
5554

55+
let glx_registry = Registry::new(Api::Glx, Fallbacks::All, vec![], "1.4", Profile::Core);
56+
5657
writeln!(&mut file, "mod glx_global {{").unwrap();
57-
gl_generator::generate_bindings(GlobalGenerator, Api::Glx, Fallbacks::All,
58-
vec![], "1.4", Profile::Core, &mut file).unwrap();
58+
GlobalGenerator.write(&glx_registry, &mut file).unwrap();
5959
writeln!(&mut file, "}}").unwrap();
6060

6161
writeln!(&mut file, "mod glx_static {{").unwrap();
62-
gl_generator::generate_bindings(StaticGenerator, Api::Glx, Fallbacks::All,
63-
vec![], "1.4", Profile::Core, &mut file).unwrap();
62+
StaticGenerator.write(&glx_registry, &mut file).unwrap();
6463
writeln!(&mut file, "}}").unwrap();
6564

6665
writeln!(&mut file, "mod glx_struct {{").unwrap();
67-
gl_generator::generate_bindings(StructGenerator, Api::Glx, Fallbacks::All,
68-
vec![], "1.4", Profile::Core, &mut file).unwrap();
66+
StructGenerator.write(&glx_registry, &mut file).unwrap();
6967
writeln!(&mut file, "}}").unwrap();
7068

7169
writeln!(&mut file, "mod glx_static_struct {{").unwrap();
72-
gl_generator::generate_bindings(StaticStructGenerator, Api::Glx, Fallbacks::All,
73-
vec![], "1.4", Profile::Core, &mut file).unwrap();
70+
StaticStructGenerator.write(&glx_registry, &mut file).unwrap();
7471
writeln!(&mut file, "}}").unwrap();
7572

7673
writeln!(&mut file, "mod glx_debug_struct {{").unwrap();
77-
gl_generator::generate_bindings(DebugStructGenerator, Api::Glx, Fallbacks::All,
78-
vec![], "1.4", Profile::Core, &mut file).unwrap();
74+
DebugStructGenerator.write(&glx_registry, &mut file).unwrap();
7975
writeln!(&mut file, "}}").unwrap();
8076

8177
// Wgl
8278

79+
let wgl_registry = Registry::new(Api::Wgl, Fallbacks::All, vec![], "1.0", Profile::Core);
80+
8381
writeln!(&mut file, "mod wgl_global {{").unwrap();
84-
gl_generator::generate_bindings(GlobalGenerator, Api::Wgl, Fallbacks::All,
85-
vec![], "1.0", Profile::Core, &mut file).unwrap();
82+
GlobalGenerator.write(&wgl_registry, &mut file).unwrap();
8683
writeln!(&mut file, "}}").unwrap();
8784

8885
writeln!(&mut file, "mod wgl_static {{").unwrap();
89-
gl_generator::generate_bindings(StaticGenerator, Api::Wgl, Fallbacks::All,
90-
vec![], "1.0", Profile::Core, &mut file).unwrap();
86+
StaticGenerator.write(&wgl_registry, &mut file).unwrap();
9187
writeln!(&mut file, "}}").unwrap();
9288

9389
writeln!(&mut file, "mod wgl_struct {{").unwrap();
94-
gl_generator::generate_bindings(StructGenerator, Api::Wgl, Fallbacks::All,
95-
vec![], "1.0", Profile::Core, &mut file).unwrap();
90+
StructGenerator.write(&wgl_registry, &mut file).unwrap();
9691
writeln!(&mut file, "}}").unwrap();
9792

9893
writeln!(&mut file, "mod wgl_static_struct {{").unwrap();
99-
gl_generator::generate_bindings(StaticStructGenerator, Api::Wgl, Fallbacks::All,
100-
vec![], "1.0", Profile::Core, &mut file).unwrap();
94+
StaticStructGenerator.write(&wgl_registry, &mut file).unwrap();
10195
writeln!(&mut file, "}}").unwrap();
10296

10397
writeln!(&mut file, "mod wgl_debug_struct {{").unwrap();
104-
gl_generator::generate_bindings(DebugStructGenerator, Api::Wgl, Fallbacks::All,
105-
vec![], "1.0", Profile::Core, &mut file).unwrap();
98+
DebugStructGenerator.write(&wgl_registry, &mut file).unwrap();
10699
writeln!(&mut file, "}}").unwrap();
107100

108101
// Gles1
109102

103+
let gles1_registry = Registry::new(Api::Gles1, Fallbacks::All, vec![], "1.1", Profile::Core);
104+
110105
writeln!(&mut file, "mod gles1_global {{").unwrap();
111-
gl_generator::generate_bindings(GlobalGenerator, Api::Gles1, Fallbacks::All,
112-
vec![], "1.1", Profile::Core, &mut file).unwrap();
106+
GlobalGenerator.write(&gles1_registry, &mut file).unwrap();
113107
writeln!(&mut file, "}}").unwrap();
114108

115109
writeln!(&mut file, "mod gles1_static {{").unwrap();
116-
gl_generator::generate_bindings(StaticGenerator, Api::Gles1, Fallbacks::All,
117-
vec![], "1.1", Profile::Core, &mut file).unwrap();
110+
StaticGenerator.write(&gles1_registry, &mut file).unwrap();
118111
writeln!(&mut file, "}}").unwrap();
119112

120113
writeln!(&mut file, "mod gles1_struct {{").unwrap();
121-
gl_generator::generate_bindings(StructGenerator, Api::Gles1, Fallbacks::All,
122-
vec![], "1.1", Profile::Core, &mut file).unwrap();
114+
StructGenerator.write(&gles1_registry, &mut file).unwrap();
123115
writeln!(&mut file, "}}").unwrap();
124116

125117
writeln!(&mut file, "mod gles1_static_struct {{").unwrap();
126-
gl_generator::generate_bindings(StaticStructGenerator, Api::Gles1, Fallbacks::All,
127-
vec![], "1.1", Profile::Core, &mut file).unwrap();
118+
StaticStructGenerator.write(&gles1_registry, &mut file).unwrap();
128119
writeln!(&mut file, "}}").unwrap();
129120

130121
writeln!(&mut file, "mod gles1_debug_struct {{").unwrap();
131-
gl_generator::generate_bindings(DebugStructGenerator, Api::Gles1, Fallbacks::All,
132-
vec![], "1.1", Profile::Core, &mut file).unwrap();
122+
DebugStructGenerator.write(&gles1_registry, &mut file).unwrap();
133123
writeln!(&mut file, "}}").unwrap();
134124

135125
// Gles2
136126

127+
let gles2_registry = Registry::new(Api::Gles2, Fallbacks::All, vec![], "3.1", Profile::Core);
128+
137129
writeln!(&mut file, "mod gles2_global {{").unwrap();
138-
gl_generator::generate_bindings(GlobalGenerator, Api::Gles2, Fallbacks::All,
139-
vec![], "3.1", Profile::Core, &mut file).unwrap();
130+
GlobalGenerator.write(&gles2_registry, &mut file).unwrap();
140131
writeln!(&mut file, "}}").unwrap();
141132

142133
writeln!(&mut file, "mod gles2_static {{").unwrap();
143-
gl_generator::generate_bindings(StaticGenerator, Api::Gles2, Fallbacks::All,
144-
vec![], "3.1", Profile::Core, &mut file).unwrap();
134+
StaticGenerator.write(&gles2_registry, &mut file).unwrap();
145135
writeln!(&mut file, "}}").unwrap();
146136

147137
writeln!(&mut file, "mod gles2_struct {{").unwrap();
148-
gl_generator::generate_bindings(StructGenerator, Api::Gles2, Fallbacks::All,
149-
vec![], "3.1", Profile::Core, &mut file).unwrap();
138+
StructGenerator.write(&gles2_registry, &mut file).unwrap();
150139
writeln!(&mut file, "}}").unwrap();
151140

152141
writeln!(&mut file, "mod gles2_static_struct {{").unwrap();
153-
gl_generator::generate_bindings(StaticStructGenerator, Api::Gles2, Fallbacks::All,
154-
vec![], "3.1", Profile::Core, &mut file).unwrap();
142+
StaticStructGenerator.write(&gles2_registry, &mut file).unwrap();
155143
writeln!(&mut file, "}}").unwrap();
156144

157145
writeln!(&mut file, "mod gles2_debug_struct {{").unwrap();
158-
gl_generator::generate_bindings(DebugStructGenerator, Api::Gles2, Fallbacks::All,
159-
vec![], "3.1", Profile::Core, &mut file).unwrap();
146+
DebugStructGenerator.write(&gles2_registry, &mut file).unwrap();
160147
writeln!(&mut file, "}}").unwrap();
161148

162149
// Egl
163150

151+
let egl_registry = Registry::new(Api::Egl, Fallbacks::All, vec![], "1.5", Profile::Core);
152+
164153
writeln!(&mut file, "mod egl_global {{ {}", build_egl_symbols()).unwrap();
165-
gl_generator::generate_bindings(GlobalGenerator, Api::Egl, Fallbacks::All,
166-
vec![], "1.5", Profile::Core, &mut file).unwrap();
154+
GlobalGenerator.write(&egl_registry, &mut file).unwrap();
167155
writeln!(&mut file, "}}").unwrap();
168156

169157
writeln!(&mut file, "mod egl_static {{ {}", build_egl_symbols()).unwrap();
170-
gl_generator::generate_bindings(StaticGenerator, Api::Egl, Fallbacks::All,
171-
vec![], "1.5", Profile::Core, &mut file).unwrap();
158+
StaticGenerator.write(&egl_registry, &mut file).unwrap();
172159
writeln!(&mut file, "}}").unwrap();
173160

174161
writeln!(&mut file, "mod egl_struct {{ {}", build_egl_symbols()).unwrap();
175-
gl_generator::generate_bindings(StructGenerator, Api::Egl, Fallbacks::All,
176-
vec![], "1.5", Profile::Core, &mut file).unwrap();
162+
StructGenerator.write(&egl_registry, &mut file).unwrap();
177163
writeln!(&mut file, "}}").unwrap();
178164

179165
writeln!(&mut file, "mod egl_static_struct {{ {}", build_egl_symbols()).unwrap();
180-
gl_generator::generate_bindings(StaticStructGenerator, Api::Egl, Fallbacks::All,
181-
vec![], "1.5", Profile::Core, &mut file).unwrap();
166+
StaticStructGenerator.write(&egl_registry, &mut file).unwrap();
182167
writeln!(&mut file, "}}").unwrap();
183168

184169
writeln!(&mut file, "mod egl_debug_struct {{ {}", build_egl_symbols()).unwrap();
185-
gl_generator::generate_bindings(DebugStructGenerator, Api::Egl, Fallbacks::All,
186-
vec![], "1.5", Profile::Core, &mut file).unwrap();
170+
DebugStructGenerator.write(&egl_registry, &mut file).unwrap();
187171
writeln!(&mut file, "}}").unwrap();
188172
}
189173

0 commit comments

Comments
 (0)