Skip to content
Merged
Changes from all commits
Commits
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
26 changes: 10 additions & 16 deletions src/renderers/webgl/WebGLPrograms.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
const _customShaders = new WebGLShaderCache();
const _activeChannels = new Set();
const programs = [];
const programsMap = new Map();

const logarithmicDepthBuffer = capabilities.logarithmicDepthBuffer;

Expand Down Expand Up @@ -589,29 +590,19 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities

function acquireProgram( parameters, cacheKey ) {

let program;
let program = programsMap.get( cacheKey );

// Check if code has been already compiled
for ( let p = 0, pl = programs.length; p < pl; p ++ ) {
if ( program !== undefined ) {

const preexistingProgram = programs[ p ];
++ program.usedTimes;

if ( preexistingProgram.cacheKey === cacheKey ) {

program = preexistingProgram;
++ program.usedTimes;

break;

}

}

if ( program === undefined ) {
} else {

program = new WebGLProgram( renderer, cacheKey, parameters, bindingStates );
programs.push( program );

programsMap.set( cacheKey, program );

}

return program;
Expand All @@ -627,6 +618,9 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
programs[ i ] = programs[ programs.length - 1 ];
programs.pop();

// Remove from map
programsMap.delete( program.cacheKey );

// Free WebGL resources
program.destroy();

Expand Down