Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Red flicker fix/workaround #2280

Merged
merged 1 commit into from
Jan 14, 2018
Merged

Red flicker fix/workaround #2280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 34 additions & 12 deletions webrender/src/device.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ use std::ptr;
use std::rc::Rc;
use std::thread;

// Apparently, in some cases calling `glTexImage3D` with
// similar parameters that the texture already has confuses
// Angle when running with optimizations.
const WORK_AROUND_TEX_IMAGE: bool = cfg!(windows);
Copy link
Contributor

@nical nical Jan 11, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh fun! added https://github.com/servo/webrender/wiki/Driver-issues#2280---resizing-with-glteximage3d-on-angle


#[derive(Debug, Copy, Clone, PartialEq, Ord, Eq, PartialOrd)]
pub struct FrameId(usize);

Expand Down Expand Up @@ -468,6 +473,10 @@ impl Texture {
pub fn has_depth(&self) -> bool {
self.depth_rb.is_some()
}

pub fn get_rt_info(&self) -> Option<&RenderTargetInfo> {
self.render_target.as_ref()
}
}

impl Drop for Texture {
Expand Down Expand Up @@ -962,7 +971,7 @@ impl Device {

self.bind_texture(DEFAULT_TEXTURE, texture);
self.set_texture_parameters(texture.target, texture.filter);
self.update_texture_storage(texture, &rt_info, true);
self.update_texture_storage(texture, &rt_info, true, false);

let rect = DeviceIntRect::new(DeviceIntPoint::zero(), old_size.to_i32());
for (read_fbo, &draw_fbo) in old_fbos.into_iter().zip(&texture.fbo_ids) {
Expand All @@ -984,13 +993,13 @@ impl Device {
filter: TextureFilter,
render_target: Option<RenderTargetInfo>,
layer_count: i32,

pixels: Option<&[u8]>,
) {
debug_assert!(self.inside_frame);

let resized = texture.width != width ||
texture.height != height ||
texture.format != format;
let is_resized = texture.width != width || texture.height != height;
let is_format_changed = texture.format != format;

texture.format = format;
texture.width = width;
Expand All @@ -1005,7 +1014,7 @@ impl Device {
match render_target {
Some(info) => {
assert!(pixels.is_none());
self.update_texture_storage(texture, &info, resized);
self.update_texture_storage(texture, &info, is_resized, is_format_changed);
}
None => {
let (internal_format, gl_format) = gl_texture_formats_for_image_format(self.gl(), format);
Expand Down Expand Up @@ -1065,11 +1074,12 @@ impl Device {
texture: &mut Texture,
rt_info: &RenderTargetInfo,
is_resized: bool,
is_format_changed: bool,
) {
assert!(texture.layer_count > 0);

let needed_layer_count = texture.layer_count - texture.fbo_ids.len() as i32;
let allocate_color = needed_layer_count != 0 || is_resized;
let allocate_color = needed_layer_count != 0 || is_resized || is_format_changed;

if allocate_color {
let (internal_format, gl_format) =
Expand All @@ -1078,6 +1088,19 @@ impl Device {

match texture.target {
gl::TEXTURE_2D_ARRAY => {
if WORK_AROUND_TEX_IMAGE {
// reset the contents before resizing
self.gl.tex_image_3d(
texture.target,
0,
gl::RGBA32F as _,
2, 2, 1,
0,
gl::RGBA,
gl::FLOAT,
None,
)
}
self.gl.tex_image_3d(
texture.target,
0,
Expand Down Expand Up @@ -1138,8 +1161,8 @@ impl Device {
self.gl.renderbuffer_storage(
gl::RENDERBUFFER,
gl::DEPTH_COMPONENT24,
texture.width as gl::GLsizei,
texture.height as gl::GLsizei,
texture.width as _,
texture.height as _,
);
} else {
self.gl.delete_renderbuffers(&[depth_rb]);
Expand All @@ -1149,6 +1172,7 @@ impl Device {
}

if allocate_color || allocate_depth {
let original_bound_fbo = self.bound_draw_fbo;
for (fbo_index, &fbo_id) in texture.fbo_ids.iter().enumerate() {
self.bind_external_draw_target(fbo_id);
match texture.target {
Expand All @@ -1158,7 +1182,7 @@ impl Device {
gl::COLOR_ATTACHMENT0,
texture.id,
0,
fbo_index as gl::GLint,
fbo_index as _,
)
}
_ => {
Expand All @@ -1180,9 +1204,7 @@ impl Device {
depth_rb,
);
}
// restore the previous FBO
let bound_fbo = self.bound_draw_fbo;
self.bind_external_draw_target(bound_fbo);
self.bind_external_draw_target(original_bound_fbo);
}
}

Expand Down
6 changes: 4 additions & 2 deletions webrender/src/renderer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4082,6 +4082,7 @@ impl Renderer {
}
} else {
if list.texture.is_some() {
list.check_ready();
return
}
match self.texture_resolver.render_target_pool.pop() {
Expand All @@ -4103,6 +4104,7 @@ impl Renderer {
None,
);
list.texture = Some(texture);
list.check_ready();
}

fn prepare_tile_frame(&mut self, frame: &mut Frame) {
Expand Down Expand Up @@ -4217,8 +4219,8 @@ impl Renderer {
(None, None)
}
RenderPassKind::OffScreen { ref mut alpha, ref mut color } => {
assert!(alpha.targets.is_empty() || alpha.texture.is_some());
assert!(color.targets.is_empty() || color.texture.is_some());
alpha.check_ready();
color.check_ready();

for (target_index, target) in alpha.targets.iter().enumerate() {
stats.alpha_target_count += 1;
Expand Down
16 changes: 16 additions & 0 deletions webrender/src/tiling.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,22 @@ impl<T: RenderTarget> RenderTargetList<T> {
pub fn needs_depth(&self) -> bool {
self.targets.iter().any(|target| target.needs_depth())
}

pub fn check_ready(&self) {
match self.texture {
Some(ref t) => {
assert_eq!(t.get_dimensions(), self.max_size);
assert_eq!(t.get_format(), self.format);
assert_eq!(t.get_render_target_layer_count(), self.targets.len());
assert_eq!(t.get_layer_count() as usize, self.targets.len());
assert_eq!(t.has_depth(), t.get_rt_info().unwrap().has_depth);
assert_eq!(t.has_depth(), self.needs_depth());
}
None => {
assert!(self.targets.is_empty())
}
}
}
}

/// Frame output information for a given pipeline ID.
Expand Down