mirror of
https://github.com/servo/servo.git
synced 2025-07-24 15:50:21 +01:00
Auto merge of #10433 - saurvs:pr3, r=emilio
Implement WebGLRenderingContext.getActiveUniform() Fixes https://github.com/servo/servo/issues/10397 <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10433) <!-- Reviewable:end -->
This commit is contained in:
bors-servo
commit
4cc241c858
7 changed files with 84 additions and 43 deletions
|
|
@ -8,7 +8,8 @@ use dom::bindings::codegen::Bindings::WebGLProgramBinding;
|
|||
use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLRenderingContextConstants as constants;
|
||||
use dom::bindings::global::GlobalRef;
|
||||
use dom::bindings::js::{JS, MutNullableHeap, Root};
|
||||
use dom::bindings::reflector::reflect_dom_object;
|
||||
use dom::bindings::reflector::{Reflectable, reflect_dom_object};
|
||||
use dom::webglactiveinfo::WebGLActiveInfo;
|
||||
use dom::webglobject::WebGLObject;
|
||||
use dom::webglrenderingcontext::MAX_UNIFORM_AND_ATTRIBUTE_LEN;
|
||||
use dom::webglshader::WebGLShader;
|
||||
|
|
@ -156,6 +157,16 @@ impl WebGLProgram {
|
|||
Ok(())
|
||||
}
|
||||
|
||||
pub fn get_active_uniform(&self, index: u32) -> WebGLResult<Root<WebGLActiveInfo>> {
|
||||
let (sender, receiver) = ipc::channel().unwrap();
|
||||
self.renderer
|
||||
.send(CanvasMsg::WebGL(WebGLCommand::GetActiveUniform(self.id, index, sender)))
|
||||
.unwrap();
|
||||
|
||||
receiver.recv().unwrap().map(|(size, ty, name)|
|
||||
WebGLActiveInfo::new(self.global().r(), size, ty, DOMString::from(name)))
|
||||
}
|
||||
|
||||
/// glGetAttribLocation
|
||||
pub fn get_attrib_location(&self, name: DOMString) -> WebGLResult<Option<i32>> {
|
||||
if name.len() > MAX_UNIFORM_AND_ATTRIBUTE_LEN {
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ use dom::event::{Event, EventBubbles, EventCancelable};
|
|||
use dom::htmlcanvaselement::HTMLCanvasElement;
|
||||
use dom::htmlcanvaselement::utils as canvas_utils;
|
||||
use dom::node::{Node, NodeDamage, window_from_node};
|
||||
use dom::webglactiveinfo::WebGLActiveInfo;
|
||||
use dom::webglbuffer::WebGLBuffer;
|
||||
use dom::webglcontextevent::WebGLContextEvent;
|
||||
use dom::webglframebuffer::WebGLFramebuffer;
|
||||
|
|
@ -794,6 +795,17 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
|
|||
.unwrap()
|
||||
}
|
||||
|
||||
// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
|
||||
fn GetActiveUniform(&self, program: Option<&WebGLProgram>, index: u32) -> Option<Root<WebGLActiveInfo>> {
|
||||
program.and_then(|p| match p.get_active_uniform(index) {
|
||||
Ok(ret) => Some(ret),
|
||||
Err(error) => {
|
||||
self.webgl_error(error);
|
||||
None
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
|
||||
fn GetAttribLocation(&self, program: Option<&WebGLProgram>, name: DOMString) -> i32 {
|
||||
if let Some(program) = program {
|
||||
|
|
|
|||
|
|
@ -568,7 +568,7 @@ interface WebGLRenderingContextBase
|
|||
void generateMipmap(GLenum target);
|
||||
|
||||
//WebGLActiveInfo? getActiveAttrib(WebGLProgram? program, GLuint index);
|
||||
//WebGLActiveInfo? getActiveUniform(WebGLProgram? program, GLuint index);
|
||||
WebGLActiveInfo? getActiveUniform(WebGLProgram? program, GLuint index);
|
||||
//sequence<WebGLShader>? getAttachedShaders(WebGLProgram? program);
|
||||
|
||||
[WebGLHandlesContextLoss] GLint getAttribLocation(WebGLProgram? program, DOMString name);
|
||||
|
|
|
|||
32
components/servo/Cargo.lock
generated
32
components/servo/Cargo.lock
generated
|
|
@ -16,7 +16,7 @@ dependencies = [
|
|||
"gaol 0.0.1 (git+https://github.com/servo/gaol)",
|
||||
"gfx 0.0.1",
|
||||
"gfx_tests 0.0.1",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"glutin_app 0.0.1",
|
||||
"image 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)",
|
||||
|
|
@ -158,6 +158,11 @@ name = "byteorder"
|
|||
version = "0.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "byteorder"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "canvas"
|
||||
version = "0.0.1"
|
||||
|
|
@ -166,7 +171,7 @@ dependencies = [
|
|||
"canvas_traits 0.0.1",
|
||||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gfx_traits 0.0.1",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)",
|
||||
"layers 0.2.4 (git+https://github.com/servo/rust-layers)",
|
||||
"log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -215,7 +220,7 @@ name = "cgl"
|
|||
version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
|
|
@ -296,7 +301,7 @@ dependencies = [
|
|||
"gaol 0.0.1 (git+https://github.com/servo/gaol)",
|
||||
"gfx 0.0.1",
|
||||
"gfx_traits 0.0.1",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"image 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)",
|
||||
"layers 0.2.4 (git+https://github.com/servo/rust-layers)",
|
||||
|
|
@ -775,7 +780,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gleam"
|
||||
version = "0.2.11"
|
||||
version = "0.2.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -794,7 +799,7 @@ dependencies = [
|
|||
"cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"compositing 0.0.1",
|
||||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"layers 0.2.4 (git+https://github.com/servo/rust-layers)",
|
||||
"msg 0.0.1",
|
||||
"net_traits 0.0.1",
|
||||
|
|
@ -963,7 +968,7 @@ dependencies = [
|
|||
"cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"leaky-cow 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
|
@ -1035,7 +1040,7 @@ dependencies = [
|
|||
"cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"glx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -1418,7 +1423,7 @@ dependencies = [
|
|||
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gl_generator 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -1911,7 +1916,7 @@ dependencies = [
|
|||
"cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"expat-sys 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"glx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"io-surface 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -2323,7 +2328,7 @@ dependencies = [
|
|||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)",
|
||||
"lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -2337,12 +2342,13 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "webrender_traits"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/servo/webrender_traits#c578452dc34d5a0bf431b8e4e50438d359ade75a"
|
||||
source = "git+https://github.com/servo/webrender_traits#d90190d5ca704caa533d4fa8b648653182f9d106"
|
||||
dependencies = [
|
||||
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)",
|
||||
"offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
|
|||
34
ports/cef/Cargo.lock
generated
34
ports/cef/Cargo.lock
generated
|
|
@ -12,7 +12,7 @@ dependencies = [
|
|||
"devtools 0.0.1",
|
||||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gfx 0.0.1",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"glutin_app 0.0.1",
|
||||
"js 0.1.2 (git+https://github.com/servo/rust-mozjs)",
|
||||
"layers 0.2.4 (git+https://github.com/servo/rust-layers)",
|
||||
|
|
@ -142,6 +142,11 @@ name = "byteorder"
|
|||
version = "0.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "byteorder"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "canvas"
|
||||
version = "0.0.1"
|
||||
|
|
@ -150,7 +155,7 @@ dependencies = [
|
|||
"canvas_traits 0.0.1",
|
||||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gfx_traits 0.0.1",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)",
|
||||
"layers 0.2.4 (git+https://github.com/servo/rust-layers)",
|
||||
"log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -199,7 +204,7 @@ name = "cgl"
|
|||
version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
|
|
@ -265,7 +270,7 @@ dependencies = [
|
|||
"gaol 0.0.1 (git+https://github.com/servo/gaol)",
|
||||
"gfx 0.0.1",
|
||||
"gfx_traits 0.0.1",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"image 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)",
|
||||
"layers 0.2.4 (git+https://github.com/servo/rust-layers)",
|
||||
|
|
@ -694,7 +699,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gleam"
|
||||
version = "0.2.11"
|
||||
version = "0.2.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -713,7 +718,7 @@ dependencies = [
|
|||
"cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"compositing 0.0.1",
|
||||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"layers 0.2.4 (git+https://github.com/servo/rust-layers)",
|
||||
"msg 0.0.1",
|
||||
"net_traits 0.0.1",
|
||||
|
|
@ -882,7 +887,7 @@ dependencies = [
|
|||
"cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"leaky-cow 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
|
@ -954,7 +959,7 @@ dependencies = [
|
|||
"cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"glx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -1304,7 +1309,7 @@ dependencies = [
|
|||
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gl_generator 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -1712,7 +1717,7 @@ dependencies = [
|
|||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gaol 0.0.1 (git+https://github.com/servo/gaol)",
|
||||
"gfx 0.0.1",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"glutin_app 0.0.1",
|
||||
"ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)",
|
||||
"layers 0.2.4 (git+https://github.com/servo/rust-layers)",
|
||||
|
|
@ -1807,7 +1812,7 @@ dependencies = [
|
|||
"cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"expat-sys 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"glx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"io-surface 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -2191,7 +2196,7 @@ dependencies = [
|
|||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)",
|
||||
"lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -2205,12 +2210,13 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "webrender_traits"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/servo/webrender_traits#c578452dc34d5a0bf431b8e4e50438d359ade75a"
|
||||
source = "git+https://github.com/servo/webrender_traits#d90190d5ca704caa533d4fa8b648653182f9d106"
|
||||
dependencies = [
|
||||
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)",
|
||||
"offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
|
|||
32
ports/gonk/Cargo.lock
generated
32
ports/gonk/Cargo.lock
generated
|
|
@ -8,7 +8,7 @@ dependencies = [
|
|||
"errno 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gfx 0.0.1",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"layers 0.2.4 (git+https://github.com/servo/rust-layers)",
|
||||
"layout 0.0.1",
|
||||
"libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -135,6 +135,11 @@ name = "byteorder"
|
|||
version = "0.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "byteorder"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "canvas"
|
||||
version = "0.0.1"
|
||||
|
|
@ -143,7 +148,7 @@ dependencies = [
|
|||
"canvas_traits 0.0.1",
|
||||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gfx_traits 0.0.1",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)",
|
||||
"layers 0.2.4 (git+https://github.com/servo/rust-layers)",
|
||||
"log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -192,7 +197,7 @@ name = "cgl"
|
|||
version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
|
|
@ -258,7 +263,7 @@ dependencies = [
|
|||
"gaol 0.0.1 (git+https://github.com/servo/gaol)",
|
||||
"gfx 0.0.1",
|
||||
"gfx_traits 0.0.1",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"image 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)",
|
||||
"layers 0.2.4 (git+https://github.com/servo/rust-layers)",
|
||||
|
|
@ -697,7 +702,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gleam"
|
||||
version = "0.2.11"
|
||||
version = "0.2.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"gl_generator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -864,7 +869,7 @@ dependencies = [
|
|||
"cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"leaky-cow 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
|
@ -936,7 +941,7 @@ dependencies = [
|
|||
"cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"glx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -1286,7 +1291,7 @@ dependencies = [
|
|||
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gl_generator 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -1694,7 +1699,7 @@ dependencies = [
|
|||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gaol 0.0.1 (git+https://github.com/servo/gaol)",
|
||||
"gfx 0.0.1",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)",
|
||||
"layers 0.2.4 (git+https://github.com/servo/rust-layers)",
|
||||
"layout 0.0.1",
|
||||
|
|
@ -1787,7 +1792,7 @@ dependencies = [
|
|||
"cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"expat-sys 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"glx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"io-surface 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -2141,7 +2146,7 @@ dependencies = [
|
|||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)",
|
||||
"lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -2155,12 +2160,13 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "webrender_traits"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/servo/webrender_traits#c578452dc34d5a0bf431b8e4e50438d359ade75a"
|
||||
source = "git+https://github.com/servo/webrender_traits#d90190d5ca704caa533d4fa8b648653182f9d106"
|
||||
dependencies = [
|
||||
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"byteorder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)",
|
||||
"offscreen_gl_context 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
|
|||
|
|
@ -220,7 +220,7 @@ def check_lock(file_name, contents):
|
|||
raise StopIteration
|
||||
|
||||
# package names to be neglected (as named by cargo)
|
||||
exceptions = ["bitflags", "xml-rs", "gl_generator"]
|
||||
exceptions = ["bitflags", "xml-rs", "gl_generator", "byteorder"]
|
||||
|
||||
import toml
|
||||
content = toml.loads(contents)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue