Skip to content

Commit 161ed13

Browse files
Methuselah96Methuselah96
authored
Fix shadowing of error function (#32245)
1 parent d31f771 commit 161ed13

File tree

4 files changed

+39
-39
lines changed

4 files changed

+39
-39
lines changed

‎src/renderers/WebGLRenderer.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -398,10 +398,10 @@ class WebGLRenderer {
398398

399399
}
400400

401-
} catch ( error ) {
401+
} catch ( e ) {
402402

403-
error( 'WebGLRenderer: ' + error.message );
404-
throw error;
403+
error( 'WebGLRenderer: ' + e.message );
404+
throw e;
405405

406406
}
407407

‎src/renderers/webgl-fallback/utils/WebGLTimestampQueryPool.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { warnOnce, warn } from '../../../utils.js';
1+
import { error, warnOnce, warn } from '../../../utils.js';
22
import TimestampQueryPool from '../../common/TimestampQueryPool.js';
33

44
/**
@@ -122,9 +122,9 @@ class WebGLTimestampQueryPool extends TimestampQueryPool {
122122

123123
}
124124

125-
} catch ( error ) {
125+
} catch ( e ) {
126126

127-
error( 'Error in beginQuery:', error );
127+
error( 'Error in beginQuery:', e );
128128
this.activeQuery = null;
129129
this.queryStates.set( baseOffset, 'inactive' );
130130

@@ -165,9 +165,9 @@ class WebGLTimestampQueryPool extends TimestampQueryPool {
165165
this.queryStates.set( baseOffset, 'ended' );
166166
this.activeQuery = null;
167167

168-
} catch ( error ) {
168+
} catch ( e ) {
169169

170-
error( 'Error in endQuery:', error );
170+
error( 'Error in endQuery:', e );
171171
// Reset state on error
172172
this.queryStates.set( baseOffset, 'inactive' );
173173
this.activeQuery = null;
@@ -258,9 +258,9 @@ class WebGLTimestampQueryPool extends TimestampQueryPool {
258258

259259
return totalDuration;
260260

261-
} catch ( error ) {
261+
} catch ( e ) {
262262

263-
error( 'Error resolving queries:', error );
263+
error( 'Error resolving queries:', e );
264264
return this.lastValue;
265265

266266
} finally {
@@ -346,9 +346,9 @@ class WebGLTimestampQueryPool extends TimestampQueryPool {
346346
const elapsed = this.gl.getQueryParameter( query, this.gl.QUERY_RESULT );
347347
resolve( Number( elapsed ) / 1e6 ); // Convert nanoseconds to milliseconds
348348

349-
} catch ( error ) {
349+
} catch ( e ) {
350350

351-
error( 'Error checking query:', error );
351+
error( 'Error checking query:', e );
352352
resolve( this.lastValue );
353353

354354
}

‎src/renderers/webgl/WebGLState.js‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -983,9 +983,9 @@ function WebGLState( gl, extensions ) {
983983

984984
gl.compressedTexImage2D( ...arguments );
985985

986-
} catch ( error ) {
986+
} catch ( e ) {
987987

988-
error( 'WebGLState:', error );
988+
error( 'WebGLState:', e );
989989

990990
}
991991

@@ -997,9 +997,9 @@ function WebGLState( gl, extensions ) {
997997

998998
gl.compressedTexImage3D( ...arguments );
999999

1000-
} catch ( error ) {
1000+
} catch ( e ) {
10011001

1002-
error( 'WebGLState:', error );
1002+
error( 'WebGLState:', e );
10031003

10041004
}
10051005

@@ -1011,9 +1011,9 @@ function WebGLState( gl, extensions ) {
10111011

10121012
gl.texSubImage2D( ...arguments );
10131013

1014-
} catch ( error ) {
1014+
} catch ( e ) {
10151015

1016-
error( 'WebGLState:', error );
1016+
error( 'WebGLState:', e );
10171017

10181018
}
10191019

@@ -1025,9 +1025,9 @@ function WebGLState( gl, extensions ) {
10251025

10261026
gl.texSubImage3D( ...arguments );
10271027

1028-
} catch ( error ) {
1028+
} catch ( e ) {
10291029

1030-
error( 'WebGLState:', error );
1030+
error( 'WebGLState:', e );
10311031

10321032
}
10331033

@@ -1039,9 +1039,9 @@ function WebGLState( gl, extensions ) {
10391039

10401040
gl.compressedTexSubImage2D( ...arguments );
10411041

1042-
} catch ( error ) {
1042+
} catch ( e ) {
10431043

1044-
error( 'WebGLState:', error );
1044+
error( 'WebGLState:', e );
10451045

10461046
}
10471047

@@ -1053,9 +1053,9 @@ function WebGLState( gl, extensions ) {
10531053

10541054
gl.compressedTexSubImage3D( ...arguments );
10551055

1056-
} catch ( error ) {
1056+
} catch ( e ) {
10571057

1058-
error( 'WebGLState:', error );
1058+
error( 'WebGLState:', e );
10591059

10601060
}
10611061

@@ -1067,9 +1067,9 @@ function WebGLState( gl, extensions ) {
10671067

10681068
gl.texStorage2D( ...arguments );
10691069

1070-
} catch ( error ) {
1070+
} catch ( e ) {
10711071

1072-
error( 'WebGLState:', error );
1072+
error( 'WebGLState:', e );
10731073

10741074
}
10751075

@@ -1081,9 +1081,9 @@ function WebGLState( gl, extensions ) {
10811081

10821082
gl.texStorage3D( ...arguments );
10831083

1084-
} catch ( error ) {
1084+
} catch ( e ) {
10851085

1086-
error( 'WebGLState:', error );
1086+
error( 'WebGLState:', e );
10871087

10881088
}
10891089

@@ -1095,9 +1095,9 @@ function WebGLState( gl, extensions ) {
10951095

10961096
gl.texImage2D( ...arguments );
10971097

1098-
} catch ( error ) {
1098+
} catch ( e ) {
10991099

1100-
error( 'WebGLState:', error );
1100+
error( 'WebGLState:', e );
11011101

11021102
}
11031103

@@ -1109,9 +1109,9 @@ function WebGLState( gl, extensions ) {
11091109

11101110
gl.texImage3D( ...arguments );
11111111

1112-
} catch ( error ) {
1112+
} catch ( e ) {
11131113

1114-
error( 'WebGLState:', error );
1114+
error( 'WebGLState:', e );
11151115

11161116
}
11171117

‎src/renderers/webgpu/utils/WebGPUTimestampQueryPool.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { warnOnce } from '../../../utils.js';
1+
import { error, warnOnce } from '../../../utils.js';
22
import TimestampQueryPool from '../../common/TimestampQueryPool.js';
33

44
/**
@@ -217,9 +217,9 @@ class WebGPUTimestampQueryPool extends TimestampQueryPool {
217217

218218
return totalDuration;
219219

220-
} catch ( error ) {
220+
} catch ( e ) {
221221

222-
error( 'Error resolving queries:', error );
222+
error( 'Error resolving queries:', e );
223223
if ( this.resultBuffer.mapState === 'mapped' ) {
224224

225225
this.resultBuffer.unmap();
@@ -255,9 +255,9 @@ class WebGPUTimestampQueryPool extends TimestampQueryPool {
255255

256256
await this.pendingResolve;
257257

258-
} catch ( error ) {
258+
} catch ( e ) {
259259

260-
error( 'Error waiting for pending resolve:', error );
260+
error( 'Error waiting for pending resolve:', e );
261261

262262
}
263263

@@ -270,9 +270,9 @@ class WebGPUTimestampQueryPool extends TimestampQueryPool {
270270

271271
this.resultBuffer.unmap();
272272

273-
} catch ( error ) {
273+
} catch ( e ) {
274274

275-
error( 'Error unmapping buffer:', error );
275+
error( 'Error unmapping buffer:', e );
276276

277277
}
278278

0 commit comments

Comments
 (0)