mirror of
https://github.com/encounter/rust-sdl2.git
synced 2026-07-10 21:18:41 -07:00
Merge pull request #976 from Cobrand/master
Fix compilation with use-bindgen
This commit is contained in:
Cobrand
+1
-1
@@ -20,7 +20,7 @@ path = "src/lib.rs"
|
||||
libc = "^0.2"
|
||||
|
||||
[build-dependencies.bindgen]
|
||||
version = "^0.42"
|
||||
version = "^0.53"
|
||||
optional = true
|
||||
|
||||
[build-dependencies.pkg-config]
|
||||
|
||||
+1
-3
@@ -543,6 +543,7 @@ fn generate_bindings(target: &str, host: &str, headers_paths: &[String]) {
|
||||
let mut bindings = bindgen::Builder::default()
|
||||
// enable no_std-friendly output by only using core definitions
|
||||
.use_core()
|
||||
.default_enum_style(bindgen::EnumVariation::Rust { non_exhaustive: false })
|
||||
.ctypes_prefix("libc");
|
||||
|
||||
let mut image_bindings = bindgen::Builder::default()
|
||||
@@ -704,13 +705,11 @@ fn generate_bindings(target: &str, host: &str, headers_paths: &[String]) {
|
||||
|
||||
let bindings = bindings
|
||||
.header("wrapper.h")
|
||||
.rustified_enum(".*")
|
||||
.blacklist_type("FP_NAN")
|
||||
.blacklist_type("FP_INFINITE")
|
||||
.blacklist_type("FP_ZERO")
|
||||
.blacklist_type("FP_SUBNORMAL")
|
||||
.blacklist_type("FP_NORMAL")
|
||||
.blacklist_type("max_align_t") // Until https://github.com/rust-lang-nursery/rust-bindgen/issues/550 gets fixed
|
||||
.derive_debug(false)
|
||||
.generate()
|
||||
.expect("Unable to generate bindings!");
|
||||
@@ -729,7 +728,6 @@ fn generate_bindings(target: &str, host: &str, headers_paths: &[String]) {
|
||||
.blacklist_type("FP_ZERO")
|
||||
.blacklist_type("FP_SUBNORMAL")
|
||||
.blacklist_type("FP_NORMAL")
|
||||
.blacklist_type("max_align_t") // Until https://github.com/rust-lang-nursery/rust-bindgen/issues/550 gets fixed
|
||||
.whitelist_type("IMG.*")
|
||||
.whitelist_function("IMG.*")
|
||||
.whitelist_var("IMG.*")
|
||||
|
||||
+5787
-5190
File diff suppressed because it is too large
Load Diff
+72
-72
@@ -205,42 +205,42 @@ impl_raw_constructor!((PixelFormat, PixelFormat (raw: *mut sys::SDL_PixelFormat)
|
||||
#[repr(i32)]
|
||||
#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
|
||||
pub enum PixelFormatEnum {
|
||||
Unknown = sys::SDL_PIXELFORMAT_UNKNOWN as i32,
|
||||
Index1LSB = sys::SDL_PIXELFORMAT_INDEX1LSB as i32,
|
||||
Index1MSB = sys::SDL_PIXELFORMAT_INDEX1MSB as i32,
|
||||
Index4LSB = sys::SDL_PIXELFORMAT_INDEX4LSB as i32,
|
||||
Index4MSB = sys::SDL_PIXELFORMAT_INDEX4MSB as i32,
|
||||
Index8 = sys::SDL_PIXELFORMAT_INDEX8 as i32,
|
||||
RGB332 = sys::SDL_PIXELFORMAT_RGB332 as i32,
|
||||
RGB444 = sys::SDL_PIXELFORMAT_RGB444 as i32,
|
||||
RGB555 = sys::SDL_PIXELFORMAT_RGB555 as i32,
|
||||
BGR555 = sys::SDL_PIXELFORMAT_BGR555 as i32,
|
||||
ARGB4444 = sys::SDL_PIXELFORMAT_ARGB4444 as i32,
|
||||
RGBA4444 = sys::SDL_PIXELFORMAT_RGBA4444 as i32,
|
||||
ABGR4444 = sys::SDL_PIXELFORMAT_ABGR4444 as i32,
|
||||
BGRA4444 = sys::SDL_PIXELFORMAT_BGRA4444 as i32,
|
||||
ARGB1555 = sys::SDL_PIXELFORMAT_ARGB1555 as i32,
|
||||
RGBA5551 = sys::SDL_PIXELFORMAT_RGBA5551 as i32,
|
||||
ABGR1555 = sys::SDL_PIXELFORMAT_ABGR1555 as i32,
|
||||
BGRA5551 = sys::SDL_PIXELFORMAT_BGRA5551 as i32,
|
||||
RGB565 = sys::SDL_PIXELFORMAT_RGB565 as i32,
|
||||
BGR565 = sys::SDL_PIXELFORMAT_BGR565 as i32,
|
||||
RGB24 = sys::SDL_PIXELFORMAT_RGB24 as i32,
|
||||
BGR24 = sys::SDL_PIXELFORMAT_BGR24 as i32,
|
||||
RGB888 = sys::SDL_PIXELFORMAT_RGB888 as i32,
|
||||
RGBX8888 = sys::SDL_PIXELFORMAT_RGBX8888 as i32,
|
||||
BGR888 = sys::SDL_PIXELFORMAT_BGR888 as i32,
|
||||
BGRX8888 = sys::SDL_PIXELFORMAT_BGRX8888 as i32,
|
||||
ARGB8888 = sys::SDL_PIXELFORMAT_ARGB8888 as i32,
|
||||
RGBA8888 = sys::SDL_PIXELFORMAT_RGBA8888 as i32,
|
||||
ABGR8888 = sys::SDL_PIXELFORMAT_ABGR8888 as i32,
|
||||
BGRA8888 = sys::SDL_PIXELFORMAT_BGRA8888 as i32,
|
||||
ARGB2101010 = sys::SDL_PIXELFORMAT_ARGB2101010 as i32,
|
||||
YV12 = sys::SDL_PIXELFORMAT_YV12 as i32,
|
||||
IYUV = sys::SDL_PIXELFORMAT_IYUV as i32,
|
||||
YUY2 = sys::SDL_PIXELFORMAT_YUY2 as i32,
|
||||
UYVY = sys::SDL_PIXELFORMAT_UYVY as i32,
|
||||
YVYU = sys::SDL_PIXELFORMAT_YVYU as i32
|
||||
Unknown = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_UNKNOWN as i32,
|
||||
Index1LSB = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_INDEX1LSB as i32,
|
||||
Index1MSB = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_INDEX1MSB as i32,
|
||||
Index4LSB = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_INDEX4LSB as i32,
|
||||
Index4MSB = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_INDEX4MSB as i32,
|
||||
Index8 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_INDEX8 as i32,
|
||||
RGB332 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_RGB332 as i32,
|
||||
RGB444 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_RGB444 as i32,
|
||||
RGB555 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_RGB555 as i32,
|
||||
BGR555 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_BGR555 as i32,
|
||||
ARGB4444 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_ARGB4444 as i32,
|
||||
RGBA4444 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_RGBA4444 as i32,
|
||||
ABGR4444 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_ABGR4444 as i32,
|
||||
BGRA4444 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_BGRA4444 as i32,
|
||||
ARGB1555 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_ARGB1555 as i32,
|
||||
RGBA5551 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_RGBA5551 as i32,
|
||||
ABGR1555 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_ABGR1555 as i32,
|
||||
BGRA5551 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_BGRA5551 as i32,
|
||||
RGB565 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_RGB565 as i32,
|
||||
BGR565 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_BGR565 as i32,
|
||||
RGB24 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_RGB24 as i32,
|
||||
BGR24 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_BGR24 as i32,
|
||||
RGB888 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_RGB888 as i32,
|
||||
RGBX8888 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_RGBX8888 as i32,
|
||||
BGR888 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_BGR888 as i32,
|
||||
BGRX8888 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_BGRX8888 as i32,
|
||||
ARGB8888 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_ARGB8888 as i32,
|
||||
RGBA8888 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_RGBA8888 as i32,
|
||||
ABGR8888 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_ABGR8888 as i32,
|
||||
BGRA8888 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_BGRA8888 as i32,
|
||||
ARGB2101010 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_ARGB2101010 as i32,
|
||||
YV12 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_YV12 as i32,
|
||||
IYUV = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_IYUV as i32,
|
||||
YUY2 = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_YUY2 as i32,
|
||||
UYVY = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_UYVY as i32,
|
||||
YVYU = sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_YVYU as i32
|
||||
}
|
||||
|
||||
// Endianness-agnostic aliases for 32-bit formats
|
||||
@@ -413,42 +413,42 @@ impl TryFrom<u32> for PixelFormatEnum {
|
||||
use self::PixelFormatEnum::*;
|
||||
|
||||
Ok( match unsafe { transmute(n) } {
|
||||
sys::SDL_PIXELFORMAT_UNKNOWN => Unknown,
|
||||
sys::SDL_PIXELFORMAT_INDEX1LSB => Index1LSB,
|
||||
sys::SDL_PIXELFORMAT_INDEX1MSB => Index1MSB,
|
||||
sys::SDL_PIXELFORMAT_INDEX4LSB => Index4LSB,
|
||||
sys::SDL_PIXELFORMAT_INDEX4MSB => Index4MSB,
|
||||
sys::SDL_PIXELFORMAT_INDEX8 => Index8,
|
||||
sys::SDL_PIXELFORMAT_RGB332 => RGB332,
|
||||
sys::SDL_PIXELFORMAT_RGB444 => RGB444,
|
||||
sys::SDL_PIXELFORMAT_RGB555 => RGB555,
|
||||
sys::SDL_PIXELFORMAT_BGR555 => BGR555,
|
||||
sys::SDL_PIXELFORMAT_ARGB4444 => ARGB4444,
|
||||
sys::SDL_PIXELFORMAT_RGBA4444 => RGBA4444,
|
||||
sys::SDL_PIXELFORMAT_ABGR4444 => ABGR4444,
|
||||
sys::SDL_PIXELFORMAT_BGRA4444 => BGRA4444,
|
||||
sys::SDL_PIXELFORMAT_ARGB1555 => ARGB1555,
|
||||
sys::SDL_PIXELFORMAT_RGBA5551 => RGBA5551,
|
||||
sys::SDL_PIXELFORMAT_ABGR1555 => ABGR1555,
|
||||
sys::SDL_PIXELFORMAT_BGRA5551 => BGRA5551,
|
||||
sys::SDL_PIXELFORMAT_RGB565 => RGB565,
|
||||
sys::SDL_PIXELFORMAT_BGR565 => BGR565,
|
||||
sys::SDL_PIXELFORMAT_RGB24 => RGB24,
|
||||
sys::SDL_PIXELFORMAT_BGR24 => BGR24,
|
||||
sys::SDL_PIXELFORMAT_RGB888 => RGB888,
|
||||
sys::SDL_PIXELFORMAT_RGBX8888 => RGBX8888,
|
||||
sys::SDL_PIXELFORMAT_BGR888 => BGR888,
|
||||
sys::SDL_PIXELFORMAT_BGRX8888 => BGRX8888,
|
||||
sys::SDL_PIXELFORMAT_ARGB8888 => ARGB8888,
|
||||
sys::SDL_PIXELFORMAT_RGBA8888 => RGBA8888,
|
||||
sys::SDL_PIXELFORMAT_ABGR8888 => ABGR8888,
|
||||
sys::SDL_PIXELFORMAT_BGRA8888 => BGRA8888,
|
||||
sys::SDL_PIXELFORMAT_ARGB2101010 => ARGB2101010,
|
||||
sys::SDL_PIXELFORMAT_YV12 => YV12,
|
||||
sys::SDL_PIXELFORMAT_IYUV => IYUV,
|
||||
sys::SDL_PIXELFORMAT_YUY2 => YUY2,
|
||||
sys::SDL_PIXELFORMAT_UYVY => UYVY,
|
||||
sys::SDL_PIXELFORMAT_YVYU => YVYU,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_UNKNOWN => Unknown,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_INDEX1LSB => Index1LSB,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_INDEX1MSB => Index1MSB,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_INDEX4LSB => Index4LSB,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_INDEX4MSB => Index4MSB,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_INDEX8 => Index8,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_RGB332 => RGB332,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_RGB444 => RGB444,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_RGB555 => RGB555,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_BGR555 => BGR555,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_ARGB4444 => ARGB4444,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_RGBA4444 => RGBA4444,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_ABGR4444 => ABGR4444,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_BGRA4444 => BGRA4444,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_ARGB1555 => ARGB1555,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_RGBA5551 => RGBA5551,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_ABGR1555 => ABGR1555,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_BGRA5551 => BGRA5551,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_RGB565 => RGB565,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_BGR565 => BGR565,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_RGB24 => RGB24,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_BGR24 => BGR24,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_RGB888 => RGB888,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_RGBX8888 => RGBX8888,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_BGR888 => BGR888,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_BGRX8888 => BGRX8888,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_ARGB8888 => ARGB8888,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_RGBA8888 => RGBA8888,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_ABGR8888 => ABGR8888,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_BGRA8888 => BGRA8888,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_ARGB2101010 => ARGB2101010,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_YV12 => YV12,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_IYUV => IYUV,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_YUY2 => YUY2,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_UYVY => UYVY,
|
||||
sys::SDL_PixelFormatEnum::SDL_PIXELFORMAT_YVYU => YVYU,
|
||||
_ => return Err(()),
|
||||
})
|
||||
}
|
||||
|
||||
+2
-2
@@ -131,7 +131,7 @@ impl<'a> io::Read for RWops<'a> {
|
||||
// FIXME: it's better to use as_mut_ptr().
|
||||
// number of objects read, or 0 at error or end of file.
|
||||
let ret = unsafe {
|
||||
((*self.raw).read.unwrap())(self.raw, buf.as_ptr() as *mut c_void, 1, out_len)
|
||||
((*self.raw).read.unwrap())(self.raw, buf.as_ptr() as *mut c_void, 1, out_len as u64)
|
||||
};
|
||||
Ok(ret as usize)
|
||||
}
|
||||
@@ -141,7 +141,7 @@ impl<'a> io::Write for RWops<'a> {
|
||||
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
|
||||
let in_len = buf.len() as size_t;
|
||||
let ret = unsafe {
|
||||
((*self.raw).write.unwrap())(self.raw, buf.as_ptr() as *const c_void, 1, in_len)
|
||||
((*self.raw).write.unwrap())(self.raw, buf.as_ptr() as *const c_void, 1, in_len as u64)
|
||||
};
|
||||
Ok(ret as usize)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user