This repository was archived by the owner on Aug 15, 2019. It is now read-only.

Commit 893ba6e

author

Nikhil Thorat

authored

Add a setter for MAX_TEXTURE_SIZE so the property can be modifi... (#1868)

BUG

1 parent 6e6bd19 commit 893ba6eCopy full SHA for 893ba6e

File tree

+13

-6

lines changed

+13

-6

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ describe('WEBGL_CONV_IM2COL', () => {`
`195`	`195`	`describe('WEBGL_MAX_TEXTURE_SIZE', () => {`
`196`	`196`	`beforeEach(() => {`
`197`	`197`	`ENV.reset();`
`198`		`- webgl_util.MAX_TEXTURE_SIZE=null;`
	`198`	`+ webgl_util.resetMaxTextureSize();`
`199`	`199`
`200`	`200`	`spyOn(canvas_util, 'getWebGLContext').and.returnValue({`
`201`	`201`	`MAX_TEXTURE_SIZE: 101,`
`@@ -209,7 +209,7 @@ describe('WEBGL_MAX_TEXTURE_SIZE', () => {`
`209`	`209`	`});`
`210`	`210`	`afterAll(() => {`
`211`	`211`	`ENV.reset();`
`212`		`- webgl_util.MAX_TEXTURE_SIZE=null;`
	`212`	`+ webgl_util.resetMaxTextureSize();`
`213`	`213`	`});`
`214`	`214`
`215`	`215`	`it('is a function of gl.getParameter(MAX_TEXTURE_SIZE)', () => {`
`@@ -221,7 +221,7 @@ describe('WEBGL_MAX_TEXTURES_IN_SHADER', () => {`
`221`	`221`	`let maxTextures: number;`
`222`	`222`	`beforeEach(() => {`
`223`	`223`	`ENV.reset();`
`224`		`- webgl_util.MAX_TEXTURES_IN_SHADER=null;`
	`224`	`+ webgl_util.resetMaxTexturesInShader();`
`225`	`225`
`226`	`226`	`spyOn(canvas_util, 'getWebGLContext').and.callFake(() => {`
`227`	`227`	`return {`
`@@ -237,7 +237,7 @@ describe('WEBGL_MAX_TEXTURES_IN_SHADER', () => {`
`237`	`237`	`});`
`238`	`238`	`afterAll(() => {`
`239`	`239`	`ENV.reset();`
`240`		`- webgl_util.MAX_TEXTURES_IN_SHADER=null;`
	`240`	`+ webgl_util.resetMaxTexturesInShader();`
`241`	`241`	`});`
`242`	`242`
`243`	`243`	`it('is a function of gl.getParameter(MAX_TEXTURE_IMAGE_UNITS)', () => {`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -498,8 +498,8 @@ export function isReshapeFree(shape1: number[], shape2: number[]): boolean {`
`498`	`498`	`// We cache webgl params because the environment gets reset between`
`499`	`499`	`// unit tests and we don't want to constantly query the WebGLContext for`
`500`	`500`	`// MAX_TEXTURE_SIZE.`
`501`		`-exportlet MAX_TEXTURE_SIZE: number;`
`502`		`-exportlet MAX_TEXTURES_IN_SHADER: number;`
	`501`	`+let MAX_TEXTURE_SIZE: number;`
	`502`	`+let MAX_TEXTURES_IN_SHADER: number;`
`503`	`503`
`504`	`504`	`export function getWebGLMaxTextureSize(webGLVersion: number): number {`
`505`	`505`	`if (MAX_TEXTURE_SIZE == null) {`
`@@ -509,6 +509,13 @@ export function getWebGLMaxTextureSize(webGLVersion: number): number {`
`509`	`509`	`return MAX_TEXTURE_SIZE;`
`510`	`510`	`}`
`511`	`511`
	`512`	`+export function resetMaxTextureSize() {`
	`513`	`+ MAX_TEXTURE_SIZE = null;`
	`514`	`+}`
	`515`	`+export function resetMaxTexturesInShader() {`
	`516`	`+ MAX_TEXTURES_IN_SHADER = null;`
	`517`	`+}`
	`518`	`+`
`512`	`519`	`export function getMaxTexturesInShader(webGLVersion: number): number {`
`513`	`520`	`if (MAX_TEXTURES_IN_SHADER == null) {`
`514`	`521`	`const gl = getWebGLContext(webGLVersion);`

Comments

(0)