Merge pull request #518 from kvark/api-update

Update khronos APIs to the latest, except for webgl

Author: brendanzab

gl_generator/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gl_generator"
-version = "0.14.0"
+version = "0.14.1"
 authors = [
     "Brendan Zabarauskas <[email protected]>",
     "Corey Richardson",
@@ -23,6 +23,6 @@ path = "lib.rs"
 unstable_generator_utils = []
 
 [dependencies]
-khronos_api = { version = "3.1.0", path = "../khronos_api" }
+khronos_api = { version = "3.2.0", path = "../khronos_api" }
 log = "0.4"
 xml-rs = "0.8"

gl_generator/registry/mod.rs

@@ -25,6 +25,8 @@ use Generator;
 
 mod parse;
 
+const BYTE_ORDER_MARK: &'static [u8] = &[0xef, 0xbb, 0xbf];
+
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum Api {
     Gl,
@@ -145,13 +147,19 @@ impl Registry {
             profile,
         };
 
-        let src = match api {
+        let src_raw = match api {
             Api::Gl | Api::GlCore | Api::Gles1 | Api::Gles2 | Api::Glsc2 => khronos_api::GL_XML,
             Api::Glx => khronos_api::GLX_XML,
             Api::Wgl => khronos_api::WGL_XML,
             Api::Egl => khronos_api::EGL_XML,
         };
 
+        let src = if &src_raw[..BYTE_ORDER_MARK.len()] == BYTE_ORDER_MARK {
+            &src_raw[BYTE_ORDER_MARK.len()..]
+        } else {
+            src_raw
+        };
+
         let mut registry = parse::from_xml(src, &filter, true);
         if filter.extensions.iter().any(|e| e.starts_with("GL_ANGLE_")) {
             registry += parse::from_xml(khronos_api::GL_ANGLE_EXT_XML, &filter, false);

gl_generator/registry/parse.rs

@@ -1077,6 +1077,10 @@ pub fn to_rust_ty<T: AsRef<str>>(ty: T) -> Cow<'static, str> {
         "EGLOutputPortEXT *" => "*mut types::EGLOutputPortEXT",
         "EGLuint64KHR *" => "*mut types::EGLuint64KHR",
         "const struct AHardwareBuffer *" => "*const __gl_imports::raw::c_void", // humm
+        "char *" => "*const __gl_imports::raw::c_char",
+        "struct wl_buffer *" => "*const __gl_imports::raw::c_void",
+        "struct wl_display *" => "*const __gl_imports::raw::c_void",
+        "struct wl_resource *" => "*const __gl_imports::raw::c_void",
 
         "GLeglClientBufferEXT" => "types::GLeglClientBufferEXT",
         "GLVULKANPROCNV" => "types::GLVULKANPROCNV",

khronos_api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "khronos_api"
-version = "3.1.0"
+version = "3.2.0"
 authors = [
   "Brendan Zabarauskas <[email protected]>",
   "Corey Richardson",

khronos_api/api

@@ -77,5 +77,8 @@ pub fn camel(name: &str) -> String {
 pub fn parse_defs(src: &[u8]) -> Vec<ast::Definition> {
     let src = str::from_utf8(src).expect("IDL contained invalid UTF-8");
 
-    webidl::parse_string(src).expect("Failed to parse IDL")
+    match webidl::parse_string(src) {
+        Ok(defs) => defs,
+        Err(error) => panic!("Failed to parse IDL:\n{}\nError: {:?}", src, error),
+    }
 }