@@ -217,11 +217,19 @@ impl Resources {
217
217
make_texture_from_png ( & ctx, "images/cardBack_green.png" ) ,
218
218
] ;
219
219
220
+ let vertex_buffer = unsafe {
221
+ let mut buffer = 0 ;
222
+
223
+ ctx. GenBuffers ( 1 , & mut buffer as _ ) ;
224
+
225
+ buffer
226
+ } ;
227
+
220
228
let mut result = Resources {
221
229
ctx,
222
230
vert_ranges : [ ( 0 , 0 ) ; 16 ] ,
223
231
vert_ranges_len : 0 ,
224
- vertex_buffer : 0 ,
232
+ vertex_buffer,
225
233
colour_shader,
226
234
texture_shader,
227
235
textures,
@@ -236,19 +244,14 @@ impl Resources {
236
244
237
245
let ( verts, vert_ranges, vert_ranges_len) = get_verts_and_ranges ( vert_vecs) ;
238
246
239
- let vertex_buffer = unsafe {
240
- let mut buffer = 0 ;
241
-
242
- self . ctx . GenBuffers ( 1 , & mut buffer as _ ) ;
243
- self . ctx . BindBuffer ( gl:: ARRAY_BUFFER , buffer) ;
247
+ unsafe {
248
+ self . ctx . BindBuffer ( gl:: ARRAY_BUFFER , self . vertex_buffer ) ;
244
249
self . ctx . BufferData (
245
250
gl:: ARRAY_BUFFER ,
246
251
( verts. len ( ) * std:: mem:: size_of :: < f32 > ( ) ) as _ ,
247
252
std:: mem:: transmute ( verts. as_ptr ( ) ) ,
248
253
gl:: DYNAMIC_DRAW ,
249
254
) ;
250
-
251
- buffer
252
255
} ;
253
256
254
257
//TODO (assuming we don't end up manipulating this at all)
@@ -274,7 +277,6 @@ impl Resources {
274
277
275
278
self . vert_ranges = vert_ranges;
276
279
self . vert_ranges_len = vert_ranges_len;
277
- self . vertex_buffer = vertex_buffer;
278
280
}
279
281
}
280
282
0 commit comments