Skip to content

Commit b06c446

Browse files
committed
WebGLCapabilities: Fixed displacementMap breakage. Fixes mrdoob#9568
1 parent 5ca49f7 commit b06c446

File tree

1 file changed

+25
-11
lines changed

1 file changed

+25
-11
lines changed

src/renderers/webgl/WebGLCapabilities.js

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,20 @@ function WebGLCapabilities( gl, extensions, parameters ) {
6868

6969
var logarithmicDepthBuffer = parameters.logarithmicDepthBuffer === true && !! extensions.get( 'EXT_frag_depth' );
7070

71+
var maxTextures = gl.getParameter( gl.MAX_TEXTURE_IMAGE_UNITS );
72+
var maxVertexTextures = gl.getParameter( gl.MAX_VERTEX_TEXTURE_IMAGE_UNITS );
73+
var maxTextureSize = gl.getParameter( gl.MAX_TEXTURE_SIZE );
74+
var maxCubemapSize = gl.getParameter( gl.MAX_CUBE_MAP_TEXTURE_SIZE );
75+
76+
var maxAttributes = gl.getParameter( gl.MAX_VERTEX_ATTRIBS );
77+
var maxVertexUniforms = gl.getParameter( gl.MAX_VERTEX_UNIFORM_VECTORS );
78+
var maxVaryings = gl.getParameter( gl.MAX_VARYING_VECTORS );
79+
var maxFragmentUniforms = gl.getParameter( gl.MAX_FRAGMENT_UNIFORM_VECTORS );
80+
81+
var vertexTextures = maxVertexTextures > 0;
82+
var floatFragmentTextures = !! extensions.get( 'OES_texture_float' );
83+
var floatVertexTextures = vertexTextures && floatFragmentTextures;
84+
7185
return {
7286

7387
getMaxAnisotropy: getMaxAnisotropy,
@@ -76,19 +90,19 @@ function WebGLCapabilities( gl, extensions, parameters ) {
7690
precision: precision,
7791
logarithmicDepthBuffer: logarithmicDepthBuffer,
7892

79-
maxTextures: gl.getParameter( gl.MAX_TEXTURE_IMAGE_UNITS ),
80-
maxVertexTextures: gl.getParameter( gl.MAX_VERTEX_TEXTURE_IMAGE_UNITS ),
81-
maxTextureSize: gl.getParameter( gl.MAX_TEXTURE_SIZE ),
82-
maxCubemapSize: gl.getParameter( gl.MAX_CUBE_MAP_TEXTURE_SIZE ),
93+
maxTextures: maxTextures,
94+
maxVertexTextures: maxVertexTextures,
95+
maxTextureSize: maxTextureSize,
96+
maxCubemapSize: maxCubemapSize,
8397

84-
maxAttributes: gl.getParameter( gl.MAX_VERTEX_ATTRIBS ),
85-
maxVertexUniforms: gl.getParameter( gl.MAX_VERTEX_UNIFORM_VECTORS ),
86-
maxVaryings: gl.getParameter( gl.MAX_VARYING_VECTORS ),
87-
maxFragmentUniforms: gl.getParameter( gl.MAX_FRAGMENT_UNIFORM_VECTORS ),
98+
maxAttributes: maxAttributes,
99+
maxVertexUniforms: maxVertexUniforms,
100+
maxVaryings: maxVaryings,
101+
maxFragmentUniforms: maxFragmentUniforms,
88102

89-
vertexTextures: this.maxVertexTextures > 0,
90-
floatFragmentTextures: !! extensions.get( 'OES_texture_float' ),
91-
floatVertexTextures: this.vertexTextures && this.floatFragmentTextures
103+
vertexTextures: vertexTextures,
104+
floatFragmentTextures: floatFragmentTextures,
105+
floatVertexTextures: floatVertexTextures
92106

93107
};
94108

0 commit comments

Comments
 (0)