Commit graph

5613 commits

Author SHA1 Message Date
thefiddler c3451530a6 [KMS] Initial implementation 2014-07-16 14:28:27 +02:00
thefiddler c1c6b4269b Merge pull request #149 from thefiddler/mac_stability
[Mac] Improved stability for NSOpenGLPixelFormat
2014-07-15 06:06:41 +00:00
thefiddler 32958ffcce [Mac] Improved stability for NSOpenGLPixelFormat
Non-accelerated contexts are now considered iff no accelerated contexts
are available. Additionally, a GraphicsException will be thrown if
context construction fails for any reason, instead of causing a runtime
crash.
2014-07-14 12:27:28 +02:00
thefiddler c32bf4ec5d [Rewrite] Refactored string prologue/epilogues
We currently have three categories of string parameters: `string`,
`string[]` and `StringBuilder`. (OpenTK 1.2 adds one more: `ref
string`.) Each category needs to be marshaled separately into a native
character array.

This commit implements the following changes:
- string[] epilogues are now correctly emitted, instead of being
ignored.
- string[] prologues and epilogues now use the same local variable name.
- all epilogues are now generated with a single pass over the function
parameters, instead of requiring a separate pass for each category.
- string prologues and epilogues now allocate local variables based on
the relevant parameter *name* rather than the parameter *type*.

Fixes issue #144.
2014-07-07 13:16:17 +02:00
Fraser Waters 6dda84dc77 Change to correct throw statement to preserve stack trace. 2014-06-22 20:40:15 +01:00
thefiddler cb861446ab Merge pull request #140 from thefiddler/glspecs_june2014
[ES][GL] Sync with June 2014 specification
2014-06-20 11:35:54 +02:00
thefiddler 9659aad748 Revert "[Convert] Workaround for broken names with spaces"
This reverts commit 1e78e62b90.
The relevant issue has been fixed upstream by Khronos.
2014-06-20 09:27:22 +02:00
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 7629d45907 [ES][GL] Regenerated bindings 2014-06-19 16:24:49 +02:00
thefiddler 28746e85cc [ES][GL] Synced with June 2014 specifications
This introduces support for the following extensions:
- EXT_geometry_point_size
- EXT_primitive_bounding_box
- EXT_texture_array
- EXT_tessellation_point_size
2014-06-19 16:24:40 +02:00
thefiddler 1e78e62b90 [Convert] Workaround for broken names with spaces 2014-06-19 16:22:38 +02: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 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 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 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 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 a6bdd2840c [Graphics] Synced with May 2014 Khronos spec 2014-05-19 23:03:39 +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
thefiddler b4f4be7ece [X11] Split X11 and XI2 input drivers 2014-05-15 10:22:01 +02:00
thefiddler 7d1bec58cc [X11] Implemented XI2 keyboard input 2014-05-15 10:21:06 +02:00
thefiddler 2eb88d9788 [X11] Added XIDeviceType enumeration 2014-05-15 10:20:23 +02:00
thefiddler 692c4c64ff [X11] Rebased on develop branch 2014-05-15 01:16:28 +02:00
thefiddler 7cce215a4b [X11] Use XKB for layout-independent input
The code will fall back to core X11 if XKB is not available.
2014-05-15 01:13:12 +02:00
thefiddler e8176ef7cf [X11] Added XKB bindings 2014-05-15 01:12:06 +02:00
thefiddler 687fc90c95 Merge pull request #120 from thefiddler/xcursorfix
[X11] Improve mouse input
2014-05-15 00:43:38 +02:00
Goz3rr 4414886832 Added GameWindowFlags.FixedWindow to allow for fixed border SDL Windows 2014-05-15 00:38:06 +02:00
thefiddler 1419c1e3a0 [Mac] Explicitly retain/release CocoaWindowInfo instances 2014-05-14 18:01:08 +02:00
thefiddler 1690cf859e [X11] Removed unused SetCursor() function 2014-05-14 00:42:05 +02:00
thefiddler a062d4c0a7 [X11] Removed stale comment 2014-05-14 00:00:13 +02:00
thefiddler 30d7780f1e [X11] Removed unused warp detection code 2014-05-13 23:51:55 +02:00
thefiddler dd16142a3a [X11] Fixed GetCursorState() after SetPosition()
The new position is now immediately reflected in GetCursorPos().
2014-05-13 23:50:39 +02:00
thefiddler 452d61bc60 [X11] Warn when XI2Mouse is not supported.
Without the XI2 extension, mouse support will suffer significantly.
More specifically, low-level mouse events will not be available.
2014-05-13 23:34:27 +02:00
thefiddler 3febb4dda0 [Input] Renamed MouseScrollWheel to MouseScroll
This better describes the functionality of this structure.
2014-05-13 23:25:56 +02:00
thefiddler c6dafbccba [X11] Implemented high-resolution scroll events 2014-05-13 23:23:51 +02:00
thefiddler 9255fdcdb4 [Platform] Fixed OnMouseDown/Up events for secondary buttons 2014-05-13 22:53:47 +02:00
thefiddler a30af547f9 [X11] Improved CursorVisible = false behavior
We now use an XGrabPointer to confine the cursor to the window,
instead of the XWarpPointer hack. Fixes issue #28 and #36.
2014-05-13 22:31:45 +02:00
thefiddler 7e3b99c636 [X11] Fixed cursor position when CursorVisible becomes true 2014-05-13 13:23:20 +02:00
thefiddler fc718026fd [X11] Fixed Cursor when CursorVisible = false
Setting Cursor will no longer override CursorVisible.
2014-05-13 09:27:21 +02:00
thefiddler 290cc91275 Merge branch 'nulldisplay' into develop 2014-05-12 17:01:01 +02:00
thefiddler c2bd8624b5 Merge branch 'nvidiafix' into develop 2014-05-12 17:00:42 +02:00
thefiddler 50b611ec5f Merge branch 'arrayfix' into develop 2014-05-12 17:00:16 +02:00
thefiddler bb01f35de9 [Rewrite] Removed unused conditional. 2014-05-12 16:35:48 +02:00
thefiddler c0b0990687 [OpenTK] Do not crash when no monitor connected
NativeWindow now checks for a non-null device before attempting to
access its properties. Affects
https://github.com/mono/MonoGame/issues/2416
2014-05-12 16:27:39 +02:00
thefiddler 4e8786f123 [X11] Correct Glx.*.SwapInterval definitions
Improved error checking means we are no longer crashing when
SwapInterval is not available.
2014-05-12 14:50:03 +02:00
thefiddler 88905cb6aa [X11] Fixed GLX extension loading
GLX is now using the new extension loading mechanism,
and the entry point names now much the available slots.
2014-05-12 13:59:48 +02:00
thefiddler 3a94d8147f [Rewrite] Fixed 2d/3d arrays on .Net
Mono can use ldlen and ldelema on both 1d arrays (vectors) and 2d/3d
arrays. However, .Net can only use these instructions on 1d arrays -
higher rank arrays must use get_Length and Address explicitly.
2014-05-12 13:03:27 +02:00
thefiddler bd712e4775 [X11] Flush XSendEvent on exit 2014-05-12 02:20:53 +02:00
thefiddler 1cf7386748 [X11] Fixed XI2Mouse smooth scrolling
The scrolling valuator offsets are now calculated correctly, based on
the number of set bits in the valuator mask.
Additionally XI2Mouse now runs on a background thread, using blocking
XIfEvent. This should improve resonsiveness and reduce CPU usage, due
to reduced polling.
2014-05-12 02:20:53 +02:00
thefiddler bba9c8c26f [X11] Improved XI2Mouse implementation
Horizontal and vertical smooth scrolling is now supported.
Movement axes are now correctly identified. Device hotplugging
has been improved.
2014-05-12 02:20:53 +02:00
thefiddler 2b16a641f0 [Examples] Improved Mouse.GetState output 2014-05-12 02:20:53 +02:00
thefiddler 96aaef9b37 [Mac] Implemented Mouse.GetCursorState() 2014-05-12 02:20:53 +02:00
thefiddler b89c920f32 [Examples] Test Mouse.SetPosition 2014-05-12 02:20:52 +02:00
thefiddler 7eefb3e3ff [SDL] Use h-wheel events 2014-05-12 02:20:52 +02:00
thefiddler bb8dfe4304 [Input] Improve SDL2 and Windows GetCursorState 2014-05-12 02:20:52 +02:00
thefiddler f4a3cab0e0 [Input] Added Mouse.GetCursorPos() (WIP) 2014-05-12 02:20:52 +02:00
thefiddler cd7342b688 Merge pull request #114 from thefiddler/nativewindow
INativeWindow cleanup and consolidation
2014-05-12 02:20:29 +02:00
thefiddler 0e48ad30d0 [Examples] Fixed Scroll.X/Y misreporting
Scroll.X and Y are no longer swapped.
2014-05-10 01:52:06 +02:00
thefiddler d7e0373852 [Platform] Fixed keys getting stuck on focus loss
NativeWindowBase will now clear all keyboard keys when losing focus.
This prevents keys from getting stuck when refocusing the window.

[Win] Also fixed WindowState.Maximized when WindowBorder is Hidden and
the window is minimized.
2014-05-09 16:45:45 +02:00
thefiddler 4556e54405 [Win] Fixed infinite recursion 2014-05-09 16:14:13 +02:00
thefiddler fb034de00d [Graphics] Made entry points internal
Internal protected means internal *or* protected, not internal *and*
protected.
2014-05-09 15:24:12 +02:00
thefiddler c98b4ea178 [Input] Do not hook FocusedChanged
This is handled by NativeWindowBase now.
2014-05-09 15:23:39 +02:00
thefiddler 8eae337d93 [Win] Cleaned up window size/pos properties 2014-05-09 15:22:33 +02:00
thefiddler f0d0f6e53a [X11] Fixed WindowBorder and WindowState setters
After many hours of fighting with xlib, the monster is slain and
WindowBorder/WindowState changes now take effect without messing
up the window size or position on the desktop.

Phew!
2014-05-09 13:10:23 +02:00
thefiddler ab29797079 [Platform] Raise KeyUp events on focus lost
This ensures that no keys are stuck in pressed state when the user
switches away from the application window.
2014-05-09 01:50:48 +02:00
thefiddler 86146f54d5 [X11] Fixed key repeat 2014-05-09 00:26:51 +02:00
thefiddler 8195800ee7 [X11] Improved vsync support
OpenTK will now check for GLX_EXT_swap_control, GLX_MESA_swap_control
and GLX_SGI_swap_control. This allows us to control vsync on more
systems.
2014-05-09 00:13:23 +02:00