Skip to content

Commit

Permalink
Add a test to make sure we don't render upside-down
Browse files Browse the repository at this point in the history
  • Loading branch information
@pcwalton
pcwalton committed Dec 9, 2019
1 parent 9b17328 commit 2b9cc49
Showing 1 changed file with 95 additions and 20 deletions.
115 changes: 95 additions & 20 deletions surfman/src/tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ fn test_gl() {
// Check basic clear.
env.gl.ClearColor(0.0, 1.0, 0.0, 1.0);
env.gl.Clear(gl::COLOR_BUFFER_BIT);
assert_eq!(get_pixel(&env.gl), [0, 255, 0, 255]);
assert_eq!(get_pixel_from_bottom_row(&env.gl), [0, 255, 0, 255]);

// Check that GL commands don't work after `make_no_context_current()`.
//
Expand All @@ -219,7 +219,7 @@ fn test_gl() {
.unwrap()
.framebuffer_object;
env.gl.BindFramebuffer(gl::FRAMEBUFFER, framebuffer_object);
assert_eq!(get_pixel(&env.gl), [0, 255, 0, 255]);
assert_eq!(get_pixel_from_bottom_row(&env.gl), [0, 255, 0, 255]);

// Make sure GL commands don't work when no surface is attached.
//
Expand All @@ -233,7 +233,7 @@ fn test_gl() {
env.gl.Clear(gl::COLOR_BUFFER_BIT); env.gl.GetError();
env.device.bind_surface_to_context(&mut env.context, green_surface).unwrap();
env.gl.BindFramebuffer(gl::FRAMEBUFFER, framebuffer_object);
assert_eq!(get_pixel(&env.gl), [0, 255, 0, 255]);
assert_eq!(get_pixel_from_bottom_row(&env.gl), [0, 255, 0, 255]);

// Make sure GL commands go to the right surface.
let green_surface = env.device
Expand All @@ -250,15 +250,15 @@ fn test_gl() {
env.gl.BindFramebuffer(gl::FRAMEBUFFER, red_framebuffer_object);
env.gl.ClearColor(1.0, 0.0, 0.0, 1.0);
env.gl.Clear(gl::COLOR_BUFFER_BIT);
assert_eq!(get_pixel(&env.gl), [255, 0, 0, 255]);
assert_eq!(get_pixel_from_bottom_row(&env.gl), [255, 0, 0, 255]);

let mut red_surface = env.device
.unbind_surface_from_context(&mut env.context)
.unwrap()
.unwrap();
env.device.bind_surface_to_context(&mut env.context, green_surface).unwrap();
env.gl.BindFramebuffer(gl::FRAMEBUFFER, framebuffer_object);
assert_eq!(get_pixel(&env.gl), [0, 255, 0, 255]);
assert_eq!(get_pixel_from_bottom_row(&env.gl), [0, 255, 0, 255]);

// Clean up.
env.device.destroy_surface(&mut env.context, &mut red_surface).unwrap();
Expand All @@ -276,7 +276,7 @@ fn test_surface_texture_blit_framebuffer() {

unsafe {
clear(&env.gl, &[0, 255, 0, 255]);
assert_eq!(get_pixel(&env.gl), [0, 255, 0, 255]);
assert_eq!(get_pixel_from_bottom_row(&env.gl), [0, 255, 0, 255]);

let green_surface = env.device
.unbind_surface_from_context(&mut env.context)
Expand All @@ -289,16 +289,14 @@ fn test_surface_texture_blit_framebuffer() {
let main_surface = make_surface(&mut env.device, &env.context);
env.device.bind_surface_to_context(&mut env.context, main_surface).unwrap();

// FIXME(pcwalton): This call shouldn't be necessary.
env.device.make_context_current(&env.context).unwrap();
let main_framebuffer_object = env.device
.context_surface_info(&env.context)
.unwrap()
.unwrap()
.framebuffer_object;
env.gl.BindFramebuffer(gl::FRAMEBUFFER, main_framebuffer_object);
clear(&env.gl, &[255, 0, 0, 255]);
assert_eq!(get_pixel(&env.gl), [255, 0, 0, 255]);
assert_eq!(get_pixel_from_bottom_row(&env.gl), [255, 0, 0, 255]);

let mut green_framebuffer_object =
make_fbo(&env.gl,
Expand All @@ -308,7 +306,7 @@ fn test_surface_texture_blit_framebuffer() {
// Blit to main framebuffer.
blit_fbo(&env.gl, main_framebuffer_object, green_framebuffer_object);
env.gl.BindFramebuffer(gl::FRAMEBUFFER, main_framebuffer_object); check_gl(&env.gl);
assert_eq!(get_pixel(&env.gl), [0, 255, 0, 255]);
assert_eq!(get_pixel_from_bottom_row(&env.gl), [0, 255, 0, 255]);

// Clean up.
env.gl.BindFramebuffer(gl::FRAMEBUFFER, 0); check_gl(&env.gl);
Expand All @@ -334,7 +332,7 @@ fn test_cross_device_surface_texture_blit_framebuffer() {

unsafe {
clear(&env.gl, &[255, 0, 0, 255]);
assert_eq!(get_pixel(&env.gl), [255, 0, 0, 255]);
assert_eq!(get_pixel_from_bottom_row(&env.gl), [255, 0, 0, 255]);

let mut other_context = other_device.create_context(&env.context_descriptor).unwrap();
let other_surface = make_surface(&mut other_device, &other_context);
Expand All @@ -343,7 +341,7 @@ fn test_cross_device_surface_texture_blit_framebuffer() {
bind_context_fbo(&env.gl, &other_device, &other_context);

clear(&env.gl, &[0, 255, 0, 255]);
assert_eq!(get_pixel(&env.gl), [0, 255, 0, 255]);
assert_eq!(get_pixel_from_bottom_row(&env.gl), [0, 255, 0, 255]);

let green_surface = other_device.unbind_surface_from_context(&mut other_context)
.unwrap()
Expand All @@ -353,7 +351,7 @@ fn test_cross_device_surface_texture_blit_framebuffer() {
.unwrap();

env.device.make_context_current(&env.context).unwrap();
assert_eq!(get_pixel(&env.gl), [255, 0, 0, 255]);
assert_eq!(get_pixel_from_bottom_row(&env.gl), [255, 0, 0, 255]);

let mut green_framebuffer_object =
make_fbo(&env.gl,
Expand All @@ -363,7 +361,7 @@ fn test_cross_device_surface_texture_blit_framebuffer() {
// Blit to main framebuffer.
blit_fbo(&env.gl, context_fbo(&env.device, &env.context), green_framebuffer_object);
bind_context_fbo(&env.gl, &env.device, &env.context);
assert_eq!(get_pixel(&env.gl), [0, 255, 0, 255]);
assert_eq!(get_pixel_from_bottom_row(&env.gl), [0, 255, 0, 255]);

// Clean up.
env.gl.BindFramebuffer(gl::FRAMEBUFFER, 0); check_gl(&env.gl);
Expand Down Expand Up @@ -403,7 +401,7 @@ fn test_cross_thread_surface_texture_blit_framebuffer() {
bind_context_fbo(&gl, &device, &context);

clear(&gl, &[0, 255, 0, 255]);
assert_eq!(get_pixel(&gl), [0, 255, 0, 255]);
assert_eq!(get_pixel_from_bottom_row(&gl), [0, 255, 0, 255]);

let surface = device.unbind_surface_from_context(&mut context).unwrap().unwrap();
to_main_sender.send(surface).unwrap();
Expand All @@ -415,15 +413,15 @@ fn test_cross_thread_surface_texture_blit_framebuffer() {

unsafe {
clear(&env.gl, &[255, 0, 0, 255]);
assert_eq!(get_pixel(&env.gl), [255, 0, 0, 255]);
assert_eq!(get_pixel_from_bottom_row(&env.gl), [255, 0, 0, 255]);

let green_surface = to_main_receiver.recv().unwrap();
let green_surface_texture = env.device
.create_surface_texture(&mut env.context, green_surface)
.unwrap();

env.device.make_context_current(&env.context).unwrap();
assert_eq!(get_pixel(&env.gl), [255, 0, 0, 255]);
assert_eq!(get_pixel_from_bottom_row(&env.gl), [255, 0, 0, 255]);

let mut green_framebuffer_object =
make_fbo(&env.gl,
Expand All @@ -433,7 +431,7 @@ fn test_cross_thread_surface_texture_blit_framebuffer() {
// Blit to main framebuffer.
blit_fbo(&env.gl, context_fbo(&env.device, &env.context), green_framebuffer_object);
bind_context_fbo(&env.gl, &env.device, &env.context);
assert_eq!(get_pixel(&env.gl), [0, 255, 0, 255]);
assert_eq!(get_pixel_from_bottom_row(&env.gl), [0, 255, 0, 255]);

// Clean up.
env.gl.BindFramebuffer(gl::FRAMEBUFFER, 0); check_gl(&env.gl);
Expand All @@ -448,6 +446,62 @@ fn test_cross_thread_surface_texture_blit_framebuffer() {
}
}

// Tests that surface textures are not upside-down.
#[test]
fn test_surface_texture_right_side_up() {
let mut env = match BasicEnvironment::new() {
None => return,
Some(env) => env,
};

unsafe {
clear(&env.gl, &[255, 0, 0, 255]);
clear_bottom_row(&env.gl, &[0, 255, 0, 255]);
assert_eq!(get_pixel_from_bottom_row(&env.gl), [0, 255, 0, 255]);

let subsurface = env.device
.unbind_surface_from_context(&mut env.context)
.unwrap()
.unwrap();
let subsurface_texture = env.device
.create_surface_texture(&mut env.context, subsurface)
.unwrap();

let main_surface = make_surface(&mut env.device, &env.context);
env.device.bind_surface_to_context(&mut env.context, main_surface).unwrap();

let main_framebuffer_object = env.device
.context_surface_info(&env.context)
.unwrap()
.unwrap()
.framebuffer_object;
env.gl.BindFramebuffer(gl::FRAMEBUFFER, main_framebuffer_object);
clear(&env.gl, &[255, 0, 0, 255]);
assert_eq!(get_pixel_from_bottom_row(&env.gl), [255, 0, 0, 255]);

let mut subframebuffer_object =
make_fbo(&env.gl,
env.device.surface_gl_texture_target(),
env.device.surface_texture_object(&subsurface_texture));

// Blit to main framebuffer.
blit_fbo(&env.gl, main_framebuffer_object, subframebuffer_object);
env.gl.BindFramebuffer(gl::FRAMEBUFFER, main_framebuffer_object); check_gl(&env.gl);
assert_eq!(get_pixel_from_bottom_row(&env.gl), [0, 255, 0, 255]);
assert_eq!(get_pixel_from_second_from_bottom_row(&env.gl), [255, 0, 0, 255]);

// Clean up.
env.gl.BindFramebuffer(gl::FRAMEBUFFER, 0); check_gl(&env.gl);
env.gl.DeleteFramebuffers(1, &mut subframebuffer_object);

let mut subsurface = env.device
.destroy_surface_texture(&mut env.context, subsurface_texture)
.unwrap();
env.device.destroy_surface(&mut env.context, &mut subsurface).unwrap();
env.device.destroy_context(&mut env.context).unwrap();
}
}

fn bind_context_fbo(gl: &Gl, device: &Device, context: &Context) {
unsafe {
gl.BindFramebuffer(gl::FRAMEBUFFER, context_fbo(device, context)); check_gl(&gl);
Expand Down Expand Up @@ -553,7 +607,6 @@ impl BasicEnvironment {

fn clear(gl: &Gl, color: &[u8; 4]) {
unsafe {
gl.Viewport(0, 0, 640, 480);
gl.ClearColor(color[0] as f32 / 255.0,
color[1] as f32 / 255.0,
color[2] as f32 / 255.0,
Expand All @@ -562,14 +615,36 @@ fn clear(gl: &Gl, color: &[u8; 4]) {
}
}

fn get_pixel(gl: &Gl) -> [u8; 4] {
fn clear_bottom_row(gl: &Gl, color: &[u8; 4]) {
unsafe {
gl.Scissor(0, 0, 640, 1);
gl.Enable(gl::SCISSOR_TEST);
gl.ClearColor(color[0] as f32 / 255.0,
color[1] as f32 / 255.0,
color[2] as f32 / 255.0,
color[3] as f32 / 255.0);
gl.Clear(gl::COLOR_BUFFER_BIT);
gl.Disable(gl::SCISSOR_TEST);
gl.Scissor(0, 0, 640, 480);
}
}

fn get_pixel_from_bottom_row(gl: &Gl) -> [u8; 4] {
unsafe {
let mut pixel: [u8; 4] = [0; 4];
gl.ReadPixels(0, 0, 1, 1, gl::RGBA, gl::UNSIGNED_BYTE, pixel.as_mut_ptr() as *mut c_void);
pixel
}
}

fn get_pixel_from_second_from_bottom_row(gl: &Gl) -> [u8; 4] {
unsafe {
let mut pixel: [u8; 4] = [0; 4];
gl.ReadPixels(0, 1, 1, 1, gl::RGBA, gl::UNSIGNED_BYTE, pixel.as_mut_ptr() as *mut c_void);
pixel
}
}

fn check_gl(gl: &Gl) {
unsafe {
assert_eq!(gl.GetError(), gl::NO_ERROR);
Expand Down

0 comments on commit 2b9cc49

Please # to comment.