Skip to content

Commit ff9534a

Browse files
committed
Added higher threshold for warning emission on shader linking and validation
1 parent 51670f5 commit ff9534a

2 files changed

Lines changed: 7 additions & 12 deletions

File tree

v3/src/checksum.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
var CHECKSUM = {
2-
build: '7d813d50-8217-11e7-b68c-d36461f65b44'
2+
build: 'ce0b7300-8279-11e7-a43d-997ba01bf63f'
33
};
44
module.exports = CHECKSUM;

v3/src/renderer/webgl/ResourceManager.js

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ var ResourceManager = new Class({
142142
gl.shaderSource(vertShader, shaderSources.vert);
143143
gl.compileShader(vertShader);
144144

145-
error = gl.getShaderInfoLog(vertShader);
146145
status = gl.getShaderParameter(vertShader, gl.COMPILE_STATUS);
146+
error = gl.getShaderInfoLog(vertShader);
147147

148148
if (!status && error && error.length > 0)
149149
{
@@ -158,8 +158,8 @@ var ResourceManager = new Class({
158158
gl.shaderSource(fragShader, shaderSources.frag);
159159
gl.compileShader(fragShader);
160160

161-
error = gl.getShaderInfoLog(fragShader);
162161
status = gl.getShaderParameter(fragShader, gl.COMPILE_STATUS);
162+
error = gl.getShaderInfoLog(fragShader);
163163

164164
if (!status && error && error.length > 0)
165165
{
@@ -176,31 +176,26 @@ var ResourceManager = new Class({
176176
gl.linkProgram(program);
177177
gl.validateProgram(program);
178178

179-
error = gl.getProgramInfoLog(program);
180179
status = gl.getProgramParameter(program, gl.LINK_STATUS);
180+
error = gl.getProgramInfoLog(program);
181181

182182
if (!status && error && error.length > 0)
183183
{
184184
throw new Error('Program Linking Error. Shader name: ' + shaderName + '.\n' + error);
185185
}
186-
else if (error && error.length > 0)
186+
else if (error && error.length > 10)
187187
{
188188
console.warn('Program Linking Warning. Shader name: ' + shaderName + '.\n' + error);
189189
}
190190

191-
if (!error)
192-
{
193-
194-
}
195-
196-
error = gl.getProgramInfoLog(program);
197191
status = gl.getProgramParameter(program, gl.VALIDATE_STATUS);
192+
error = gl.getProgramInfoLog(program);
198193

199194
if (!status && error && error.length > 0)
200195
{
201196
throw new Error('Program Validation Error. Shader name: ' + shaderName + '.\n' + error);
202197
}
203-
else if (error && error.length > 0)
198+
else if (error && error.length > 10)
204199
{
205200
console.warn('Program Validation Warning. Shader name: ' + shaderName + '.\n' + error);
206201
}

0 commit comments

Comments
 (0)