254 Commits

Author SHA1 Message Date
Jack Palevich
e54f267f06 am a3a351e5: resolved conflicts for merge of 4e3fadd0 to eclair-mr2
Merge commit 'a3a351e5d164d0c8b461ae7af86edc0227654a76' into eclair-mr2-plus-aosp

* commit 'a3a351e5d164d0c8b461ae7af86edc0227654a76':
  Fix stupid bug in GLThreadManager implementation.
2009-11-06 16:45:58 -08:00
Jack Palevich
a3a351e5d1 resolved conflicts for merge of 4e3fadd0 to eclair-mr2 2009-11-06 16:35:19 -08:00
Jack Palevich
a44249500f Fix stupid bug in GLThreadManager implementation.
The code intended to copy the old value of a field, before the
field was updated. However, what the code was actually doing was
copying the new value of the field, after the field was updated.

The fix was to move the copy to before the update.

This is work towards fixing bug 2228262
2009-11-07 07:49:15 +08:00
Jack Palevich
3f7b5a13ca am a9e47546: am 79447b20: resolved conflicts for merge of 84872738 to eclair-mr2
Merge commit 'a9e47546a5132b30a2ed1e24d9193d4db09ef323'

* commit 'a9e47546a5132b30a2ed1e24d9193d4db09ef323':
  Improve GLSurfaceView to avoid deadlocks and race conditions.
2009-11-06 00:40:00 -08:00
Jack Palevich
a9e47546a5 am 79447b20: resolved conflicts for merge of 84872738 to eclair-mr2
Merge commit '79447b2087c8c820d742185dda7305101f9656f0' into eclair-mr2-plus-aosp

* commit '79447b2087c8c820d742185dda7305101f9656f0':
  Improve GLSurfaceView to avoid deadlocks and race conditions.
2009-11-06 00:25:44 -08:00
Jack Palevich
79447b2087 resolved conflicts for merge of 84872738 to eclair-mr2 2009-11-06 00:13:38 -08:00
Jack Palevich
8b2c9c9ecb Improve GLSurfaceView to avoid deadlocks and race conditions.
This is work towards fixing bug 2228262

Specific issues fixed by this change:

+ GLThread names now include the thread id, making it easier to tell one
GLThread from another.

+ A private final static boolean LOG_THREADS can be set to true at compile
time to print out thread-related trace information, helpful for debugging
GLSurfaceView behavior. This static defaults to "false".

+ Changed calls to "notify" to "notifyAll" to make the code more
robust in case more than two threads are blocked on the same monitor.

+ Add a GLThreadManager to help manage the transition to
a new GLThread. Currently only one GLThread can be active in an address
space. When the second thread starts up, the GLThreadManager helps the old
GLThread to shut down,

+ Make sure we stop waiting for dead GLThreads. This is done by adding
checks for a variable mDone being true to our monitor wait loops. And
we use a "finally" clause at the end of GLThread.run() method to set mDone
and notifyAll any wait loops.
2009-11-06 10:21:46 +08:00
Jack Palevich
86a19b3d2c am 70d12dda: am 3743559d: Merge change I28023911 into eclair-mr2
Merge commit '70d12dda7c1e36850e1ed95d719bc1d6dadb6fef'

* commit '70d12dda7c1e36850e1ed95d719bc1d6dadb6fef':
  Add additional error checking of EGL function calls.
2009-10-13 20:10:10 -07:00
Jack Palevich
70d12dda7c am 3743559d: Merge change I28023911 into eclair-mr2
Merge commit '3743559db03645ef7d319c0344238c335a315b65' into eclair-mr2-plus-aosp

* commit '3743559db03645ef7d319c0344238c335a315b65':
  Add additional error checking of EGL function calls.
2009-10-13 20:00:51 -07:00
Jack Palevich
28023911a4 Add additional error checking of EGL function calls. 2009-10-13 19:52:06 -07:00
Jack Palevich
ef79172c55 am 98a51b86: am 3b7a1e6d: Merge change Ic52ba78c into eclair-mr2
Merge commit '98a51b86869e9cf2a1624f8540c4c126962a3a85'

* commit '98a51b86869e9cf2a1624f8540c4c126962a3a85':
  Allow multiple OpenGL contexts on systems that support them.
2009-10-13 18:20:28 -07:00
Jack Palevich
98a51b8686 am 3b7a1e6d: Merge change Ic52ba78c into eclair-mr2
Merge commit '3b7a1e6d70fda4ce834034930847fe2cc75de515' into eclair-mr2-plus-aosp

* commit '3b7a1e6d70fda4ce834034930847fe2cc75de515':
  Allow multiple OpenGL contexts on systems that support them.
2009-10-13 18:14:51 -07:00
Jack Palevich
c52ba78cab Allow multiple OpenGL contexts on systems that support them.
Previously we always restricted the number of OpenGL contexts to 1.
2009-10-13 17:58:47 -07:00
Jack Palevich
d70213e70e Implement GL11 and GL11Ext methods for GL Log and Error wrappers.
Until now we had been throwing UnsupportedOperationException when
developers tried to use the GL11 or GL11Ext methods. Now we handle
these methods correctly, passing their arguments through to the
wrapped interface's methods.

Fixes bug 2167522	GLUtils debug wrapper doesn't support GL11 features
2009-10-12 19:20:49 -07:00
Jack Palevich
a46c138ab3 am 07e0dce4: Merge change 27202 into eclair
Merge commit '07e0dce441ea056710efd76d7df18b8833de772a' into eclair-plus-aosp

* commit '07e0dce441ea056710efd76d7df18b8833de772a':
  Check for failure to create EGL surfaces and contexts.
2009-09-25 19:16:13 -07:00
Jack Palevich
2e26fc08aa Check for failure to create EGL surfaces and contexts. 2009-09-25 19:06:30 -07:00
Jack Palevich
bf0d904120 am b87f24a6: Merge change 26908 into eclair
Merge commit 'b87f24a6a88a994256ca97b69904af28824bc9ce' into eclair-plus-aosp

* commit 'b87f24a6a88a994256ca97b69904af28824bc9ce':
  Fix broken Javadoc link for GLSurfaceView.EGLWindowSurfaceFactory.
2009-09-24 14:16:48 -07:00
Jack Palevich
d40dfbbbff Fix broken Javadoc link for GLSurfaceView.EGLWindowSurfaceFactory. 2009-09-24 14:10:17 -07:00
Jack Palevich
c055f173c9 am 1267b0e1: Merge change 26882 into eclair
Merge commit '1267b0e1844ac802de92b203007513573e4886fd' into eclair-plus-aosp

* commit '1267b0e1844ac802de92b203007513573e4886fd':
  Publish minor additions to GLSurfaceView API.
2009-09-24 12:06:29 -07:00
Jack Palevich
82cbaab450 Publish minor additions to GLSurfaceView API.
Clients can now modify the way that the EGL context and the EGL window
surface are created and destroyed.
2009-09-24 11:55:04 -07:00
Jack Palevich
b09c63e240 am 311ed019: Merge change 26679 into eclair
Merge commit '311ed0191d6423e41b1cf5137a38e53504494818' into eclair-plus-aosp

* commit '311ed0191d6423e41b1cf5137a38e53504494818':
  Create samples showing how to call OpenGL from JNI libraries.
2009-09-23 15:03:46 -07:00
Jack Palevich
a8fecb87c5 Create samples showing how to call OpenGL from JNI libraries. 2009-09-23 14:48:07 -07:00
Jack Palevich
e231743843 am 1167b43c: Merge change 26317 into eclair
Merge commit '1167b43c3d1ca232c9b4e0a75343b6b3cb90f0df' into eclair-plus-aosp

* commit '1167b43c3d1ca232c9b4e0a75343b6b3cb90f0df':
  Allow GLSurfaceView clients to customize EGL Surfaces and Contexts.
2009-09-21 19:31:42 -07:00
Jack Palevich
15e1c6dc7a Allow GLSurfaceView clients to customize EGL Surfaces and Contexts.
This API is hidden for now, will expose once it's been tested more.
2009-09-21 19:19:25 -07:00
Jack Palevich
5ac5b68bf1 am 5222a957: Merge change 26270 into eclair
Merge commit '5222a9571ea2538c989608d376ac71eabe0f09d4' into eclair-plus-aosp

* commit '5222a9571ea2538c989608d376ac71eabe0f09d4':
  Fix GLSurfaceView to sync surfaceDestroyed with GL rendering thread
2009-09-21 16:09:45 -07:00
Jack Palevich
1bd888ba2e Fix GLSurfaceView to sync surfaceDestroyed with GL rendering thread
Until now we had a race condition where the GL rendering thread could
continue rendering a frame after we have returned from the
SurfaceHolder.Callback.surfaceDestroyed notification.
2009-09-21 15:59:17 -07:00
Jean-Baptiste Queru
85a2c7f1ca merge from open-source master 2009-09-01 11:46:14 -07:00
Android Code Review
0648422f67 Merge change 10840
* changes:
  the vertex index should be "first + i".
2009-08-25 14:37:40 -07:00
Mathias Agopian
82fd4fce16 fix a bug in ComponentSizeChooser where it could pick a software EGLConfig instead of a better h/w one.
We now just try to honor the stencil / depth buffer "at least", while doing a "shortest distance" on the colors.
2009-08-20 19:09:34 -07:00
Mathias Agopian
317a6280cc Surface::GPU and Surface::HARDWARE are now deprecated; they will be set automatically if needed.
this also ripples into the window manager API by making some constant there deprecated as well.
2009-08-13 18:19:32 -07:00
Li Wenhao
219749df3e the vertex index should be "first + i". 2009-07-29 14:45:08 +08:00
Jack Palevich
7e263332e0 Remove recently-added android.opengl.Version API
There's another already-existing way of obtaining this information,
the ConfigurationInfo.reqGlEsVersion field returned from
ActivityManager.getDeviceConfigurationInfo.
2009-07-22 15:22:59 -07:00
Jack Palevich
1baf11b116 Add a public API that reports the supported OpenGLES API level. 2009-07-22 12:59:49 -07:00
Jean-Baptiste Queru
cf4550c319 donut snapshot 2009-07-21 11:16:54 -07:00
Jack Palevich
91a27ae2fe Allow pre-Donut apps to use indirect Buffers in GL11 Pointer methods.
Apps targeting Donut and newer will throw an exception.

We use a heuristic to determine whether an app is pre-Donut or not:
We take the address space's __progname, and use that as the application's
package name. For simple applications this is correct.
2009-06-15 21:03:24 -07:00
Jean-Baptiste Queru
843ef36f7b donut snapshot 2009-05-20 11:28:04 -07:00
Jack Palevich
e20ea783a1 Require native-order direct buffers for glXXXPointer APIs.
This was always a documented restriction, but was not enforced by the runtime until now.

Until now, if you passed in some other kind of buffer, it would sometimes work, and
sometimes fail. The failures happened when the Java VM moved the buffer data while
OpenGL was still holding a pointer to it.

Now we throw an exception rather than leaving the system in a potentially bad state.
2009-05-07 18:28:29 -07:00
Jack Palevich
a379585e6e Enable static Java APIs for OpenGL ES 1.1 extensions.
This is just plumbing. The Java APIs existed already, but there were no C APIs to hook the Java APIs
up to. Now there are C APIs, so we can call them.

Of course, whether or not the C APIs actually work when you call them depend upon the
capabilities of the active OpenGL driver, which must be checked at run time.

Also, while we're here, make the glGetString method static. It was always supposed to be static,
but was accidentally implemented as non-static, because the code was copied from the non-static
OpenGL ES classes.
2009-04-24 13:07:17 -07:00
Jack Palevich
27f8002e59 Add an Android-specific static OpenGL ES 1.1 Java API.
This change adds four new public classes that expose a static OpenGL ES 1.1 API:

	android.opengl.GLES10
	android.opengl.GLES10Ext
	android.opengl.GLES11
	android.opengl.GLES11Ext

Benefits:

 + The static API is slightly faster (1% to 4%) than the existing Interface based JSR239 API.
 + The static API is similar to the C API, which should make it easier to import C-based
   example code.
 + The static API provides a clear path for adding new OpenGL ES 1.1 extensions
   and OpenGL ES 2.0 APIs, neither of which currently have a JSR standard.

Example:

  import static android.opengl.GLES10.*;

  ...

  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);

Note that it is possible to mix-and-match calls to both the static and JSR239 APIs.
This works because neither API maintains state. They both call through to the same underlying
C OpenGL ES APIs.

Implementation details:

This change enhances the "glgen" "gen" script to generate both the original JSR239 and
new static OpenGL ES APIs. The contents of the generated JSR239 classes remained the same as before,
so there is no need to check in new versions of the generated JSR239 classes.

As part of this work the gen script was updated to be somewhat more robust, and to
work with git instead of perforce. The script prints out commands to git add the generated files,
but leaves it up to the script runner to actually execute those commands.
2009-04-16 15:20:55 -07:00
Jack Palevich
b1970201ec AI 145526: am: CL 145249 Correct misspelling of constant RENDERMODE_CONTUOUSLY --> RENDERMODE_CONTINUOUSLY
Original author: jackpal
  Merged from: //branches/cupcake/...

Automated import of CL 145526
2009-04-09 15:00:37 -07:00
Jack Palevich
23cda69aaa AI 145523: am: CL 145244 Fully document GLSurfaceView and related classes.
Original author: jackpal
  Merged from: //branches/cupcake/...

Automated import of CL 145523
2009-04-09 14:51:25 -07:00
Jack Palevich
93f411386a AI 145249: Correct misspelling of constant RENDERMODE_CONTUOUSLY --> RENDERMODE_CONTINUOUSLY
BUG=1766678

Automated import of CL 145249
2009-04-08 19:28:00 -07:00
Jack Palevich
722a96cbb4 AI 145244: Fully document GLSurfaceView and related classes.
BUG=1766685

Automated import of CL 145244
2009-04-08 19:02:20 -07:00
Jack Palevich
b848880889 Automated import from //branches/donutburger/...@142687,142687 2009-03-25 15:30:56 -07:00
Jack Palevich
c2310f32b0 Automated import from //branches/donutburger/...@142486,142486 2009-03-24 22:49:06 -07:00
Jack Palevich
0577b26b7f Automated import from //branches/donutburger/...@141859,141859 2009-03-24 21:01:35 -07:00
Jack Palevich
50fd2b9ef2 Automated import from //branches/cupcake/...@142485,142485 2009-03-24 20:22:54 -07:00
Jack Palevich
c8405b6d02 Automated import from //branches/cupcake/...@141857,141857 2009-03-24 18:31:57 -07:00
The Android Open Source Project
9066cfe988 auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
The Android Open Source Project
d83a98f4ce auto import from //depot/cupcake/@135843 2009-03-03 18:28:45 -08:00