Skip to content
Permalink
Browse files

Auto merge of #24676 - Manishearth:unpatch, r=jdm

Remove patched webxr

Unsure if this compiles yet, testing locally.

r? @jdm
  • Loading branch information...
bors-servo committed Nov 8, 2019
2 parents 970f716 + 464e28b commit bbbb5b691362b932bc59de7727fd040afacdb324

Some generated files are not rendered by default. Learn more.

@@ -29,12 +29,3 @@ opt-level = 3
mio = { git = "https://github.com/servo/mio.git", branch = "servo" }
# https://github.com/retep998/winapi-rs/pull/816
winapi = { git = "https://github.com/servo/winapi-rs", branch = "patch-1" }


# temporary
[patch."https://github.com/pcwalton/surfman"]
surfman = { git = "https://github.com/jdm/rust-offscreen-rendering-context", branch = "servo" }

[patch."https://github.com/servo/webxr"]
webxr = { git = "https://github.com/jdm/webxr", branch = "no-gl-readback2" }
webxr-api = { git = "https://github.com/jdm/webxr", branch = "no-gl-readback2" }
@@ -39,5 +39,5 @@ webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
webrender_traits = {path = "../webrender_traits"}
webxr-api = {git = "https://github.com/servo/webxr", features = ["ipc"]}
# NOTE: the sm-angle feature only enables angle on windows, not other platforms!
surfman = { git = "https://github.com/pcwalton/surfman", features = ["sm-angle", "sm-osmesa"] }
surfman-chains = { git = "https://github.com/asajeffrey/surfman-chains" }
surfman = { version = "0.1", features = ["sm-angle", "sm-osmesa"] }
surfman-chains = "0.1"
@@ -17,6 +17,7 @@ use std::sync::{Arc, Mutex};
use surfman::platform::generic::universal::context::Context;
use surfman::platform::generic::universal::device::Device;
use surfman::platform::generic::universal::surface::SurfaceTexture;
use surfman::SurfaceInfo;
use surfman_chains::SwapChains;
use webrender_traits::{WebrenderExternalImageApi, WebrenderExternalImageRegistry};
use webxr_api::SwapChainId as WebXRSwapChainId;
@@ -105,8 +106,12 @@ impl WebGLExternalImages {
debug!("... locking chain {:?}", id);
let front_buffer = self.swap_chains.get(id)?.take_surface()?;

debug!("... getting texture for surface {:?}", front_buffer.id());
let size = front_buffer.size();
let SurfaceInfo {
id: front_buffer_id,
size,
..
} = self.device.surface_info(&front_buffer);
debug!("... getting texture for surface {:?}", front_buffer_id);
let front_buffer_texture = self
.device
.create_surface_texture(&mut self.context, front_buffer)
@@ -67,6 +67,7 @@ use surfman::ContextAttributeFlags;
use surfman::ContextAttributes;
use surfman::GLVersion;
use surfman::SurfaceAccess;
use surfman::SurfaceInfo;
use surfman::SurfaceType;
use surfman_chains::SwapChains;
use webrender_traits::{WebrenderExternalImageRegistry, WebrenderImageHandlerType};
@@ -438,8 +439,15 @@ impl WebGLThread {

let mut ctx = self
.device
.create_context(&context_descriptor, surface_access, &surface_type)
.create_context(&context_descriptor)
.expect("Failed to create the GL context!");
let surface = self
.device
.create_surface(&ctx, surface_access, &surface_type)
.expect("Failed to create the initial surface!");
self.device
.bind_surface_to_context(&mut ctx, surface)
.unwrap();
// https://github.com/pcwalton/surfman/issues/7
self.device
.make_context_current(&ctx)
@@ -490,8 +498,10 @@ impl WebGLThread {
self.device.make_context_current(&ctx).unwrap();
let framebuffer = self
.device
.context_surface_framebuffer_object(&ctx)
.unwrap();
.context_surface_info(&ctx)
.unwrap()
.unwrap()
.framebuffer_object;
gl.bind_framebuffer(gl::FRAMEBUFFER, framebuffer);
gl.viewport(0, 0, size.width as i32, size.height as i32);
gl.scissor(0, 0, size.width as i32, size.height as i32);
@@ -695,14 +705,18 @@ impl WebGLThread {
debug!("Rebinding {:?}", swap_id);
framebuffer_rebinding_info.apply(&self.device, &data.ctx, &*data.gl);

let framebuffer = self
let SurfaceInfo {
framebuffer_object,
id,
..
} = self
.device
.context_surface_framebuffer_object(&data.ctx)
.context_surface_info(&data.ctx)
.unwrap()
.unwrap();
debug!(
"... rebound framebuffer {}, new back buffer surface is {:?}",
framebuffer,
self.device.context_surface_id(&data.ctx).unwrap()
framebuffer_object, id
);
}

@@ -1427,14 +1441,18 @@ impl WebGLImpl {
},
WebGLCommand::DrawingBufferWidth(ref sender) => {
let size = device
.context_surface_size(&ctx)
.expect("Where's the front buffer?");
.context_surface_info(&ctx)
.unwrap()
.expect("Where's the front buffer?")
.size;
sender.send(size.width).unwrap()
},
WebGLCommand::DrawingBufferHeight(ref sender) => {
let size = device
.context_surface_size(&ctx)
.expect("Where's the front buffer?");
.context_surface_info(&ctx)
.unwrap()
.expect("Where's the front buffer?")
.size;
sender.send(size.height).unwrap()
},
WebGLCommand::Finish(ref sender) => Self::finish(gl, sender),
@@ -2192,9 +2210,13 @@ impl WebGLImpl {
id.get()
},
WebGLFramebufferBindingRequest::Explicit(WebGLFramebufferId::Opaque(_)) |
WebGLFramebufferBindingRequest::Default => device
.context_surface_framebuffer_object(ctx)
.expect("No surface attached!"),
WebGLFramebufferBindingRequest::Default => {
device
.context_surface_info(ctx)
.unwrap()
.expect("No surface attached!")
.framebuffer_object
},
};

debug!("WebGLImpl::bind_framebuffer: {:?}", id);
@@ -2649,8 +2671,11 @@ impl FramebufferRebindingInfo {
gl.get_integer_v(gl::READ_FRAMEBUFFER_BINDING, &mut read_framebuffer);
gl.get_integer_v(gl::DRAW_FRAMEBUFFER_BINDING, &mut draw_framebuffer);

let context_surface_framebuffer =
device.context_surface_framebuffer_object(context).unwrap();
let context_surface_framebuffer = device
.context_surface_info(context)
.unwrap()
.unwrap()
.framebuffer_object;

let mut flags = FramebufferRebindingFlags::empty();
if context_surface_framebuffer == read_framebuffer[0] as GLuint {
@@ -2672,8 +2697,11 @@ impl FramebufferRebindingInfo {
return;
}

let context_surface_framebuffer =
device.context_surface_framebuffer_object(context).unwrap();
let context_surface_framebuffer = device
.context_surface_info(context)
.unwrap()
.unwrap()
.framebuffer_object;
if self
.flags
.contains(FramebufferRebindingFlags::REBIND_READ_FRAMEBUFFER)
@@ -82,7 +82,7 @@ webdriver_server = {path = "../webdriver_server", optional = true}
webvr = {path = "../webvr"}
webvr_traits = {path = "../webvr_traits"}
webxr-api = {git = "https://github.com/servo/webxr"}
surfman = { git = "https://github.com/pcwalton/surfman", features = ["sm-osmesa"] }
surfman = { version = "0.1", features = ["sm-osmesa"] }

[target.'cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64")))'.dependencies]
gaol = "0.2.1"

0 comments on commit bbbb5b6

Please sign in to comment.
You can’t perform that action at this time.