Skip to content

Commit c8c8a27

Browse files
authored
Merge pull request #368 from lankaapura/fix-typescript-issue-14925
Update type arguments for WebGLRenderingContext.uniform*fv
2 parents c3856af + 67d58e6 commit c8c8a27

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

baselines/dom.generated.d.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12555,24 +12555,24 @@ interface WebGLRenderingContext {
1255512555
texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, width: number, height: number, format: number, type: number, pixels: ArrayBufferView | null): void;
1255612556
texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, pixels: ImageBitmap | ImageData | HTMLVideoElement | HTMLImageElement | HTMLCanvasElement): void;
1255712557
uniform1f(location: WebGLUniformLocation | null, x: number): void;
12558-
uniform1fv(location: WebGLUniformLocation, v: Float32Array | number[]): void;
12558+
uniform1fv(location: WebGLUniformLocation, v: Float32Array | ArrayLike<number>): void;
1255912559
uniform1i(location: WebGLUniformLocation | null, x: number): void;
12560-
uniform1iv(location: WebGLUniformLocation, v: Int32Array | number[]): void;
12560+
uniform1iv(location: WebGLUniformLocation, v: Int32Array | ArrayLike<number>): void;
1256112561
uniform2f(location: WebGLUniformLocation | null, x: number, y: number): void;
12562-
uniform2fv(location: WebGLUniformLocation, v: Float32Array | number[]): void;
12562+
uniform2fv(location: WebGLUniformLocation, v: Float32Array | ArrayLike<number>): void;
1256312563
uniform2i(location: WebGLUniformLocation | null, x: number, y: number): void;
12564-
uniform2iv(location: WebGLUniformLocation, v: Int32Array | number[]): void;
12564+
uniform2iv(location: WebGLUniformLocation, v: Int32Array | ArrayLike<number>): void;
1256512565
uniform3f(location: WebGLUniformLocation | null, x: number, y: number, z: number): void;
12566-
uniform3fv(location: WebGLUniformLocation, v: Float32Array | number[]): void;
12566+
uniform3fv(location: WebGLUniformLocation, v: Float32Array | ArrayLike<number>): void;
1256712567
uniform3i(location: WebGLUniformLocation | null, x: number, y: number, z: number): void;
12568-
uniform3iv(location: WebGLUniformLocation, v: Int32Array | number[]): void;
12568+
uniform3iv(location: WebGLUniformLocation, v: Int32Array | ArrayLike<number>): void;
1256912569
uniform4f(location: WebGLUniformLocation | null, x: number, y: number, z: number, w: number): void;
12570-
uniform4fv(location: WebGLUniformLocation, v: Float32Array | number[]): void;
12570+
uniform4fv(location: WebGLUniformLocation, v: Float32Array | ArrayLike<number>): void;
1257112571
uniform4i(location: WebGLUniformLocation | null, x: number, y: number, z: number, w: number): void;
12572-
uniform4iv(location: WebGLUniformLocation, v: Int32Array | number[]): void;
12573-
uniformMatrix2fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | number[]): void;
12574-
uniformMatrix3fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | number[]): void;
12575-
uniformMatrix4fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | number[]): void;
12572+
uniform4iv(location: WebGLUniformLocation, v: Int32Array | ArrayLike<number>): void;
12573+
uniformMatrix2fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | ArrayLike<number>): void;
12574+
uniformMatrix3fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | ArrayLike<number>): void;
12575+
uniformMatrix4fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | ArrayLike<number>): void;
1257612576
useProgram(program: WebGLProgram | null): void;
1257712577
validateProgram(program: WebGLProgram | null): void;
1257812578
vertexAttrib1f(indx: number, x: number): void;

inputfiles/overridingTypes.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -927,87 +927,87 @@
927927
"interface": "WebGLRenderingContext",
928928
"name": "uniform1fv",
929929
"signatures": [
930-
"uniform1fv(location: WebGLUniformLocation, v: Float32Array | number[]): void"
930+
"uniform1fv(location: WebGLUniformLocation, v: Float32Array | ArrayLike<number>): void"
931931
]
932932
},
933933
{
934934
"kind": "method",
935935
"interface": "WebGLRenderingContext",
936936
"name": "uniform2fv",
937937
"signatures": [
938-
"uniform2fv(location: WebGLUniformLocation, v: Float32Array | number[]): void"
938+
"uniform2fv(location: WebGLUniformLocation, v: Float32Array | ArrayLike<number>): void"
939939
]
940940
},
941941
{
942942
"kind": "method",
943943
"interface": "WebGLRenderingContext",
944944
"name": "uniform3fv",
945945
"signatures": [
946-
"uniform3fv(location: WebGLUniformLocation, v: Float32Array | number[]): void"
946+
"uniform3fv(location: WebGLUniformLocation, v: Float32Array | ArrayLike<number>): void"
947947
]
948948
},
949949
{
950950
"kind": "method",
951951
"interface": "WebGLRenderingContext",
952952
"name": "uniform4fv",
953953
"signatures": [
954-
"uniform4fv(location: WebGLUniformLocation, v: Float32Array | number[]): void"
954+
"uniform4fv(location: WebGLUniformLocation, v: Float32Array | ArrayLike<number>): void"
955955
]
956956
},
957957
{
958958
"kind": "method",
959959
"interface": "WebGLRenderingContext",
960960
"name": "uniform1iv",
961961
"signatures": [
962-
"uniform1iv(location: WebGLUniformLocation, v: Int32Array | number[]): void"
962+
"uniform1iv(location: WebGLUniformLocation, v: Int32Array | ArrayLike<number>): void"
963963
]
964964
},
965965
{
966966
"kind": "method",
967967
"interface": "WebGLRenderingContext",
968968
"name": "uniform2iv",
969969
"signatures": [
970-
"uniform2iv(location: WebGLUniformLocation, v: Int32Array | number[]): void"
970+
"uniform2iv(location: WebGLUniformLocation, v: Int32Array | ArrayLike<number>): void"
971971
]
972972
},
973973
{
974974
"kind": "method",
975975
"interface": "WebGLRenderingContext",
976976
"name": "uniform3iv",
977977
"signatures": [
978-
"uniform3iv(location: WebGLUniformLocation, v: Int32Array | number[]): void"
978+
"uniform3iv(location: WebGLUniformLocation, v: Int32Array | ArrayLike<number>): void"
979979
]
980980
},
981981
{
982982
"kind": "method",
983983
"interface": "WebGLRenderingContext",
984984
"name": "uniform4iv",
985985
"signatures": [
986-
"uniform4iv(location: WebGLUniformLocation, v: Int32Array | number[]): void"
986+
"uniform4iv(location: WebGLUniformLocation, v: Int32Array | ArrayLike<number>): void"
987987
]
988988
},
989989
{
990990
"kind": "method",
991991
"interface": "WebGLRenderingContext",
992992
"name": "uniformMatrix2fv",
993993
"signatures": [
994-
"uniformMatrix2fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | number[]): void"
994+
"uniformMatrix2fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | ArrayLike<number>): void"
995995
]
996996
},
997997
{
998998
"kind": "method",
999999
"interface": "WebGLRenderingContext",
10001000
"name": "uniformMatrix3fv",
10011001
"signatures": [
1002-
"uniformMatrix3fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | number[]): void"
1002+
"uniformMatrix3fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | ArrayLike<number>): void"
10031003
]
10041004
},
10051005
{
10061006
"kind": "method",
10071007
"interface": "WebGLRenderingContext",
10081008
"name": "uniformMatrix4fv",
10091009
"signatures": [
1010-
"uniformMatrix4fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | number[]): void"
1010+
"uniformMatrix4fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array | ArrayLike<number>): void"
10111011
]
10121012
},
10131013
{

0 commit comments

Comments
 (0)