Camilla Berglund
5f26deaf59
Merge branch 'master' of github.com:elmindreda/glfw
2012-08-02 19:02:42 +02:00
Camilla Berglund
b03e62f6ac
Made X11 resolution enumeration a separate function.
2012-08-02 18:54:47 +02:00
Camilla Löwy Berglund
255e79918e
Merge pull request #11 from arturjpv/master
...
Fixed updateTrackingAreas not calling super.
2012-08-02 09:49:28 -07:00
Camilla Berglund
88fd170e64
Fixed type errors in modes test.
2012-08-02 18:22:11 +02:00
Camilla Berglund
871e1a70d7
Made video mode retrieval dynamic.
2012-08-02 18:03:43 +02:00
Arturo J. Pérez
287e94cd6b
Behavior differences under Lion and Snow Leopard in updateTrackingAreas.
...
super call added.
According to documentation (NSView Class Reference -> Instance Methods -> updateTrackingAreas):
You should override this method to remove out of date tracking areas and add recomputed tracking areas; your implementation should call super.
2012-08-02 17:45:52 +02:00
Camilla Berglund
957ecdc9a0
Renamed no current context error to match function.
2012-08-02 15:36:15 +02:00
Camilla Berglund
a916997c86
Simplified call to platform-specific extension check.
2012-08-02 15:32:39 +02:00
Camilla Berglund
1bad573c10
Tightened scope of some local variables.
2012-08-02 15:31:08 +02:00
Camilla Berglund
ee3304c09a
Removed check for invalid user, added error setting.
2012-08-02 15:29:13 +02:00
Camilla Berglund
bfc746a847
Error message grammar fix.
2012-08-02 15:14:38 +02:00
Camilla Berglund
ba941b2fc8
Added formatting to error string.
2012-08-02 15:13:57 +02:00
Camilla Berglund
208377d08e
Imported version parsing from EGL branch.
2012-08-02 14:48:06 +02:00
Camilla Berglund
59896c327a
Context property fixes.
2012-08-02 14:42:24 +02:00
Camilla Berglund
f274b329d1
Fixed check for GL_ARB_multisample.
2012-08-02 14:16:07 +02:00
Camilla Berglund
a182acd585
Removed EGL-specific context param refresh.
2012-08-02 03:01:31 +02:00
Camilla Berglund
7d222030da
Merge branch 'master' into EGL
...
Conflicts:
src/internal.h
src/opengl.c
tests/glfwinfo.c
2012-08-02 02:50:17 +02:00
Camilla Berglund
c047bd2efe
Merge branch 'master' of github.com:elmindreda/glfw
2012-08-02 01:42:26 +02:00
Camilla Berglund
053737e660
Use OpenGL to get default framebuffer properties.
2012-08-02 01:37:08 +02:00
Camilla Berglund
3a72f33541
Removed GLFW_ACCELERATED window parameter.
2012-08-02 01:13:05 +02:00
Camilla Berglund
d1617bdd78
Made flag parsing output even more consistent.
2012-08-01 01:46:06 +02:00
Camilla Berglund
0f1ab5317f
Formatting.
2012-08-01 01:07:08 +02:00
Camilla Berglund
76bd8b79b6
Merge branch 'master' into EGL
...
Conflicts:
src/win32_window.c
tests/glfwinfo.c
2012-08-01 01:04:14 +02:00
Camilla Berglund
98d02ebb1d
Updated MinGW cross-compilation documentation.
2012-08-01 00:56:11 +02:00
Camilla Berglund
302037d5b4
Added stub debug context detection.
2012-07-31 23:52:23 +02:00
Camilla Berglund
b00064902d
Made flag parsing output more consistent.
2012-07-31 23:51:27 +02:00
Camilla Berglund
6c86149bad
Improved output of OpenGL bitmasks.
2012-07-31 23:14:31 +02:00
Camilla Berglund
669c40f102
Fixed debug context being a hard constraint on WGL.
2012-07-31 23:07:18 +02:00
Camilla Berglund
fc74a5533e
Moved WGL context logic into OpenGL module.
2012-07-31 22:48:28 +02:00
Camilla Berglund
331aa26503
Formatting.
2012-07-31 19:13:27 +02:00
Camilla Berglund
b1de4d6fed
Fixed client API version parsing.
2012-07-31 19:06:48 +02:00
Camilla Berglund
0b25bba5b5
Merge branch 'master' into EGL
2012-07-31 18:55:00 +02:00
Camilla Berglund
6c37c84d91
Reduced the number of conditional blocks.
2012-07-30 20:15:34 +02:00
Camilla Berglund
a8686ce0b5
Added credit.
2012-07-30 20:11:19 +02:00
Camilla Löwy Berglund
d270fe3c15
Merge pull request #10 from johnbartholomew/rename-lib-glfw3
...
Allow GLFW 3 to be installed side-by-side with GLFW 2.
2012-07-29 17:33:01 -07:00
John Bartholomew
0f0e42b975
Use SOVERSION for shared libraries on Unix-like systems.
2012-07-30 01:04:08 +01:00
John Bartholomew
93ec9fa901
Changed library output name to "glfw3", and pkg-config name to libglfw3.
...
Since the headers are already named differently, this allows
side-by-side installation of GLFW 2.x and GLFW 3.x.
2012-07-30 00:14:09 +01:00
Camilla Berglund
b28298f329
Fixed call to CGPointMake.
2012-07-29 14:07:01 +02:00
Camilla Berglund
a3c4b96c91
Removed commented-out code, added error reporting.
2012-07-23 18:40:31 +02:00
Camilla Berglund
3bb04b3a76
Merge branch 'master' into EGL
2012-07-23 18:04:32 +02:00
Camilla Berglund
52ebc0db85
Fixed use of wrong point type.
2012-07-23 00:50:52 +02:00
Camilla Berglund
dd298ab908
Fixed copypaste errors.
2012-07-23 00:48:30 +02:00
Camilla Berglund
03d526097d
Comment fix.
2012-07-23 00:48:18 +02:00
Camilla Berglund
f457223bdf
Minor context creation fixes.
2012-07-22 17:06:37 +02:00
Camilla Berglund
3f9fa39564
Merge branch 'master' into EGL
...
Conflicts:
src/CMakeLists.txt
2012-07-22 16:19:24 +02:00
Camilla Berglund
df6d4bc58a
Added glfw3native.h to installation.
2012-07-22 15:42:18 +02:00
Camilla Berglund
d83119a874
Added explicit access to native handles.
2012-07-22 15:26:15 +02:00
Camilla Berglund
b069391cc0
Formatting.
2012-07-22 02:01:42 +02:00
Camilla Berglund
ccca5d71fe
Use EGL_KHR_create_context with GLES as well.
2012-07-22 02:00:00 +02:00
Camilla Berglund
bddc95c017
Removed references to GLX in EGL port.
2012-07-22 01:38:15 +02:00