Skip to content

Commit 7c74b3d

Browse files
authored
WebGLRenderer: Remove SUPPORTS_VERTEX_TEXTURES (#32455)
1 parent 3b687a2 commit 7c74b3d

File tree

4 files changed

+23
-38
lines changed

4 files changed

+23
-38
lines changed

src/renderers/WebGLRenderer.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3490,7 +3490,6 @@ class WebGLRenderer {
34903490
* @property {string} precision - The shader precision currently being used by the renderer.
34913491
* @property {boolean} reversedDepthBuffer - `true` if `reversedDepthBuffer` was set to `true` in the constructor
34923492
* and the rendering context supports `EXT_clip_control`.
3493-
* @property {boolean} vertexTextures - `true` if vertex textures can be used.
34943493
**/
34953494

34963495
/**

src/renderers/webgl/WebGLCapabilities.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,6 @@ function WebGLCapabilities( gl, extensions, parameters, utils ) {
105105
const maxVaryings = gl.getParameter( gl.MAX_VARYING_VECTORS );
106106
const maxFragmentUniforms = gl.getParameter( gl.MAX_FRAGMENT_UNIFORM_VECTORS );
107107

108-
const vertexTextures = maxVertexTextures > 0;
109-
110108
const maxSamples = gl.getParameter( gl.MAX_SAMPLES );
111109
const samples = gl.getParameter( gl.SAMPLES );
112110

@@ -134,8 +132,6 @@ function WebGLCapabilities( gl, extensions, parameters, utils ) {
134132
maxVaryings: maxVaryings,
135133
maxFragmentUniforms: maxFragmentUniforms,
136134

137-
vertexTextures: vertexTextures,
138-
139135
maxSamples: maxSamples,
140136

141137
samples: samples

src/renderers/webgl/WebGLPrograms.js

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
1515
const programs = [];
1616

1717
const logarithmicDepthBuffer = capabilities.logarithmicDepthBuffer;
18-
const SUPPORTS_VERTEX_TEXTURES = capabilities.vertexTextures;
1918

2019
let precision = capabilities.precision;
2120

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

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

@@ -212,7 +210,7 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
212210
lightMap: HAS_LIGHTMAP,
213211
bumpMap: HAS_BUMPMAP,
214212
normalMap: HAS_NORMALMAP,
215-
displacementMap: SUPPORTS_VERTEX_TEXTURES && HAS_DISPLACEMENTMAP,
213+
displacementMap: HAS_DISPLACEMENTMAP,
216214
emissiveMap: HAS_EMISSIVEMAP,
217215

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

473471
_programLayers.disableAll();
474472

475-
if ( parameters.supportsVertexTextures )
476-
_programLayers.enable( 0 );
477473
if ( parameters.instancing )
478-
_programLayers.enable( 1 );
474+
_programLayers.enable( 0 );
479475
if ( parameters.instancingColor )
480-
_programLayers.enable( 2 );
476+
_programLayers.enable( 1 );
481477
if ( parameters.instancingMorph )
482-
_programLayers.enable( 3 );
478+
_programLayers.enable( 2 );
483479
if ( parameters.matcap )
484-
_programLayers.enable( 4 );
480+
_programLayers.enable( 3 );
485481
if ( parameters.envMap )
486-
_programLayers.enable( 5 );
482+
_programLayers.enable( 4 );
487483
if ( parameters.normalMapObjectSpace )
488-
_programLayers.enable( 6 );
484+
_programLayers.enable( 5 );
489485
if ( parameters.normalMapTangentSpace )
490-
_programLayers.enable( 7 );
486+
_programLayers.enable( 6 );
491487
if ( parameters.clearcoat )
492-
_programLayers.enable( 8 );
488+
_programLayers.enable( 7 );
493489
if ( parameters.iridescence )
494-
_programLayers.enable( 9 );
490+
_programLayers.enable( 8 );
495491
if ( parameters.alphaTest )
496-
_programLayers.enable( 10 );
492+
_programLayers.enable( 9 );
497493
if ( parameters.vertexColors )
498-
_programLayers.enable( 11 );
494+
_programLayers.enable( 10 );
499495
if ( parameters.vertexAlphas )
500-
_programLayers.enable( 12 );
496+
_programLayers.enable( 11 );
501497
if ( parameters.vertexUv1s )
502-
_programLayers.enable( 13 );
498+
_programLayers.enable( 12 );
503499
if ( parameters.vertexUv2s )
504-
_programLayers.enable( 14 );
500+
_programLayers.enable( 13 );
505501
if ( parameters.vertexUv3s )
506-
_programLayers.enable( 15 );
502+
_programLayers.enable( 14 );
507503
if ( parameters.vertexTangents )
508-
_programLayers.enable( 16 );
504+
_programLayers.enable( 15 );
509505
if ( parameters.anisotropy )
510-
_programLayers.enable( 17 );
506+
_programLayers.enable( 16 );
511507
if ( parameters.alphaHash )
512-
_programLayers.enable( 18 );
508+
_programLayers.enable( 17 );
513509
if ( parameters.batching )
514-
_programLayers.enable( 19 );
510+
_programLayers.enable( 18 );
515511
if ( parameters.dispersion )
516-
_programLayers.enable( 20 );
512+
_programLayers.enable( 19 );
517513
if ( parameters.batchingColor )
518-
_programLayers.enable( 21 );
514+
_programLayers.enable( 20 );
519515
if ( parameters.gradientMap )
520-
_programLayers.enable( 22 );
516+
_programLayers.enable( 21 );
521517

522518
array.push( _programLayers.mask );
523519
_programLayers.disableAll();

test/unit/src/renderers/webgl/WebGLCapabilities.tests.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,6 @@ export default QUnit.module( 'Renderers', () => {
8888

8989
} );
9090

91-
QUnit.todo( 'vertexTextures', ( assert ) => {
92-
93-
assert.ok( false, 'everything\'s gonna be alright' );
94-
95-
} );
96-
9791
QUnit.todo( 'floatFragmentTextures', ( assert ) => {
9892

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

0 commit comments

Comments
 (0)