@swf2es/context3d 0.1.19 → 0.1.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +112 -22
- package/dist/agal.d.ts +11 -2
- package/dist/agal.d.ts.map +1 -1
- package/dist/agal.js +318 -47
- package/dist/agal.js.map +1 -1
- package/dist/backend.d.ts +50 -3
- package/dist/backend.d.ts.map +1 -1
- package/dist/backend.js +74 -2
- package/dist/backend.js.map +1 -1
- package/dist/errors.d.ts +1 -1
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/webgl/context.d.ts +24 -3
- package/dist/webgl/context.d.ts.map +1 -1
- package/dist/webgl/context.js +184 -43
- package/dist/webgl/context.js.map +1 -1
- package/dist/webgl/programs.d.ts +4 -1
- package/dist/webgl/programs.d.ts.map +1 -1
- package/dist/webgl/programs.js +7 -6
- package/dist/webgl/programs.js.map +1 -1
- package/dist/webgl/targets.d.ts +3 -1
- package/dist/webgl/targets.d.ts.map +1 -1
- package/dist/webgl/targets.js +5 -3
- package/dist/webgl/targets.js.map +1 -1
- package/dist/webgl/textures.d.ts +9 -1
- package/dist/webgl/textures.d.ts.map +1 -1
- package/dist/webgl/textures.js +161 -7
- package/dist/webgl/textures.js.map +1 -1
- package/package.json +1 -1
- package/src/agal.ts +375 -51
- package/src/backend.ts +113 -3
- package/src/errors.ts +27 -1
- package/src/index.ts +12 -1
- package/src/webgl/context.ts +220 -40
- package/src/webgl/programs.ts +10 -5
- package/src/webgl/targets.ts +4 -2
- package/src/webgl/textures.ts +183 -9
package/src/webgl/textures.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { compressedFormat, TEXEL_BYTES, type Texture3D, type TextureFormat } from "../backend.js";
|
|
2
2
|
import { blockBytes, type DxtEncoder, decodeDxt, encodeDxt } from "../dxt.js";
|
|
3
3
|
import { Context3DError } from "../errors.js";
|
|
4
4
|
import { range } from "./state.js";
|
|
@@ -20,20 +20,169 @@ export interface TextureState {
|
|
|
20
20
|
multisample: MultisampleTarget | null;
|
|
21
21
|
samples: number;
|
|
22
22
|
antiAlias: number;
|
|
23
|
+
/** The extra colour outputs its framebuffer has attached, a bit each from output 1. */
|
|
24
|
+
outputs: number;
|
|
23
25
|
/** TEXTURE_BASE_LEVEL: a streaming texture's finest level whole to the smallest. */
|
|
24
26
|
base: number;
|
|
25
27
|
}
|
|
26
28
|
|
|
27
|
-
/**
|
|
29
|
+
/**
|
|
30
|
+
* GL's internal format for an uncompressed texture's storage. The packed formats are kept
|
|
31
|
+
* at 8 bits a channel, as AIR draws into them, their texels widened on upload as Direct3D
|
|
32
|
+
* samples them; 5:6:5 has no alpha to read but 1.
|
|
33
|
+
*/
|
|
34
|
+
export function storageFormat(gl: WebGL2RenderingContext, format: TextureFormat): number {
|
|
35
|
+
switch (format) {
|
|
36
|
+
case "bgrPacked565":
|
|
37
|
+
return gl.RGB8;
|
|
38
|
+
case "rgbaHalfFloat":
|
|
39
|
+
return gl.RGBA16F;
|
|
40
|
+
default:
|
|
41
|
+
return gl.RGBA8;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
/** 8-bit channel values as half floats, for bitmaps uploaded to rgbaHalfFloat. */
|
|
46
|
+
let halves: Uint16Array | null = null;
|
|
47
|
+
|
|
48
|
+
function halfOf(byte: number): number {
|
|
49
|
+
if (!halves) {
|
|
50
|
+
halves = new Uint16Array(256);
|
|
51
|
+
const float = new Float32Array(1);
|
|
52
|
+
const bits = new Uint32Array(float.buffer);
|
|
53
|
+
for (let i = 1; i < 256; i++) {
|
|
54
|
+
float[0] = i / 255;
|
|
55
|
+
const word = bits[0];
|
|
56
|
+
const exponent = ((word >>> 23) & 255) - 127 + 15;
|
|
57
|
+
// Every value here is a normal half: round its 23-bit mantissa to 10 bits, to nearest even.
|
|
58
|
+
const mantissa = word & 0x7fffff;
|
|
59
|
+
let half = (exponent << 10) | (mantissa >>> 13);
|
|
60
|
+
const rest = mantissa & 0x1fff;
|
|
61
|
+
if (rest > 0x1000 || (rest === 0x1000 && half & 1)) {
|
|
62
|
+
half++;
|
|
63
|
+
}
|
|
64
|
+
halves[i] = half;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
return halves[byte];
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
/** A channel cut to its high `bits` and widened back to 8 by repeating them, as Direct3D reads it. */
|
|
72
|
+
function widen(value: number, bits: number): number {
|
|
73
|
+
const kept = value >> (8 - bits);
|
|
74
|
+
return (kept << (8 - bits)) | (kept >> (2 * bits - 8));
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
/**
|
|
78
|
+
* The staging array, made base-sized at its first use: a texture given only blocks on S3TC
|
|
79
|
+
* has none. It holds a level as RGBA bytes, or a byte upload's texels as they came, with
|
|
80
|
+
* room for half floats' eight bytes a texel.
|
|
81
|
+
*/
|
|
28
82
|
function staging(texture: Texture3D, state: TextureState): Uint8Array {
|
|
29
83
|
if (state.bytes.length === 0) {
|
|
30
|
-
state.bytes = new Uint8Array(
|
|
84
|
+
state.bytes = new Uint8Array(
|
|
85
|
+
texture.width * texture.height * Math.max(4, TEXEL_BYTES[texture.format] ?? 4),
|
|
86
|
+
);
|
|
31
87
|
}
|
|
32
88
|
|
|
33
89
|
return state.bytes;
|
|
34
90
|
}
|
|
35
91
|
|
|
36
|
-
/**
|
|
92
|
+
/**
|
|
93
|
+
* The staged level turned, in place, into what the texture's storage takes: from RGBA
|
|
94
|
+
* bytes, or from its format's texels where `raw`, little-endian words. 5:6:5 and 4:4:4:4
|
|
95
|
+
* keep each channel's high bits, as AIR packs a bitmap; half floats take each byte over 255.
|
|
96
|
+
*/
|
|
97
|
+
function convertStaged(
|
|
98
|
+
format: TextureFormat,
|
|
99
|
+
bytes: Uint8Array,
|
|
100
|
+
count: number,
|
|
101
|
+
raw: boolean,
|
|
102
|
+
): void {
|
|
103
|
+
const words = new Uint16Array(bytes.buffer, bytes.byteOffset, bytes.length >> 1);
|
|
104
|
+
switch (format) {
|
|
105
|
+
case "bgrPacked565":
|
|
106
|
+
if (raw) {
|
|
107
|
+
// Backwards: texel i's three bytes land at 3i, ahead of its word at 2i.
|
|
108
|
+
for (let i = count - 1; i >= 0; i--) {
|
|
109
|
+
const word = words[i];
|
|
110
|
+
const at = i * 3;
|
|
111
|
+
bytes[at] = ((word >> 11) << 3) | (word >> 13);
|
|
112
|
+
bytes[at + 1] = (((word >> 5) & 63) << 2) | ((word >> 9) & 3);
|
|
113
|
+
bytes[at + 2] = ((word & 31) << 3) | ((word >> 2) & 7);
|
|
114
|
+
}
|
|
115
|
+
} else {
|
|
116
|
+
// Forwards: texel i's three bytes land at 3i, behind its own four at 4i.
|
|
117
|
+
for (let i = 0; i < count; i++) {
|
|
118
|
+
const at = i * 4;
|
|
119
|
+
const to = i * 3;
|
|
120
|
+
const r = widen(bytes[at], 5);
|
|
121
|
+
const g = widen(bytes[at + 1], 6);
|
|
122
|
+
const b = widen(bytes[at + 2], 5);
|
|
123
|
+
bytes[to] = r;
|
|
124
|
+
bytes[to + 1] = g;
|
|
125
|
+
bytes[to + 2] = b;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
break;
|
|
129
|
+
case "bgraPacked4444":
|
|
130
|
+
if (raw) {
|
|
131
|
+
// A word is alpha, red, green and blue from its high nibble down.
|
|
132
|
+
for (let i = count - 1; i >= 0; i--) {
|
|
133
|
+
const word = words[i];
|
|
134
|
+
const at = i * 4;
|
|
135
|
+
bytes[at] = ((word >> 8) & 15) * 17;
|
|
136
|
+
bytes[at + 1] = ((word >> 4) & 15) * 17;
|
|
137
|
+
bytes[at + 2] = (word & 15) * 17;
|
|
138
|
+
bytes[at + 3] = (word >> 12) * 17;
|
|
139
|
+
}
|
|
140
|
+
} else {
|
|
141
|
+
for (let i = 0; i < count * 4; i++) {
|
|
142
|
+
bytes[i] = (bytes[i] >> 4) * 17;
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
break;
|
|
146
|
+
case "rgbaHalfFloat":
|
|
147
|
+
if (!raw) {
|
|
148
|
+
// Backwards: texel i's four words land at 8i, ahead of its own bytes at 4i.
|
|
149
|
+
for (let i = count - 1; i >= 0; i--) {
|
|
150
|
+
const at = i * 4;
|
|
151
|
+
const r = halfOf(bytes[at]);
|
|
152
|
+
const g = halfOf(bytes[at + 1]);
|
|
153
|
+
const b = halfOf(bytes[at + 2]);
|
|
154
|
+
const a = halfOf(bytes[at + 3]);
|
|
155
|
+
words[i * 4] = r;
|
|
156
|
+
words[i * 4 + 1] = g;
|
|
157
|
+
words[i * 4 + 2] = b;
|
|
158
|
+
words[i * 4 + 3] = a;
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
break;
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
/** The staged level's texels, as WebGL takes them for the texture's storage. */
|
|
166
|
+
function stagedPixels(
|
|
167
|
+
gl: WebGL2RenderingContext,
|
|
168
|
+
format: TextureFormat,
|
|
169
|
+
bytes: Uint8Array,
|
|
170
|
+
count: number,
|
|
171
|
+
): [number, number, ArrayBufferView] {
|
|
172
|
+
switch (format) {
|
|
173
|
+
case "bgrPacked565":
|
|
174
|
+
return [gl.RGB, gl.UNSIGNED_BYTE, bytes];
|
|
175
|
+
case "rgbaHalfFloat":
|
|
176
|
+
return [gl.RGBA, gl.HALF_FLOAT, new Uint16Array(bytes.buffer, bytes.byteOffset, count * 4)];
|
|
177
|
+
default:
|
|
178
|
+
return [gl.RGBA, gl.UNSIGNED_BYTE, bytes];
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
/**
|
|
183
|
+
* The staged level uploaded: as it is, or a compressed texture's encoded to its blocks, as
|
|
184
|
+
* AIR compresses pixels; `raw` where it is staged in the texture's own format, not as RGBA.
|
|
185
|
+
*/
|
|
37
186
|
function uploadLevel(
|
|
38
187
|
gl: WebGL2RenderingContext,
|
|
39
188
|
texture: Texture3D,
|
|
@@ -43,8 +192,9 @@ function uploadLevel(
|
|
|
43
192
|
w: number,
|
|
44
193
|
h: number,
|
|
45
194
|
encoder: DxtEncoder | null,
|
|
195
|
+
raw = false,
|
|
46
196
|
): void {
|
|
47
|
-
if (texture.format
|
|
197
|
+
if (compressedFormat(texture.format)) {
|
|
48
198
|
const rgba = state.bytes.subarray(0, w * h * 4);
|
|
49
199
|
const dxt5 = texture.format === "compressedAlpha";
|
|
50
200
|
const blocks = encoder?.(rgba, dxt5, w, h) ?? encodeDxt(rgba, dxt5, w, h);
|
|
@@ -52,6 +202,18 @@ function uploadLevel(
|
|
|
52
202
|
return;
|
|
53
203
|
}
|
|
54
204
|
|
|
205
|
+
// BGRA's staging is RGBA bytes already: no conversion and no views.
|
|
206
|
+
const bgra = texture.format === "bgra";
|
|
207
|
+
if (!bgra) {
|
|
208
|
+
convertStaged(texture.format, state.bytes, w * h, raw);
|
|
209
|
+
}
|
|
210
|
+
const [layout, type, pixels] = bgra
|
|
211
|
+
? [gl.RGBA, gl.UNSIGNED_BYTE, state.bytes]
|
|
212
|
+
: stagedPixels(gl, texture.format, state.bytes, w * h);
|
|
213
|
+
// 5:6:5's rows of three bytes need not be 4-byte aligned.
|
|
214
|
+
if (texture.format === "bgrPacked565") {
|
|
215
|
+
gl.pixelStorei(gl.UNPACK_ALIGNMENT, 1);
|
|
216
|
+
}
|
|
55
217
|
const cube = texture.cube;
|
|
56
218
|
const target = cube ? gl.TEXTURE_CUBE_MAP : gl.TEXTURE_2D;
|
|
57
219
|
gl.activeTexture(gl.TEXTURE0);
|
|
@@ -63,10 +225,13 @@ function uploadLevel(
|
|
|
63
225
|
0,
|
|
64
226
|
w,
|
|
65
227
|
h,
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
228
|
+
layout,
|
|
229
|
+
type,
|
|
230
|
+
pixels,
|
|
69
231
|
);
|
|
232
|
+
if (texture.format === "bgrPacked565") {
|
|
233
|
+
gl.pixelStorei(gl.UNPACK_ALIGNMENT, 4);
|
|
234
|
+
}
|
|
70
235
|
state.uploaded[face] |= 1 << level;
|
|
71
236
|
}
|
|
72
237
|
|
|
@@ -149,10 +314,19 @@ export function uploadTextureBytes(
|
|
|
149
314
|
range(face, 1, faces);
|
|
150
315
|
const w = Math.max(1, width >> level);
|
|
151
316
|
const h = Math.max(1, height >> level);
|
|
152
|
-
const
|
|
317
|
+
const texel = TEXEL_BYTES[texture.format] ?? 4;
|
|
318
|
+
const length = w * h * texel;
|
|
153
319
|
range(offset, length, data.length);
|
|
154
320
|
staging(texture, state);
|
|
155
321
|
|
|
322
|
+
// BGRA, and the compressed formats' pixels, which are BGRA too, go up as RGBA; the
|
|
323
|
+
// others' texels as they are, little-endian words.
|
|
324
|
+
if (texel !== 4) {
|
|
325
|
+
state.bytes.set(data.subarray(offset, offset + length));
|
|
326
|
+
uploadLevel(gl, texture, state, level, face, w, h, encoder, true);
|
|
327
|
+
return;
|
|
328
|
+
}
|
|
329
|
+
|
|
156
330
|
for (let i = 0; i < length; i += 4) {
|
|
157
331
|
state.bytes[i] = data[offset + i + 2];
|
|
158
332
|
state.bytes[i + 1] = data[offset + i + 1];
|