Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 23:33:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

When rendering to PNG, draw to an FBO rather than default framebuffer.

Browse source 
This means that it doesn't matter if the window if partially placed
off screen when reftests run.

Fixes #3470.
This commit is contained in:
Glenn Watson 2014-09-25 10:24:23 +10:00
parent 95a4731c0e
commit 1edbe17db1
1 changed files with 32 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

41
components/compositing/compositor.rs
View file

@ -923,6 +923,31 @@ impl IOCompositor {
} }
fn composite(&mut self) { fn composite(&mut self) {
let output_image = self.opts.output_file.is_some() &&
self.is_ready_to_render_image_output();
let mut framebuffer_ids = vec!();
let mut texture_ids = vec!();
let (width, height) = (self.window_size.width.get(), self.window_size.height.get());
if output_image {
framebuffer_ids = gl2::gen_framebuffers(1);
gl2::bind_framebuffer(gl2::FRAMEBUFFER, framebuffer_ids[0]);
texture_ids = gl2::gen_textures(1);
gl2::bind_texture(gl2::TEXTURE_2D, texture_ids[0]);
gl2::tex_image_2d(gl2::TEXTURE_2D, 0, gl2::RGB as gl2::GLint, width as gl2::GLsizei,
height as gl2::GLsizei, 0, gl2::RGB, gl2::UNSIGNED_BYTE, None);
gl2::tex_parameter_i(gl2::TEXTURE_2D, gl2::TEXTURE_MAG_FILTER, gl2::NEAREST as gl2::GLint);
gl2::tex_parameter_i(gl2::TEXTURE_2D, gl2::TEXTURE_MIN_FILTER, gl2::NEAREST as gl2::GLint);
gl2::framebuffer_texture_2d(gl2::FRAMEBUFFER, gl2::COLOR_ATTACHMENT0, gl2::TEXTURE_2D,
texture_ids[0], 0);
gl2::bind_texture(gl2::TEXTURE_2D, 0);
}
profile(time::CompositingCategory, None, self.time_profiler_chan.clone(), || { profile(time::CompositingCategory, None, self.time_profiler_chan.clone(), || {
debug!("compositor: compositing"); debug!("compositor: compositing");
// Adjust the layer dimensions as necessary to correspond to the size of the window. // Adjust the layer dimensions as necessary to correspond to the size of the window.
@ -940,20 +965,18 @@ impl IOCompositor {
} }
}); });
if self.opts.output_file.is_some() { if output_image {
// If we aren't ready to produce image output, we will wait until the next composite.
if !self.is_ready_to_render_image_output() {
return;
}
// We must read from the back buffer (ie, before self.window.present()) as
// OpenGL ES 2 does not have glReadBuffer().
let (width, height) = (self.window_size.width.get(), self.window_size.height.get());
let path = from_str::<Path>(self.opts.output_file.as_ref().unwrap().as_slice()).unwrap(); let path = from_str::<Path>(self.opts.output_file.as_ref().unwrap().as_slice()).unwrap();
let mut pixels = gl2::read_pixels(0, 0, let mut pixels = gl2::read_pixels(0, 0,
width as gl2::GLsizei, width as gl2::GLsizei,
height as gl2::GLsizei, height as gl2::GLsizei,
gl2::RGB, gl2::UNSIGNED_BYTE); gl2::RGB, gl2::UNSIGNED_BYTE);
gl2::bind_framebuffer(gl2::FRAMEBUFFER, 0);
gl2::delete_buffers(texture_ids.as_slice());
gl2::delete_frame_buffers(framebuffer_ids.as_slice());
// flip image vertically (texture is upside down) // flip image vertically (texture is upside down)
let orig_pixels = pixels.clone(); let orig_pixels = pixels.clone();
let stride = width * 3; let stride = width * 3;