Commit graph

6080 commits

Author SHA1 Message Date
thefiddler
4acbc2268d Merge pull request #141 from Frassle/marshal
Fixes bugs in String marshalling.
2014-06-20 08:45:03 +02:00
Fraser Waters
22760a4032 Fixes bugs in String marshalling.
Fixes two issues:
1. FreeStringArrayPtr used the wrong variable in the offset to
ReadIntPtr causing an access violation.
2. Better cleanup of memory in MarshalStringArrayToPtr when any alloc
fails.
2014-06-19 22:51:47 +01:00
thefiddler
f0fd13a23e Merge pull request #138 from thefiddler/xi2exitfix
[X11] Fix hang when exiting XI2 input thread
2014-06-18 10:26:06 +02:00
thefiddler
f889835dd5 Merge pull request #135 from thefiddler/xquartz
XQuartz support (X11 on Mac)
2014-06-17 09:06:05 +02:00
thefiddler
ea5f1ad1e8 [X11] Send ClientMessage to exit input event loop
To do that, we need a custom InputOnly window. This window is only used
for receiving the exit ClientMessage - XI2 input is still received
through the root window.

Fixes issue https://github.com/mono/MonoGame/issues/2711
2014-06-17 09:05:29 +02:00
thefiddler
7accefea3e [X11] Remove unused XCreateWindow overloads 2014-06-17 08:51:00 +02:00
thefiddler
e39e4fbb37 [X11] Construct X11 Factory first if enabled
This allows us to use X11 on Windows and Mac, if explicitly requested
by the user via `ToolkitOptions.Backend`.
2014-06-15 14:32:43 +02:00
thefiddler
9d840e5969 [X11] Added glXQueryVersion DllImport. 2014-06-15 14:30:40 +02:00
thefiddler
9075129df0 [X11] Throw exception if GLX is not supported
You cannot create an X11/OpenGL context without the GLX extension.
OpenTK will now throw a `NotSupportedException` when this condition is
encountered.

In some cases, it may be possible to enable the EGL backend by passing
`GraphicsContextFlags.Embedded` to the `GraphicsContext` constructor.
2014-06-15 14:30:23 +02:00
thefiddler
c657b3d11e [X11] Check before monitoring /dev/input
This avoids a crash on non-Linux systems that do not support /dev/input.
2014-06-15 14:29:07 +02:00
thefiddler
40f1668989 [X11] Implement support for XQuartz (X11 on Mac) 2014-06-15 14:28:23 +02:00
thefiddler
ef0ebb0a64 Merge branch 'xquartz' of https://github.com/thefiddler/opentk into xquartz 2014-06-15 14:24:44 +02:00
thefiddler
bc555efd03 Merge pull request #134 from thefiddler/scrollfix
[Mac][X11] Match win32 wheel coordinate system
2014-06-11 07:41:38 +02:00
thefiddler
8373782fad [Mac] Fix Mouse.GetState() h-wheel
External mice will now report horizontal scrolling in the low-level
`Mouse.GetState()` API. The touchpad apparently creates an emulated
mouse device that does not report horizontal wheel scrolling events.

Touchpad support probably requires a proper multitouch implementation.
2014-06-10 17:43:31 +02:00
thefiddler
5e63c5fa5c [Mac] Add note for higher precision pixel scroll 2014-06-10 16:41:09 +02:00
thefiddler
2a4f634848 [Mac] Match win32 scrolling coordinates 2014-06-10 16:40:44 +02:00
thefiddler
525af589f1 [X11] Match win32 wheel coordinate system
OpenTK uses the win32 wheel coordinate system, where
(+h, +v) = (right, up). XI2 uses (+h, +v) = (right, down)
instead, so we need to flip the vertical offset.

Fixes issue #133 and https://github.com/mono/MonoGame/issues/2686
2014-06-10 14:53:23 +02:00
thefiddler
b9e948580a Merge pull request #132 from thefiddler/fixbool2
Fix bool return types
2014-06-08 12:30:41 +02:00
thefiddler
829185a68b [ES][GL] Regenerated bindings 2014-06-08 09:58:01 +02:00
thefiddler
c0f6d4bc79 [Bind] Fixed a System.FormatException 2014-06-08 09:57:48 +02:00
thefiddler
c7c3e3b69b [Rewrite] Implement byte -> bool marshalling
Since GL_TRUE and GL_FALSE match .Net true and false (1 and 0,
respectively), we can simply reinterpret the byte value as a bool.

In the future, we could issue a `(if value == 0 then false else true)`
statement for added safety, but this does not appear to be necessary
right now.
2014-06-08 09:52:25 +02:00
thefiddler
92efb5957f [Bind] Use byte for GLboolean return types
GLboolean is typedefed as an unsigned char.  It appears that `[return:
MarshalAs(UnmanagedType.U1)]` is ignored in calli p/invokes, so we need
to take care of this ourselves by emitting byte instead of bool for the
p/invoke signature. The public API remains unchanged.

Fixes issue #129.
2014-06-08 09:52:12 +02:00
thefiddler
d81fc0ee10 Merge pull request #127 from thefiddler/apitest
[AL][ES][GL] Add API compatibility test
2014-06-02 14:47:43 +02:00
thefiddler
aa4e8ef9aa Merge pull request #128 from Frassle/half-fix
Fix a bug in single->half conversion.
2014-06-02 13:03:30 +02:00
Fraser Waters
5481aa7097 Fix a bug in single->half conversion.
The original C code had if(m & 0x00800000) which is true if the
expresssion does not evaluate to zero. This was inncorretly translated
to the C# code if((m & 0x00800000) == 1) which only evaluates true if
the expression evalaute to 1, which it never does. The correct test is
to test not equal to zero (!= 0).
2014-06-02 11:16:43 +01:00
thefiddler
ab3aac815e [Test] Added API.Desktop to OpenTK.sln 2014-06-01 00:38:32 +02:00
thefiddler
fc00c59f84 [Test] Added API compatibility test
This test checks every public API under OpenTK.Audio, OpenTK.Compute
and OpenTK.Graphics for compatibility. Incompatible changes will cause
a compilation failure.
2014-06-01 00:10:21 +02:00
thefiddler
08829c4feb Merge pull request #126 from thefiddler/sdlversion
[SDL] Do not attempt to use versions < 2.0.0
2014-05-31 15:54:20 +02:00
thefiddler
897c4d7540 [SDL] Removed unnecessary if-branch 2014-05-30 13:50:11 +02:00
thefiddler
7153a69466 [SDL] Do not attempt to use versions < 2.0.0
Versions prior to 2.0.0 are not ABI-compatible with 2.0.x and
attempting to use those will result in random instability. We now
explicitly check the SDL2 version before enabling the SDL2 backend.
2014-05-30 13:47:27 +02:00
thefiddler
256266c9a6 [X11] Added dllmap for Mac OS X (XQuartz) 2014-05-20 18:36:58 +02:00
thefiddler
0fcd47132c Merge pull request #125 from thefiddler/r112
Prepare for 1.1.2 release
2014-05-20 01:11:41 +02:00
thefiddler
5b529647c9 [Mac] Fixed NRE and initial position on 64bit 2014-05-20 01:00:54 +02:00
thefiddler
c65e2a4d9e [Mac] Added NSFloat implementation 2014-05-20 00:14:57 +02:00
thefiddler
ea0ab3243e Merge pull request #123 from thefiddler/eglfix
[EGL] Fix initialization and extension loading
2014-05-19 23:14:41 +02:00
thefiddler
064fb62822 Merge pull request #124 from thefiddler/xdestroyfix
[X11] Fixed BadWindow error on shutdown
2014-05-19 23:14:32 +02:00
thefiddler
56d373ffb7 [Docs] Yet more formatting fixes 2014-05-19 23:11:25 +02:00
thefiddler
a9ac8eb772 [Docs] Minor formatting fixes 2014-05-19 23:08:22 +02:00
thefiddler
a6bdd2840c [Graphics] Synced with May 2014 Khronos spec 2014-05-19 23:03:39 +02:00
thefiddler
4dea46bca0 [Docs] Updated documentation for release 2014-05-19 23:01:29 +02:00
thefiddler
ec31675fc8 [X11] Fixed BadWindow error on shutdown
This was caused by calling XDestroyWindow inside Dispose(), or
by processing events after calling XDestroyWindow. Pending events
are now discarded when Close() is called and not cancelled, and
XDestroyWindow is only called if the window exists.
2014-05-19 22:02:46 +02:00
thefiddler
fd3ac1e4cc Removed file committed by mistake 2014-05-19 12:34:09 +02:00
thefiddler
ade8e61625 Merge branch 'xkeyfix' of https://github.com/thefiddler/opentk into develop 2014-05-19 10:52:37 +02:00
thefiddler
cfb2d45b8b [X11] Improved WindowBorder.Fixed detection
This now works even without having to map the window first.
2014-05-19 09:22:27 +02:00
thefiddler
d6426f20bd Merge branch 'develop' of git://github.com/Goz3rr/opentk into pr/122 2014-05-19 08:43:45 +02:00
thefiddler
d483b01de0 [EGL] Fixed display connection
We now use the display connection specified in EglWindowInfo
throughout the EGL backend, instead of opening new connections
in EglGraphicsMode. This fixes EGL errors in
Egl.CreateWindowSurface.

As part of this fix, all instances of
IPlatformFactory.CreateGraphicsMode() have been removed. This
API is no longer used in OpenTK 1.1
2014-05-19 08:31:38 +02:00
thefiddler
97b211a101 [EGL] Egl.GetProcAddress only returns extensions
We have to load statically exported entry points using the regular OS
symbol loading facilities, and only use eglGetProcAddress for
extensions.

Fixes crash in https://github.com/mono/MonoGame/pull/2377
2014-05-18 22:04:52 +02:00
Goz3rr
0c348d2429 Made NativeWindow set WindowBorder to Fixed when created with FixedWindow flag like SDL windows 2014-05-17 00:27:38 +02:00
Goz3rr
399e08ee33 Changed TranslateFlags to actually translate flags instead of using switch 2014-05-15 11:52:55 +02:00
thefiddler
4ede3ad2d0 [X11] Renamed XI2Mouse
This file now implements both mouse and keyboard input, so its name
has been updated to reflect that.
2014-05-15 10:24:03 +02:00