Commit Graph

1889 Commits

Author SHA1 Message Date
Diederick Niehorster
07a7dbd8ca Merge remote-tracking branch 'svn/trunk' into git_master 2014-08-27 13:47:24 +08:00
dcnieho
f57980927a resizer demo:
some breaks missing in keyboard switch
added instruction text for which buttons can be pressed

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1699 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-27 05:47:05 +00:00
dcnieho
a894e63bdd For builds not using cmake, generate fg_version.h to match cmake-specified version number.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1696 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-18 02:00:40 +00:00
Diederick Niehorster
2204e280c8 Merge remote-tracking branch 'svn/trunk' into git_master 2014-08-18 10:00:34 +08:00
Diederick C. Niehorster
eefd4bc619 Merge pull request #18 from nigels-com/merge-version2
For builds not using cmake, generate fg_version.h
2014-08-18 09:59:22 +08:00
jtsiomb
2ed4ed5b52 changed the X11 gamemode code policy. Falling back to xf86vm when xrandr fails
was problematic when passing invalid modes. Now instead, if xrandr is
available, we use that, and only that. XF86VM is now only used when XR&R is not
supported at all.

I also added a set of env vars to artificially disable one or the other, or
both. If FREEGLUT_NO_XRANDR is set we completely ignore XR&R, and if
FREEGLUT_NO_XF86VM is set, we completely ignore XF86VidMode. Obviously if both
are defined or missing, game mode can't switch resolutions at all any more, but
that's a nice debugging aid, and may be useful to allow the user to pick which
extension he'd rather use for mode switching.



git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1695 7f0cb862-5218-0410-a997-914c9d46530a
2014-08-18 00:52:53 +00:00
Nigel Stewart
274af23a3c For builds not using cmake, generate fg_version.h to match cmake-specified version number. 2014-08-16 13:05:12 +10:00
Nigel Stewart
55e4430113 XParseGeometry will always be needed for Windows, no need for cmake to figure this out. 2014-07-24 16:47:25 +10:00
Rcmaniac25
ef1643ae63 Added support for minimizing window.
Fixed issue where reshape callback would be called multiple times due to conflicting window size messages on keyboard closure.
Fixed issue where changing orientation with the keyboard open would cause multiple reshape events.
2014-07-05 23:03:52 -04:00
Diederick C. Niehorster
6a3b4e4771 Merge remote-tracking branch 'svn/trunk' into git_master 2014-06-24 09:03:30 +02:00
dcnieho
c12f6173db Updated BlackBerry references to make note of the change from FREEGLUT_GLES2/1 to FREEGLUT_GLES.
Updated BlackBerry toolchain to support building with Dinkum and to support OS 10.3 and GCC 4.8.2
Updated BlackBerry fg_window_blackberry so that window usages aren't hardcoded based on compile information, since it is now controlled by glutInitContextVersion.
EGL window setup now supports EGL 1.5, Renderable type for ES3, and using the minor version from glutInitContextVersion to have more exact control over which version of OpenGL ES is used (requires EGL 1.5)

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1694 7f0cb862-5218-0410-a997-914c9d46530a
2014-06-24 07:03:16 +00:00
Diederick C. Niehorster
3ae17e42da Merge pull request #14 from rcmaniac25/GLES31
Futureproof: EGL 1.5 support, OpenGL ES 3.1 support
2014-06-24 09:01:56 +02:00
Rcmaniac25
2dab5a32a6 Updated BlackBerry references to make note of the change from FREEGLUT_GLES2/1 to FREEGLUT_GLES.
Updated BlackBerry toolchain to support building with Dinkum and to support OS 10.3 and GCC 4.8.2
Updated BlackBerry fg_window_blackberry so that window usages aren't hardcoded based on compile information, since it is now controlled by glutInitContextVersion.
EGL window setup now supports EGL 1.5, Renderable type for ES3, and using the minor version from glutInitContextVersion to have more exact control over which version of OpenGL ES is used (requires EGL 1.5)
2014-06-09 22:39:03 -04:00
Diederick Niehorster
d11c062c72 Merge remote-tracking branch 'svn/trunk' into git_master 2014-06-02 21:25:37 +08:00
dcnieho
89cfab41fc updated api doc
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1693 7f0cb862-5218-0410-a997-914c9d46530a
2014-06-02 13:25:25 +00:00
Diederick Niehorster
8647b9a01e Merge remote-tracking branch 'svn/trunk' into git_master 2014-06-01 23:31:57 +08:00
beuc
c93af8dfea Provide Android binaries for testers
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1692 7f0cb862-5218-0410-a997-914c9d46530a
2014-06-01 13:55:34 +00:00
beuc
364d6a4cff Clarify the problem with Raspberry PI
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1691 7f0cb862-5218-0410-a997-914c9d46530a
2014-06-01 13:37:17 +00:00
beuc
f2a534098c Rewrite EGL attributes using our ATTRIB/ATTRIB_VAL macros
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1690 7f0cb862-5218-0410-a997-914c9d46530a
2014-06-01 11:04:09 +00:00
beuc
7fee3a3bb3 Update GLES instructions
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1689 7f0cb862-5218-0410-a997-914c9d46530a
2014-06-01 10:43:01 +00:00
beuc
13416c05d6 EGL is always double-buffered
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1688 7f0cb862-5218-0410-a997-914c9d46530a
2014-06-01 09:48:51 +00:00
Diederick Niehorster
27b5dcd000 Merge remote-tracking branch 'svn/trunk' into git_master 2014-06-01 17:34:00 +08:00
beuc
25be478938 Unify GLES1 and GLES2 (libraries are compatible and can be co-linked)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1687 7f0cb862-5218-0410-a997-914c9d46530a
2014-06-01 09:24:47 +00:00
dcnieho
693b4b8de8 add menu to opengl 3 demo. Should work as menu windows have their own classic context
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1686 7f0cb862-5218-0410-a997-914c9d46530a
2014-06-01 03:50:51 +00:00
beuc
5051e40380 android: update documentation with gles1/gles2 unification
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1685 7f0cb862-5218-0410-a997-914c9d46530a
2014-05-31 22:47:17 +00:00
Diederick Niehorster
368e7efe81 Merge remote-tracking branch 'svn/trunk' into git_master 2014-05-31 19:29:38 +08:00
beuc
c4d5ab086d Update GLES2 status and instructions
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1684 7f0cb862-5218-0410-a997-914c9d46530a
2014-05-31 10:38:44 +00:00
Diederick Niehorster
2ac0974cf6 Merge branch 'svn/trunk' 2014-05-15 06:02:59 +08:00
dcnieho
98d0182357 KEY_EVENT macro exists in windows 8.1 API: renamed it. Also renamed KEY macro to be safe.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1683 7f0cb862-5218-0410-a997-914c9d46530a
2014-05-14 22:02:41 +00:00
jtsiomb
bca59c67ef Using the -pedantic flag with gcc uncovered a series of warnings about
non-standard C constructs in the code. This commit fixes them.



git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1682 7f0cb862-5218-0410-a997-914c9d46530a
2014-05-14 18:31:58 +00:00
jtsiomb
ff6255810d Compiling with -ansi makes a lot of important POSIX (standard UNIX) facilities
unavailable. This was masked until recently by an incorrect conditional in the
CMakeLists.txt file, that looked like it would use -ansi on anything other than
android, but it didn't actually use it anywhere. As soon as that was fixed, and
-ansi started being used, build broke on linux.

The intention of the -ansi flag was to help catch portability-reducing mistakes
in the code, so instead of removing it completely I used -pedantic in its place,
which produces a lot of warnings for not strictly ISO/ANSI compliant code that
relies on compiler-specific features.



git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1681 7f0cb862-5218-0410-a997-914c9d46530a
2014-05-14 18:28:53 +00:00
Diederick Niehorster
79b0981875 Merge branch 'svn/trunk' 2014-04-11 21:42:02 +08:00
dcnieho
18718163db XPutBackEvent copies an XEvent internally, so the pointer passed in must
point to an actual XEvent object, not an XConfigureEvent, which is
smaller. This avoids an invalid stack read.

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1680 7f0cb862-5218-0410-a997-914c9d46530a
2014-04-11 13:41:49 +00:00
Diederick C. Niehorster
8a906a7525 Merge pull request #11 from LindleyF/git_master
Avoid invalid stack read
2014-04-11 21:40:38 +08:00
Lindley French
94ee505f8a XPutBackEvent copies an XEvent internally, so the pointer passed in must
point to an actual XEvent object, not an XConfigureEvent, which is
smaller. This avoids an invalid stack read.
2014-04-10 16:07:03 -07:00
Diederick Niehorster
ed10f72c86 Merge branch 'svn/trunk' 2014-03-09 11:50:29 +08:00
dcnieho
d0c5d990d7 Docs update related to BlackBerry 10
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1679 7f0cb862-5218-0410-a997-914c9d46530a
2014-03-09 03:49:43 +00:00
Diederick C. Niehorster
a360185861 Merge pull request #10 from rcmaniac25/blackberry
Docs update related to BlackBerry 10
2014-03-09 11:48:51 +08:00
Rcmaniac25
48aaf2d0d5 Docs update related to BlackBerry 10 2014-03-08 20:58:10 -05:00
Diederick Niehorster
58fa5fa87e Merge branch 'svn/trunk' 2014-03-05 09:41:19 +08:00
dcnieho
2c025ce66d Fix issues with context lost on Android
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1678 7f0cb862-5218-0410-a997-914c9d46530a
2014-03-05 01:40:18 +00:00
Diederick C. Niehorster
0c669616e2 Merge pull request #9 from nazgee/fix_android_context
Fix issues with context lost on Android
2014-03-05 09:38:08 +08:00
Michal Stawinski
98e866547a Fix issues with context lost on Android 2014-03-04 18:02:25 +01:00
Diederick Niehorster
b94b82249d Merge branch 'svn/trunk' 2014-01-24 18:41:04 +08:00
dcnieho
aff8412f26 Added comments about GLES 3.0 support with 2.0 references.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1677 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:35:48 +00:00
dcnieho
8c6c71d29d BlackBerry and Android -Added ability for developer to choose OpenGL ES version (2.0 or 3.0) via glutInitContextVersion (only the major version is used)
BlackBerry specific
-Added better documentation on required window bit depth for BlackBerry.
-Modified screen format picking so it will choose either RGBA8888 or RGB565 instead of always using RGBA8888

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1676 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:35:35 +00:00
dcnieho
47945e4119 Updated toolchain so that it does a more exact check if this is for PlayBook or BlackBerry 10 Fixed bug with keyboard on PlayBook where keyboard heights only occurred on rotation, and resize would occur twice because of it and resize wouldn't happen for keyboard
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1675 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:35:22 +00:00
dcnieho
4c37b66f1e Added BlackBerry PlayBook support Bug memleak when getting the number of mouse buttons on a non-PlayBook where an appropriate device is found and the value is returned
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1674 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:35:05 +00:00
dcnieho
e8cc20621f Info logging only shows in debug compilation Added support for UseCurrentContext flag Updated fghPlatformCloseWindowEGL for performance so that eglMakeCurrent isn't invoked unless it's the current window and that the EGL context isn't destroyed unless no other windows uses
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1673 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:34:49 +00:00
dcnieho
c5201e73ef Hardcoded the RGB bitdepths for EGL surface creation.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1672 7f0cb862-5218-0410-a997-914c9d46530a
2014-01-24 10:34:32 +00:00