Fix bindgen, update sdl_bindings.rs

changelog.md

@@ -1,6 +1,11 @@
 In this file will be listed the changes, especially the breaking ones that one should be careful of
 when upgrading from a version of rust-sdl2 to another.
 
+### v0.35 (UNRELEASED)
+
+* **BREAKING CHANGE** Update `sdl2-sys/sdl_bindings.rs` to use enums instead of consts. If you were using `sdl2-sys`'s
+enum variants directly in your project, you may be affected. If you only used sdl2 calls, there should not be any problems.
+
 ### v0.34.5
 
 [PR #1100](https://github.com/Rust-SDL2/rust-sdl2/pull/1100) Added binding for `SDL_GetDisplayUsableBounds`

examples/animation.rs

@@ -26,7 +26,7 @@ fn main() -> Result<(), String> {
 
     canvas.set_draw_color(sdl2::pixels::Color::RGBA(0, 0, 0, 255));
 
-    let mut timer = sdl_context.timer()?;
+    let timer = sdl_context.timer()?;
 
     let mut event_pump = sdl_context.event_pump()?;
 

examples/game-of-life.rs

@@ -118,7 +118,7 @@ fn dummy_texture<'a>(
     enum TextureColor {
         Yellow,
         White,
-    };
+    }
     let mut square_texture1 = texture_creator
         .create_texture_target(None, SQUARE_SIZE, SQUARE_SIZE)
         .map_err(|e| e.to_string())?;

src/sdl2/event.rs

@@ -814,7 +814,7 @@ where
     let keycode = keycode
         .into()
         .map(|kc| kc as sys::SDL_Keycode)
-        .unwrap_or(sys::SDLK_UNKNOWN as i32);
+        .unwrap_or(sys::SDL_KeyCode::SDLK_UNKNOWN as i32);
     let keymod = keymod.bits() as u16;
     sys::SDL_Keysym {
         scancode,

src/sdl2/log.rs

@@ -20,23 +20,23 @@ pub enum Category {
 impl Category {
     #[allow(dead_code)]
     fn from_ll(value: u32) -> Category {
-        if value == sys::SDL_LOG_CATEGORY_APPLICATION as u32 {
+        if value == sys::SDL_LogCategory::SDL_LOG_CATEGORY_APPLICATION as u32 {
             Category::Application
-        } else if value == sys::SDL_LOG_CATEGORY_ERROR as u32 {
+        } else if value == sys::SDL_LogCategory::SDL_LOG_CATEGORY_ERROR as u32 {
             Category::Error
-        } else if value == sys::SDL_LOG_CATEGORY_ASSERT as u32 {
+        } else if value == sys::SDL_LogCategory::SDL_LOG_CATEGORY_ASSERT as u32 {
             Category::Assert
-        } else if value == sys::SDL_LOG_CATEGORY_SYSTEM as u32 {
+        } else if value == sys::SDL_LogCategory::SDL_LOG_CATEGORY_SYSTEM as u32 {
             Category::System
-        } else if value == sys::SDL_LOG_CATEGORY_AUDIO as u32 {
+        } else if value == sys::SDL_LogCategory::SDL_LOG_CATEGORY_AUDIO as u32 {
             Category::Audio
-        } else if value == sys::SDL_LOG_CATEGORY_VIDEO as u32 {
+        } else if value == sys::SDL_LogCategory::SDL_LOG_CATEGORY_VIDEO as u32 {
             Category::Video
-        } else if value == sys::SDL_LOG_CATEGORY_RENDER as u32 {
+        } else if value == sys::SDL_LogCategory::SDL_LOG_CATEGORY_RENDER as u32 {
             Category::Render
-        } else if value == sys::SDL_LOG_CATEGORY_INPUT as u32 {
+        } else if value == sys::SDL_LogCategory::SDL_LOG_CATEGORY_INPUT as u32 {
             Category::Input
-        } else if value == sys::SDL_LOG_CATEGORY_TEST as u32 {
+        } else if value == sys::SDL_LogCategory::SDL_LOG_CATEGORY_TEST as u32 {
             Category::Test
         } else {
             Category::Custom

src/sdl2/render.rs

@@ -156,6 +156,8 @@ pub enum BlendMode {
     ///
     /// dstRGB = srcRGB * dstRGB
     Mod = SDL_BlendMode::SDL_BLENDMODE_MOD as i32,
+    /// Color multiply
+    Mul = SDL_BlendMode::SDL_BLENDMODE_MUL as i32,
     /// Invalid blending mode (indicates error)
     Invalid = SDL_BlendMode::SDL_BLENDMODE_INVALID as i32,
 }
@@ -172,6 +174,7 @@ impl TryFrom<u32> for BlendMode {
             SDL_BLENDMODE_BLEND => Blend,
             SDL_BLENDMODE_ADD => Add,
             SDL_BLENDMODE_MOD => Mod,
+            SDL_BLENDMODE_MUL => Mul,
             SDL_BLENDMODE_INVALID => Invalid,
         })
     }