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

Jump to bottom

1.2.0-alpha1 - do not merge #142

Closed
wants to merge 2,988 commits into from
Closed

1.2.0-alpha1 - do not merge #142

wants to merge 2,988 commits into from

Conversation

thefiddler
Copy link
Contributor

This PR synchronizes OpenTK with the Xamarin version (https://github.com/mono/opentk). The result is fully functional, but requires some additional work regarding API compatibility. This PR is created now to ensure testing by the CI server.

New features:

  • Support for Xamarin.Android
  • Support for Xamarin.iOS
  • OpenGL ES bindings for Android, iOS, ANGLE and Linux are now generated from the Khronos xml registry. This resolves all const-correctness issues (differing ref/out parameters).
  • OpenCL bindings for versions 1.0, 1.1, 1.2 and 2.0
  • The binding generator can now generate structures with fields, static methods and extension methods. This functionality is currently used in the OpenCL and Wayland bindings. There is a good chance that it will also be used for OpenGL 5.0, whenever that is released.
  • The binding generator can now cope with more mathml constructs. This translates into better documentation for OpenGL, OpenGL ES and OpenCL.

Known issues:

  • The ABI must be bumped to 1.2.
  • Only a subset of the OpenTK API is supported on Android and iOS. This will be improved in the future.
  • A number of OpenGL ES enumerations are present in downstream headers but missing from the Khronos registry. These enumerations are not actually used by any OpenGL ES function, but they must still be added to maintain backwards compatibility.
  • [done] OpenGL ES tokens starting with a number are translated differently from mono/opentk. This affects exactly 2 tokens (3dfx_*) and should be fixed before merging.
  • OpenCL should not use bindings with unsafe pointers. This is because OpenCL often requires null parameters, which cause conflicts between array and pointer parameters.
  • We still need OpenCL examples:
    • Buffers
    • Texture samplers
    • Synchronization
    • Events
  • We still need Android and iOS examples.

@thefiddler
Fix compilation errors
356c80a
@thefiddler
Added Build.UpdateVersion and Generator.Rewrite projects
4f6a019
@thefiddler
[Android] Added ES11 sample
2ae9966
@thefiddler
[ES11] Maintain compatibility with Xamarin.Android
6269d60 
Compatibility verified through apitest.

A single incompatible change remains: GL.GetError() now returns
ErrorCode instead of All.
@thefiddler
System.Drawing.Color is now available on Android/iPhone
4d60534
@thefiddler
[ES20] Maintain compatibility with Xamarin.Android
167643e 
Compatibility verified with apitest.

Incompatible changes: GetError() returns ErrorCode and
GetFramebufferStatus() returns FramebufferErrorCode instead
of All.
@thefiddler
[ES30] Maintain compatibility with Xamarin.Android
4e77e74 
Compatibility verified with apitest.

Changes:
- GetActiveUniforms has ref not out parameter
- GetError returns ErrorCode not All
- GetFramebufferStatus returns FramebufferErrorCode not All
@thefiddler
[Projects] Removed unused file.
a582b3c
@thefiddler
[ES30] Maintain compatibility with Xamarin.iOS
2fdd711 
Compatibility testing in progress.
@thefiddler
[iOS] Fixed compilation
77ef201
@thefiddler
Removed corrupt project settings
a13d121
@thefiddler
[Android] Improve ES11 sample deployment
96c6d01 
This sample can now be deployed on older devices.
@thefiddler
[iOS] Added iOS project platform
c000b7c
@thefiddler
[ES11] Removed unused files
ee82e3c
@thefiddler
[ES20] Removed unused files
cd81cda
@thefiddler
[Rewrite] Don't try to resolve every assembly
a3175e3 
We only need to resolve mscorlib. This fixes issues when rewriting the
iOS build.
@thefiddler
[iOS] Initialize the correct IPlatformFactory
052b830
@thefiddler
[iOS] Implement extension loading
98a7ce7
@thefiddler
[Graphics] Disable validity checks on iOS
f16d649
@thefiddler
[iOS] Removed unused EGL platform
1d47dc6 
iOS uses EAGL instead.
@thefiddler
[iOS] Added ES11 sample
83d150b
@thefiddler
[Android] Load ES entry points
1021fc2
@thefiddler
Removed SDL2 projects from workspace
6c49299 
The SDL2 projects are completely experimental and should not normally
be used.
@thefiddler
[iOS] Fixed xml documentation generation
6b85ce4
@thefiddler
[iOS] Reduce size of release-mode bundle
f3393ed
@thefiddler
[Bind] Add Android/iOS generation settings
8c1ac74 
In order to reduce the binary size, a new option “ForceDllImport” has
been added for iOS builds. This suppress the generation of entry point
slots, in favor of DllImports.

Android now uses “UseDllImport” by default. This suppress the
generation of entry point slots for core functions, and keeps slots
only for extension functions.
@thefiddler
[iOS] Rename to OpenTK.dll
22104ed 
This simplifies the deployment of OpenTK.dll.config
@thefiddler
Merged updates from mono/opentk
75dea1a
@thefiddler
[Android] Fixed release build
1e65349
@thefiddler
[iOS] Added Build.UpdateVersion project
6206135
@thefiddler
[ES] Improved Xamarin.Android compatibility
6f1e856
@thefiddler
[Bind] Implemented KeepCoreOnly setting
817b940 
Also fixed a minor issue in reuse enum elements.
@thefiddler
[Bind] Implemented ES 1.0 generator
c158e75
@thefiddler
[Bind] Implemented -mode:gl shortcut for gl2+gl4
a101541
@thefiddler
[Bind] Fixed potential crash when merging enums
fe3cce0 
Merging an enum with itself might possibly lead to a crash. This is now
detected and avoided.
@thefiddler
[Bind] Removed unused debugging code
36d8373
@thefiddler
[ES] Corrected 1.1 compatibility
c23a270
@thefiddler
[ES] Regenerated bindings
26b9b17
@thefiddler
[ES] Removed unused file
5d892db
@thefiddler
[Tests] Added Android and iOS 1.0 API tests
b9c8096
@thefiddler
Merge branch 'merge_escl' and 'develop' into escl
965a8ee
@thefiddler
[Bind] Fixed build (missing ES*Generator.cs)
682c641
@thefiddler
[Bind] Generate all bindings by default
ec6b1da
@thefiddler
[ES][GL] Regenerated bindings
8ff0fbe
@thefiddler thefiddler mentioned this pull request Jun 23, 2014
Open
@thefiddler
[Bind] Do not translate tokens starting with "##"
622219a
@thefiddler
[ES] Improve Xamarin.Android ES10 compatibility
a1e8a8a
@thefiddler
[ES] Maintain Xamarin.Android ES 2.0 compatibility
3abd72d
@thefiddler
[SDL][X11] Do not warn about unused private fields
d7b597b 
We sometimes need to declare private fields for alignment. Disable
spurious warnings about these fields not being used.
@thefiddler
[ES][GL] Regenerated bindings
cd11153
@thefiddler
Merged develop into escl2
b9c8ce5
@thefiddler
Fixed string reference prologue/epilogue
9e9bee7 
This commit fixes the following issues in string reference parameters:
- prologue now uses the same local variable name as the epilogue
- epilogue is no longer incorrectly skipped
@thefiddler thefiddler mentioned this pull request Jul 21, 2014
Closed
@thefiddler thefiddler added this to the 1.2.0 milestone Jul 30, 2014
@thefiddler thefiddler mentioned this pull request Sep 30, 2014
Closed
@harry-cpp harry-cpp mentioned this pull request May 18, 2016
Closed
@varon
Copy link
Member

varon commented Dec 12, 2016

Closing. This is ancient, and would need to be re-done against the new structure.

@varon varon closed this Dec 12, 2016
@varon varon mentioned this pull request Dec 12, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.2.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@thefiddler @varon @radekdoulik @spouliot @dellis1972