Skip to content

Make pgpu-render compile on non apple platforms#180

Merged
raphlinus merged 2 commits intolinebender:mainfrom
DJMcNab:pgpu_render_not_apple
Jul 13, 2022
Merged

Make pgpu-render compile on non apple platforms#180
raphlinus merged 2 commits intolinebender:mainfrom
DJMcNab:pgpu_render_not_apple

Conversation

@DJMcNab
Copy link
Copy Markdown
Member

@DJMcNab DJMcNab commented Jun 25, 2022

This makes use of a cfg to disable the metal dependencies and the functions they are used in on ios or macos.
This is also reflected in the generated cbindgen code, using the with_define feature.

Also add resolver="2" to the workspace root, primarily in case we gain a wgpu dependency.

I've also added a fix for the android example

DJMcNab added 2 commits June 25, 2022 14:11
Also add `resolver="2"` to the entire workspace, in case we gain a wgpu
dependency
Copy link
Copy Markdown
Contributor

@raphlinus raphlinus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems good to me. @dfrg can you confirm, as this is mostly in your code? Also this might conflict with some of the CI changes I'm making.

@dfrg
Copy link
Copy Markdown
Collaborator

dfrg commented Jul 13, 2022

This looks good to me as well. It seems we might be able to slip this in without creating any merge conflicts.

@raphlinus raphlinus merged commit 57b94a3 into linebender:main Jul 13, 2022
@DJMcNab DJMcNab deleted the pgpu_render_not_apple branch July 13, 2022 19:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants