From d0c5d990d709a4063b296b60c13c35b18298201a Mon Sep 17 00:00:00 2001 From: dcnieho Date: Sun, 9 Mar 2014 03:49:43 +0000 Subject: [PATCH] Docs update related to BlackBerry 10 git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1679 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/web-src/docs/api.php | 17 +++++++++++------ freeglut/web-src/docs/gles.php | 4 ++++ freeglut/web-src/docs/install.php | 2 ++ freeglut/web-src/index.php | 6 +++--- freeglut/web-src/progress.php | 10 +++++----- 5 files changed, 25 insertions(+), 14 deletions(-) diff --git a/freeglut/web-src/docs/api.php b/freeglut/web-src/docs/api.php index dcf574d..fba7fd4 100644 --- a/freeglut/web-src/docs/api.php +++ b/freeglut/web-src/docs/api.php @@ -231,7 +231,7 @@ will thus not work with the currently available 2.8.1 release.
  • glutMultiPassiveFunc ← id, x, y
    • -
  • Android functions +
  • Mobile functions
    1. glutInitContextFunc ← void
    2. glutAppStatusFunc ← event
      3. @@ -2528,11 +2528,11 @@ desirable to get the device id as well in the following situations: -Since this extra support comes at the cost of extra complexity, we're +

      Since this extra support comes at the cost of extra complexity, we're considering -whether/how to implement it. +whether/how to implement it.

      -

      Android Functions

      +

      Mobile Functions

      These new callbacks were added:

      @@ -2547,9 +2547,14 @@ Possible states:
    3. application comes back from a pause → GLUT_APPSTATUS_RESUME. Is called after the glutInitContextFunc callback.
      4. + -

      Android support is further described at -the Android page.

      +

      Supported mobile platforms

      +
        +
      • Android support is further described at +the Android page.
        • +
      • BlackBerry 10/BlackBerry PlayBook
        • +

      19. Miscellaneous Functions

      diff --git a/freeglut/web-src/docs/gles.php b/freeglut/web-src/docs/gles.php index 672c840..4bf05f6 100644 --- a/freeglut/web-src/docs/gles.php +++ b/freeglut/web-src/docs/gles.php @@ -20,12 +20,16 @@ generateHeader($_SERVER['PHP_SELF']);

      FreeGLUT can initialize an OpenGL ES (GLES) context. It works under platforms that supports EGL:

      • Android (see dedicated page)
        • +
      • BlackBerry 10/BlackBerry PlayBook
      • Unix X11 with Mesa EGL

      FreeGLUT ES is provided as a separate library, because OpenGL ES has a distinct, incompatible library for each version (e.g. -lGLESv1_CM and -lGLESv2).

      +

      When compiled for OpenGL ES 2.0, it is possible to use OpenGL ES 3.0 and higher if the device or +driver supports it by calling glutInitContextVersion(3.0, 0.0) before creating a window.

      +

      The following explains how to use FreeGLUT ES under Mesa EGL.

      diff --git a/freeglut/web-src/docs/install.php b/freeglut/web-src/docs/install.php index 3bbff74..69b5c2d 100644 --- a/freeglut/web-src/docs/install.php +++ b/freeglut/web-src/docs/install.php @@ -48,6 +48,8 @@ make install

      For Android, please see the dedicated Android page.

      +

      For BlackBerry support, please see README.blackberry in the project source code.

      +

      For OpenGL ES support (1.x and 2.x), please see the dedicated GLES page.

      diff --git a/freeglut/web-src/index.php b/freeglut/web-src/index.php index a70608b..62485f0 100644 --- a/freeglut/web-src/index.php +++ b/freeglut/web-src/index.php @@ -32,8 +32,8 @@ generateHeader($_SERVER['PHP_SELF']);
      Help out!

      FreeGLUT 3.0 is in active development, and will feature ports to -Android and BB10 as well as a host of other enhancements. We are looking -for developers to help out with further work on the Android and BB10 +Android and BlackBerry 10 as well as a host of other enhancements. We are looking +for developers to help out with further work on the Android and BlackBerry 10 ports. Furthermore, ports to Cocoa/Carbon on OSX, and maybe even Wayland are planned, along with some enhancements to the API and implementation. See here for an overview of the major points @@ -54,7 +54,7 @@ mailing list.

      Testing Releases
      -

      The ports to Andriod and BB10 as well as other API and +

      The ports to Android and BlackBerry 10 as well as other API and implementation enhancements (e.g., move to CMake build system, VBO and shader support for geometry) are currently only available in trunk. Feel free to test by downloading a - -
      FeatureStatusMilestone
      Android portBasic but complete functionality by Sylvain -Beucler, but there are todo +
      Android portBasic but complete functionality by Sylvain +Beucler, but there are todo pointsBasic functionality as is now done: 3.0. Future enhancements: 3.0 or later.
      Blackberry OS 10 portBasic but complete functionality -by Vinnie Simonetti.Basic functionality as is now done: 3.0. Future +
      BlackBerry 10 portBasic but complete functionality +by Vinnie Simonetti.Basic functionality as is now done: 3.0. Future enhancements: 3.0 or later.
      10bit display formatsGLUT supports that but FreeGLUT @@ -74,7 +74,7 @@ value) after each token are ignored. This is a significant way in which FreeGLUT is not compatible with GLUT. Could be a nice project for someone who want to become familiar with the intricacies of requesting specific display formats on at least one of the various window servers -(Windows, X11 and Android/EGL at the +(Windows, X11 and Android/BlackBerry 10/EGL at the moment).Undecided