From 242da30a046e1a09af971d3b1a0de45b62211680 Mon Sep 17 00:00:00 2001 From: Alan Jeffrey Date: Wed, 25 Mar 2020 15:09:13 -0500 Subject: [PATCH 1/3] Fix windows build --- surfman/src/platform/windows/angle/surface.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/surfman/src/platform/windows/angle/surface.rs b/surfman/src/platform/windows/angle/surface.rs index 73f06bf..55054c0 100644 --- a/surfman/src/platform/windows/angle/surface.rs +++ b/surfman/src/platform/windows/angle/surface.rs @@ -10,6 +10,7 @@ use crate::gl; use crate::platform::generic::egl::device::EGL_FUNCTIONS; use crate::platform::generic::egl::error::ToWindowingApiError; use crate::platform::generic::egl::ffi::EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE; +use crate::platform::generic::egl::ffi::EGL_D3D_TEXTURE_ANGLE; use crate::platform::generic::egl::ffi::EGL_DXGI_KEYED_MUTEX_ANGLE; use crate::platform::generic::egl::ffi::EGL_EXTENSION_FUNCTIONS; use crate::{Error, SurfaceAccess, SurfaceID, SurfaceInfo, SurfaceType}; @@ -158,11 +159,11 @@ impl Device { ]; EGL_FUNCTIONS.with(|egl| { - let egl_surface = if let Some(HandleOrTexture::Texture(texture)) = share_handle { + let egl_surface = if let Some(share_handle) = share_handle { let surface = - egl.CreatePbufferFromClientBuffer(self.native_display.egl_display(), + egl.CreatePbufferFromClientBuffer(self.egl_display, EGL_D3D_TEXTURE_ANGLE, - texture as *const _, + share_handle as *const _, egl_config, attributes.as_ptr()); assert_ne!(surface, egl::NO_SURFACE); From 68b1b899ce663010aeca6912f3460ca1e87d68ba Mon Sep 17 00:00:00 2001 From: Alan Jeffrey Date: Wed, 25 Mar 2020 14:18:35 -0500 Subject: [PATCH 2/3] Fix android build --- surfman/src/platform/android/context.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/surfman/src/platform/android/context.rs b/surfman/src/platform/android/context.rs index 84e088d..26bda80 100644 --- a/surfman/src/platform/android/context.rs +++ b/surfman/src/platform/android/context.rs @@ -86,7 +86,8 @@ impl Device { unsafe { // Create the EGL context. - let egl_context = context::create_context(egl_display, descriptor)?; + let gl_api = self.gl_api(); + let egl_context = context::create_context(egl_display, descriptor, gl_api)?; // Create a dummy pbuffer. let pbuffer = context::create_dummy_pbuffer(egl_display, egl_context); From 5e126f98e53482b39c8e5324f5b97b2a3b613daa Mon Sep 17 00:00:00 2001 From: Alan Jeffrey Date: Wed, 25 Mar 2020 14:23:27 -0500 Subject: [PATCH 3/3] Fix travis build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 38ce288..a9548b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,9 +27,9 @@ os: script: - cd surfman - cargo build --verbose - - cargo build --verbose --features=sm-osmesa - cargo build --verbose --features=sm-angle-default - cargo build --verbose --features=sm-wayland-default + - cargo build --verbose --features=sm-winit - rustup target add arm-linux-androideabi - cargo build --verbose --target=arm-linux-androideabi - rustup target add aarch64-pc-windows-msvc