@egret/engine 7.0.1-rc.3 → 7.0.2
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/dist/Engine.js +7 -2
- package/dist/animation/sequenceResetTypes.d.ts +6 -0
- package/dist/animation/types.d.ts +6 -0
- package/dist/assetBundle.d.ts +2 -0
- package/dist/assetGroupTypes.d.ts +2 -0
- package/dist/audioCues.d.ts +4 -0
- package/dist/audioTypes.d.ts +13 -0
- package/dist/bitmapButtonTypes.d.ts +2 -0
- package/dist/bitmapFontTypes.d.ts +3 -0
- package/dist/bitmapResourceSlot.d.ts +1 -0
- package/dist/camera2d.js +10 -2
- package/dist/cameraTypes.d.ts +12 -0
- package/dist/contentTypes.d.ts +2 -0
- package/dist/createEngineForProfile.js +8 -5
- package/dist/fontContentTypes.d.ts +5 -0
- package/dist/gameClockTypes.d.ts +6 -0
- package/dist/gameRun.d.ts +3 -0
- package/dist/gamepadTypes.d.ts +8 -0
- package/dist/hoverInputTypes.d.ts +10 -0
- package/dist/index.d.ts +5 -2
- package/dist/index.js +2 -1
- package/dist/inputActions.d.ts +5 -0
- package/dist/internal/uiFactoryState.d.ts +4 -0
- package/dist/internal/uiFactoryState.js +18 -2
- package/dist/keyboardInput.d.ts +1 -0
- package/dist/keyboardInput.js +1 -0
- package/dist/keyboardInputTypes.d.ts +12 -0
- package/dist/kit.d.ts +3 -1
- package/dist/kit.js +2 -1
- package/dist/manifestResourceState.d.ts +1 -0
- package/dist/manifestResourceState.js +1 -0
- package/dist/manifestResourceTypes.d.ts +1 -0
- package/dist/motion.d.ts +2 -0
- package/dist/mouseInputTypes.d.ts +4 -0
- package/dist/particleEmitter.js +8 -0
- package/dist/particleTypes.d.ts +8 -0
- package/dist/physics2d.d.ts +2 -2
- package/dist/physics2d.js +1 -1
- package/dist/physics2dTypes.d.ts +55 -1
- package/dist/physics2dWorld.js +209 -9
- package/dist/pointerInput.d.ts +1 -0
- package/dist/pointerInput.js +1 -0
- package/dist/pointerInputTypes.d.ts +3 -0
- package/dist/random.d.ts +1 -0
- package/dist/rendering/packSharedDraws2D.js +53 -5
- package/dist/rendering/prepareSharedDraws2D.d.ts +2 -0
- package/dist/rendering/prepareSharedDraws2D.js +17 -6
- package/dist/rendering/sharedColor2D.d.ts +35 -1
- package/dist/rendering/sharedColor2D.js +131 -8
- package/dist/rendering/sharedEffects2D.js +16 -8
- package/dist/rendering/world3d/Animation3D.d.ts +9 -0
- package/dist/rendering/world3d/Animation3D.js +4 -0
- package/dist/rendering/world3d/AnimationTexture3D.d.ts +6 -0
- package/dist/rendering/world3d/AnimationTexture3D.js +2 -0
- package/dist/rendering/world3d/Batch3D.d.ts +4 -0
- package/dist/rendering/world3d/Batch3D.js +3 -0
- package/dist/rendering/world3d/Camera3D.d.ts +5 -0
- package/dist/rendering/world3d/Camera3D.js +3 -0
- package/dist/rendering/world3d/Character3D.d.ts +4 -0
- package/dist/rendering/world3d/Character3D.js +2 -0
- package/dist/rendering/world3d/Cloth3D.d.ts +18 -3
- package/dist/rendering/world3d/Cloth3D.js +6 -1
- package/dist/rendering/world3d/Compression3D.d.ts +1 -0
- package/dist/rendering/world3d/Compression3D.js +1 -0
- package/dist/rendering/world3d/Curves3D.d.ts +8 -0
- package/dist/rendering/world3d/Curves3D.js +5 -0
- package/dist/rendering/world3d/Decal3D.d.ts +2 -0
- package/dist/rendering/world3d/Decal3D.js +1 -0
- package/dist/rendering/world3d/Export3D.d.ts +13 -0
- package/dist/rendering/world3d/Export3D.js +263 -0
- package/dist/rendering/world3d/Geometry3D.d.ts +11 -1
- package/dist/rendering/world3d/Geometry3D.js +10 -1
- package/dist/rendering/world3d/GeometryBuilder3D.d.ts +2 -0
- package/dist/rendering/world3d/Gizmo3D.d.ts +5 -0
- package/dist/rendering/world3d/Gizmo3D.js +2 -0
- package/dist/rendering/world3d/Gltf3D.d.ts +6 -0
- package/dist/rendering/world3d/Gltf3D.js +25 -5
- package/dist/rendering/world3d/GpuParticles3D.d.ts +2 -0
- package/dist/rendering/world3d/GpuParticles3D.js +1 -0
- package/dist/rendering/world3d/Hdr3D.d.ts +2 -0
- package/dist/rendering/world3d/Hdr3D.js +1 -0
- package/dist/rendering/world3d/Jelly3D.d.ts +2 -0
- package/dist/rendering/world3d/Jelly3D.js +1 -0
- package/dist/rendering/world3d/Ktx23D.d.ts +3 -0
- package/dist/rendering/world3d/Light3D.d.ts +9 -0
- package/dist/rendering/world3d/Light3D.js +4 -0
- package/dist/rendering/world3d/Material3D.d.ts +10 -0
- package/dist/rendering/world3d/Material3D.js +2 -0
- package/dist/rendering/world3d/Mesh3D.d.ts +4 -0
- package/dist/rendering/world3d/Mesh3D.js +16 -2
- package/dist/rendering/world3d/Meshopt3D.d.ts +3 -0
- package/dist/rendering/world3d/Meshopt3D.js +1 -0
- package/dist/rendering/world3d/Navigation3D.d.ts +41 -1
- package/dist/rendering/world3d/Navigation3D.js +74 -2
- package/dist/rendering/world3d/Object3D.d.ts +11 -0
- package/dist/rendering/world3d/Object3D.js +10 -0
- package/dist/rendering/world3d/Particles3D.d.ts +5 -0
- package/dist/rendering/world3d/Particles3D.js +3 -0
- package/dist/rendering/world3d/Physics3D.d.ts +14 -0
- package/dist/rendering/world3d/Physics3D.js +5 -0
- package/dist/rendering/world3d/PhysicsHull3D.d.ts +2 -0
- package/dist/rendering/world3d/PhysicsHull3D.js +2 -0
- package/dist/rendering/world3d/PhysicsMesh3D.d.ts +2 -0
- package/dist/rendering/world3d/PhysicsMesh3D.js +2 -0
- package/dist/rendering/world3d/PhysicsRemote3D.d.ts +5 -0
- package/dist/rendering/world3d/PhysicsRemote3D.js +2 -0
- package/dist/rendering/world3d/Ragdoll3D.d.ts +5 -0
- package/dist/rendering/world3d/Ragdoll3D.js +2 -0
- package/dist/rendering/world3d/Raycast3D.d.ts +3 -0
- package/dist/rendering/world3d/Raycast3D.js +1 -0
- package/dist/rendering/world3d/RenderList3D.d.ts +3 -0
- package/dist/rendering/world3d/RenderList3D.js +12 -0
- package/dist/rendering/world3d/Retarget3D.d.ts +1 -0
- package/dist/rendering/world3d/Rig3D.d.ts +57 -0
- package/dist/rendering/world3d/Rig3D.js +219 -0
- package/dist/rendering/world3d/Sdf3D.d.ts +181 -0
- package/dist/rendering/world3d/Sdf3D.js +1136 -0
- package/dist/rendering/world3d/SdfLod3D.d.ts +17 -0
- package/dist/rendering/world3d/SdfLod3D.js +56 -0
- package/dist/rendering/world3d/Serialize3D.d.ts +17 -0
- package/dist/rendering/world3d/Serialize3D.js +22 -0
- package/dist/rendering/world3d/Simplify3D.d.ts +29 -0
- package/dist/rendering/world3d/Simplify3D.js +426 -0
- package/dist/rendering/world3d/StateMachine3D.d.ts +9 -0
- package/dist/rendering/world3d/StateMachine3D.js +3 -0
- package/dist/rendering/world3d/SurfaceMaterial3D.d.ts +26 -0
- package/dist/rendering/world3d/SurfaceMaterial3D.js +138 -0
- package/dist/rendering/world3d/Terrain3D.d.ts +21 -0
- package/dist/rendering/world3d/Terrain3D.js +25 -1
- package/dist/rendering/world3d/Text3D.d.ts +5 -0
- package/dist/rendering/world3d/Text3D.js +2 -0
- package/dist/rendering/world3d/Texture3D.d.ts +16 -1
- package/dist/rendering/world3d/Texture3D.js +19 -1
- package/dist/rendering/world3d/Trail3D.d.ts +3 -0
- package/dist/rendering/world3d/Trail3D.js +2 -0
- package/dist/rendering/world3d/Vehicle3D.d.ts +5 -0
- package/dist/rendering/world3d/Vehicle3D.js +2 -0
- package/dist/rendering/world3d/VolumetricFog3D.d.ts +2 -0
- package/dist/rendering/world3d/VolumetricFog3D.js +1 -0
- package/dist/rendering/world3d/Water3D.d.ts +2 -0
- package/dist/rendering/world3d/Water3D.js +1 -0
- package/dist/rendering/world3d/core3D.d.ts +2 -0
- package/dist/rendering/world3d/debug3D.d.ts +5 -0
- package/dist/rendering/world3d/debug3D.js +5 -0
- package/dist/rendering/world3d/geometries3D.d.ts +12 -0
- package/dist/rendering/world3d/geometries3D.js +5 -0
- package/dist/rendering/world3d/helpers3D.d.ts +2 -0
- package/dist/rendering/world3d/helpers3D.js +1 -0
- package/dist/rendering/world3d/index.d.ts +12 -0
- package/dist/rendering/world3d/index.js +6 -0
- package/dist/rendering/world3d/math3D.d.ts +36 -0
- package/dist/rendering/world3d/math3D.js +35 -0
- package/dist/rendering/world3d/primitives3D.d.ts +7 -0
- package/dist/rendering/world3d/primitives3D.js +1 -0
- package/dist/saveStore.d.ts +18 -3
- package/dist/saveStore.js +23 -4
- package/dist/semanticList.d.ts +4 -0
- package/dist/semanticList.js +1 -0
- package/dist/semanticTree.js +11 -4
- package/dist/semanticTypes.d.ts +8 -0
- package/dist/sequencePlaybackTypes.d.ts +3 -0
- package/dist/text.d.ts +1 -0
- package/dist/textTable.d.ts +41 -0
- package/dist/textTable.js +114 -0
- package/dist/tilemapTypes.d.ts +13 -0
- package/dist/timer.d.ts +34 -0
- package/dist/timer.js +119 -0
- package/dist/tweenTypes.d.ts +4 -0
- package/dist/ui/controlKeys.d.ts +4 -0
- package/dist/ui/controlKeys.js +1 -0
- package/dist/ui/controls.d.ts +6 -0
- package/dist/ui/controls.js +2 -0
- package/dist/ui/layerTypes.d.ts +7 -0
- package/dist/ui/rangeControl.d.ts +3 -0
- package/dist/ui/rangeControl.js +1 -0
- package/dist/ui/scrollControl.d.ts +12 -0
- package/dist/ui/scrollControl.js +5 -1
- package/dist/ui/stateControls.d.ts +8 -0
- package/dist/ui/stateControls.js +3 -0
- package/dist/ui/textEditor.d.ts +1 -0
- package/dist/ui/textEditor.js +1 -0
- package/dist/ui/textEditorTypes.d.ts +7 -0
- package/dist/ui/textFieldControl.d.ts +4 -0
- package/dist/ui/textFieldControl.js +1 -0
- package/dist/ui/theme.d.ts +5 -0
- package/dist/ui/theme.js +1 -0
- package/dist/ui/types.d.ts +20 -0
- package/dist/ui/uiRoot.js +38 -9
- package/dist/ui/uiRootModel.d.ts +3 -1
- package/dist/ui/uiRootModel.js +8 -2
- package/dist/videoTypes.d.ts +3 -0
- package/dist/web/BrowserAssetBundle.d.ts +2 -0
- package/dist/web/BrowserAudio.d.ts +34 -1
- package/dist/web/BrowserAudio.js +69 -39
- package/dist/web/BrowserFrameLoop.d.ts +4 -0
- package/dist/web/BrowserGame.d.ts +64 -2
- package/dist/web/BrowserGame.js +129 -8
- package/dist/web/BrowserGamepadInput.d.ts +3 -0
- package/dist/web/BrowserHoverInput.d.ts +1 -0
- package/dist/web/BrowserImageTextures.d.ts +6 -0
- package/dist/web/BrowserInputActions.d.ts +10 -0
- package/dist/web/BrowserInputActions.js +4 -1
- package/dist/web/BrowserPlay.d.ts +130 -2
- package/dist/web/BrowserPlay.js +366 -19
- package/dist/web/BrowserPreferences.d.ts +10 -0
- package/dist/web/BrowserPreferences.js +39 -0
- package/dist/web/BrowserSemantics.d.ts +2 -0
- package/dist/web/BrowserStatsPanel.d.ts +10 -0
- package/dist/web/BrowserStatsPanel.js +9 -3
- package/dist/web/BrowserStorage.d.ts +2 -0
- package/dist/web/BrowserTextEditor.d.ts +3 -0
- package/dist/web/BrowserTextInput.d.ts +6 -0
- package/dist/web/BrowserTextureProvider.d.ts +6 -0
- package/dist/web/BrowserVideo.d.ts +13 -1
- package/dist/web/BrowserVideo.js +28 -2
- package/dist/web/CanvasKitFontSetProvider.d.ts +3 -0
- package/dist/web/CanvasKitParagraphProvider.d.ts +4 -0
- package/dist/web/CanvasKitParagraphProvider.js +1 -0
- package/dist/web/ManifestByteSource.d.ts +4 -0
- package/dist/web/ManifestByteSource.js +1 -0
- package/dist/web/ManifestFontContentLoader.d.ts +1 -0
- package/dist/web/WebGL2Host.js +64 -25
- package/dist/web/WebGPUHost.d.ts +13 -0
- package/dist/web/WebGPUHost.js +117 -36
- package/dist/web/audio.d.ts +2 -2
- package/dist/web/audio.js +1 -1
- package/dist/web/editorFonts.d.ts +4 -0
- package/dist/web/game.d.ts +1 -1
- package/dist/web/imageProjections2D.d.ts +2 -0
- package/dist/web/kit.d.ts +1 -0
- package/dist/web/kit.js +1 -0
- package/dist/web/play.d.ts +6 -1
- package/dist/web/play.js +4 -1
- package/dist/web/playMusic.d.ts +33 -0
- package/dist/web/playMusic.js +194 -0
- package/dist/web/playTouch.d.ts +45 -0
- package/dist/web/playTouch.js +141 -0
- package/dist/web/playWidgets.d.ts +71 -0
- package/dist/web/playWidgets.js +431 -0
- package/dist/web/prepareSharedSubmission2D.js +9 -3
- package/dist/web/resources.d.ts +2 -0
- package/dist/web/sharedEffectShaders.d.ts +6 -2
- package/dist/web/sharedEffectShaders.js +23 -7
- package/dist/web/sharedSubmissionStorage2D.js +1 -1
- package/dist/web/sharedWebGL2Options.d.ts +3 -0
- package/dist/web/sharedWebGL2Options.js +8 -2
- package/dist/web/sharedWebGL2Shaders.d.ts +15 -2
- package/dist/web/sharedWebGL2Shaders.js +108 -14
- package/dist/web/sharedWebGPUOptions.d.ts +5 -1
- package/dist/web/sharedWebGPUOptions.js +6 -2
- package/dist/web/video.d.ts +1 -1
- package/dist/web/webgl2Native.d.ts +3 -1
- package/dist/web/webgl2Native.js +9 -5
- package/dist/web/webgl2Types.d.ts +18 -0
- package/dist/web/webgpuImageResidency.d.ts +5 -2
- package/dist/web/webgpuImageResidency.js +7 -3
- package/dist/web/webgpuRetentionPool.d.ts +2 -2
- package/dist/web/webgpuRetentionPool.js +2 -1
- package/dist/web/webgpuSharedPass.d.ts +1 -1
- package/dist/web/webgpuSharedPass.js +87 -5
- package/dist/web/webgpuSharedResolvePass.d.ts +1 -1
- package/dist/web/webgpuSharedResolvePass.js +9 -4
- package/dist/web/world3d/Audio3D.d.ts +18 -1
- package/dist/web/world3d/Audio3D.js +62 -3
- package/dist/web/world3d/BrowserPlay3D.d.ts +115 -2
- package/dist/web/world3d/BrowserPlay3D.js +448 -43
- package/dist/web/world3d/FlyControls3D.d.ts +4 -0
- package/dist/web/world3d/FlyControls3D.js +2 -0
- package/dist/web/world3d/FollowControls3D.d.ts +3 -0
- package/dist/web/world3d/FollowControls3D.js +2 -0
- package/dist/web/world3d/OrbitControls3D.d.ts +3 -0
- package/dist/web/world3d/OrbitControls3D.js +2 -0
- package/dist/web/world3d/TransformControls3D.d.ts +5 -2
- package/dist/web/world3d/TransformControls3D.js +7 -4
- package/dist/web/world3d/WebGL2Renderer3D.d.ts +3 -0
- package/dist/web/world3d/WebGL2Renderer3D.js +2 -0
- package/dist/web/world3d/WebGPURenderer3D.d.ts +2 -0
- package/dist/web/world3d/WebGPURenderer3D.js +1 -0
- package/dist/web/world3d/World3DView.d.ts +3 -0
- package/dist/web/world3d/World3DView.js +2 -0
- package/dist/web/world3d/app3D.d.ts +7 -0
- package/dist/web/world3d/app3D.js +1 -0
- package/dist/web/world3d/assets3D.d.ts +1 -0
- package/dist/web/world3d/atmosphere3D.d.ts +9 -0
- package/dist/web/world3d/atmosphere3D.js +19 -4
- package/dist/web/world3d/canvasFont3D.d.ts +21 -0
- package/dist/web/world3d/canvasFont3D.js +165 -0
- package/dist/web/world3d/frame3D.d.ts +2 -0
- package/dist/web/world3d/host3D.d.ts +1 -0
- package/dist/web/world3d/index.d.ts +4 -2
- package/dist/web/world3d/index.js +2 -1
- package/dist/web/world3d/loaders3D.d.ts +1 -0
- package/dist/web/world3d/markers3D.d.ts +4 -0
- package/dist/web/world3d/overlay3D.d.ts +19 -0
- package/dist/web/world3d/overlay3D.js +21 -4
- package/dist/web/world3d/post3D.d.ts +4 -0
- package/dist/web/world3d/post3D.js +3 -0
- package/dist/web/world3d/probe3D.d.ts +1 -0
- package/dist/web/world3d/stats3D.d.ts +3 -0
- package/dist/web/world3d/stats3D.js +1 -0
- package/dist/web/world3d/webGL2FrameMetrics3D.d.ts +5 -0
- package/dist/web/world3d/webgpu.d.ts +2 -0
- package/dist/web/world3d/webgpu.js +1 -0
- package/package.json +3 -3
|
@@ -72,6 +72,21 @@ const TINTED = `vec4 tinted(vec4 value) {
|
|
|
72
72
|
return vec4(factor * (v * materialLight.rgb + (vec3(a) - v) * materialDark.rgb), factor * a);
|
|
73
73
|
}
|
|
74
74
|
`;
|
|
75
|
+
/**
|
|
76
|
+
* What a draw writes to its target. A target that mixes light takes the linear premultiplied colour as it is; one
|
|
77
|
+
* that mixes the stored codes, as a 2D canvas does, takes the colour encoded and then multiplied by its alpha.
|
|
78
|
+
* Light added with no alpha, as an additive draw may give, is encoded as it is.
|
|
79
|
+
*/
|
|
80
|
+
const finished = (srgb) => srgb
|
|
81
|
+
? `vec4 finished(vec4 c) {
|
|
82
|
+
float a = clamp(c.a, 0.0, 1.0);
|
|
83
|
+
vec3 u = clamp(a > 0.0 ? c.rgb / a : c.rgb, vec3(0.0), vec3(1.0));
|
|
84
|
+
vec3 e = mix(12.92 * u, 1.055 * pow(u, vec3(1.0 / 2.4)) - vec3(0.055), greaterThan(u, vec3(0.0031308)));
|
|
85
|
+
return vec4(a > 0.0 ? a * e : e, a);
|
|
86
|
+
}
|
|
87
|
+
`
|
|
88
|
+
: `vec4 finished(vec4 c) { return c; }
|
|
89
|
+
`;
|
|
75
90
|
/**
|
|
76
91
|
* Native objects, compilation, linking and all state remain owned by the Host.
|
|
77
92
|
* The vertex stage of a sampled draw reads its region from the bound window of the region table and
|
|
@@ -127,7 +142,8 @@ void main() {
|
|
|
127
142
|
${POSITION}
|
|
128
143
|
}
|
|
129
144
|
`;
|
|
130
|
-
|
|
145
|
+
/** The fragment stage of a draw without a region, for a target that mixes light or one that mixes codes. */
|
|
146
|
+
export const sharedWebGL2SolidFragment = (srgb) => `#version 300 es
|
|
131
147
|
precision highp float;
|
|
132
148
|
precision highp int;
|
|
133
149
|
${DRAW_UNIFORM}
|
|
@@ -138,13 +154,74 @@ flat in float drawOpacity;
|
|
|
138
154
|
layout(location = 0) out vec4 fragmentColor;
|
|
139
155
|
|
|
140
156
|
${TINTED}
|
|
141
|
-
|
|
157
|
+
${finished(srgb)}
|
|
158
|
+
void main() { fragmentColor = finished(tinted(vec4(1.0))); }
|
|
142
159
|
`;
|
|
160
|
+
export const sharedWebGL2SolidFragmentSource = sharedWebGL2SolidFragment(false);
|
|
161
|
+
/**
|
|
162
|
+
* A draw whose material asks for smaller copies reads them when it is drawn smaller than its texels: `rho` is
|
|
163
|
+
* how many texels one pixel spans. Level 0 is the sample as it is without them; a deeper level is read with the
|
|
164
|
+
* same bilinear rule on that level's texels, and two levels next to each other are blended. Word 9 of the
|
|
165
|
+
* block is the deepest level the draw may read and word 10 how it finds its texels there: by the size of the
|
|
166
|
+
* level (1), or, for a region on a page shared with others, by halving every edge of the region (0).
|
|
167
|
+
*/
|
|
168
|
+
const MIPMAPPED = `vec4 levelPage(vec2 q, int level, uvec2 modes) {
|
|
169
|
+
ivec2 size = max(ivec2(1), ivec2(pageOfRegion.yz) >> level);
|
|
170
|
+
vec2 shifted = q * vec2(size) / vec2(pageOfRegion.yz) - vec2(0.5);
|
|
171
|
+
ivec2 base = ivec2(floor(shifted));
|
|
172
|
+
vec2 weight = fract(shifted);
|
|
173
|
+
vec4 taps[4];
|
|
174
|
+
for (int i = 0; i < 4; i++) {
|
|
175
|
+
ivec2 at = base + ivec2(i & 1, i >> 1);
|
|
176
|
+
taps[i] = decodedLevelTap(ivec2(addressed(at.x, size.x, modes.x), addressed(at.y, size.y, modes.y)), level);
|
|
177
|
+
}
|
|
178
|
+
return mix(mix(taps[0], taps[1], weight.x), mix(taps[2], taps[3], weight.x), weight.y);
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
vec4 levelRegionTap(ivec2 logical, int level) {
|
|
182
|
+
ivec2 extent = ivec2(logicalTrim.xy) >> level;
|
|
183
|
+
ivec2 index = clamp(logical, ivec2(0), extent - ivec2(1));
|
|
184
|
+
ivec2 local = index - (ivec2(logicalTrim.zw) >> level);
|
|
185
|
+
ivec2 size = ivec2(contentOrigin.xy) >> level;
|
|
186
|
+
if (any(lessThan(local, ivec2(0))) || any(greaterThanEqual(local, size))) { return vec4(0.0); }
|
|
187
|
+
ivec2 packedCoordinate = local;
|
|
188
|
+
switch (quarterTurn) {
|
|
189
|
+
case 1u: packedCoordinate = ivec2(size.y - 1 - local.y, local.x); break;
|
|
190
|
+
case 2u: packedCoordinate = size - ivec2(1) - local; break;
|
|
191
|
+
case 3u: packedCoordinate = ivec2(local.y, size.x - 1 - local.x); break;
|
|
192
|
+
default: break;
|
|
193
|
+
}
|
|
194
|
+
return decodedLevelTap((ivec2(contentOrigin.zw) >> level) + packedCoordinate, level);
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
vec4 atLevel(vec2 coordinate, int level) {
|
|
198
|
+
if (domain.w == 1u) { return levelPage(coordinate * vec2(pageOfRegion.yz), level, samplerPolicy.xy); }
|
|
199
|
+
vec2 extent = vec2(logicalTrim.xy);
|
|
200
|
+
vec2 q = clamp(coordinate * extent, vec2(0.0), extent);
|
|
201
|
+
if (domain.z == 1u) { return levelPage(q, level, uvec2(0u)); }
|
|
202
|
+
vec2 shifted = q / float(1 << level) - vec2(0.5);
|
|
203
|
+
ivec2 base = ivec2(floor(shifted));
|
|
204
|
+
vec2 weight = fract(shifted);
|
|
205
|
+
return mix(mix(levelRegionTap(base, level), levelRegionTap(base + ivec2(1, 0), level), weight.x),
|
|
206
|
+
mix(levelRegionTap(base + ivec2(0, 1), level), levelRegionTap(base + ivec2(1, 1), level), weight.x), weight.y);
|
|
207
|
+
}
|
|
208
|
+
|
|
209
|
+
vec4 mipmapped(vec4 top, vec2 coordinate, float rho) {
|
|
210
|
+
int deepest = int(domain.y);
|
|
211
|
+
float lod = clamp(log2(max(rho, 1e-6)), 0.0, float(deepest));
|
|
212
|
+
if (lod <= 0.0) { return top; }
|
|
213
|
+
int level = int(floor(lod));
|
|
214
|
+
float blend = lod - float(level);
|
|
215
|
+
vec4 near = level == 0 ? top : atLevel(coordinate, level);
|
|
216
|
+
if (level >= deepest || blend == 0.0) { return near; }
|
|
217
|
+
return mix(near, atLevel(coordinate, level + 1), blend);
|
|
218
|
+
}`;
|
|
143
219
|
/**
|
|
144
220
|
* The fragment stage of a sampled draw. The program of a batch of one page has one page sampler and reads it
|
|
145
221
|
* directly; the program of a batch of several pages has eight and selects by the unit of the region's page.
|
|
146
222
|
*/
|
|
147
|
-
|
|
223
|
+
/** The fragment stage of a sampled draw, of one page or several, for a target that mixes light or codes. */
|
|
224
|
+
export const sampledFragmentSource = (paged, srgb) => `#version 300 es
|
|
148
225
|
precision highp float;
|
|
149
226
|
precision highp int;
|
|
150
227
|
${DRAW_UNIFORM}
|
|
@@ -164,19 +241,21 @@ vec3 decoded(vec3 value) {
|
|
|
164
241
|
greaterThan(value, vec3(0.04045)));
|
|
165
242
|
}
|
|
166
243
|
|
|
167
|
-
vec4
|
|
244
|
+
vec4 decodedLevelTap(ivec2 index, int level) {
|
|
168
245
|
// Canonical rows retain their CPU order on upload. RGBA8 performs no sRGB decode.
|
|
169
246
|
// Every read of a page is this one fetch${paged ? " from the unit that holds the region's page" : ''}.
|
|
170
247
|
${paged
|
|
171
248
|
? ` vec4 value;
|
|
172
249
|
switch (pageOfRegion.x) {
|
|
173
|
-
${[1, 2, 3, 4, 5, 6, 7].map(unit => ` case ${unit}u: value = texelFetch(page${unit}, index,
|
|
174
|
-
default: value = texelFetch(page0, index,
|
|
250
|
+
${[1, 2, 3, 4, 5, 6, 7].map(unit => ` case ${unit}u: value = texelFetch(page${unit}, index, level); break;`).join('\n')}
|
|
251
|
+
default: value = texelFetch(page0, index, level); break;
|
|
175
252
|
}`
|
|
176
|
-
: ' vec4 value = texelFetch(page, index,
|
|
253
|
+
: ' vec4 value = texelFetch(page, index, level);'}
|
|
177
254
|
return vec4(decoded(value.rgb), value.a);
|
|
178
255
|
}
|
|
179
256
|
|
|
257
|
+
vec4 decodedPageTap(ivec2 index) { return decodedLevelTap(index, 0); }
|
|
258
|
+
|
|
180
259
|
int wrapped(int value, int period) {
|
|
181
260
|
// GLSL ES leaves negative integer remainder undefined. Both % operands stay non-negative.
|
|
182
261
|
return value < 0 ? period - 1 - ((-1 - value) % period) : value % period;
|
|
@@ -254,11 +333,21 @@ vec4 sampled(vec2 coordinate) {
|
|
|
254
333
|
return linearPage(vec2(contentOrigin.zw) + packedCoordinate, uvec2(0u)) * (coverage.x * coverage.y);
|
|
255
334
|
}
|
|
256
335
|
|
|
336
|
+
${MIPMAPPED}
|
|
257
337
|
${TINTED}
|
|
258
|
-
|
|
338
|
+
${finished(srgb)}
|
|
339
|
+
void main() {
|
|
340
|
+
// Derivatives are taken here, where every fragment of the draw runs: the block is the same for all of them.
|
|
341
|
+
vec2 extent = domain.w == 1u ? vec2(pageOfRegion.yz) : vec2(logicalTrim.xy);
|
|
342
|
+
vec2 texels = vertexUV * extent;
|
|
343
|
+
float rho = max(length(dFdx(texels)), length(dFdy(texels)));
|
|
344
|
+
vec4 value = sampled(vertexUV);
|
|
345
|
+
if (domain.x == 1u) { value = mipmapped(value, vertexUV, rho); }
|
|
346
|
+
fragmentColor = finished(tinted(value));
|
|
347
|
+
}
|
|
259
348
|
`;
|
|
260
|
-
export const sharedWebGL2FragmentSource = sampledFragmentSource(false);
|
|
261
|
-
export const sharedWebGL2PagedFragmentSource = sampledFragmentSource(true);
|
|
349
|
+
export const sharedWebGL2FragmentSource = sampledFragmentSource(false, false);
|
|
350
|
+
export const sharedWebGL2PagedFragmentSource = sampledFragmentSource(true, false);
|
|
262
351
|
export const sharedWebGL2ResolveVertexSource = `#version 300 es
|
|
263
352
|
precision highp float;
|
|
264
353
|
precision highp int;
|
|
@@ -268,7 +357,11 @@ void main() {
|
|
|
268
357
|
gl_Position = vec4(position, 0.0, 1.0);
|
|
269
358
|
}
|
|
270
359
|
`;
|
|
271
|
-
|
|
360
|
+
/**
|
|
361
|
+
* Writes the working target to the canvas as it stores colour there: light encoded at the end, or, for a target
|
|
362
|
+
* that mixes codes, the codes as they are.
|
|
363
|
+
*/
|
|
364
|
+
export const sharedWebGL2ResolveFragment = (srgb) => `#version 300 es
|
|
272
365
|
precision highp float;
|
|
273
366
|
precision highp int;
|
|
274
367
|
uniform highp sampler2D workingTexture;
|
|
@@ -279,18 +372,19 @@ vec3 encoded(vec3 value) {
|
|
|
279
372
|
greaterThan(value, vec3(0.0031308)));
|
|
280
373
|
}
|
|
281
374
|
void main() {
|
|
282
|
-
// SRGB8_ALPHA8 integer fetch already decodes RGB. Both targets use the same GL row.
|
|
375
|
+
// SRGB8_ALPHA8 integer fetch already decodes RGB; an RGBA8 target holds codes. Both targets use the same GL row.
|
|
283
376
|
vec4 value = texelFetch(workingTexture, ivec2(gl_FragCoord.xy), 0);
|
|
284
377
|
if (opaque) {
|
|
285
|
-
fragmentColor = vec4(encoded(clamp(value.rgb, vec3(0.0), vec3(1.0))), 1.0);
|
|
378
|
+
fragmentColor = vec4(${srgb ? 'clamp(value.rgb, vec3(0.0), vec3(1.0))' : 'encoded(clamp(value.rgb, vec3(0.0), vec3(1.0)))'}, 1.0);
|
|
286
379
|
return;
|
|
287
380
|
}
|
|
288
381
|
float a = clamp(value.a, 0.0, 1.0);
|
|
289
382
|
vec3 c = clamp(value.rgb, vec3(0.0), vec3(a));
|
|
290
383
|
if (a == 0.0) { fragmentColor = vec4(0.0); }
|
|
291
|
-
else { fragmentColor = vec4(a * encoded(c / a), a); }
|
|
384
|
+
else { fragmentColor = ${srgb ? 'vec4(c, a)' : 'vec4(a * encoded(c / a), a)'}; }
|
|
292
385
|
}
|
|
293
386
|
`;
|
|
387
|
+
export const sharedWebGL2ResolveFragmentSource = sharedWebGL2ResolveFragment(false);
|
|
294
388
|
/** FUNC_ADD for RGB and alpha; admission separately restricts add-preserve to opaque output. */
|
|
295
389
|
export function sharedWebGL2BlendFactors(blend) {
|
|
296
390
|
switch (blend) {
|
|
@@ -5,6 +5,7 @@ export interface SharedPageLimits2D {
|
|
|
5
5
|
readonly maxFramePageBytes: number;
|
|
6
6
|
readonly maxReadyPageBytes: number;
|
|
7
7
|
}
|
|
8
|
+
/** A shared WebGPU host's own options: its geometry limits, effects, output alpha, blend space and recovery. */
|
|
8
9
|
export interface SharedWebGPUHostOptions extends WebGPUHostOptions, Partial<SharedPageLimits2D> {
|
|
9
10
|
readonly maxSourceTriangles?: number;
|
|
10
11
|
readonly maxFrameGeometryBytes?: number;
|
|
@@ -12,15 +13,18 @@ export interface SharedWebGPUHostOptions extends WebGPUHostOptions, Partial<Shar
|
|
|
12
13
|
readonly maxTupleComparisons?: number;
|
|
13
14
|
readonly enableEffects?: boolean;
|
|
14
15
|
readonly outputAlpha?: 'premultiplied' | 'opaque';
|
|
16
|
+
/** Where translucent draws mix: `linear` light (the default) or the stored `srgb` codes, as a 2D canvas does. */
|
|
17
|
+
readonly blendSpace?: 'linear' | 'srgb';
|
|
15
18
|
readonly recovery?: {
|
|
16
19
|
readonly mode: 'manual' | 'automatic';
|
|
17
20
|
readonly timeoutMs?: number;
|
|
18
21
|
};
|
|
19
22
|
}
|
|
20
|
-
type BaseConfiguration = Required<Omit<SharedWebGPUHostOptions, 'canvas' | 'device' | 'onDiagnostic' | 'enableEffects' | 'outputAlpha' | 'recovery' | keyof SharedPageLimits2D>>;
|
|
23
|
+
type BaseConfiguration = Required<Omit<SharedWebGPUHostOptions, 'canvas' | 'device' | 'onDiagnostic' | 'enableEffects' | 'outputAlpha' | 'blendSpace' | 'recovery' | keyof SharedPageLimits2D>>;
|
|
21
24
|
export type SharedWebGPUConfiguration = BaseConfiguration & SharedPageLimits2D & {
|
|
22
25
|
readonly enableEffects: boolean;
|
|
23
26
|
readonly outputAlpha: 'premultiplied' | 'opaque';
|
|
27
|
+
readonly blendSpace: 'linear' | 'srgb';
|
|
24
28
|
readonly recovery: {
|
|
25
29
|
readonly mode: 'manual' | 'automatic';
|
|
26
30
|
readonly timeoutMs: number;
|
|
@@ -43,7 +43,8 @@ const KEYS = [
|
|
|
43
43
|
'outputAlpha',
|
|
44
44
|
'recovery',
|
|
45
45
|
'enableEffects',
|
|
46
|
-
...PAGE_KEYS
|
|
46
|
+
...PAGE_KEYS,
|
|
47
|
+
'blendSpace'
|
|
47
48
|
];
|
|
48
49
|
function object(value) {
|
|
49
50
|
return typeof value === 'object' && value !== null;
|
|
@@ -116,9 +117,12 @@ export function admitSharedWebGPUOptions(input) {
|
|
|
116
117
|
throw new RangeError(key);
|
|
117
118
|
pages[key] = value;
|
|
118
119
|
}
|
|
120
|
+
const blendSpace = captured.blendSpace === undefined ? 'linear' : captured.blendSpace;
|
|
121
|
+
if (blendSpace !== 'linear' && blendSpace !== 'srgb')
|
|
122
|
+
throw new TypeError('blendSpace');
|
|
119
123
|
return {
|
|
120
124
|
surface: captured.canvas,
|
|
121
|
-
configuration: Object.freeze({ ...configuration, enableEffects, outputAlpha, recovery, ...pages }),
|
|
125
|
+
configuration: Object.freeze({ ...configuration, enableEffects, outputAlpha, recovery, ...pages, blendSpace }),
|
|
122
126
|
borrowed: kind === 'borrow' ? borrowed : undefined,
|
|
123
127
|
callback: captured.onDiagnostic
|
|
124
128
|
};
|
package/dist/web/video.d.ts
CHANGED
|
@@ -41,6 +41,8 @@ export declare class GLNativeSession {
|
|
|
41
41
|
} | undefined;
|
|
42
42
|
recordOwners: GLNativeOwner[] | undefined;
|
|
43
43
|
timingSerial: number | null;
|
|
44
|
+
/** Working targets hold codes (RGBA8, mixed as a 2D canvas mixes) rather than light (SRGB8_ALPHA8). */
|
|
45
|
+
codedTargets: boolean;
|
|
44
46
|
private readonly calls;
|
|
45
47
|
private readonly qualifiedColorTargets;
|
|
46
48
|
private readonly qualifiedDepthTargets;
|
|
@@ -65,6 +67,6 @@ export declare class GLNativeSession {
|
|
|
65
67
|
workingAttachment(color: WebGLTexture, depth: WebGLRenderbuffer | null): void;
|
|
66
68
|
attachment(working: boolean): void;
|
|
67
69
|
reset(width: number, height: number): void;
|
|
68
|
-
texture(owner: GLNativeOwner, width: number, height: number, working: boolean): void;
|
|
70
|
+
texture(owner: GLNativeOwner, width: number, height: number, working: boolean, levels?: number): void;
|
|
69
71
|
}
|
|
70
72
|
//# sourceMappingURL=webgl2Native.d.ts.map
|
package/dist/web/webgl2Native.js
CHANGED
|
@@ -102,6 +102,8 @@ export class GLNativeSession {
|
|
|
102
102
|
cleanupFailure;
|
|
103
103
|
recordOwners;
|
|
104
104
|
timingSerial = null;
|
|
105
|
+
/** Working targets hold codes (RGBA8, mixed as a 2D canvas mixes) rather than light (SRGB8_ALPHA8). */
|
|
106
|
+
codedTargets = false;
|
|
105
107
|
calls = new Map();
|
|
106
108
|
qualifiedColorTargets = new WeakSet();
|
|
107
109
|
qualifiedDepthTargets = new WeakMap();
|
|
@@ -174,6 +176,7 @@ export class GLNativeSession {
|
|
|
174
176
|
TEXTURE_BASE_LEVEL: 33084,
|
|
175
177
|
TEXTURE_MAX_LEVEL: 33085,
|
|
176
178
|
NEAREST: 9728,
|
|
179
|
+
NEAREST_MIPMAP_NEAREST: 9984,
|
|
177
180
|
LINEAR: 9729,
|
|
178
181
|
CLAMP_TO_EDGE: 33071,
|
|
179
182
|
RGBA: 6408,
|
|
@@ -491,7 +494,7 @@ export class GLNativeSession {
|
|
|
491
494
|
const start = this.recordOwners ? this.startTiming() : undefined;
|
|
492
495
|
try {
|
|
493
496
|
for (const [name, expected] of [
|
|
494
|
-
[gl.FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING, working ? gl.SRGB : gl.LINEAR],
|
|
497
|
+
[gl.FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING, working && !this.codedTargets ? gl.SRGB : gl.LINEAR],
|
|
495
498
|
[gl.FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE, gl.UNSIGNED_NORMALIZED],
|
|
496
499
|
[gl.FRAMEBUFFER_ATTACHMENT_RED_SIZE, 8],
|
|
497
500
|
[gl.FRAMEBUFFER_ATTACHMENT_GREEN_SIZE, 8],
|
|
@@ -550,17 +553,18 @@ export class GLNativeSession {
|
|
|
550
553
|
gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, false);
|
|
551
554
|
gl.pixelStorei(gl.UNPACK_COLORSPACE_CONVERSION_WEBGL, gl.NONE);
|
|
552
555
|
}
|
|
553
|
-
texture(owner, width, height, working) {
|
|
556
|
+
texture(owner, width, height, working, levels = 1) {
|
|
554
557
|
const gl = this.gl;
|
|
555
558
|
gl.bindTexture(gl.TEXTURE_2D, owner.value);
|
|
556
|
-
gl.texStorage2D(gl.TEXTURE_2D,
|
|
559
|
+
gl.texStorage2D(gl.TEXTURE_2D, levels, working && !this.codedTargets ? gl.SRGB8_ALPHA8 : gl.RGBA8, width, height);
|
|
557
560
|
for (const [name, value] of [
|
|
558
|
-
|
|
561
|
+
// Keep every uploaded level accessible to explicit texelFetch on ANGLE D3D11.
|
|
562
|
+
[gl.TEXTURE_MIN_FILTER, levels > 1 ? gl.NEAREST_MIPMAP_NEAREST : gl.NEAREST],
|
|
559
563
|
[gl.TEXTURE_MAG_FILTER, gl.NEAREST],
|
|
560
564
|
[gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE],
|
|
561
565
|
[gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE],
|
|
562
566
|
[gl.TEXTURE_BASE_LEVEL, 0],
|
|
563
|
-
[gl.TEXTURE_MAX_LEVEL,
|
|
567
|
+
[gl.TEXTURE_MAX_LEVEL, levels - 1]
|
|
564
568
|
])
|
|
565
569
|
gl.texParameteri(gl.TEXTURE_2D, name, value);
|
|
566
570
|
}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import type { SharedRenderFrame2D, SharedRenderHostAdapter } from '@egret/contracts';
|
|
2
2
|
import type { SharedDeviceSessionStatus, SharedHostResourceStatus } from './sharedDeviceSession.js';
|
|
3
3
|
import type { SharedFrameUpload, SharedFrameUploadOptions } from './sharedFrameUpload.js';
|
|
4
|
+
/** Where a WebGL2 host is: new, starting, active, lost, restoring, stopped, failed, closing or closed. */
|
|
4
5
|
export type WebGL2HostState = 'new' | 'starting' | 'active' | 'lost' | 'restoring' | 'stopped' | 'failed' | 'closing' | 'closed';
|
|
6
|
+
/** What went wrong in a WebGL2 host. */
|
|
5
7
|
export type WebGL2HostErrorCode = 'WEBGL2_OPTIONS_INVALID' | 'WEBGL2_CONTEXT_UNAVAILABLE' | 'WEBGL2_CONTEXT_ATTRIBUTES_UNSUPPORTED' | 'WEBGL2_FORMAT_UNSUPPORTED' | 'WEBGL2_START_FAILED' | 'WEBGL2_START_CANCELLED' | 'WEBGL2_NOT_STARTED' | 'WEBGL2_STOPPED' | 'WEBGL2_CLOSED' | 'WEBGL2_FAILED' | 'WEBGL2_REENTRANT' | 'WEBGL2_FRAME_PROFILE_UNSUPPORTED' | 'WEBGL2_FRAME_INVALID' | 'WEBGL2_BACKING_LIMIT' | 'WEBGL2_GEOMETRY_RANGE' | 'WEBGL2_PRECISION_UNSUPPORTED' | 'WEBGL2_FRAME_BUDGET' | 'WEBGL2_BACKPRESSURE' | 'WEBGL2_CONTEXT_LIMIT' | 'WEBGL2_SERIAL_EXHAUSTED' | 'WEBGL2_GENERATION_EXHAUSTED' | 'WEBGL2_RENDER_FAILED' | 'WEBGL2_VALIDATION' | 'WEBGL2_OUT_OF_MEMORY' | 'WEBGL2_CONTEXT_LOST' | 'WEBGL2_CONTEXT_RESTORING' | 'WEBGL2_RESTORE_FAILED' | 'WEBGL2_RESTORE_TIMEOUT' | 'WEBGL2_READBACK_DISABLED' | 'WEBGL2_READBACK_PENDING' | 'WEBGL2_READBACK_FAILED' | 'WEBGL2_SYNC_FAILED' | 'WEBGL2_SYNC_TIMEOUT' | 'WEBGL2_DIAGNOSTIC_CALLBACK_FAILED' | 'WEBGL2_CLOSE_UNSAFE' | 'WEBGL2_UPLOAD_INVALID' | 'WEBGL2_UPLOAD_OPTIONS_INVALID' | 'WEBGL2_UPLOAD_NOT_READY' | 'WEBGL2_UPLOAD_USED' | 'WEBGL2_UPLOAD_DISPOSED' | 'WEBGL2_UPLOAD_ABORTED' | 'WEBGL2_UPLOAD_EXPIRED' | 'WEBGL2_UPLOAD_STALE' | 'WEBGL2_LAYER_EFFECT_INVALID' | 'WEBGL2_LAYER_INVALID' | 'WEBGL2_LAYER_BUDGET' | 'WEBGL2_LAYER_NOT_READY' | 'WEBGL2_LAYER_PENDING' | 'WEBGL2_LAYER_DISPOSED';
|
|
8
|
+
/** A failure of a WebGL2 host: its code, the frame and context generation it happened at, the phase, and its cause. */
|
|
6
9
|
export interface WebGL2HostFailure {
|
|
7
10
|
readonly code: WebGL2HostErrorCode;
|
|
8
11
|
readonly serial: number | null;
|
|
@@ -10,9 +13,11 @@ export interface WebGL2HostFailure {
|
|
|
10
13
|
readonly phase: 'startup' | 'frame' | 'readback' | 'context' | 'restore' | 'cleanup' | 'callback';
|
|
11
14
|
readonly cause: unknown;
|
|
12
15
|
}
|
|
16
|
+
/** Something a WebGL2 host reports: a failure, with how serious it is. */
|
|
13
17
|
export interface WebGL2HostDiagnostic extends WebGL2HostFailure {
|
|
14
18
|
readonly severity: 'error';
|
|
15
19
|
}
|
|
20
|
+
/** A WebGL2 host as it is now: its state and generation, frames and bytes pending, and its failures. */
|
|
16
21
|
export interface WebGL2HostStatus {
|
|
17
22
|
readonly state: WebGL2HostState;
|
|
18
23
|
readonly generation: number;
|
|
@@ -26,6 +31,7 @@ export interface WebGL2HostStatus {
|
|
|
26
31
|
readonly lastCallbackFailure: WebGL2HostFailure | null;
|
|
27
32
|
readonly cleanupOutcome: 'not-started' | 'pending' | 'safe' | 'unsafe';
|
|
28
33
|
}
|
|
34
|
+
/** The pixels of a shared frame read back: its generation and frame, size, format, color space, alpha and bytes. */
|
|
29
35
|
export interface SharedWebGL2Readback {
|
|
30
36
|
readonly generation: number;
|
|
31
37
|
readonly serial: number;
|
|
@@ -38,6 +44,7 @@ export interface SharedWebGL2Readback {
|
|
|
38
44
|
readonly alphaMode: 'premultiplied' | 'opaque';
|
|
39
45
|
readonly bytes: Uint8Array;
|
|
40
46
|
}
|
|
47
|
+
/** A shared WebGL2 host as it is now: its resources, host status, bytes pending and retention. */
|
|
41
48
|
export interface SharedWebGL2HostStatus {
|
|
42
49
|
readonly resources: SharedHostResourceStatus;
|
|
43
50
|
readonly host: WebGL2HostStatus;
|
|
@@ -55,6 +62,7 @@ export interface SharedWebGL2HostStatus {
|
|
|
55
62
|
readonly unknownNativeObjects: number;
|
|
56
63
|
};
|
|
57
64
|
}
|
|
65
|
+
/** A layer drawn once and kept on the GPU: update it, or dispose of it. */
|
|
58
66
|
export interface SharedWebGL2Layer2D {
|
|
59
67
|
readonly state: 'empty' | 'ready' | 'stale' | 'disposed';
|
|
60
68
|
/** Bake a transparent Engine capture. The current revision remains usable until the replacement completes. */
|
|
@@ -62,6 +70,7 @@ export interface SharedWebGL2Layer2D {
|
|
|
62
70
|
dispose(): void;
|
|
63
71
|
}
|
|
64
72
|
type LayerRGB = readonly [number, number, number];
|
|
73
|
+
/** How a kept layer is tinted when it is placed: its bounds and its multiplied and added color. */
|
|
65
74
|
export interface SharedWebGL2LayerEffect2D {
|
|
66
75
|
/** Half-open rectangle in logical frame coordinates. */
|
|
67
76
|
readonly bounds: {
|
|
@@ -73,6 +82,7 @@ export interface SharedWebGL2LayerEffect2D {
|
|
|
73
82
|
readonly multiply?: LayerRGB;
|
|
74
83
|
readonly add?: LayerRGB;
|
|
75
84
|
}
|
|
85
|
+
/** Where a kept layer is placed in a frame, how large, and with what effect. */
|
|
76
86
|
export interface SharedWebGL2LayerPlacement2D {
|
|
77
87
|
readonly layer: SharedWebGL2Layer2D;
|
|
78
88
|
/** Destination bounds in logical frame coordinates, before the host pixel ratio. */
|
|
@@ -82,13 +92,16 @@ export interface SharedWebGL2LayerPlacement2D {
|
|
|
82
92
|
readonly height: number;
|
|
83
93
|
readonly effect?: SharedWebGL2LayerEffect2D;
|
|
84
94
|
}
|
|
95
|
+
/** The kept layers of a host: the bytes they hold, and how many are ready and pending. */
|
|
85
96
|
export interface SharedWebGL2LayerStatus {
|
|
86
97
|
/** Logical RGBA8 bytes for live targets, including pending and pinned superseded revisions. */
|
|
87
98
|
readonly residentBytes: number;
|
|
88
99
|
readonly readyLayers: number;
|
|
89
100
|
readonly pendingLayers: number;
|
|
90
101
|
}
|
|
102
|
+
/** A phase of drawing a shared frame that the host can time. */
|
|
91
103
|
export type SharedWebGL2TimingPhase = 'texture-prepare' | 'texture-upload' | 'working-framebuffer-validation' | 'default-framebuffer-validation' | 'submit' | 'fence-poll' | 'completion-error-query' | 'retire' | 'sync-delete-error-query';
|
|
104
|
+
/** One timed phase of a frame: its generation and frame, the phase, when it began and how long it took. */
|
|
92
105
|
export interface SharedWebGL2TimingSample {
|
|
93
106
|
readonly generation: number;
|
|
94
107
|
/** Null before a frame is assigned a submission serial. */
|
|
@@ -97,6 +110,7 @@ export interface SharedWebGL2TimingSample {
|
|
|
97
110
|
readonly startMs: number;
|
|
98
111
|
readonly durationMs: number;
|
|
99
112
|
}
|
|
113
|
+
/** The timings of a host's frames: totals by phase, the recent samples and how many were dropped. */
|
|
100
114
|
export interface SharedWebGL2FrameTiming {
|
|
101
115
|
readonly totals: Readonly<Record<SharedWebGL2TimingPhase, {
|
|
102
116
|
readonly count: number;
|
|
@@ -107,6 +121,7 @@ export interface SharedWebGL2FrameTiming {
|
|
|
107
121
|
readonly recent: readonly SharedWebGL2TimingSample[];
|
|
108
122
|
readonly dropped: number;
|
|
109
123
|
}
|
|
124
|
+
/** A host that draws shared frames with WebGL2: start and stop it, stage frames, read them back, time them and recover a lost context. */
|
|
110
125
|
export interface SharedWebGL2Host extends SharedRenderHostAdapter {
|
|
111
126
|
readonly surface: HTMLCanvasElement;
|
|
112
127
|
start(): Promise<void>;
|
|
@@ -117,12 +132,15 @@ export interface SharedWebGL2Host extends SharedRenderHostAdapter {
|
|
|
117
132
|
requestReadback(): Promise<SharedWebGL2Readback>;
|
|
118
133
|
getStatus(): WebGL2HostStatus;
|
|
119
134
|
getSharedStatus(): SharedWebGL2HostStatus;
|
|
135
|
+
/** Draw calls of the last frame drawn: its batches, a pass for each effect, kept layers and the copy to the canvas. */
|
|
136
|
+
getFrameDrawCalls(): number;
|
|
120
137
|
/** Bounded CPU elapsed timings, or null when measurement is disabled. */
|
|
121
138
|
getSharedFrameTiming(): SharedWebGL2FrameTiming | null;
|
|
122
139
|
getSessionStatus(): SharedDeviceSessionStatus<WebGL2HostFailure>;
|
|
123
140
|
stageSharedFrame(frame: SharedRenderFrame2D, options?: SharedFrameUploadOptions): SharedFrameUpload;
|
|
124
141
|
setTimeout(callback: () => void, delayMs: number): () => void;
|
|
125
142
|
}
|
|
143
|
+
/** A shared WebGL2 host that also draws kept layers. */
|
|
126
144
|
export interface SharedLayerWebGL2Host extends SharedWebGL2Host {
|
|
127
145
|
createSharedLayer2D(): SharedWebGL2Layer2D;
|
|
128
146
|
renderSharedFrameWithLayers(frame: SharedRenderFrame2D, layers: readonly SharedWebGL2LayerPlacement2D[]): undefined;
|
|
@@ -13,7 +13,9 @@ export interface ImageResidencyEntry {
|
|
|
13
13
|
pinCount: number;
|
|
14
14
|
previous: ImageResidencyEntry | undefined;
|
|
15
15
|
next: ImageResidencyEntry | undefined;
|
|
16
|
-
state: 'cold' | 'ready' | 'detached';
|
|
16
|
+
state: 'cold' | 'submitted' | 'ready' | 'detached';
|
|
17
|
+
/** Producer error scopes, held only while an immutable page is lent before its fence. */
|
|
18
|
+
validation?: Promise<void>;
|
|
17
19
|
}
|
|
18
20
|
export interface ImageResidencyCandidate {
|
|
19
21
|
image: ImageData2D;
|
|
@@ -45,9 +47,10 @@ export interface ImageResidencyUse {
|
|
|
45
47
|
pinned: boolean;
|
|
46
48
|
finished: boolean;
|
|
47
49
|
touchedQueue: boolean;
|
|
50
|
+
producerValidations?: Set<Promise<void>>;
|
|
48
51
|
}
|
|
49
52
|
/** Accumulates demand into the submission's existing maps without taking ownership of any native resources. */
|
|
50
|
-
export declare function collectWebGPUImageDemand(projectionPlan: ProjectionPlan2D, draws: readonly ImageResidencyDraw[], shared: boolean, directory: WeakMap<ImageData2D, Map<string, ImageResidencyEntry>>, enabled: boolean, epoch: object, hits: Map<number, ImageResidencyEntry>, candidates: Map<number, ImageResidencyCandidate
|
|
53
|
+
export declare function collectWebGPUImageDemand(projectionPlan: ProjectionPlan2D, draws: readonly ImageResidencyDraw[], shared: boolean, directory: WeakMap<ImageData2D, Map<string, ImageResidencyEntry>>, enabled: boolean, epoch: object, hits: Map<number, ImageResidencyEntry>, candidates: Map<number, ImageResidencyCandidate>, borrowSubmitted: boolean): number;
|
|
51
54
|
/** Reads the ready list in eviction order. The Host retains all mutation and retirement authority. */
|
|
52
55
|
export declare function selectWebGPUImageVictims(oldest: ImageResidencyEntry | undefined, epoch: object, available: number, count: number, maxReadyBytes: number, bytes: number, candidateCount: number, hits: ReadonlyMap<number, ImageResidencyEntry>): ImageResidencyEntry[];
|
|
53
56
|
//# sourceMappingURL=webgpuImageResidency.d.ts.map
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/** Accumulates demand into the submission's existing maps without taking ownership of any native resources. */
|
|
2
|
-
export function collectWebGPUImageDemand(projectionPlan, draws, shared, directory, enabled, epoch, hits, candidates) {
|
|
2
|
+
export function collectWebGPUImageDemand(projectionPlan, draws, shared, directory, enabled, epoch, hits, candidates, borrowSubmitted) {
|
|
3
3
|
const buckets = new Map();
|
|
4
4
|
let bytes = 0;
|
|
5
5
|
for (const draw of draws) {
|
|
@@ -10,14 +10,18 @@ export function collectWebGPUImageDemand(projectionPlan, draws, shared, director
|
|
|
10
10
|
continue;
|
|
11
11
|
const view = projectionPlan.views[draw.viewIndex], region = view.region;
|
|
12
12
|
const cropKey = (shared ? 'shared:egret.alpha8-capped-srgb-pma8/1:rgba8unorm-srgb:' : '') +
|
|
13
|
-
`${region.x},${region.y},${region.width},${region.height}
|
|
13
|
+
`${region.x},${region.y},${region.width},${region.height}` +
|
|
14
|
+
// A page kept with one level cannot serve a draw that samples its smaller copies.
|
|
15
|
+
((view.levels ?? 1) === 1 ? '' : `:levels=${view.levels}`);
|
|
14
16
|
let bucket = directory.get(view.image) ?? buckets.get(view.image);
|
|
15
17
|
if (!bucket) {
|
|
16
18
|
bucket = new Map();
|
|
17
19
|
buckets.set(view.image, bucket);
|
|
18
20
|
}
|
|
19
21
|
const entry = bucket.get(cropKey);
|
|
20
|
-
if (enabled &&
|
|
22
|
+
if (enabled &&
|
|
23
|
+
entry?.epoch === epoch &&
|
|
24
|
+
(entry.state === 'ready' || (borrowSubmitted && entry.state === 'submitted')))
|
|
21
25
|
hits.set(draw.viewIndex, entry);
|
|
22
26
|
else {
|
|
23
27
|
candidates.set(draw.viewIndex, {
|
|
@@ -11,13 +11,13 @@ export interface RetentionTargetRequest {
|
|
|
11
11
|
readonly id: number;
|
|
12
12
|
readonly width: number;
|
|
13
13
|
readonly height: number;
|
|
14
|
-
readonly format: 'rgba8unorm-srgb' | 'depth32float';
|
|
14
|
+
readonly format: 'rgba8unorm-srgb' | 'rgba8unorm' | 'depth32float';
|
|
15
15
|
readonly usage: 20 | 16;
|
|
16
16
|
readonly byteLength: number;
|
|
17
17
|
readonly sampleCount: 1;
|
|
18
18
|
readonly mipLevelCount: 1;
|
|
19
19
|
readonly depthOrArrayLayers: 1;
|
|
20
|
-
readonly recipe: 'egret.srgb-pma8-target/1' | 'egret.shared-reverse-depth/1';
|
|
20
|
+
readonly recipe: 'egret.srgb-pma8-target/1' | 'egret.encoded-srgb-pma8-target/1' | 'egret.shared-reverse-depth/1';
|
|
21
21
|
}
|
|
22
22
|
export type RetentionRequest = RetentionBufferRequest | RetentionTargetRequest;
|
|
23
23
|
export type RetentionHandle = ((RetentionBufferRequest & {
|
|
@@ -24,7 +24,8 @@ export function createWebGPURetentionPool(session, diagnostics) {
|
|
|
24
24
|
request.mipLevelCount !== 1 ||
|
|
25
25
|
request.depthOrArrayLayers !== 1 ||
|
|
26
26
|
(request.kind === 'color'
|
|
27
|
-
? request.format
|
|
27
|
+
? !((request.format === 'rgba8unorm-srgb' && request.recipe === 'egret.srgb-pma8-target/1') ||
|
|
28
|
+
(request.format === 'rgba8unorm' && request.recipe === 'egret.encoded-srgb-pma8-target/1')) || request.usage !== 20
|
|
28
29
|
: request.format !== 'depth32float' ||
|
|
29
30
|
request.usage !== 16 ||
|
|
30
31
|
request.recipe !== 'egret.shared-reverse-depth/1')) {
|
|
@@ -3,5 +3,5 @@ export declare const SHARED_BLENDS: readonly ['normal', 'add-accumulate', 'add-p
|
|
|
3
3
|
/** The pipelines of a draw without a region, of a batch of one page, and of a batch of several pages. */
|
|
4
4
|
export declare const SHARED_PIPELINE_KINDS: readonly ['solid', 'sampled', 'paged'];
|
|
5
5
|
/** All shaders and promises are immediately owned by the Host's captured startup boundaries. */
|
|
6
|
-
export declare function createSharedWebGPUPipeline(shader: (d: GPUShaderModuleDescriptor) => GPUShaderModule, pipeline: (d: GPURenderPipelineDescriptor) => Promise<GPURenderPipeline>, kind: (typeof SHARED_PIPELINE_KINDS)[number], blend: SharedMaterial2D['blend']): Promise<GPURenderPipeline>;
|
|
6
|
+
export declare function createSharedWebGPUPipeline(shader: (d: GPUShaderModuleDescriptor) => GPUShaderModule, pipeline: (d: GPURenderPipelineDescriptor) => Promise<GPURenderPipeline>, kind: (typeof SHARED_PIPELINE_KINDS)[number], blend: SharedMaterial2D['blend'], srgb?: boolean): Promise<GPURenderPipeline>;
|
|
7
7
|
//# sourceMappingURL=webgpuSharedPass.d.ts.map
|