Fixes screen grab crash #366
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GyroJoe
commented
Apr 15, 2023
| @@ -11,9 +11,9 @@ | |||
| using LibDmd.Output.PinDmd1; | |||
| using LibDmd.Output.PinDmd2; | |||
| using LibDmd.Output.PinDmd3; | |||
| using LibDmd.Output.ZeDMD; | |||
GyroJoe
commented
Apr 15, 2023
| @@ -196,8 +197,6 @@ private static IDestination ShowVirtualDmd(IConfiguration config, int[] position | |||
|
|
|||
| dmd.Dispatcher.Invoke(() => { | |||
| dmd.Dmd.Init(); | |||
| if(position != null) | |||
There was a problem hiding this comment.
The position it was passing here was the screen grab position, not the virtual dmd position. Not sure why, but it didn't seem correct to me.
There was a problem hiding this comment.
You're absolutely right, grabbing position has no business when creating the virtual DMD.
GyroJoe
commented
Apr 15, 2023
| @@ -605,7 +605,7 @@ private void ogl_OpenGLDraw(object sender, OpenGLRoutedEventArgs args) | |||
| if (createTexture) | |||
| gl.TexImage2D(OpenGL.GL_TEXTURE_2D, 0, OpenGL.GL_RGB, _bitmapToRender.Width, _bitmapToRender.Height, 0, OpenGL.GL_BGR, OpenGL.GL_UNSIGNED_BYTE, data.Scan0); | |||
| else | |||
| glTexSubImage2D(OpenGL.GL_TEXTURE_2D, 0, 0, 0, DmdWidth, DmdHeight, OpenGL.GL_BGR, OpenGL.GL_UNSIGNED_BYTE, data.Scan0); | |||
| glTexSubImage2D(OpenGL.GL_TEXTURE_2D, 0, 0, 0, _bitmapToRender.Width, _bitmapToRender.Height, OpenGL.GL_BGR, OpenGL.GL_UNSIGNED_BYTE, data.Scan0); | |||
There was a problem hiding this comment.
Cause of the crash. The size needs to match the buffer size. Likely just a copy/paste error.
GyroJoe
commented
Apr 15, 2023
| { | ||
| var dmd = new VirtualDmd { | ||
| Left = config.VirtualDmd.Left, | ||
| Top = config.VirtualDmd.Top, | ||
| Width = config.VirtualDmd.Width, | ||
| Height = config.VirtualDmd.Height | ||
| Height = config.VirtualDmd.Height, | ||
| IgnoreAspectRatio = config.VirtualDmd.IgnoreAr |
There was a problem hiding this comment.
Height was getting ignored, since the AR was locked.
|
Awesome, thanks a lot! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #357
Allows unlocked AR for virtual DMD when using the mirror command again.