Browse Source
Merge branch 'master' into fixes/Samples/ControlCatalog
pull/8717/head
Max Katz
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
2 deletions
-
samples/ControlCatalog/Pages/OpenGlPage.xaml.cs
-
src/Skia/Avalonia.Skia/Gpu/OpenGl/OpenGlBitmapImpl.cs
|
|
|
@ -345,7 +345,7 @@ namespace ControlCatalog.Pages |
|
|
|
0.01f, 1000); |
|
|
|
|
|
|
|
|
|
|
|
var view = Matrix4x4.CreateLookAt(new Vector3(25, 25, 25), new Vector3(), new Vector3(0, -1, 0)); |
|
|
|
var view = Matrix4x4.CreateLookAt(new Vector3(25, 25, 25), new Vector3(), new Vector3(0, 1, 0)); |
|
|
|
var model = Matrix4x4.CreateFromYawPitchRoll(_yaw, _pitch, _roll); |
|
|
|
var modelLoc = GL.GetUniformLocationString(_shaderProgram, "uModel"); |
|
|
|
var viewLoc = GL.GetUniformLocationString(_shaderProgram, "uView"); |
|
|
|
|
|
|
|
@ -41,7 +41,7 @@ namespace Avalonia.Skia |
|
|
|
new GRGlTextureInfo( |
|
|
|
GlConsts.GL_TEXTURE_2D, (uint)_surface.GetTextureId(), |
|
|
|
(uint)_surface.InternalFormat))) |
|
|
|
using (var surface = SKSurface.Create(context.GrContext, backendTexture, GRSurfaceOrigin.TopLeft, |
|
|
|
using (var surface = SKSurface.Create(context.GrContext, backendTexture, GRSurfaceOrigin.BottomLeft, |
|
|
|
SKColorType.Rgba8888)) |
|
|
|
{ |
|
|
|
// Again, silently ignore, if something went wrong it's not our fault
|
|
|
|
|
