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.

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

Sync changes from mozilla-central #3812

Merged
merged 1 commit into from Dec 12, 2019
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Bug 1594524 - Move the call to gpu_profile.end_frame() up so that we …

  • Loading branch information
mstange authored and moz-gfx committed Dec 12, 2019
commit e3d5535a212c4cfa9f04512c486b8710a46262f9
@@ -3153,6 +3153,9 @@ impl Renderer {

self.unlock_external_images();
self.active_documents = active_documents;

let _gm = self.gpu_profile.start_marker("end frame");
self.gpu_profile.end_frame();
});

if let Some(device_size) = device_size {
@@ -3264,8 +3267,6 @@ impl Renderer {
self.gpu_cache_upload_time = 0;

profile_timers.cpu_time.profile(|| {
let _gm = self.gpu_profile.start_marker("end frame");
self.gpu_profile.end_frame();
if let Some(debug_renderer) = self.debug.try_get_mut() {
let small_screen = self.debug_flags.contains(DebugFlags::SMALL_SCREEN);
let scale = if small_screen { 1.6 } else { 1.0 };
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.