Merge "Remove @hide from the generated EGL 1.4 API"
This commit is contained in:
commit
fd16f0a2bb
@ -44,7 +44,7 @@ public class EGLCodeEmitter extends JniCodeEmitter {
|
||||
mUseContextPointer = false;
|
||||
mUseStaticMethods = true;
|
||||
mUseSimpleMethodNames = true;
|
||||
mUseHideCommentForAPI = true;
|
||||
mUseHideCommentForAPI = false;
|
||||
}
|
||||
|
||||
public void emitCode(CFunc cfunc, String original) {
|
||||
|
@ -18,10 +18,11 @@
|
||||
package android.opengl;
|
||||
|
||||
/**
|
||||
* @hide
|
||||
* Wrapper class for native EGLConfig objects.
|
||||
*
|
||||
*/
|
||||
public class EGLConfig extends EGLObjectHandle {
|
||||
public EGLConfig(int handle) {
|
||||
private EGLConfig(int handle) {
|
||||
super(handle);
|
||||
}
|
||||
|
||||
@ -33,9 +34,4 @@ public class EGLConfig extends EGLObjectHandle {
|
||||
EGLConfig that = (EGLConfig) o;
|
||||
return getHandle() == that.getHandle();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return getHandle();
|
||||
}
|
||||
}
|
||||
|
@ -18,10 +18,11 @@
|
||||
package android.opengl;
|
||||
|
||||
/**
|
||||
* @hide
|
||||
* Wrapper class for native EGLContext objects.
|
||||
*
|
||||
*/
|
||||
public class EGLContext extends EGLObjectHandle {
|
||||
public EGLContext(int handle) {
|
||||
private EGLContext(int handle) {
|
||||
super(handle);
|
||||
}
|
||||
|
||||
@ -33,9 +34,4 @@ public class EGLContext extends EGLObjectHandle {
|
||||
EGLContext that = (EGLContext) o;
|
||||
return getHandle() == that.getHandle();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return getHandle();
|
||||
}
|
||||
}
|
||||
|
@ -18,10 +18,11 @@
|
||||
package android.opengl;
|
||||
|
||||
/**
|
||||
* @hide
|
||||
* Wrapper class for native EGLDisplay objects.
|
||||
*
|
||||
*/
|
||||
public class EGLDisplay extends EGLObjectHandle {
|
||||
public EGLDisplay(int handle) {
|
||||
private EGLDisplay(int handle) {
|
||||
super(handle);
|
||||
}
|
||||
|
||||
@ -33,9 +34,4 @@ public class EGLDisplay extends EGLObjectHandle {
|
||||
EGLDisplay that = (EGLDisplay) o;
|
||||
return getHandle() == that.getHandle();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return getHandle();
|
||||
}
|
||||
}
|
||||
|
@ -18,16 +18,30 @@
|
||||
package android.opengl;
|
||||
|
||||
/**
|
||||
* @hide
|
||||
* Base class for wrapped EGL objects.
|
||||
*
|
||||
*/
|
||||
public abstract class EGLObjectHandle {
|
||||
private final int mHandle;
|
||||
|
||||
public EGLObjectHandle(int handle) {
|
||||
protected EGLObjectHandle(int handle) {
|
||||
mHandle = handle;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the native handle of the wrapped EGL object. This handle can be
|
||||
* cast to the corresponding native type on the native side.
|
||||
*
|
||||
* For example, EGLDisplay dpy = (EGLDisplay)handle;
|
||||
*
|
||||
* @return the native handle of the wrapped EGL object.
|
||||
*/
|
||||
public int getHandle() {
|
||||
return mHandle;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return getHandle();
|
||||
}
|
||||
}
|
||||
|
@ -18,10 +18,11 @@
|
||||
package android.opengl;
|
||||
|
||||
/**
|
||||
* @hide
|
||||
* Wrapper class for native EGLSurface objects.
|
||||
*
|
||||
*/
|
||||
public class EGLSurface extends EGLObjectHandle {
|
||||
public EGLSurface(int handle) {
|
||||
private EGLSurface(int handle) {
|
||||
super(handle);
|
||||
}
|
||||
|
||||
@ -33,9 +34,4 @@ public class EGLSurface extends EGLObjectHandle {
|
||||
EGLSurface that = (EGLSurface) o;
|
||||
return getHandle() == that.getHandle();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return getHandle();
|
||||
}
|
||||
}
|
||||
|
@ -23,10 +23,10 @@ import android.view.Surface;
|
||||
import android.view.SurfaceView;
|
||||
import android.view.SurfaceHolder;
|
||||
|
||||
|
||||
/**
|
||||
* @hide
|
||||
*/
|
||||
* EGL 1.4
|
||||
*
|
||||
*/
|
||||
public class EGL14 {
|
||||
|
||||
public static final int EGL_DEFAULT_DISPLAY = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user