Skip to content
Merged
Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion src/renderers/WebGLRenderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -3490,7 +3490,6 @@ class WebGLRenderer {
* @property {string} precision - The shader precision currently being used by the renderer.
* @property {boolean} reversedDepthBuffer - `true` if `reversedDepthBuffer` was set to `true` in the constructor
* and the rendering context supports `EXT_clip_control`.
* @property {boolean} vertexTextures - `true` if vertex textures can be used.
**/

/**
Expand Down
4 changes: 0 additions & 4 deletions src/renderers/webgl/WebGLCapabilities.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,6 @@ function WebGLCapabilities( gl, extensions, parameters, utils ) {
const maxVaryings = gl.getParameter( gl.MAX_VARYING_VECTORS );
const maxFragmentUniforms = gl.getParameter( gl.MAX_FRAGMENT_UNIFORM_VECTORS );

const vertexTextures = maxVertexTextures > 0;

const maxSamples = gl.getParameter( gl.MAX_SAMPLES );
const samples = gl.getParameter( gl.SAMPLES );

Expand Down Expand Up @@ -134,8 +132,6 @@ function WebGLCapabilities( gl, extensions, parameters, utils ) {
maxVaryings: maxVaryings,
maxFragmentUniforms: maxFragmentUniforms,

vertexTextures: vertexTextures,

maxSamples: maxSamples,

samples: samples
Expand Down
50 changes: 23 additions & 27 deletions src/renderers/webgl/WebGLPrograms.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
const programs = [];

const logarithmicDepthBuffer = capabilities.logarithmicDepthBuffer;
const SUPPORTS_VERTEX_TEXTURES = capabilities.vertexTextures;

let precision = capabilities.precision;

Expand Down Expand Up @@ -199,7 +198,6 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
instancingColor: IS_INSTANCEDMESH && object.instanceColor !== null,
instancingMorph: IS_INSTANCEDMESH && object.morphTexture !== null,

supportsVertexTextures: SUPPORTS_VERTEX_TEXTURES,
outputColorSpace: ( currentRenderTarget === null ) ? renderer.outputColorSpace : ( currentRenderTarget.isXRRenderTarget === true ? currentRenderTarget.texture.colorSpace : LinearSRGBColorSpace ),
alphaToCoverage: !! material.alphaToCoverage,

Expand All @@ -212,7 +210,7 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
lightMap: HAS_LIGHTMAP,
bumpMap: HAS_BUMPMAP,
normalMap: HAS_NORMALMAP,
displacementMap: SUPPORTS_VERTEX_TEXTURES && HAS_DISPLACEMENTMAP,
displacementMap: HAS_DISPLACEMENTMAP,
emissiveMap: HAS_EMISSIVEMAP,

normalMapObjectSpace: HAS_NORMALMAP && material.normalMapType === ObjectSpaceNormalMap,
Expand Down Expand Up @@ -472,52 +470,50 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities

_programLayers.disableAll();

if ( parameters.supportsVertexTextures )
_programLayers.enable( 0 );
if ( parameters.instancing )
_programLayers.enable( 1 );
_programLayers.enable( 0 );
if ( parameters.instancingColor )
_programLayers.enable( 2 );
_programLayers.enable( 1 );
if ( parameters.instancingMorph )
_programLayers.enable( 3 );
_programLayers.enable( 2 );
if ( parameters.matcap )
_programLayers.enable( 4 );
_programLayers.enable( 3 );
if ( parameters.envMap )
_programLayers.enable( 5 );
_programLayers.enable( 4 );
if ( parameters.normalMapObjectSpace )
_programLayers.enable( 6 );
_programLayers.enable( 5 );
if ( parameters.normalMapTangentSpace )
_programLayers.enable( 7 );
_programLayers.enable( 6 );
if ( parameters.clearcoat )
_programLayers.enable( 8 );
_programLayers.enable( 7 );
if ( parameters.iridescence )
_programLayers.enable( 9 );
_programLayers.enable( 8 );
if ( parameters.alphaTest )
_programLayers.enable( 10 );
_programLayers.enable( 9 );
if ( parameters.vertexColors )
_programLayers.enable( 11 );
_programLayers.enable( 10 );
if ( parameters.vertexAlphas )
_programLayers.enable( 12 );
_programLayers.enable( 11 );
if ( parameters.vertexUv1s )
_programLayers.enable( 13 );
_programLayers.enable( 12 );
if ( parameters.vertexUv2s )
_programLayers.enable( 14 );
_programLayers.enable( 13 );
if ( parameters.vertexUv3s )
_programLayers.enable( 15 );
_programLayers.enable( 14 );
if ( parameters.vertexTangents )
_programLayers.enable( 16 );
_programLayers.enable( 15 );
if ( parameters.anisotropy )
_programLayers.enable( 17 );
_programLayers.enable( 16 );
if ( parameters.alphaHash )
_programLayers.enable( 18 );
_programLayers.enable( 17 );
if ( parameters.batching )
_programLayers.enable( 19 );
_programLayers.enable( 18 );
if ( parameters.dispersion )
_programLayers.enable( 20 );
_programLayers.enable( 19 );
if ( parameters.batchingColor )
_programLayers.enable( 21 );
_programLayers.enable( 20 );
if ( parameters.gradientMap )
_programLayers.enable( 22 );
_programLayers.enable( 21 );

array.push( _programLayers.mask );
_programLayers.disableAll();
Expand Down
6 changes: 0 additions & 6 deletions test/unit/src/renderers/webgl/WebGLCapabilities.tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,6 @@ export default QUnit.module( 'Renderers', () => {

} );

QUnit.todo( 'vertexTextures', ( assert ) => {

assert.ok( false, 'everything\'s gonna be alright' );

} );

QUnit.todo( 'floatFragmentTextures', ( assert ) => {

assert.ok( false, 'everything\'s gonna be alright' );
Expand Down