소스 검색

WebGLProgram: Do not define USE_UV. (#25740)

mrdoob 2 년 전
부모
커밋
c0cba0ddca
2개의 변경된 파일2개의 추가작업 그리고 7개의 파일을 삭제
  1. 0 1
      src/renderers/webgl/WebGLProgram.js
  2. 2 6
      src/renderers/webgl/WebGLPrograms.js

+ 0 - 1
src/renderers/webgl/WebGLProgram.js

@@ -527,7 +527,6 @@ function WebGLProgram( renderer, cacheKey, parameters, bindingStates ) {
 			parameters.vertexTangents ? '#define USE_TANGENT' : '',
 			parameters.vertexColors ? '#define USE_COLOR' : '',
 			parameters.vertexAlphas ? '#define USE_COLOR_ALPHA' : '',
-			parameters.vertexUvs ? '#define USE_UV' : '',
 			parameters.vertexUvs2 ? '#define USE_UV2' : '',
 
 			parameters.pointsUvs ? '#define USE_POINTS_UV' : '',

+ 2 - 6
src/renderers/webgl/WebGLPrograms.js

@@ -151,7 +151,6 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
 
 		const HAS_EXTENSIONS = !! material.extensions;
 
-		const HAS_ATTRIBUTE_UV = !! geometry.attributes.uv;
 		const HAS_ATTRIBUTE_UV2 = !! geometry.attributes.uv2;
 
 		const parameters = {
@@ -266,7 +265,6 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
 			vertexTangents: HAS_NORMALMAP && !! geometry.attributes.tangent,
 			vertexColors: material.vertexColors,
 			vertexAlphas: material.vertexColors === true && !! geometry.attributes.color && geometry.attributes.color.itemSize === 4,
-			vertexUvs: HAS_ATTRIBUTE_UV,
 			vertexUvs2: HAS_ATTRIBUTE_UV2,
 
 			pointsUvs: object.isPoints === true && !! geometry.attributes.uv && ( HAS_MAP || HAS_ALPHAMAP ),
@@ -459,12 +457,10 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
 			_programLayers.enable( 11 );
 		if ( parameters.vertexAlphas )
 			_programLayers.enable( 12 );
-		if ( parameters.vertexUvs )
-			_programLayers.enable( 13 );
 		if ( parameters.vertexUvs2 )
-			_programLayers.enable( 14 );
+			_programLayers.enable( 13 );
 		if ( parameters.vertexTangents )
-			_programLayers.enable( 15 );
+			_programLayers.enable( 14 );
 
 		array.push( _programLayers.mask );
 		_programLayers.disableAll();