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.

Sign up for GitHub

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

[3.0] Fix OpenGL type-mappings #1907

Merged
merged 25 commits into from
Jan 21, 2024
Merged

[3.0] Fix OpenGL type-mappings #1907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
7e26cac
Initial untested work on the cache mechanism
Perksey Dec 28, 2023
c70863f
Fix dependency injection bugs
Perksey Dec 30, 2023
5be25b8
Minor cleanups
Perksey Dec 30, 2023
7f7b3ad
Make unit test representative
Perksey Dec 30, 2023
18bd76b
Fix the caching problem
Perksey Dec 30, 2023
2101c73
Regenerate Windows bindings
dotnet-bot Dec 30, 2023
ff78fe6
Adjust git attributes
dotnet-bot Dec 30, 2023
c190bfa
Flush the file stream maybe?
Perksey Jan 1, 2024
3984605
Delete just in case gitattributes didn't apply
dotnet-bot Jan 1, 2024
b0a9a90
Readd .stout files
dotnet-bot Jan 1, 2024
a26cbbc
Fix some pathing schenanigans
Perksey Jan 1, 2024
b229bde
Regenerate bindings
dotnet-bot Jan 1, 2024
130a663
Apply generalisation to the whole cache key
Perksey Jan 1, 2024
4684c22
That's relativity folks
Perksey Jan 1, 2024
630e7e4
Just hash the original input rather than recreating it
Perksey Jan 1, 2024
0033ce6
Crank up logging
Perksey Jan 1, 2024
1e2552a
Another attempt at the cache key
Perksey Jan 1, 2024
f01439d
Another attempt at the cache key
Perksey Jan 1, 2024
8c0cc8f
Regenerated w/ cache finally!
dotnet-bot Jan 1, 2024
89dcc7a
Small cleanups now that caching is working
Perksey Jan 1, 2024
ce47b91
Fix OpenGL type mappings
Perksey Jan 21, 2024
60f76cd
Merge and regenerate
Perksey Jan 21, 2024
31e171c
Delete non-existent files in the sln
Perksey Jan 21, 2024
01ca02f
Add generator.json to sln
Perksey Jan 21, 2024
ac9a51b
Remove test.json
Perksey Jan 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .silktouch/ff24659f6032c36e.stout
View file
Open in desktop
Binary file not shown.
9 changes: 1 addition & 8 deletions Silk.NET.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.editorconfig = .editorconfig
.gitattributes = .gitattributes
.gitignore = .gitignore
build.cmd = build.cmd
build.sh = build.sh
Directory.Build.props = Directory.Build.props
Directory.Build.targets = Directory.Build.targets
LICENSE.md = LICENSE.md
pack.cmd = pack.cmd
pack.sh = pack.sh
restore.cmd = restore.cmd
restore.sh = restore.sh
test.cmd = test.cmd
test.sh = test.sh
generator.json = generator.json
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{9DB0EA3E-7216-4F9C-98F5-8A7483E9F083}"
Expand Down
21 changes: 21 additions & 0 deletions eng/silktouch/opengl/remap.rsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,24 @@
__GLsync=GLsync
_cl_context=void
_cl_event=void
GLboolean=uint
GLbyte=sbyte
GLubyte=byte
GLshort=short
GLushort=ushort
GLint=int
GLuint=uint
GLfixed=int
GLint64=long
GLuint64=ulong
GLsizei=uint
GLenum=uint
GLintptr=nint
GLsizeiptr=nuint
GLbitfield=uint
GLhalf=Half
GLfloat=float
GLclampf=float
GLdouble=double
GLclampd=double
GLhandleARB=uint
44 changes: 22 additions & 22 deletions sources/SilkTouch/test.json → generator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
"Jobs": {
"Microsoft": {
"ClangSharpResponseFiles": [
"../../eng/submodules/terrafx.interop.windows/generation/**/generate.rsp"
"eng/submodules/terrafx.interop.windows/generation/**/generate.rsp"
],
"ManualOverrides": {
"sources/Windows/um/icm/Windows.gen.cs": "../../eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Windows/um/icm/Windows.cs",
"sources/Gdiplus/um/gdiplustypes/GpRect.gen.cs": "../../eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Gdiplus/um/gdiplustypes/GpRect.cs",
"sources/Gdiplus/um/gdiplustypes/GpRectF.gen.cs": "../../eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Gdiplus/um/gdiplustypes/GpRectF.cs",
"sources/Gdiplus/um/gdiplustypes/GpPathData.gen.cs": "../../eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Gdiplus/um/gdiplustypes/GpPathData.cs"
"sources/Windows/um/icm/Windows.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Windows/um/icm/Windows.cs",
"sources/Gdiplus/um/gdiplustypes/GpRect.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Gdiplus/um/gdiplustypes/GpRect.cs",
"sources/Gdiplus/um/gdiplustypes/GpRectF.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Gdiplus/um/gdiplustypes/GpRectF.cs",
"sources/Gdiplus/um/gdiplustypes/GpPathData.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Gdiplus/um/gdiplustypes/GpPathData.cs"
},
"InputSourceRoot": "../../eng/submodules/terrafx.interop.windows/sources/Interop/Windows",
"InputTestRoot": "../../eng/submodules/terrafx.interop.windows/tests/Interop/Windows",
"OutputSourceRoot": "../Windows",
"OutputTestRoot": "../../tests/Windows",
"Solution": "../../Silk.NET.sln",
"InputSourceRoot": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows",
"InputTestRoot": "eng/submodules/terrafx.interop.windows/tests/Interop/Windows",
"OutputSourceRoot": "sources/Windows",
"OutputTestRoot": "tests/Windows",
"Solution": "Silk.NET.sln",
"Mods": [
"AddIncludes",
"ChangeNamespace"
Expand All @@ -30,13 +30,13 @@
},
"GLFW": {
"ClangSharpResponseFiles": [
"../../eng/silktouch/glfw/**/generate.rsp"
"eng/silktouch/glfw/**/generate.rsp"
],
"InputSourceRoot": "../GLFW",
"InputTestRoot": "../../tests/GLFW",
"OutputSourceRoot": "../GLFW",
"OutputTestRoot": "../../tests/GLFW",
"Solution": "../../Silk.NET.sln",
"InputSourceRoot": "sources/GLFW",
"InputTestRoot": "tests/GLFW",
"OutputSourceRoot": "sources/GLFW",
"OutputTestRoot": "tests/GLFW",
"Solution": "Silk.NET.sln",
"Mods": [
"AddIncludes",
"AddOpaqueStructs",
Expand All @@ -54,13 +54,13 @@
},
"OpenGL": {
"ClangSharpResponseFiles": [
"../../eng/silktouch/opengl/**/generate.rsp"
"eng/silktouch/opengl/**/generate.rsp"
],
"InputSourceRoot": "../OpenGL",
"InputTestRoot": "../../tests/OpenGL",
"OutputSourceRoot": "../OpenGL",
"OutputTestRoot": "../../tests/OpenGL",
"Solution": "../../Silk.NET.sln",
"InputSourceRoot": "sources/OpenGL",
"InputTestRoot": "tests/OpenGL",
"OutputSourceRoot": "sources/OpenGL",
"OutputTestRoot": "tests/OpenGL",
"Solution": "Silk.NET.sln",
"Mods": [
"AddIncludes",
"AddApiProfiles",
Expand Down
2 changes: 1 addition & 1 deletion sources/OpenGL/GL.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
// The .NET Foundation licenses this file to you under the MIT license.
// Ported from the OpenGL Core Profile headers and corresponding dependencies.
// Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using Silk.NET.Core.Loader;
using System.Reflection;

namespace Silk.NET.OpenGL;

Expand Down
Loading
Loading