Skip to content

WebGLUniforms: Clean up #14038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 11, 2018
Merged

WebGLUniforms: Clean up #14038

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 31 additions & 10 deletions src/renderers/webgl/WebGLUniforms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,12 +372,13 @@ function setValue4fm( gl, v ) {

function setValueT1( gl, v, renderer ) {

var cache = this.cache;
var unit = renderer.allocTextureUnit();

if ( this.cache[ 0 ] !== unit ) {
if ( cache[ 0 ] !== unit ) {

gl.uniform1i( this.addr, unit );
this.cache[ 0 ] = unit;
cache[ 0 ] = unit;

}

Expand All @@ -387,12 +388,13 @@ function setValueT1( gl, v, renderer ) {

function setValueT6( gl, v, renderer ) {

var cache = this.cache;
var unit = renderer.allocTextureUnit();

if ( this.cache[ 0 ] !== unit ) {
if ( cache[ 0 ] !== unit ) {

gl.uniform1i( this.addr, unit );
this.cache[ 0 ] = unit;
cache[ 0 ] = unit;

}

Expand All @@ -404,31 +406,37 @@ function setValueT6( gl, v, renderer ) {

function setValue2iv( gl, v ) {

if ( arraysEqual( this.cache, v ) ) return;
var cache = this.cache;

if ( arraysEqual( cache, v ) ) return;

gl.uniform2iv( this.addr, v );

copyArray( this.cache, v );
copyArray( cache, v );

}

function setValue3iv( gl, v ) {

if ( arraysEqual( this.cache, v ) ) return;
var cache = this.cache;

if ( arraysEqual( cache, v ) ) return;

gl.uniform3iv( this.addr, v );

copyArray( this.cache, v );
copyArray( cache, v );

}

function setValue4iv( gl, v ) {

if ( arraysEqual( this.cache, v ) ) return;
var cache = this.cache;

if ( arraysEqual( cache, v ) ) return;

gl.uniform4iv( this.addr, v );

copyArray( this.cache, v );
copyArray( cache, v );

}

Expand Down Expand Up @@ -463,13 +471,25 @@ function getSingularSetter( type ) {

function setValue1fv( gl, v ) {

var cache = this.cache;

if ( arraysEqual( cache, v ) ) return;

gl.uniform1fv( this.addr, v );

copyArray( cache, v );

}
function setValue1iv( gl, v ) {

var cache = this.cache;

if ( arraysEqual( cache, v ) ) return;

gl.uniform1iv( this.addr, v );

copyArray( cache, v );

}

// Array of vectors (flat or from THREE classes)
Expand Down Expand Up @@ -588,6 +608,7 @@ function PureArrayUniform( id, activeInfo, addr ) {

this.id = id;
this.addr = addr;
this.cache = [];
this.size = activeInfo.size;
this.setValue = getPureArraySetter( activeInfo.type );

Expand Down