Merge change 551 into donut (9e8ca9a1) · Commits · e / os / android_frameworks_base

api/current.xml

+3 −16

Original line number	Original line	Diff line number	Diff line
	@@ -58047,7 +58047,7 @@
	type="float"		type="float"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	value="0.001f"		value="0.0010f"
	static="true"		static="true"
	final="true"		final="true"
	deprecated="not deprecated"		deprecated="not deprecated"
	@@ -73275,19 +73275,6 @@
	visibility="public"		visibility="public"
	>		>
	</constructor>		</constructor>
	<method name="_glGetString"
	return="java.lang.String"
	abstract="false"
	native="true"
	synchronized="false"
	static="false"
	final="false"
	deprecated="not deprecated"
	visibility="public"
	>
	<parameter name="name" type="int">
	</parameter>
	</method>
	<method name="glActiveTexture"		<method name="glActiveTexture"
	return="void"		return="void"
	abstract="false"		abstract="false"
	@@ -74092,9 +74079,9 @@
	<method name="glGetString"		<method name="glGetString"
	return="java.lang.String"		return="java.lang.String"
	abstract="false"		abstract="false"
	native="false"		native="true"
	synchronized="false"		synchronized="false"
	static="false"		static="true"
	final="false"		final="false"
	deprecated="not deprecated"		deprecated="not deprecated"
	visibility="public"		visibility="public"

core/jni/android_opengl_GLES10.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3434,7 +3434,7 @@ static JNINativeMethod methods[] = {
	{"glGetError", "()I", (void *) android_glGetError__ },		{"glGetError", "()I", (void *) android_glGetError__ },
	{"glGetIntegerv", "(I[II)V", (void *) android_glGetIntegerv__I_3II },		{"glGetIntegerv", "(I[II)V", (void *) android_glGetIntegerv__I_3II },
	{"glGetIntegerv", "(ILjava/nio/IntBuffer;)V", (void *) android_glGetIntegerv__ILjava_nio_IntBuffer_2 },		{"glGetIntegerv", "(ILjava/nio/IntBuffer;)V", (void *) android_glGetIntegerv__ILjava_nio_IntBuffer_2 },
	{"_glGetString", "(I)Ljava/lang/String;", (void *) android_glGetString },		{"glGetString", "(I)Ljava/lang/String;", (void *) android_glGetString },
	{"glHint", "(II)V", (void *) android_glHint__II },		{"glHint", "(II)V", (void *) android_glHint__II },
	{"glLightModelf", "(IF)V", (void *) android_glLightModelf__IF },		{"glLightModelf", "(IF)V", (void *) android_glLightModelf__IF },
	{"glLightModelfv", "(I[FI)V", (void *) android_glLightModelfv__I_3FI },		{"glLightModelfv", "(I[FI)V", (void *) android_glLightModelfv__I_3FI },

core/jni/android_opengl_GLES11Ext.cpp

+1217 −169

File changed.

Preview size limit exceeded, changes collapsed.

opengl/java/android/opengl/GLES10.java

+1 −12

Original line number	Original line	Diff line number	Diff line
	@@ -671,20 +671,9 @@ public class GLES10 {

	// C function const GLubyte * glGetString ( GLenum name )		// C function const GLubyte * glGetString ( GLenum name )

	public native String _glGetString(		public static native String glGetString(
	int name		int name
	);		);

	public String glGetString(
	int name
	) {
	String returnValue;
	returnValue = _glGetString(
	name
	);
	return returnValue;
	}

	// C function void glHint ( GLenum target, GLenum mode )		// C function void glHint ( GLenum target, GLenum mode )

	public static native void glHint(		public static native void glHint(

opengl/tools/glgen/specs/gles11/checks.spec

+0 −84

Original line number	Original line	Diff line number	Diff line
	@@ -59,87 +59,3 @@ glTexGenf unsupported
	glTexGeni unsupported		glTexGeni unsupported
	glTexGenx unsupported		glTexGenx unsupported
	glWeightPointerOES unsupported		glWeightPointerOES unsupported
	// Lots of unsupported
	glAlphaFuncxOES unsupported
	glBlendEquationOES unsupported
	glBlendEquationSeparateOES unsupported
	glBlendFuncSeparateOES unsupported
	glClearColorxOES unsupported
	glClearDepthfOES unsupported
	glClearDepthxOES unsupported
	glClipPlanefOES unsupported
	glClipPlanefOES unsupported
	glClipPlanexOES unsupported
	glClipPlanexOES unsupported
	glColor4xOES unsupported
	glDepthRangefOES unsupported
	glDepthRangexOES unsupported
	glEGLImageTargetRenderbufferStorageOES unsupported
	glEGLImageTargetTexture2DOES unsupported
	glFogxOES unsupported
	glFogxvOES unsupported
	glFogxvOES unsupported
	glFrustumfOES unsupported
	glFrustumxOES unsupported
	glGetClipPlanefOES unsupported
	glGetClipPlanefOES unsupported
	glGetClipPlanexOES unsupported
	glGetClipPlanexOES unsupported
	glGetFixedvOES unsupported
	glGetFixedvOES unsupported
	glGetLightxvOES unsupported
	glGetLightxvOES unsupported
	glGetMaterialxvOES unsupported
	glGetMaterialxvOES unsupported
	glGetTexEnvxvOES unsupported
	glGetTexEnvxvOES unsupported
	glGetTexGenfvOES unsupported
	glGetTexGenfvOES unsupported
	glGetTexGenivOES unsupported
	glGetTexGenivOES unsupported
	glGetTexGenxvOES unsupported
	glGetTexGenxvOES unsupported
	glGetTexParameterxvOES unsupported
	glGetTexParameterxvOES unsupported
	glLightModelxOES unsupported
	glLightModelxvOES unsupported
	glLightModelxvOES unsupported
	glLightxOES unsupported
	glLightxvOES unsupported
	glLightxvOES unsupported
	glLineWidthxOES unsupported
	glLoadMatrixxOES unsupported
	glLoadMatrixxOES unsupported
	glMaterialxOES unsupported
	glMaterialxvOES unsupported
	glMaterialxvOES unsupported
	glMultMatrixxOES unsupported
	glMultMatrixxOES unsupported
	glMultiTexCoord4xOES unsupported
	glNormal3xOES unsupported
	glOrthofOES unsupported
	glOrthoxOES unsupported
	glPointParameterxOES unsupported
	glPointParameterxvOES unsupported
	glPointParameterxvOES unsupported
	glPointSizexOES unsupported
	glPolygonOffsetxOES unsupported
	glRotatexOES unsupported
	glSampleCoveragexOES unsupported
	glScalexOES unsupported
	glTexEnvxOES unsupported
	glTexEnvxvOES unsupported
	glTexEnvxvOES unsupported
	glTexGenfOES unsupported
	glTexGenfvOES unsupported
	glTexGenfvOES unsupported
	glTexGeniOES unsupported
	glTexGenivOES unsupported
	glTexGenivOES unsupported
	glTexGenxOES unsupported
	glTexGenxvOES unsupported
	glTexGenxvOES unsupported
	glTexParameterxOES unsupported
	glTexParameterxvOES unsupported
	glTexParameterxvOES unsupported
	glTranslatexOES unsupported
	No newline at end of file