Make khronos_api an internal dependency of gl_generator

As discussed in #338, this means that users no longer need
to depend on khronos_api.

Author: brendanzab

gl/Cargo.toml

@@ -15,7 +15,6 @@ readme = "README.md"
 
 [build-dependencies]
 gl_generator = { version = "0.4.2", path = "../gl_generator" }
-khronos_api = { version = "1.0.0", path = "../khronos_api" }
 
 [dev-dependencies]
 glutin = "0.4"

gl/build.rs

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 extern crate gl_generator;
-extern crate khronos_api;
 
 use gl_generator::{Fallbacks, GlobalGenerator, Api};
 use std::env;
@@ -27,6 +26,5 @@ fn main() {
 
     let mut file = BufWriter::new(File::create(&dest.join("bindings.rs")).unwrap());
     gl_generator::generate_bindings(GlobalGenerator, Api::Gl, Fallbacks::All,
-                                    khronos_api::GL_XML, vec![], "4.5", "core",
-                                    &mut file).unwrap();
+                                    vec![], "4.5", "core", &mut file).unwrap();
 }

gl_generator/README.md

@@ -20,7 +20,6 @@ Add this to your `Cargo.toml`:
 ```toml
 [build-dependencies]
 gl_generator = "0.4.2"
-khronos_api = "1.0.0"
 ```
 
 Under the `[package]` section, add:
@@ -33,7 +32,6 @@ Create a `build.rs` to pull your specific version/API:
 
 ```rust
 extern crate gl_generator;
-extern crate khronos_api;
 
 use gl_generator::{Fallbacks, GlobalGenerator, Api};
 use std::env;
@@ -47,8 +45,7 @@ fn main() {
 
     let mut file = BufWriter::new(File::create(&dest.join("bindings.rs")).unwrap());
     gl_generator::generate_bindings(GlobalGenerator, Api::Gl, Fallbacks::All,
-                                    khronos_api::GL_XML, vec![], "4.5", "core",
-                                    &mut file).unwrap();
+                                    vec![], "4.5", "core", &mut file).unwrap();
 }
 ```
 
@@ -147,6 +144,8 @@ also attempt to load `glGenFramebuffersEXT` as a fallback.
 
 - Rename `Ns` to `API`, and expose at the top level
 - Use `Api` for `Extension::supported` and `Filter::api` fields
+- Remove `source` argument from `generate_bindings`, removing the need for
+  clients to depend on the `khronos_api` crate
 
 ### v0.4.2
 

gl_generator/lib.rs

@@ -25,7 +25,6 @@
 //!
 //! ```no_run
 //! extern crate gl_generator;
-//! extern crate khronos_api;
 //!
 //! use gl_generator::{Fallbacks, GlobalGenerator, Api};
 //! use std::env;
@@ -34,12 +33,10 @@
 //!
 //! fn main() {
 //!     let dest = env::var("OUT_DIR").unwrap();
-//!
 //!     let mut file = File::create(&Path::new(&dest).join("gl_bindings.rs")).unwrap();
 //!
 //!     gl_generator::generate_bindings(GlobalGenerator, Api::Gl, Fallbacks::All,
-//!                                     khronos_api::GL_XML, vec![], "4.5", "core",
-//!                                     &mut file).unwrap();
+//!                                     vec![], "4.5", "core", &mut file).unwrap();
 //! }
 //! ```
 //!
@@ -84,6 +81,7 @@
 //! - `NativeWindowType`
 //!
 
+extern crate khronos_api;
 #[macro_use]
 extern crate log;
 
@@ -105,7 +103,7 @@ pub mod generators;
 pub mod registry;
 
 /// Public function that generates Rust source code.
-pub fn generate_bindings<G, W>(generator: G, api: registry::Api, fallbacks: Fallbacks, source: &[u8],
+pub fn generate_bindings<G, W>(generator: G, api: registry::Api, fallbacks: Fallbacks,
                                extensions: Vec<String>, version: &str, profile: &str,
                                dest: &mut W) -> io::Result<()> where G: Generator, W: io::Write
 {
@@ -122,7 +120,15 @@ pub fn generate_bindings<G, W>(generator: G, api: registry::Api, fallbacks: Fall
     // Generate the registry of all bindings
     let registry = {
         use std::io::BufReader;
-        let reader = BufReader::new(source);
+
+        let src = match api {
+            Api::Gl | Api::GlCore | Api::Gles1 | Api::Gles2 => khronos_api::GL_XML,
+            Api::Glx => khronos_api::GLX_XML,
+            Api::Wgl => khronos_api::WGL_XML,
+            Api::Egl => khronos_api::EGL_XML,
+        };
+
+        let reader = BufReader::new(src);
         Registry::from_xml(reader, api, filter)
     };
 

gl_tests/test_gen_symbols/Cargo.toml

@@ -9,4 +9,3 @@ path = "lib.rs"
 
 [build-dependencies]
 gl_generator = { path = "../../gl_generator" }
-khronos_api = { path = "../../khronos_api" }

gl_tests/test_gen_symbols/build.rs

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 extern crate gl_generator;
-extern crate khronos_api;
 
 use gl_generator::*;
 use std::env;
@@ -26,35 +25,30 @@ fn main() {
     let dest = env::var("OUT_DIR").unwrap();
     let mut file = BufWriter::new(File::create(&Path::new(&dest).join("test_gen_symbols.rs")).unwrap());
 
-    (writeln!(&mut file, "mod gl {{")).unwrap();
+    writeln!(&mut file, "mod gl {{").unwrap();
     gl_generator::generate_bindings(GlobalGenerator, Api::Gl, Fallbacks::All,
-                                    khronos_api::GL_XML, vec![], "4.5", "core",
-                                    &mut file).unwrap();
-    (writeln!(&mut file, "}}")).unwrap();
+                                    vec![], "4.5", "core", &mut file).unwrap();
+    writeln!(&mut file, "}}").unwrap();
 
-    (writeln!(&mut file, "mod gles {{")).unwrap();
+    writeln!(&mut file, "mod gles {{").unwrap();
     gl_generator::generate_bindings(GlobalGenerator, Api::Gles2, Fallbacks::All,
-                                    khronos_api::GL_XML, vec![], "3.1", "core",
-                                    &mut file).unwrap();
-    (writeln!(&mut file, "}}")).unwrap();
+                                    vec![], "3.1", "core", &mut file).unwrap();
+    writeln!(&mut file, "}}").unwrap();
 
-    (writeln!(&mut file, "mod glx {{")).unwrap();
+    writeln!(&mut file, "mod glx {{").unwrap();
     gl_generator::generate_bindings(GlobalGenerator, Api::Glx, Fallbacks::All,
-                                    khronos_api::GLX_XML, vec![], "1.4", "core",
-                                    &mut file).unwrap();
-    (writeln!(&mut file, "}}")).unwrap();
+                                    vec![], "1.4", "core", &mut file).unwrap();
+    writeln!(&mut file, "}}").unwrap();
 
-    (writeln!(&mut file, "mod wgl {{")).unwrap();
+    writeln!(&mut file, "mod wgl {{").unwrap();
     gl_generator::generate_bindings(GlobalGenerator, Api::Wgl, Fallbacks::All,
-                                    khronos_api::WGL_XML, vec![], "1.0", "core",
-                                    &mut file).unwrap();
-    (writeln!(&mut file, "}}")).unwrap();
+                                    vec![], "1.0", "core", &mut file).unwrap();
+    writeln!(&mut file, "}}").unwrap();
 
-    (writeln!(&mut file, "mod egl {{ {}", build_egl_symbols())).unwrap();
+    writeln!(&mut file, "mod egl {{ {}", build_egl_symbols()).unwrap();
     gl_generator::generate_bindings(GlobalGenerator, Api::Egl, Fallbacks::All,
-                                    khronos_api::EGL_XML, vec![], "1.5", "core",
-                                    &mut file).unwrap();
-    (writeln!(&mut file, "}}")).unwrap();
+                                    vec![], "1.5", "core", &mut file).unwrap();
+    writeln!(&mut file, "}}").unwrap();
 }
 
 fn build_egl_symbols() -> &'static str {

gl_tests/test_no_warnings/Cargo.toml

@@ -9,4 +9,3 @@ path = "lib.rs"
 
 [build-dependencies]
 gl_generator = { path = "../../gl_generator" }
-khronos_api = { path = "../../khronos_api" }