Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1267b0e1 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 26882 into eclair 

* changes:
  Publish minor additions to GLSurfaceView API.
parents bb6aba19 82cbaab4

api/current.xml

+112 −0
Original line number Diff line number Diff line
@@ -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"

opengl/java/android/opengl/GLSurfaceView.java

+0 −4
Original line number Diff line number Diff line
@@ -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