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

Commit ef183909 authored Oct 23, 2009 by Jack Palevich Committed by Android Git Automerger Oct 23, 2009

am 8f89a1a3: Merge change Ic620a52b into eclair

Merge commit '8f89a1a360465e08e81ceca3cb3042606a98668b' into eclair-mr2

* commit '8f89a1a360465e08e81ceca3cb3042606a98668b':
  Add size checks for glBufferData and glBufferSubData

parents 4e6242c0 fd7e82bf

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

+62 −61

Original line number	Original line	Diff line number	Diff line
	@@ -23,7 +23,8 @@ glPointParameter check params 1
	glTexEnv ifcheck params 1 pname GL_TEXTURE_ENV_MODE,GL_COMBINE_RGB,GL_COMBINE_ALPHA ifcheck params 4 pname GL_TEXTURE_ENV_COLOR		glTexEnv ifcheck params 1 pname GL_TEXTURE_ENV_MODE,GL_COMBINE_RGB,GL_COMBINE_ALPHA ifcheck params 4 pname GL_TEXTURE_ENV_COLOR
	glTexImage2D nullAllowed		glTexImage2D nullAllowed
	glTexSubImage2D nullAllowed		glTexSubImage2D nullAllowed
	glBufferData nullAllowed		glBufferData nullAllowed check data size
			glBufferSubData check data size
	glTexParameter check params 1		glTexParameter check params 1
	glQueryMatrixxOES check mantissa 16 check exponent 16 return -1		glQueryMatrixxOES check mantissa 16 check exponent 16 return -1
	glDrawTexfvOES check coords 5		glDrawTexfvOES check coords 5

opengl/tools/glgen/specs/jsr239/glspec-checks

+60 −59

Original line number	Original line	Diff line number	Diff line
	@@ -21,7 +21,8 @@ glPointParameter check params 1
	glTexEnv ifcheck params 1 pname GL_TEXTURE_ENV_MODE,GL_COMBINE_RGB,GL_COMBINE_ALPHA ifcheck params 4 pname GL_TEXTURE_ENV_COLOR		glTexEnv ifcheck params 1 pname GL_TEXTURE_ENV_MODE,GL_COMBINE_RGB,GL_COMBINE_ALPHA ifcheck params 4 pname GL_TEXTURE_ENV_COLOR
	glTexImage2D nullAllowed		glTexImage2D nullAllowed
	glTexSubImage2D nullAllowed		glTexSubImage2D nullAllowed
	glBufferData nullAllowed		glBufferData nullAllowed check data size
			glBufferSubData check data size
	glTexParameter check params 1		glTexParameter check params 1
	glQueryMatrixxOES check mantissa 16 check exponent 16 return -1		glQueryMatrixxOES check mantissa 16 check exponent 16 return -1
	glDrawTexfvOES check coords 5		glDrawTexfvOES check coords 5

opengl/tools/glgen/src/JniCodeEmitter.java

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -907,13 +907,13 @@ public class JniCodeEmitter {
	");");		");");
	}		}

			emitNativeBoundsChecks(cfunc, cname, out, true,
			emitExceptionCheck,
			offset, remaining, nullAllowed ? " " : " ");

	if (nullAllowed) {		if (nullAllowed) {
	out.println(indent + "}");		out.println(indent + "}");
	}		}

	emitNativeBoundsChecks(cfunc, cname, out, true,
	emitExceptionCheck,
	offset, remaining, " ");
	}		}
	}		}
	}		}