Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More iOS fixes #208

Merged
merged 15 commits into from Nov 5, 2018
Merged

More iOS fixes #208

merged 15 commits into from Nov 5, 2018

Conversation

TheSpydog
Copy link
Member

Just a few small changes needed for iOS/tvOS. Of particular note is that MediaPlayer is a namespace in Xamarin.iOS, so I had to change FrameworkDispatcher to refer to Media.MediaPlayer. If there's a nicer way to resolve that namespace/classname conflict, that'd be great.

@@ -663,6 +647,17 @@ ref wmInfo
MojoShader.MOJOSHADER_glMakeContextCurrent(shaderContext);
FNALoggerEXT.LogInfo("MojoShader Profile: " + shaderProfile);

// UIKit needs special treatment for backbuffer behavior
if (SDL.SDL_GetPlatform() == "iOS" || SDL.SDL_GetPlatform() == "tvOS")
Copy link
Member

Choose a reason for hiding this comment

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

Was the wminfo data inaccurate? If possible I'd like to get the GLuint handles from SysWMInfo instead, but if something's not right with it then we can do this.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, it always returned 0 for both the Framebuffer and Renderbuffer handles, which just put us back where we started.

Copy link
Member

Choose a reason for hiding this comment

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

I wonder if it’s this part here: https://hg.libsdl.org/SDL/file/80f861112154/src/video/uikit/SDL_uikitwindow.m#l357

Depending on the reason for these results this may be an SDL bug.

Copy link
Member

Choose a reason for hiding this comment

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

I'm an idiot, we need to initialize the version info first:

d69709a

The UIKit stuff in master should work now...

@flibitijibibo
Copy link
Member

Other than the 2 comments this LGTM!

@@ -4726,4 +4728,4 @@ private void ForceToMainThread(Action action)

#endregion
}
}
}
Copy link
Member

Choose a reason for hiding this comment

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

Xamarin pls

@flibitijibibo flibitijibibo merged commit 05fc829 into FNA-XNA:master Nov 5, 2018
@TheSpydog TheSpydog deleted the ios branch November 5, 2018 17:33
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.

None yet

2 participants