Updated library to import sdl_gfx #75
Conversation
| using SDL2_gfx_jll | ||
| export SDL2_gfx_jll |
There was a problem hiding this comment.
This can be done automatically by adding SDL2_gfx_jll here in the generator config: https://github.com/JuliaMultimedia/SimpleDirectMediaLayer.jl/blob/master/gen/generator.toml#L7
Docs: https://github.com/JuliaInterop/Clang.jl/blob/master/gen/generator.toml#L34
| @@ -6267,411 +6270,411 @@ struct FPSmanager | |||
| end | |||
|
|
|||
| function SDL_initFramerate(manager) | |||
| ccall((:SDL_initFramerate, libsdl2), Cvoid, (Ptr{FPSmanager},), manager) | |||
| ccall((:SDL_initFramerate, libsdl2_gfx), Cvoid, (Ptr{FPSmanager},), manager) | |||
There was a problem hiding this comment.
Do all the libsdl2_gfx functions come from a specific header file? If so then we could set the library to be called for that header: https://github.com/JuliaInterop/Clang.jl/blob/master/gen/generator.toml#L12
|
No that's fine, thank you! When I get a chance either today or tomorrow, I can address these issues. This is super helpful! |
src/LibSDL2.jl
Outdated
| end | ||
|
|
||
| function TTF_RenderGlyph_Solid(font, ch, fg) | ||
| ccall((:TTF_RenderGlyph_Solid, libsdl2_ttf), Ptr{SDL_Surface}, (Ptr{TTF_Font}, Uint16, SDL_Color), font, ch, fg) |
There was a problem hiding this comment.
@JamesWrigley I updated the config, and it seems to be overwriting all of these. I'm not sure if I'm doing something wrong here, or if I should be going back and updating these. I figured I'd commit it and show instead of trying to explain.
There was a problem hiding this comment.
I cannot reproduce this 🤔 If I clone the repo and regenerate the bindings those lines aren't changed. What Clang.jl version are you using? I know gen/Project.toml has compat bounds but I'd actually suggest deleting all of them and running ] up. Generator projects are typically used to generate bindings for the latest version of packages and they'll never be a dependency, so I don't see any point in having compat bounds for them.
src/LibSDL2.jl
Outdated
| @@ -7098,6 +7171,10 @@ const SDL_MUTEX_TIMEDOUT = 1 | |||
|
|
|||
| const SDL_MUTEX_MAXWAIT = ~(Uint32(0)) | |||
|
|
|||
| const SDL_beginthread = _beginthreadex | |||
There was a problem hiding this comment.
This throws an error saying it doesn't exist. I'm not sure if I'm supposed to just delete it?
There was a problem hiding this comment.
This does not show up when I generate the bindings 😅 Maybe because we're using different package versions? I've updated everything.
| @@ -219,7 +262,7 @@ mutable struct SDL_BlitMap end | |||
|
|
|||
| struct SDL_Surface | |||
| flags::Uint32 | |||
| format::Ptr{Cvoid} # format::Ptr{SDL_PixelFormat} | |||
| format::Ptr{SDL_PixelFormat} | |||
There was a problem hiding this comment.
Should this stay a Cvoid?
There was a problem hiding this comment.
No that's ok, Clang.jl probably just didn't have full support for pointer fields before. You can see from the comment that it did recognize the type of the field but didn't use it for some reason.
|
I tried your branch locally and got it working, the only changes I made were:
After that, all the tests passed. |
|
Tried it with a linux machine instead of windows and it worked! I want to add a few smoke tests for the added libraries. Thank you! Definitely learned some useful stuff about Clang.jl that I can use for my other stuff 😄 |
|
Okay I actually have it working and added a simple test for each header file from the gfx library. I think it's ready for an official review. If you happen to know anyone who can, would you direct them here please? Thanks! |
|
Noice noice 👍 Maybe @Gnimuc? |
|
I think it's good to merge. |
|
Anything else I need to do here? Is there an ETA on merging? I'd like to use this soon. Thanks! |
Here is a fix for the sdl_gfx functions not actually working when called. The package SDL2_gfx_jll wasn't listed as a dependency, and I updated the calls in LibSDL2 to actually use them. Eventually I would like to update to a newer version of the package, but this is what we have at the moment.