diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-24 14:56:00 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-24 14:56:00 -0400 |
| commit | 1267b0e1844ac802de92b203007513573e4886fd (patch) | |
| tree | 33e9da0e719f7d6b7eb3d811ec7dcc2c05dca76a | |
| parent | bb6aba1984bfdceaec43054ef0b2a8e5dcd26215 (diff) | |
| parent | 82cbaab450d3c5d9f3d52c49881212f250d7cd97 (diff) | |
| download | frameworks_base-1267b0e1844ac802de92b203007513573e4886fd.zip frameworks_base-1267b0e1844ac802de92b203007513573e4886fd.tar.gz frameworks_base-1267b0e1844ac802de92b203007513573e4886fd.tar.bz2 | |
Merge change 26882 into eclair
* changes:
Publish minor additions to GLSurfaceView API.
| -rw-r--r-- | api/current.xml | 112 | ||||
| -rw-r--r-- | opengl/java/android/opengl/GLSurfaceView.java | 4 |
2 files changed, 112 insertions, 4 deletions
diff --git a/api/current.xml b/api/current.xml index 9de4797..5b1e4d1 100644 --- a/api/current.xml +++ b/api/current.xml @@ -97573,6 +97573,32 @@ <parameter name="stencilSize" type="int"> </parameter> </method> +<method name="setEGLContextFactory" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="factory" type="android.opengl.GLSurfaceView.EGLContextFactory"> +</parameter> +</method> +<method name="setEGLWindowSurfaceFactory" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="factory" type="android.opengl.GLSurfaceView.EGLWindowSurfaceFactory"> +</parameter> +</method> <method name="setGLWrapper" return="void" abstract="false" @@ -97725,6 +97751,92 @@ </parameter> </method> </interface> +<interface name="GLSurfaceView.EGLContextFactory" + abstract="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="createContext" + return="javax.microedition.khronos.egl.EGLContext" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="egl" type="javax.microedition.khronos.egl.EGL10"> +</parameter> +<parameter name="display" type="javax.microedition.khronos.egl.EGLDisplay"> +</parameter> +<parameter name="eglConfig" type="javax.microedition.khronos.egl.EGLConfig"> +</parameter> +</method> +<method name="destroyContext" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="egl" type="javax.microedition.khronos.egl.EGL10"> +</parameter> +<parameter name="display" type="javax.microedition.khronos.egl.EGLDisplay"> +</parameter> +<parameter name="context" type="javax.microedition.khronos.egl.EGLContext"> +</parameter> +</method> +</interface> +<interface name="GLSurfaceView.EGLWindowSurfaceFactory" + abstract="true" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="createWindowSurface" + return="javax.microedition.khronos.egl.EGLSurface" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="egl" type="javax.microedition.khronos.egl.EGL10"> +</parameter> +<parameter name="display" type="javax.microedition.khronos.egl.EGLDisplay"> +</parameter> +<parameter name="config" type="javax.microedition.khronos.egl.EGLConfig"> +</parameter> +<parameter name="nativeWindow" type="java.lang.Object"> +</parameter> +</method> +<method name="destroySurface" + return="void" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="egl" type="javax.microedition.khronos.egl.EGL10"> +</parameter> +<parameter name="display" type="javax.microedition.khronos.egl.EGLDisplay"> +</parameter> +<parameter name="surface" type="javax.microedition.khronos.egl.EGLSurface"> +</parameter> +</method> +</interface> <interface name="GLSurfaceView.GLWrapper" abstract="true" static="true" diff --git a/opengl/java/android/opengl/GLSurfaceView.java b/opengl/java/android/opengl/GLSurfaceView.java index 4599b77..070b7ae 100644 --- a/opengl/java/android/opengl/GLSurfaceView.java +++ b/opengl/java/android/opengl/GLSurfaceView.java @@ -286,7 +286,6 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback } /** - * @hide * Install a custom EGLContextFactory. * <p>If this method is * called, it must be called before {@link #setRenderer(Renderer)} @@ -302,7 +301,6 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback } /** - * @hide * Install a custom EGLWindowSurfaceFactory. * <p>If this method is * called, it must be called before {@link #setRenderer(Renderer)} @@ -609,7 +607,6 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback } /** - * @hide * An interface for customizing the eglCreateContext and eglDestroyContext calls. * <p> * This interface must be implemented by clients wishing to call @@ -633,7 +630,6 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback } /** - * @hide * An interface for customizing the eglCreateWindowSurface and eglDestroySurface calls. * <p> * This interface must be implemented by clients wishing to call |