|
@@ -15,7 +15,6 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
|
|
|
const programs = [];
|
|
const programs = [];
|
|
|
|
|
|
|
|
const logarithmicDepthBuffer = capabilities.logarithmicDepthBuffer;
|
|
const logarithmicDepthBuffer = capabilities.logarithmicDepthBuffer;
|
|
|
- const SUPPORTS_VERTEX_TEXTURES = capabilities.vertexTextures;
|
|
|
|
|
|
|
|
|
|
let precision = capabilities.precision;
|
|
let precision = capabilities.precision;
|
|
|
|
|
|
|
@@ -199,7 +198,6 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
|
|
|
instancingColor: IS_INSTANCEDMESH && object.instanceColor !== null,
|
|
instancingColor: IS_INSTANCEDMESH && object.instanceColor !== null,
|
|
|
instancingMorph: IS_INSTANCEDMESH && object.morphTexture !== null,
|
|
instancingMorph: IS_INSTANCEDMESH && object.morphTexture !== null,
|
|
|
|
|
|
|
|
- supportsVertexTextures: SUPPORTS_VERTEX_TEXTURES,
|
|
|
|
|
outputColorSpace: ( currentRenderTarget === null ) ? renderer.outputColorSpace : ( currentRenderTarget.isXRRenderTarget === true ? currentRenderTarget.texture.colorSpace : LinearSRGBColorSpace ),
|
|
outputColorSpace: ( currentRenderTarget === null ) ? renderer.outputColorSpace : ( currentRenderTarget.isXRRenderTarget === true ? currentRenderTarget.texture.colorSpace : LinearSRGBColorSpace ),
|
|
|
alphaToCoverage: !! material.alphaToCoverage,
|
|
alphaToCoverage: !! material.alphaToCoverage,
|
|
|
|
|
|
|
@@ -212,7 +210,7 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
|
|
|
lightMap: HAS_LIGHTMAP,
|
|
lightMap: HAS_LIGHTMAP,
|
|
|
bumpMap: HAS_BUMPMAP,
|
|
bumpMap: HAS_BUMPMAP,
|
|
|
normalMap: HAS_NORMALMAP,
|
|
normalMap: HAS_NORMALMAP,
|
|
|
- displacementMap: SUPPORTS_VERTEX_TEXTURES && HAS_DISPLACEMENTMAP,
|
|
|
|
|
|
|
+ displacementMap: HAS_DISPLACEMENTMAP,
|
|
|
emissiveMap: HAS_EMISSIVEMAP,
|
|
emissiveMap: HAS_EMISSIVEMAP,
|
|
|
|
|
|
|
|
normalMapObjectSpace: HAS_NORMALMAP && material.normalMapType === ObjectSpaceNormalMap,
|
|
normalMapObjectSpace: HAS_NORMALMAP && material.normalMapType === ObjectSpaceNormalMap,
|
|
@@ -472,52 +470,50 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
|
|
|
|
|
|
|
|
_programLayers.disableAll();
|
|
_programLayers.disableAll();
|
|
|
|
|
|
|
|
- if ( parameters.supportsVertexTextures )
|
|
|
|
|
- _programLayers.enable( 0 );
|
|
|
|
|
if ( parameters.instancing )
|
|
if ( parameters.instancing )
|
|
|
- _programLayers.enable( 1 );
|
|
|
|
|
|
|
+ _programLayers.enable( 0 );
|
|
|
if ( parameters.instancingColor )
|
|
if ( parameters.instancingColor )
|
|
|
- _programLayers.enable( 2 );
|
|
|
|
|
|
|
+ _programLayers.enable( 1 );
|
|
|
if ( parameters.instancingMorph )
|
|
if ( parameters.instancingMorph )
|
|
|
- _programLayers.enable( 3 );
|
|
|
|
|
|
|
+ _programLayers.enable( 2 );
|
|
|
if ( parameters.matcap )
|
|
if ( parameters.matcap )
|
|
|
- _programLayers.enable( 4 );
|
|
|
|
|
|
|
+ _programLayers.enable( 3 );
|
|
|
if ( parameters.envMap )
|
|
if ( parameters.envMap )
|
|
|
- _programLayers.enable( 5 );
|
|
|
|
|
|
|
+ _programLayers.enable( 4 );
|
|
|
if ( parameters.normalMapObjectSpace )
|
|
if ( parameters.normalMapObjectSpace )
|
|
|
- _programLayers.enable( 6 );
|
|
|
|
|
|
|
+ _programLayers.enable( 5 );
|
|
|
if ( parameters.normalMapTangentSpace )
|
|
if ( parameters.normalMapTangentSpace )
|
|
|
- _programLayers.enable( 7 );
|
|
|
|
|
|
|
+ _programLayers.enable( 6 );
|
|
|
if ( parameters.clearcoat )
|
|
if ( parameters.clearcoat )
|
|
|
- _programLayers.enable( 8 );
|
|
|
|
|
|
|
+ _programLayers.enable( 7 );
|
|
|
if ( parameters.iridescence )
|
|
if ( parameters.iridescence )
|
|
|
- _programLayers.enable( 9 );
|
|
|
|
|
|
|
+ _programLayers.enable( 8 );
|
|
|
if ( parameters.alphaTest )
|
|
if ( parameters.alphaTest )
|
|
|
- _programLayers.enable( 10 );
|
|
|
|
|
|
|
+ _programLayers.enable( 9 );
|
|
|
if ( parameters.vertexColors )
|
|
if ( parameters.vertexColors )
|
|
|
- _programLayers.enable( 11 );
|
|
|
|
|
|
|
+ _programLayers.enable( 10 );
|
|
|
if ( parameters.vertexAlphas )
|
|
if ( parameters.vertexAlphas )
|
|
|
- _programLayers.enable( 12 );
|
|
|
|
|
|
|
+ _programLayers.enable( 11 );
|
|
|
if ( parameters.vertexUv1s )
|
|
if ( parameters.vertexUv1s )
|
|
|
- _programLayers.enable( 13 );
|
|
|
|
|
|
|
+ _programLayers.enable( 12 );
|
|
|
if ( parameters.vertexUv2s )
|
|
if ( parameters.vertexUv2s )
|
|
|
- _programLayers.enable( 14 );
|
|
|
|
|
|
|
+ _programLayers.enable( 13 );
|
|
|
if ( parameters.vertexUv3s )
|
|
if ( parameters.vertexUv3s )
|
|
|
- _programLayers.enable( 15 );
|
|
|
|
|
|
|
+ _programLayers.enable( 14 );
|
|
|
if ( parameters.vertexTangents )
|
|
if ( parameters.vertexTangents )
|
|
|
- _programLayers.enable( 16 );
|
|
|
|
|
|
|
+ _programLayers.enable( 15 );
|
|
|
if ( parameters.anisotropy )
|
|
if ( parameters.anisotropy )
|
|
|
- _programLayers.enable( 17 );
|
|
|
|
|
|
|
+ _programLayers.enable( 16 );
|
|
|
if ( parameters.alphaHash )
|
|
if ( parameters.alphaHash )
|
|
|
- _programLayers.enable( 18 );
|
|
|
|
|
|
|
+ _programLayers.enable( 17 );
|
|
|
if ( parameters.batching )
|
|
if ( parameters.batching )
|
|
|
- _programLayers.enable( 19 );
|
|
|
|
|
|
|
+ _programLayers.enable( 18 );
|
|
|
if ( parameters.dispersion )
|
|
if ( parameters.dispersion )
|
|
|
- _programLayers.enable( 20 );
|
|
|
|
|
|
|
+ _programLayers.enable( 19 );
|
|
|
if ( parameters.batchingColor )
|
|
if ( parameters.batchingColor )
|
|
|
- _programLayers.enable( 21 );
|
|
|
|
|
|
|
+ _programLayers.enable( 20 );
|
|
|
if ( parameters.gradientMap )
|
|
if ( parameters.gradientMap )
|
|
|
- _programLayers.enable( 22 );
|
|
|
|
|
|
|
+ _programLayers.enable( 21 );
|
|
|
|
|
|
|
|
array.push( _programLayers.mask );
|
|
array.push( _programLayers.mask );
|
|
|
_programLayers.disableAll();
|
|
_programLayers.disableAll();
|