@luma.gl/webgl 9.3.0-alpha.4 → 9.3.0-alpha.8
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/adapter/converters/device-parameters.d.ts +1 -1
- package/dist/adapter/converters/device-parameters.d.ts.map +1 -1
- package/dist/adapter/converters/device-parameters.js +4 -1
- package/dist/adapter/converters/device-parameters.js.map +1 -1
- package/dist/adapter/converters/sampler-parameters.d.ts +1 -1
- package/dist/adapter/converters/sampler-parameters.d.ts.map +1 -1
- package/dist/adapter/converters/sampler-parameters.js +1 -1
- package/dist/adapter/converters/sampler-parameters.js.map +1 -1
- package/dist/adapter/converters/shader-formats.d.ts +1 -64
- package/dist/adapter/converters/shader-formats.d.ts.map +1 -1
- package/dist/adapter/converters/shader-formats.js +1 -64
- package/dist/adapter/converters/shader-formats.js.map +1 -1
- package/dist/adapter/converters/webgl-shadertypes.d.ts +1 -3
- package/dist/adapter/converters/webgl-shadertypes.d.ts.map +1 -1
- package/dist/adapter/converters/webgl-shadertypes.js +1 -6
- package/dist/adapter/converters/webgl-shadertypes.js.map +1 -1
- package/dist/adapter/converters/webgl-texture-table.d.ts +8 -4
- package/dist/adapter/converters/webgl-texture-table.d.ts.map +1 -1
- package/dist/adapter/converters/webgl-texture-table.js +122 -58
- package/dist/adapter/converters/webgl-texture-table.js.map +1 -1
- package/dist/adapter/converters/webgl-vertex-formats.d.ts +1 -1
- package/dist/adapter/converters/webgl-vertex-formats.d.ts.map +1 -1
- package/dist/adapter/converters/webgl-vertex-formats.js +1 -1
- package/dist/adapter/converters/webgl-vertex-formats.js.map +1 -1
- package/dist/adapter/device-helpers/webgl-device-features.d.ts +1 -1
- package/dist/adapter/device-helpers/webgl-device-features.d.ts.map +1 -1
- package/dist/adapter/device-helpers/webgl-device-features.js +1 -2
- package/dist/adapter/device-helpers/webgl-device-features.js.map +1 -1
- package/dist/adapter/device-helpers/webgl-device-info.d.ts +1 -1
- package/dist/adapter/device-helpers/webgl-device-info.d.ts.map +1 -1
- package/dist/adapter/device-helpers/webgl-device-info.js +6 -1
- package/dist/adapter/device-helpers/webgl-device-info.js.map +1 -1
- package/dist/adapter/device-helpers/webgl-device-limits.d.ts +1 -1
- package/dist/adapter/device-helpers/webgl-device-limits.d.ts.map +1 -1
- package/dist/adapter/device-helpers/webgl-device-limits.js +1 -1
- package/dist/adapter/device-helpers/webgl-device-limits.js.map +1 -1
- package/dist/adapter/helpers/format-utils.d.ts +1 -1
- package/dist/adapter/helpers/format-utils.d.ts.map +1 -1
- package/dist/adapter/helpers/format-utils.js +1 -1
- package/dist/adapter/helpers/format-utils.js.map +1 -1
- package/dist/adapter/helpers/get-shader-layout-from-glsl.js +30 -19
- package/dist/adapter/helpers/get-shader-layout-from-glsl.js.map +1 -1
- package/dist/adapter/helpers/set-uniform.d.ts +1 -1
- package/dist/adapter/helpers/set-uniform.d.ts.map +1 -1
- package/dist/adapter/helpers/set-uniform.js +1 -1
- package/dist/adapter/helpers/set-uniform.js.map +1 -1
- package/dist/adapter/helpers/webgl-texture-utils.d.ts +1 -1
- package/dist/adapter/helpers/webgl-texture-utils.d.ts.map +1 -1
- package/dist/adapter/helpers/webgl-texture-utils.js +4 -4
- package/dist/adapter/helpers/webgl-texture-utils.js.map +1 -1
- package/dist/adapter/helpers/webgl-topology-utils.d.ts +1 -1
- package/dist/adapter/helpers/webgl-topology-utils.d.ts.map +1 -1
- package/dist/adapter/helpers/webgl-topology-utils.js +1 -1
- package/dist/adapter/helpers/webgl-topology-utils.js.map +1 -1
- package/dist/adapter/resources/webgl-buffer.d.ts +1 -1
- package/dist/adapter/resources/webgl-buffer.d.ts.map +1 -1
- package/dist/adapter/resources/webgl-buffer.js +20 -5
- package/dist/adapter/resources/webgl-buffer.js.map +1 -1
- package/dist/adapter/resources/webgl-command-buffer.d.ts +3 -3
- package/dist/adapter/resources/webgl-command-buffer.d.ts.map +1 -1
- package/dist/adapter/resources/webgl-command-buffer.js +22 -36
- package/dist/adapter/resources/webgl-command-buffer.js.map +1 -1
- package/dist/adapter/resources/webgl-command-encoder.d.ts +6 -5
- package/dist/adapter/resources/webgl-command-encoder.d.ts.map +1 -1
- package/dist/adapter/resources/webgl-command-encoder.js +23 -8
- package/dist/adapter/resources/webgl-command-encoder.js.map +1 -1
- package/dist/adapter/resources/webgl-framebuffer.d.ts +3 -1
- package/dist/adapter/resources/webgl-framebuffer.d.ts.map +1 -1
- package/dist/adapter/resources/webgl-framebuffer.js +10 -1
- package/dist/adapter/resources/webgl-framebuffer.js.map +1 -1
- package/dist/adapter/resources/webgl-query-set.d.ts +37 -31
- package/dist/adapter/resources/webgl-query-set.d.ts.map +1 -1
- package/dist/adapter/resources/webgl-query-set.js +247 -96
- package/dist/adapter/resources/webgl-query-set.js.map +1 -1
- package/dist/adapter/resources/webgl-render-pass.d.ts +1 -1
- package/dist/adapter/resources/webgl-render-pass.d.ts.map +1 -1
- package/dist/adapter/resources/webgl-render-pass.js +25 -11
- package/dist/adapter/resources/webgl-render-pass.js.map +1 -1
- package/dist/adapter/resources/webgl-render-pipeline.d.ts +17 -21
- package/dist/adapter/resources/webgl-render-pipeline.d.ts.map +1 -1
- package/dist/adapter/resources/webgl-render-pipeline.js +69 -167
- package/dist/adapter/resources/webgl-render-pipeline.js.map +1 -1
- package/dist/adapter/resources/webgl-sampler.d.ts +1 -1
- package/dist/adapter/resources/webgl-sampler.d.ts.map +1 -1
- package/dist/adapter/resources/webgl-sampler.js +1 -1
- package/dist/adapter/resources/webgl-sampler.js.map +1 -1
- package/dist/adapter/resources/webgl-shader.d.ts +1 -1
- package/dist/adapter/resources/webgl-shader.d.ts.map +1 -1
- package/dist/adapter/resources/webgl-shader.js +15 -8
- package/dist/adapter/resources/webgl-shader.js.map +1 -1
- package/dist/adapter/resources/webgl-shared-render-pipeline.d.ts +24 -0
- package/dist/adapter/resources/webgl-shared-render-pipeline.d.ts.map +1 -0
- package/dist/adapter/resources/webgl-shared-render-pipeline.js +155 -0
- package/dist/adapter/resources/webgl-shared-render-pipeline.js.map +1 -0
- package/dist/adapter/resources/webgl-texture.d.ts +27 -6
- package/dist/adapter/resources/webgl-texture.d.ts.map +1 -1
- package/dist/adapter/resources/webgl-texture.js +199 -101
- package/dist/adapter/resources/webgl-texture.js.map +1 -1
- package/dist/adapter/resources/webgl-transform-feedback.js +1 -1
- package/dist/adapter/resources/webgl-transform-feedback.js.map +1 -1
- package/dist/adapter/resources/webgl-vertex-array.d.ts +2 -2
- package/dist/adapter/resources/webgl-vertex-array.d.ts.map +1 -1
- package/dist/adapter/resources/webgl-vertex-array.js +1 -1
- package/dist/adapter/resources/webgl-vertex-array.js.map +1 -1
- package/dist/adapter/webgl-device.d.ts +6 -3
- package/dist/adapter/webgl-device.d.ts.map +1 -1
- package/dist/adapter/webgl-device.js +36 -4
- package/dist/adapter/webgl-device.js.map +1 -1
- package/dist/adapter/webgl-presentation-context.d.ts +21 -0
- package/dist/adapter/webgl-presentation-context.d.ts.map +1 -0
- package/dist/adapter/webgl-presentation-context.js +64 -0
- package/dist/adapter/webgl-presentation-context.js.map +1 -0
- package/dist/constants/index.d.ts +3 -0
- package/dist/constants/index.d.ts.map +1 -0
- package/dist/constants/index.js +5 -0
- package/dist/constants/index.js.map +1 -0
- package/dist/constants/webgl-constants.d.ts +822 -0
- package/dist/constants/webgl-constants.d.ts.map +1 -0
- package/dist/constants/webgl-constants.js +928 -0
- package/dist/constants/webgl-constants.js.map +1 -0
- package/dist/constants/webgl-types.d.ts +480 -0
- package/dist/constants/webgl-types.d.ts.map +1 -0
- package/dist/constants/webgl-types.js +6 -0
- package/dist/constants/webgl-types.js.map +1 -0
- package/dist/context/debug/webgl-developer-tools.js +1 -1
- package/dist/context/debug/webgl-developer-tools.js.map +1 -1
- package/dist/context/helpers/webgl-context-data.d.ts +1 -1
- package/dist/context/helpers/webgl-context-data.d.ts.map +1 -1
- package/dist/context/helpers/webgl-extensions.d.ts +1 -1
- package/dist/context/helpers/webgl-extensions.d.ts.map +1 -1
- package/dist/context/parameters/unified-parameter-api.d.ts +1 -1
- package/dist/context/parameters/unified-parameter-api.d.ts.map +1 -1
- package/dist/context/parameters/webgl-parameter-tables.d.ts +1 -1
- package/dist/context/parameters/webgl-parameter-tables.d.ts.map +1 -1
- package/dist/context/parameters/webgl-parameter-tables.js +1 -1
- package/dist/context/parameters/webgl-parameter-tables.js.map +1 -1
- package/dist/context/polyfills/polyfill-webgl1-extensions.js +1 -1
- package/dist/context/polyfills/polyfill-webgl1-extensions.js.map +1 -1
- package/dist/dist.dev.js +1473 -824
- package/dist/dist.min.js +2 -2
- package/dist/index.cjs +3 -5491
- package/dist/index.cjs.map +4 -4
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/webgl-constants.d.ts +2 -0
- package/dist/webgl-constants.d.ts.map +1 -0
- package/dist/webgl-constants.js +5 -0
- package/dist/webgl-constants.js.map +1 -0
- package/dist/webgl-types.d.ts +2 -0
- package/dist/webgl-types.d.ts.map +1 -0
- package/dist/{types.js → webgl-types.js} +1 -1
- package/dist/webgl-types.js.map +1 -0
- package/package.json +18 -4
- package/src/adapter/converters/device-parameters.ts +6 -2
- package/src/adapter/converters/sampler-parameters.ts +1 -1
- package/src/adapter/converters/shader-formats.ts +1 -66
- package/src/adapter/converters/webgl-shadertypes.ts +1 -9
- package/src/adapter/converters/webgl-texture-table.ts +160 -68
- package/src/adapter/converters/webgl-vertex-formats.ts +1 -1
- package/src/adapter/device-helpers/webgl-device-features.ts +2 -3
- package/src/adapter/device-helpers/webgl-device-info.ts +7 -1
- package/src/adapter/device-helpers/webgl-device-limits.ts +1 -1
- package/src/adapter/helpers/format-utils.ts +1 -1
- package/src/adapter/helpers/get-shader-layout-from-glsl.ts +38 -20
- package/src/adapter/helpers/set-uniform.ts +1 -1
- package/src/adapter/helpers/webgl-texture-utils.ts +4 -4
- package/src/adapter/helpers/webgl-topology-utils.ts +1 -1
- package/src/adapter/resources/webgl-buffer.ts +17 -5
- package/src/adapter/resources/webgl-command-buffer.ts +28 -28
- package/src/adapter/resources/webgl-command-encoder.ts +28 -11
- package/src/adapter/resources/webgl-framebuffer.ts +12 -1
- package/src/adapter/resources/webgl-query-set.ts +295 -101
- package/src/adapter/resources/webgl-render-pass.ts +26 -13
- package/src/adapter/resources/webgl-render-pipeline.ts +101 -196
- package/src/adapter/resources/webgl-sampler.ts +1 -1
- package/src/adapter/resources/webgl-shader.ts +15 -8
- package/src/adapter/resources/webgl-shared-render-pipeline.ts +211 -0
- package/src/adapter/resources/webgl-texture.ts +324 -122
- package/src/adapter/resources/webgl-transform-feedback.ts +1 -1
- package/src/adapter/resources/webgl-vertex-array.ts +1 -1
- package/src/adapter/webgl-device.ts +50 -6
- package/src/adapter/webgl-presentation-context.ts +93 -0
- package/src/constants/index.d.ts.map +1 -0
- package/src/constants/index.js.map +1 -0
- package/src/constants/index.ts +31 -0
- package/src/constants/webgl-constants.d.ts.map +1 -0
- package/src/constants/webgl-constants.js.map +1 -0
- package/src/constants/webgl-constants.ts +1051 -0
- package/src/constants/webgl-types.d.ts.map +1 -0
- package/src/constants/webgl-types.js.map +1 -0
- package/src/constants/webgl-types.ts +813 -0
- package/src/context/debug/webgl-developer-tools.ts +1 -1
- package/src/context/helpers/webgl-context-data.ts +1 -1
- package/src/context/helpers/webgl-extensions.ts +1 -1
- package/src/context/parameters/unified-parameter-api.ts +1 -1
- package/src/context/parameters/webgl-parameter-tables.ts +1 -1
- package/src/context/polyfills/polyfill-webgl1-extensions.ts +1 -1
- package/src/index.ts +26 -0
- package/src/webgl-constants.d.ts.map +1 -0
- package/src/webgl-constants.js.map +1 -0
- package/src/webgl-constants.ts +5 -0
- package/src/webgl-types.d.ts.map +1 -0
- package/src/webgl-types.js.map +1 -0
- package/src/webgl-types.ts +29 -0
- package/dist/types.d.ts +0 -11
- package/dist/types.d.ts.map +0 -1
- package/dist/types.js.map +0 -1
- package/src/types.ts +0 -14
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
// luma.gl
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
|
-
import { getVariableShaderTypeInfo, assertDefined } from '@luma.gl/core';
|
|
5
|
-
import { GL } from '@luma.gl/constants';
|
|
4
|
+
import { getVariableShaderTypeInfo, assertDefined, log } from '@luma.gl/core';
|
|
5
|
+
import { GL } from '@luma.gl/webgl/constants';
|
|
6
6
|
import { isGLSamplerType, getTextureBindingFromGLSamplerType, convertGLUniformTypeToShaderVariableType } from "../converters/webgl-shadertypes.js";
|
|
7
7
|
/**
|
|
8
8
|
* Extract metadata describing binding information for a program's shaders
|
|
@@ -199,24 +199,35 @@ function readUniformBlocks(gl, program) {
|
|
|
199
199
|
// const uniformRowMajor = gl.getActiveUniforms(program, uniformIndices, GL.UNIFORM_IS_ROW_MAJOR);
|
|
200
200
|
for (let i = 0; i < blockInfo.uniformCount; ++i) {
|
|
201
201
|
const uniformIndex = uniformIndices[i];
|
|
202
|
-
if (uniformIndex
|
|
203
|
-
|
|
202
|
+
if (uniformIndex !== undefined) {
|
|
203
|
+
const activeInfo = gl.getActiveUniform(program, uniformIndex);
|
|
204
|
+
if (!activeInfo) {
|
|
205
|
+
throw new Error('activeInfo');
|
|
206
|
+
}
|
|
207
|
+
const format = convertGLUniformTypeToShaderVariableType(uniformType[i]);
|
|
208
|
+
blockInfo.uniforms.push({
|
|
209
|
+
name: activeInfo.name,
|
|
210
|
+
format,
|
|
211
|
+
type: uniformType[i],
|
|
212
|
+
arrayLength: uniformArrayLength[i],
|
|
213
|
+
byteOffset: uniformOffset[i],
|
|
214
|
+
byteStride: uniformStride[i]
|
|
215
|
+
// matrixStride: uniformStride[i],
|
|
216
|
+
// rowMajor: uniformRowMajor[i]
|
|
217
|
+
});
|
|
204
218
|
}
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
// matrixStride: uniformStride[i],
|
|
218
|
-
// rowMajor: uniformRowMajor[i]
|
|
219
|
-
});
|
|
219
|
+
}
|
|
220
|
+
const uniformInstancePrefixes = new Set(blockInfo.uniforms
|
|
221
|
+
.map(uniform => uniform.name.split('.')[0])
|
|
222
|
+
.filter((instanceName) => Boolean(instanceName)));
|
|
223
|
+
const blockAlias = blockInfo.name.replace(/Uniforms$/, '');
|
|
224
|
+
if (uniformInstancePrefixes.size === 1 &&
|
|
225
|
+
!uniformInstancePrefixes.has(blockInfo.name) &&
|
|
226
|
+
!uniformInstancePrefixes.has(blockAlias)) {
|
|
227
|
+
const [instanceName] = uniformInstancePrefixes;
|
|
228
|
+
log.warn(`Uniform block "${blockInfo.name}" uses GLSL instance "${instanceName}". ` +
|
|
229
|
+
`luma.gl binds uniform buffers by block name ("${blockInfo.name}") and alias ("${blockAlias}"). ` +
|
|
230
|
+
'Prefer matching the instance name to one of those to avoid confusing silent mismatches.')();
|
|
220
231
|
}
|
|
221
232
|
uniformBlocks.push(blockInfo);
|
|
222
233
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-shader-layout-from-glsl.js","sourceRoot":"","sources":["../../../src/adapter/helpers/get-shader-layout-from-glsl.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAUpC,OAAO,EAAC,yBAAyB,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"get-shader-layout-from-glsl.js","sourceRoot":"","sources":["../../../src/adapter/helpers/get-shader-layout-from-glsl.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAUpC,OAAO,EAAC,yBAAyB,EAAE,aAAa,EAAE,GAAG,EAAC,MAAM,eAAe,CAAC;AAE5E,OAAO,EAAC,EAAE,EAAgB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EACL,eAAe,EACf,kCAAkC,EAClC,wCAAwC,EACzC,2CAAwC;AAEzC;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CACrC,EAA0B,EAC1B,OAAqB;IAErB,MAAM,YAAY,GAAiB;QACjC,UAAU,EAAE,EAAE;QACd,QAAQ,EAAE,EAAE;KACb,CAAC;IAEF,YAAY,CAAC,UAAU,GAAG,yBAAyB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IAEjE,iBAAiB;IACjB,MAAM,aAAa,GAA0B,iBAAiB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IAC5E,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;QACzC,MAAM,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACrD,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,WAAW,EAAE,OAAO,CAAC,WAAW;SACjC,CAAC,CAAC,CAAC;QACJ,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC;YACzB,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,YAAY,CAAC,IAAI;YACvB,KAAK,EAAE,CAAC;YACR,QAAQ,EAAE,YAAY,CAAC,QAAQ;YAC/B,UAAU,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/E,cAAc,EAAE,YAAY,CAAC,UAAU;YACvC,QAAQ;SACT,CAAC,CAAC;IACL,CAAC;IAED,MAAM,QAAQ,GAAqB,mBAAmB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IACpE,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,IAAI,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,MAAM,EAAC,aAAa,EAAE,UAAU,EAAC,GAAG,kCAAkC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACrF,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC;gBACzB,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,CAAC;gBACR,QAAQ,EAAE,WAAW;gBACrB,aAAa;gBACb,UAAU;aACX,CAAC,CAAC;YAEH,mBAAmB;YACnB,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC;YAClC,WAAW,IAAI,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;IAED,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;QACpB,YAAY,CAAC,QAAQ,GAAG,QAAQ,CAAC;IACnC,CAAC;IAED,WAAW;IACX,MAAM,QAAQ,GAAqB,YAAY,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IAC7D,iFAAiF;IACjF,IAAI,QAAQ,EAAE,MAAM,EAAE,CAAC;QACrB,YAAY,CAAC,QAAQ,GAAG,QAAQ,CAAC;IACnC,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,UAAU;AAEV;;;;GAIG;AACH,SAAS,yBAAyB,CAChC,EAA0B,EAC1B,OAAqB;IAErB,MAAM,UAAU,GAA2B,EAAE,CAAC;IAE9C,MAAM,KAAK,GAAG,EAAE,CAAC,mBAAmB,CAAC,OAAO,QAAuB,CAAC;IAEpE,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC;QAC3C,MAAM,UAAU,GAAG,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACtD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;QAChC,CAAC;QACD,MAAM,EAAC,IAAI,EAAE,IAAI,EAAE,aAAa,CAAC,WAAW,EAAC,GAAG,UAAU,CAAC;QAC3D,MAAM,QAAQ,GAAG,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACrD,uGAAuG;QACvG,IAAI,QAAQ,IAAI,CAAC,EAAE,CAAC;YAClB,MAAM,aAAa,GAAG,wCAAwC,CAAC,aAAa,CAAC,CAAC;YAE9E,8FAA8F;YAC9F,qDAAqD;YACrD,8CAA8C;YAC9C,+FAA+F;YAC/F,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC;YAEhE,UAAU,CAAC,IAAI,CAAC;gBACd,IAAI;gBACJ,QAAQ;gBACR,QAAQ;gBACR,IAAI,EAAE,aAAoC;gBAC1C,iEAAiE;aAClE,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,4BAA4B;IAC5B,UAAU,CAAC,IAAI,CAAC,CAAC,CAAuB,EAAE,CAAuB,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC/F,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;;;GAIG;AACH,SAAS,YAAY,CAAC,EAA0B,EAAE,OAAqB;IACrE,MAAM,QAAQ,GAAqB,EAAE,CAAC;IAEtC,MAAM,KAAK,GAAG,EAAE,CAAC,mBAAmB,CAAC,OAAO,QAAiC,CAAC;IAC9E,KAAK,IAAI,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC;QACpD,MAAM,UAAU,GAAG,EAAE,CAAC,2BAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACrE,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;QAChC,CAAC;QACD,MAAM,EAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAC,GAAG,UAAU,CAAC;QACrD,MAAM,WAAW,GAAG,wCAAwC,CAAC,aAA8B,CAAC,CAAC;QAC7F,MAAM,EAAC,IAAI,EAAE,UAAU,EAAC,GAAG,yBAAyB,CAAC,WAAW,CAAC,CAAC;QAClE,QAAQ,CAAC,IAAI,CAAC,EAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,GAAG,UAAU,EAAC,CAAC,CAAC;IACjE,CAAC;IAED,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;IACjD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;GAIG;AACH,SAAS,mBAAmB,CAAC,EAA0B,EAAE,OAAqB;IAC5E,MAAM,QAAQ,GAAqB,EAAE,CAAC;IAEtC,MAAM,YAAY,GAAG,EAAE,CAAC,mBAAmB,CAAC,OAAO,QAAqB,CAAC;IACzE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACnD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;QAChC,CAAC;QACD,MAAM,EAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAC,GAAG,UAAU,CAAC;QAC/C,MAAM,EAAC,IAAI,EAAE,OAAO,EAAC,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,aAAa,GAAG,EAAE,CAAC,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACzD,MAAM,WAAW,GAAG;YAClB,sDAAsD;YACtD,QAAQ,EAAE,aAAuB;YACjC,IAAI;YACJ,IAAI;YACJ,IAAI;YACJ,OAAO;SACR,CAAC;QACF,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAE3B,iEAAiE;QACjE,IAAI,WAAW,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC1C,MAAM,WAAW,GAAG,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC;gBAEpC,aAAa,GAAG,EAAE,CAAC,kBAAkB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;gBAE5D,MAAM,uBAAuB,GAAG;oBAC9B,GAAG,WAAW;oBACd,IAAI,EAAE,WAAW;oBACjB,QAAQ,EAAE,aAAuB;iBAClC,CAAC;gBAEF,QAAQ,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;GAGG;AACH,SAAS,iBAAiB,CACxB,EAA0B,EAC1B,OAAqB;IAErB,MAAM,iBAAiB,GAAG,CAAC,UAAkB,EAAE,KAAS,EAAO,EAAE,CAC/D,EAAE,CAAC,8BAA8B,CAAC,OAAO,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;IAEhE,MAAM,aAAa,GAA0B,EAAE,CAAC;IAEhD,MAAM,UAAU,GAAG,EAAE,CAAC,mBAAmB,CAAC,OAAO,QAA2B,CAAC;IAC7E,KAAK,IAAI,UAAU,GAAG,CAAC,EAAE,UAAU,GAAG,UAAU,EAAE,UAAU,EAAE,EAAE,CAAC;QAC/D,MAAM,SAAS,GAAwB;YACrC,IAAI,EAAE,EAAE,CAAC,yBAAyB,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,EAAE;YAC7D,QAAQ,EAAE,iBAAiB,CAAC,UAAU,QAA2B;YACjE,UAAU,EAAE,iBAAiB,CAAC,UAAU,QAA6B;YACrE,MAAM,EAAE,iBAAiB,CAAC,UAAU,QAA+C;YACnF,QAAQ,EAAE,iBAAiB,CAAC,UAAU,QAAiD;YACvF,YAAY,EAAE,iBAAiB,CAAC,UAAU,QAAmC;YAC7E,QAAQ,EAAE,EAAW;SACtB,CAAC;QAEF,MAAM,cAAc,GACjB,iBAAiB,CAAC,UAAU,QAAuD,IAAI,EAAE,CAAC;QAE7F,MAAM,WAAW,GAAG,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,cAAc,QAAkB,CAAC,CAAC,wDAAwD;QAC5I,MAAM,kBAAkB,GAAG,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,cAAc,QAAkB,CAAC,CAAC,wDAAwD;QACnJ,kDAAkD;QAClD,aAAa;QACb,oBAAoB;QACpB,2BAA2B;QAC3B,qEAAqE;QACrE,MAAM,aAAa,GAAG,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,cAAc,QAAoB,CAAC,CAAC,wDAAwD;QAChJ,MAAM,aAAa,GAAG,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,cAAc,QAA0B,CAAC,CAAC,8DAA8D;QAC5J,oDAAoD;QACpD,aAAa;QACb,oBAAoB;QACpB,6BAA6B;QAC7B,8GAA8G;QAC9G,kGAAkG;QAClG,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,YAAY,EAAE,EAAE,CAAC,EAAE,CAAC;YAChD,MAAM,YAAY,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;YACvC,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;gBAC/B,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;gBAC9D,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;gBAChC,CAAC;gBAED,MAAM,MAAM,GAAG,wCAAwC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;gBAExE,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC;oBACtB,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,MAAM;oBACN,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;oBACpB,WAAW,EAAE,kBAAkB,CAAC,CAAC,CAAC;oBAClC,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC;oBAC5B,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC;oBAC5B,kCAAkC;oBAClC,+BAA+B;iBAChC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,MAAM,uBAAuB,GAAG,IAAI,GAAG,CACrC,SAAS,CAAC,QAAQ;aACf,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;aAC1C,MAAM,CAAC,CAAC,YAAY,EAA0B,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAC3E,CAAC;QACF,MAAM,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAC3D,IACE,uBAAuB,CAAC,IAAI,KAAK,CAAC;YAClC,CAAC,uBAAuB,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC;YAC5C,CAAC,uBAAuB,CAAC,GAAG,CAAC,UAAU,CAAC,EACxC,CAAC;YACD,MAAM,CAAC,YAAY,CAAC,GAAG,uBAAuB,CAAC;YAC/C,GAAG,CAAC,IAAI,CACN,kBAAkB,SAAS,CAAC,IAAI,yBAAyB,YAAY,KAAK;gBACxE,iDAAiD,SAAS,CAAC,IAAI,kBAAkB,UAAU,MAAM;gBACjG,yFAAyF,CAC5F,EAAE,CAAC;QACN,CAAC;QAED,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAChC,CAAC;IAED,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;IACtD,OAAO,aAAa,CAAC;AACvB,CAAC;AAED;;;;;;;;;;;;;;;;;;;EAmBE;AAEF,UAAU;AAEV,SAAS,gBAAgB,CAAC,IAAY;IACpC,6CAA6C;IAC7C,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;QAClC,OAAO;YACL,IAAI;YACJ,MAAM,EAAE,CAAC;YACT,OAAO,EAAE,KAAK;SACf,CAAC;IACJ,CAAC;IAED,8CAA8C;IAC9C,MAAM,mBAAmB,GAAG,sBAAsB,CAAC;IACnD,MAAM,OAAO,GAAG,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,WAAW,GAAG,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,qCAAqC,IAAI,EAAE,CAAC,CAAC;IAC7F,OAAO;QACL,IAAI,EAAE,WAAW;QACjB,uDAAuD;QACvD,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5B,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;KAC/B,CAAC;AACJ,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { UniformValue } from '@luma.gl/core';
|
|
2
|
-
import { GLUniformType, GLSamplerType } from '@luma.gl/constants';
|
|
2
|
+
import { GLUniformType, GLSamplerType } from '@luma.gl/webgl/constants';
|
|
3
3
|
/** Set a raw uniform (without type conversion and caching) */
|
|
4
4
|
export declare function setUniform(gl: WebGL2RenderingContext, location: WebGLUniformLocation, type: GLUniformType | GLSamplerType, value: UniformValue): void;
|
|
5
5
|
//# sourceMappingURL=set-uniform.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set-uniform.d.ts","sourceRoot":"","sources":["../../../src/adapter/helpers/set-uniform.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,EAAK,aAAa,EAAE,aAAa,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"set-uniform.d.ts","sourceRoot":"","sources":["../../../src/adapter/helpers/set-uniform.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,EAAK,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAE1E,8DAA8D;AAE9D,wBAAgB,UAAU,CACxB,EAAE,EAAE,sBAAsB,EAC1B,QAAQ,EAAE,oBAAoB,EAC9B,IAAI,EAAE,aAAa,GAAG,aAAa,EACnC,KAAK,EAAE,YAAY,GAClB,IAAI,CAwEN"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// luma.gl
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
|
-
import { GL } from '@luma.gl/constants';
|
|
4
|
+
import { GL } from '@luma.gl/webgl/constants';
|
|
5
5
|
/** Set a raw uniform (without type conversion and caching) */
|
|
6
6
|
/* eslint-disable max-len */
|
|
7
7
|
export function setUniform(gl, location, type, value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set-uniform.js","sourceRoot":"","sources":["../../../src/adapter/helpers/set-uniform.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAMpC,OAAO,EAAC,EAAE,EAA+B,MAAM,
|
|
1
|
+
{"version":3,"file":"set-uniform.js","sourceRoot":"","sources":["../../../src/adapter/helpers/set-uniform.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAMpC,OAAO,EAAC,EAAE,EAA+B,MAAM,0BAA0B,CAAC;AAE1E,8DAA8D;AAC9D,4BAA4B;AAC5B,MAAM,UAAU,UAAU,CACxB,EAA0B,EAC1B,QAA8B,EAC9B,IAAmC,EACnC,KAAmB;IAEnB,MAAM,GAAG,GAAG,EAA4B,CAAC;IAEzC,sCAAsC;IACtC,IAAI,YAAY,GAAG,KAAK,CAAC;IACzB,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;QAC1B,YAAY,GAAG,CAAC,CAAC;IACnB,CAAC;IACD,IAAI,YAAY,KAAK,KAAK,EAAE,CAAC;QAC3B,YAAY,GAAG,CAAC,CAAC;IACnB,CAAC;IACD,MAAM,UAAU,GAAG,OAAO,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;IAEpF,kBAAkB;IAClB,QAAQ,IAAI,EAAE,CAAC;QACb,WAAmB;QACnB,WAAqB;QACrB,WAAmB;QACnB,WAA0B;QAC1B,WAAyB;QACzB,WAAgC;QAChC,WAA4B;QAC5B,WAAuB;QACvB,WAAuB;QACvB,WAAyB;QACzB,WAA6B;QAC7B,WAAgC;QAChC,WAAgC;QAChC,WAAkC;QAClC;YACE,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC9B,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;YACtD,CAAC;YACD,OAAO,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAEvC,WAAe,OAAO,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC1D,YAAoB,OAAO,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC/D,YAAoB,OAAO,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC/D,YAAoB,OAAO,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAE/D,WAAa,OAAO,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QACxD,YAAkB,OAAO,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC7D,YAAkB,OAAO,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC7D,YAAkB,OAAO,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAE7D,YAAc,OAAO,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QACzD,YAAmB,OAAO,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC9D,YAAmB,OAAO,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC9D,YAAmB,OAAO,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAE9D,6BAA6B;QAC7B,WAAsB,OAAO,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;QACtE,YAA2B,OAAO,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;QAC3E,YAA2B,OAAO,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;QAC3E,YAA2B,OAAO,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;QAE3E,8BAA8B;QAC9B,oCAAoC;QACpC,YAAoB,OAAO,EAAE,CAAC,gBAAgB,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QAC5E,YAAoB,OAAO,EAAE,CAAC,gBAAgB,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QAC5E,YAAoB,OAAO,EAAE,CAAC,gBAAgB,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QAE5E,gCAAgC;QAChC,YAAsB,OAAO,GAAG,CAAC,kBAAkB,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QACjF,YAAsB,OAAO,GAAG,CAAC,kBAAkB,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QACjF,YAAsB,OAAO,GAAG,CAAC,kBAAkB,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QACjF,YAAsB,OAAO,GAAG,CAAC,kBAAkB,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QACjF,YAAsB,OAAO,GAAG,CAAC,kBAAkB,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QACjF,YAAsB,OAAO,GAAG,CAAC,kBAAkB,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IACnF,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;AACrC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Buffer, Texture, FramebufferProps } from '@luma.gl/core';
|
|
2
2
|
import { Framebuffer } from '@luma.gl/core';
|
|
3
|
-
import { GL, GLTextureTarget, GLTextureCubeMapTarget, GLTexelDataFormat, GLPixelType } from '@luma.gl/constants';
|
|
3
|
+
import { GL, GLTextureTarget, GLTextureCubeMapTarget, GLTexelDataFormat, GLPixelType } from '@luma.gl/webgl/constants';
|
|
4
4
|
import { WEBGLFramebuffer } from "../resources/webgl-framebuffer.js";
|
|
5
5
|
import { WEBGLBuffer } from "../resources/webgl-buffer.js";
|
|
6
6
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webgl-texture-utils.d.ts","sourceRoot":"","sources":["../../../src/adapter/helpers/webgl-texture-utils.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAC,MAAM,eAAe,CAAC;AACrE,OAAO,EAAC,WAAW,
|
|
1
|
+
{"version":3,"file":"webgl-texture-utils.d.ts","sourceRoot":"","sources":["../../../src/adapter/helpers/webgl-texture-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
// luma.gl
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
|
-
import { Framebuffer,
|
|
5
|
-
import { GL } from '@luma.gl/constants';
|
|
4
|
+
import { Framebuffer, dataTypeDecoder } from '@luma.gl/core';
|
|
5
|
+
import { GL } from '@luma.gl/webgl/constants';
|
|
6
6
|
import { convertDataTypeToGLDataType } from "../converters/webgl-shadertypes.js";
|
|
7
7
|
import { glFormatToComponents, glTypeToBytes } from "./format-utils.js";
|
|
8
8
|
import { WEBGLTexture } from "../resources/webgl-texture.js";
|
|
@@ -102,7 +102,7 @@ export function readPixelsToArray(source, options) {
|
|
|
102
102
|
// Deduce type and allocated pixelArray if needed
|
|
103
103
|
target = getPixelArray(target, sourceType, sourceFormat, sourceWidth, sourceHeight, sourceDepth);
|
|
104
104
|
// Pixel array available, if necessary, deduce type from it.
|
|
105
|
-
const signedType = getDataType(target);
|
|
105
|
+
const signedType = dataTypeDecoder.getDataType(target);
|
|
106
106
|
sourceType = sourceType || convertDataTypeToGLDataType(signedType);
|
|
107
107
|
// Note: luma.gl overrides bindFramebuffer so that we can reliably restore the previous framebuffer (this is the only function for which we do that)
|
|
108
108
|
const prevHandle = gl.bindFramebuffer(36160, handle);
|
|
@@ -262,7 +262,7 @@ function getPixelArray(pixelArray, glType, glFormat, width, height, depth) {
|
|
|
262
262
|
// Allocate pixel array if not already available, using supplied type
|
|
263
263
|
glType ||= 5121;
|
|
264
264
|
const shaderType = convertGLDataTypeToDataType(glType);
|
|
265
|
-
const ArrayType = getTypedArrayConstructor(shaderType);
|
|
265
|
+
const ArrayType = dataTypeDecoder.getTypedArrayConstructor(shaderType);
|
|
266
266
|
const components = glFormatToComponents(glFormat);
|
|
267
267
|
// TODO - check for composite type (components = 1).
|
|
268
268
|
return new ArrayType(width * height * components);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webgl-texture-utils.js","sourceRoot":"","sources":["../../../src/adapter/helpers/webgl-texture-utils.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAKpC,OAAO,EAAC,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"webgl-texture-utils.js","sourceRoot":"","sources":["../../../src/adapter/helpers/webgl-texture-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { GL, GLPrimitiveTopology, GLPrimitive } from '@luma.gl/constants';
|
|
1
|
+
import { GL, GLPrimitiveTopology, GLPrimitive } from '@luma.gl/webgl/constants';
|
|
2
2
|
import { PrimitiveTopology } from '@luma.gl/core';
|
|
3
3
|
export declare function getPrimitiveDrawMode(drawMode: GLPrimitiveTopology): GLPrimitive;
|
|
4
4
|
export declare function getPrimitiveCount(options: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webgl-topology-utils.d.ts","sourceRoot":"","sources":["../../../src/adapter/helpers/webgl-topology-utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,EAAE,EAAE,mBAAmB,EAAE,WAAW,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"webgl-topology-utils.d.ts","sourceRoot":"","sources":["../../../src/adapter/helpers/webgl-topology-utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,EAAE,EAAE,mBAAmB,EAAE,WAAW,EAAC,MAAM,0BAA0B,CAAC;AAC9E,OAAO,EAAC,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAGhD,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,WAAW,CAmB/E;AAGD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE;IACzC,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;CACrB,GAAG,MAAM,CAkBT;AAGD,wBAAgB,cAAc,CAAC,OAAO,EAAE;IACtC,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;CACrB,GAAG,MAAM,CAaT;AAED,sCAAsC;AACtC,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,iBAAiB,GAEzB,EAAE,CAAC,MAAM,GACT,EAAE,CAAC,KAAK,GACR,EAAE,CAAC,UAAU,GACb,EAAE,CAAC,SAAS,GACZ,EAAE,CAAC,SAAS,GACZ,EAAE,CAAC,cAAc,GACjB,EAAE,CAAC,YAAY,CAUlB;AAED,oDAAoD;AACpD,wBAAgB,cAAc,CAAC,QAAQ,EAAE,iBAAiB,GAAG,EAAE,CAAC,MAAM,GAAG,EAAE,CAAC,KAAK,GAAG,EAAE,CAAC,SAAS,CAU/F"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// luma.gl
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
|
-
import { GL } from '@luma.gl/constants';
|
|
4
|
+
import { GL } from '@luma.gl/webgl/constants';
|
|
5
5
|
// Counts the number of complete primitives given a number of vertices and a drawMode
|
|
6
6
|
export function getPrimitiveDrawMode(drawMode) {
|
|
7
7
|
switch (drawMode) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webgl-topology-utils.js","sourceRoot":"","sources":["../../../src/adapter/helpers/webgl-topology-utils.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,EAAE,EAAmC,MAAM,
|
|
1
|
+
{"version":3,"file":"webgl-topology-utils.js","sourceRoot":"","sources":["../../../src/adapter/helpers/webgl-topology-utils.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,EAAE,EAAmC,MAAM,0BAA0B,CAAC;AAG9E,qFAAqF;AACrF,MAAM,UAAU,oBAAoB,CAAC,QAA6B;IAChE,QAAQ,QAAQ,EAAE,CAAC;QACjB;YACE,SAAiB;QACnB;YACE,SAAgB;QAClB;YACE,SAAgB;QAClB;YACE,SAAgB;QAClB;YACE,SAAoB;QACtB;YACE,SAAoB;QACtB;YACE,SAAoB;QACtB;YACE,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;IAChC,CAAC;AACH,CAAC;AAED,uFAAuF;AACvF,MAAM,UAAU,iBAAiB,CAAC,OAGjC;IACC,MAAM,EAAC,QAAQ,EAAE,WAAW,EAAC,GAAG,OAAO,CAAC;IACxC,QAAQ,QAAQ,EAAE,CAAC;QACjB,OAAe;QACf;YACE,OAAO,WAAW,CAAC;QACrB;YACE,OAAO,WAAW,GAAG,CAAC,CAAC;QACzB;YACE,OAAO,WAAW,GAAG,CAAC,CAAC;QACzB;YACE,OAAO,WAAW,GAAG,CAAC,CAAC;QACzB,OAAuB;QACvB;YACE,OAAO,WAAW,GAAG,CAAC,CAAC;QACzB;YACE,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;IAChC,CAAC;AACH,CAAC;AAED,6FAA6F;AAC7F,MAAM,UAAU,cAAc,CAAC,OAG9B;IACC,MAAM,EAAC,QAAQ,EAAE,WAAW,EAAC,GAAG,OAAO,CAAC;IACxC,MAAM,cAAc,GAAG,iBAAiB,CAAC,EAAC,QAAQ,EAAE,WAAW,EAAC,CAAC,CAAC;IAClE,QAAQ,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvC;YACE,OAAO,cAAc,CAAC;QACxB;YACE,OAAO,cAAc,GAAG,CAAC,CAAC;QAC5B;YACE,OAAO,cAAc,GAAG,CAAC,CAAC;QAC5B;YACE,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;IAChC,CAAC;AACH,CAAC;AAED,sCAAsC;AACtC,MAAM,UAAU,aAAa,CAC3B,QAA2B;IAS3B,kBAAkB;IAClB,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,YAAY,CAAC,CAAC,SAAiB;QACpC,KAAK,WAAW,CAAC,CAAC,SAAgB;QAClC,KAAK,YAAY,CAAC,CAAC,SAAqB;QACxC,KAAK,eAAe,CAAC,CAAC,SAAoB;QAC1C,KAAK,gBAAgB,CAAC,CAAC,SAAyB;QAChD,OAAO,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC;AACH,CAAC;AAED,oDAAoD;AACpD,MAAM,UAAU,cAAc,CAAC,QAA2B;IACxD,kBAAkB;IAClB,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,YAAY,CAAC,CAAC,SAAiB;QACpC,KAAK,WAAW,CAAC,CAAC,SAAgB;QAClC,KAAK,YAAY,CAAC,CAAC,SAAgB;QACnC,KAAK,eAAe,CAAC,CAAC,SAAoB;QAC1C,KAAK,gBAAgB,CAAC,CAAC,SAAoB;QAC3C,OAAO,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC;AACH,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { BufferMapCallback, BufferProps } from '@luma.gl/core';
|
|
2
2
|
import { Buffer } from '@luma.gl/core';
|
|
3
|
-
import { GL } from '@luma.gl/constants';
|
|
3
|
+
import { GL } from '@luma.gl/webgl/constants';
|
|
4
4
|
import { WebGLDevice } from "../webgl-device.js";
|
|
5
5
|
/** WebGL Buffer interface */
|
|
6
6
|
export declare class WEBGLBuffer extends Buffer {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webgl-buffer.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-buffer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,iBAAiB,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AAClE,OAAO,EAAC,MAAM,EAAC,MAAM,eAAe,CAAC;AACrC,OAAO,EAAC,EAAE,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"webgl-buffer.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-buffer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,iBAAiB,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AAClE,OAAO,EAAC,MAAM,EAAC,MAAM,eAAe,CAAC;AACrC,OAAO,EAAC,EAAE,EAAC,MAAM,0BAA0B,CAAC;AAC5C,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAE5C,6BAA6B;AAC7B,qBAAa,WAAY,SAAQ,MAAM;IACrC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,EAAE,EAAE,sBAAsB,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAE7B,kDAAkD;IAClD,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,YAAY,GAAG,EAAE,CAAC,oBAAoB,GAAG,EAAE,CAAC,cAAc,CAAC;IACjF,mEAAmE;IACnE,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC;IACnD,yEAAyE;IACzE,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC,cAAc,GAAG,EAAE,CAAC,YAAY,CAAqB;IAE9E,2DAA2D;IAC3D,UAAU,EAAE,MAAM,CAAK;IACvB,2BAA2B;IAC3B,SAAS,EAAE,MAAM,CAAK;gBAEV,MAAM,EAAE,WAAW,EAAE,KAAK,GAAE,WAAgB;IA4B/C,OAAO,IAAI,IAAI;IAexB,sEAAsE;IACtE,aAAa,CACX,IAAI,EAAE,WAAW,GAAG,eAAe,EACnC,UAAU,GAAE,MAAU,EACtB,UAAU,GAAE,MAAqC,GAChD,IAAI;IAoBP,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IA+B7C,KAAK,CAAC,IAAI,EAAE,eAAe,GAAG,eAAe,EAAE,UAAU,GAAE,MAAU,GAAG,IAAI;IAoBtE,gBAAgB,CACpB,QAAQ,EAAE,iBAAiB,CAAC,IAAI,CAAC,EACjC,UAAU,GAAE,MAAU,EACtB,UAAU,GAAE,MAAqC,GAChD,OAAO,CAAC,IAAI,CAAC;IAOV,SAAS,CAAC,UAAU,SAAI,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAIhF,eAAe,CAAC,CAAC,EACrB,QAAQ,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAC9B,UAAU,SAAI,EACd,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,CAAC,CAAC;IAMb,aAAa,CAAC,UAAU,SAAI,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC,WAAW,CAAC;CAe5E"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
import { Buffer } from '@luma.gl/core';
|
|
5
|
-
import { GL } from '@luma.gl/constants';
|
|
5
|
+
import { GL } from '@luma.gl/webgl/constants';
|
|
6
6
|
/** WebGL Buffer interface */
|
|
7
7
|
export class WEBGLBuffer extends Buffer {
|
|
8
8
|
device;
|
|
@@ -45,8 +45,13 @@ export class WEBGLBuffer extends Buffer {
|
|
|
45
45
|
destroy() {
|
|
46
46
|
if (!this.destroyed && this.handle) {
|
|
47
47
|
this.removeStats();
|
|
48
|
-
this.
|
|
49
|
-
|
|
48
|
+
if (!this.props.handle) {
|
|
49
|
+
this.trackDeallocatedMemory();
|
|
50
|
+
this.gl.deleteBuffer(this.handle);
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
this.trackDeallocatedReferencedMemory('Buffer');
|
|
54
|
+
}
|
|
50
55
|
this.destroyed = true;
|
|
51
56
|
// @ts-expect-error
|
|
52
57
|
this.handle = null;
|
|
@@ -63,7 +68,12 @@ export class WEBGLBuffer extends Buffer {
|
|
|
63
68
|
this.bytesUsed = byteLength;
|
|
64
69
|
this.byteLength = byteLength;
|
|
65
70
|
this._setDebugData(data, byteOffset, byteLength);
|
|
66
|
-
this.
|
|
71
|
+
if (!this.props.handle) {
|
|
72
|
+
this.trackAllocatedMemory(byteLength);
|
|
73
|
+
}
|
|
74
|
+
else {
|
|
75
|
+
this.trackReferencedMemory(byteLength, 'Buffer');
|
|
76
|
+
}
|
|
67
77
|
}
|
|
68
78
|
// Allocate a GPU buffer of specified size.
|
|
69
79
|
_initWithByteLength(byteLength) {
|
|
@@ -83,7 +93,12 @@ export class WEBGLBuffer extends Buffer {
|
|
|
83
93
|
this.bytesUsed = byteLength;
|
|
84
94
|
this.byteLength = byteLength;
|
|
85
95
|
this._setDebugData(null, 0, byteLength);
|
|
86
|
-
this.
|
|
96
|
+
if (!this.props.handle) {
|
|
97
|
+
this.trackAllocatedMemory(byteLength);
|
|
98
|
+
}
|
|
99
|
+
else {
|
|
100
|
+
this.trackReferencedMemory(byteLength, 'Buffer');
|
|
101
|
+
}
|
|
87
102
|
return this;
|
|
88
103
|
}
|
|
89
104
|
write(data, byteOffset = 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webgl-buffer.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-buffer.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAC,MAAM,EAAC,MAAM,eAAe,CAAC;AACrC,OAAO,EAAC,EAAE,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"webgl-buffer.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-buffer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { type CopyBufferToBufferOptions, type CopyBufferToTextureOptions, type CopyTextureToBufferOptions, type CopyTextureToTextureOptions, CommandBuffer } from '@luma.gl/core';
|
|
2
|
-
import { GL, type GLTextureTarget, type GLTextureCubeMapTarget } from '@luma.gl/constants';
|
|
1
|
+
import { type CommandBufferProps, type CopyBufferToBufferOptions, type CopyBufferToTextureOptions, type CopyTextureToBufferOptions, type CopyTextureToTextureOptions, CommandBuffer } from '@luma.gl/core';
|
|
2
|
+
import { GL, type GLTextureTarget, type GLTextureCubeMapTarget } from '@luma.gl/webgl/constants';
|
|
3
3
|
import { WebGLDevice } from "../webgl-device.js";
|
|
4
4
|
type CopyBufferToBufferCommand = {
|
|
5
5
|
name: 'copy-buffer-to-buffer';
|
|
@@ -30,7 +30,7 @@ export declare class WEBGLCommandBuffer extends CommandBuffer {
|
|
|
30
30
|
readonly device: WebGLDevice;
|
|
31
31
|
readonly handle: null;
|
|
32
32
|
commands: Command[];
|
|
33
|
-
constructor(device: WebGLDevice);
|
|
33
|
+
constructor(device: WebGLDevice, props?: CommandBufferProps);
|
|
34
34
|
_executeCommands(commands?: Command[]): void;
|
|
35
35
|
}
|
|
36
36
|
/** Clear one mip level of a texture *
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webgl-command-buffer.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-command-buffer.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,yBAAyB,EAC9B,KAAK,0BAA0B,EAC/B,KAAK,0BAA0B,EAC/B,KAAK,2BAA2B,EAGhC,aAAa,EAId,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,EAAE,EAAE,KAAK,eAAe,EAAE,KAAK,sBAAsB,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"webgl-command-buffer.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-command-buffer.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,yBAAyB,EAC9B,KAAK,0BAA0B,EAC/B,KAAK,0BAA0B,EAC/B,KAAK,2BAA2B,EAGhC,aAAa,EAId,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,EAAE,EAAE,KAAK,eAAe,EAAE,KAAK,sBAAsB,EAAC,MAAM,0BAA0B,CAAC;AAG/F,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAK5C,KAAK,yBAAyB,GAAG;IAC/B,IAAI,EAAE,uBAAuB,CAAC;IAC9B,OAAO,EAAE,yBAAyB,CAAC;CACpC,CAAC;AAEF,KAAK,0BAA0B,GAAG;IAChC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,OAAO,EAAE,0BAA0B,CAAC;CACrC,CAAC;AAEF,KAAK,0BAA0B,GAAG;IAChC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,OAAO,EAAE,0BAA0B,CAAC;CACrC,CAAC;AAEF,KAAK,2BAA2B,GAAG;IACjC,IAAI,EAAE,yBAAyB,CAAC;IAChC,OAAO,EAAE,2BAA2B,CAAC;CACtC,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,IAAI,EAAE,eAAe,CAAC;IACtB,OAAO,EAAE,EAAE,CAAC;CACb,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACxB,IAAI,EAAE,cAAc,CAAC;IACrB,OAAO,EAAE,EAAE,CAAC;CACb,CAAC;AAEF,KAAK,OAAO,GACR,yBAAyB,GACzB,0BAA0B,GAC1B,0BAA0B,GAC1B,2BAA2B,GAC3B,mBAAmB,GACnB,kBAAkB,CAAC;AAEvB,qBAAa,kBAAmB,SAAQ,aAAa;IACnD,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,OAAQ;IACvB,QAAQ,EAAE,OAAO,EAAE,CAAM;gBAEb,MAAM,EAAE,WAAW,EAAE,KAAK,GAAE,kBAAuB;IAK/D,gBAAgB,CAAC,QAAQ,GAAE,OAAO,EAAkB;CAuBrD;AAgPD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAkCI;AAMJ;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,eAAe,EACzB,SAAS,EAAE,IAAI,GAAG,IAAI,GAAG,UAAU,GAAG,MAAM,GAAG,YAAY,GAAG,IAAI,EAClE,KAAK,EAAE,MAAM,GACZ,eAAe,GAAG,sBAAsB,CAE1C;AAqBD;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAmB9D;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAcjD"}
|
|
@@ -3,17 +3,16 @@
|
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
import {
|
|
5
5
|
// type ClearTextureOptions,
|
|
6
|
-
// type TextureReadOptions
|
|
7
6
|
CommandBuffer, Texture, assertDefined } from '@luma.gl/core';
|
|
8
|
-
import { GL } from '@luma.gl/constants';
|
|
9
|
-
import { WEBGLTexture } from "./webgl-texture.js";
|
|
7
|
+
import { GL } from '@luma.gl/webgl/constants';
|
|
10
8
|
import { getTextureFormatWebGL } from "../converters/webgl-texture-table.js";
|
|
9
|
+
import { WEBGLTexture } from "./webgl-texture.js";
|
|
11
10
|
export class WEBGLCommandBuffer extends CommandBuffer {
|
|
12
11
|
device;
|
|
13
12
|
handle = null;
|
|
14
13
|
commands = [];
|
|
15
|
-
constructor(device) {
|
|
16
|
-
super(device,
|
|
14
|
+
constructor(device, props = {}) {
|
|
15
|
+
super(device, props);
|
|
17
16
|
this.device = device;
|
|
18
17
|
}
|
|
19
18
|
_executeCommands(commands = this.commands) {
|
|
@@ -55,48 +54,35 @@ function _copyBufferToBuffer(device, options) {
|
|
|
55
54
|
* Copies data from a Buffer object into a Texture object
|
|
56
55
|
* NOTE: doesn't wait for copy to be complete
|
|
57
56
|
*/
|
|
58
|
-
function _copyBufferToTexture(
|
|
59
|
-
throw new Error('
|
|
57
|
+
function _copyBufferToTexture(_device, _options) {
|
|
58
|
+
throw new Error('copyBufferToTexture is not supported in WebGL');
|
|
60
59
|
}
|
|
61
60
|
/**
|
|
62
61
|
* Copies data from a Texture object into a Buffer object.
|
|
63
62
|
* NOTE: doesn't wait for copy to be complete
|
|
64
63
|
*/
|
|
65
64
|
function _copyTextureToBuffer(device, options) {
|
|
66
|
-
const {
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
/** Offset, in bytes, from the beginning of the buffer to the start of the image data (default 0) */
|
|
82
|
-
byteOffset = 0,
|
|
83
|
-
/**
|
|
84
|
-
* The stride, in bytes, between the beginning of each block row and the subsequent block row.
|
|
85
|
-
* Required if there are multiple block rows (i.e. the copy height or depth is more than one block).
|
|
86
|
-
*/
|
|
87
|
-
bytesPerRow,
|
|
88
|
-
/**
|
|
89
|
-
* Number of block rows per single image of the texture.
|
|
90
|
-
* rowsPerImage × bytesPerRow is the stride, in bytes, between the beginning of each image of data and the subsequent image.
|
|
91
|
-
* Required if there are multiple images (i.e. the copy depth is more than one).
|
|
92
|
-
*/
|
|
93
|
-
rowsPerImage } = options;
|
|
65
|
+
const { sourceTexture, mipLevel = 0, aspect = 'all', width = options.sourceTexture.width, height = options.sourceTexture.height, depthOrArrayLayers, origin = [0, 0, 0], destinationBuffer, byteOffset = 0, bytesPerRow, rowsPerImage } = options;
|
|
66
|
+
if (sourceTexture instanceof Texture) {
|
|
67
|
+
sourceTexture.readBuffer({
|
|
68
|
+
x: origin[0] ?? 0,
|
|
69
|
+
y: origin[1] ?? 0,
|
|
70
|
+
z: origin[2] ?? 0,
|
|
71
|
+
width,
|
|
72
|
+
height,
|
|
73
|
+
depthOrArrayLayers,
|
|
74
|
+
mipLevel,
|
|
75
|
+
aspect,
|
|
76
|
+
byteOffset
|
|
77
|
+
}, destinationBuffer);
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
94
80
|
// TODO - Not possible to read just stencil or depth part in WebGL?
|
|
95
81
|
if (aspect !== 'all') {
|
|
96
82
|
throw new Error('aspect not supported in WebGL');
|
|
97
83
|
}
|
|
98
84
|
// TODO - mipLevels are set when attaching texture to framebuffer
|
|
99
|
-
if (mipLevel !== 0 || depthOrArrayLayers !==
|
|
85
|
+
if (mipLevel !== 0 || depthOrArrayLayers !== undefined || bytesPerRow || rowsPerImage) {
|
|
100
86
|
throw new Error('not implemented');
|
|
101
87
|
}
|
|
102
88
|
// Asynchronous read (PIXEL_PACK_BUFFER) is WebGL2 only feature
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webgl-command-buffer.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-command-buffer.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO;
|
|
1
|
+
{"version":3,"file":"webgl-command-buffer.js","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-command-buffer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CommandEncoder, CommandEncoderProps } from '@luma.gl/core';
|
|
1
|
+
import { CommandBufferProps, CommandEncoder, CommandEncoderProps } from '@luma.gl/core';
|
|
2
2
|
import type { RenderPassProps, ComputePass, ComputePassProps, QuerySet, Buffer, CopyBufferToBufferOptions, CopyBufferToTextureOptions, CopyTextureToBufferOptions, CopyTextureToTextureOptions } from '@luma.gl/core';
|
|
3
3
|
import { WEBGLCommandBuffer } from "./webgl-command-buffer.js";
|
|
4
4
|
import { WEBGLRenderPass } from "./webgl-render-pass.js";
|
|
@@ -9,9 +9,9 @@ export declare class WEBGLCommandEncoder extends CommandEncoder {
|
|
|
9
9
|
readonly commandBuffer: WEBGLCommandBuffer;
|
|
10
10
|
constructor(device: WebGLDevice, props: CommandEncoderProps);
|
|
11
11
|
destroy(): void;
|
|
12
|
-
finish(): WEBGLCommandBuffer;
|
|
13
|
-
beginRenderPass(props
|
|
14
|
-
beginComputePass(props
|
|
12
|
+
finish(props?: CommandBufferProps): WEBGLCommandBuffer;
|
|
13
|
+
beginRenderPass(props?: RenderPassProps): WEBGLRenderPass;
|
|
14
|
+
beginComputePass(props?: ComputePassProps): ComputePass;
|
|
15
15
|
copyBufferToBuffer(options: CopyBufferToBufferOptions): void;
|
|
16
16
|
copyBufferToTexture(options: CopyBufferToTextureOptions): void;
|
|
17
17
|
copyTextureToBuffer(options: CopyTextureToBufferOptions): void;
|
|
@@ -19,10 +19,11 @@ export declare class WEBGLCommandEncoder extends CommandEncoder {
|
|
|
19
19
|
pushDebugGroup(groupLabel: string): void;
|
|
20
20
|
popDebugGroup(): void;
|
|
21
21
|
insertDebugMarker(markerLabel: string): void;
|
|
22
|
-
resolveQuerySet(
|
|
22
|
+
resolveQuerySet(_querySet: QuerySet, _destination: Buffer, _options?: {
|
|
23
23
|
firstQuery?: number;
|
|
24
24
|
queryCount?: number;
|
|
25
25
|
destinationOffset?: number;
|
|
26
26
|
}): void;
|
|
27
|
+
writeTimestamp(querySet: QuerySet, queryIndex: number): void;
|
|
27
28
|
}
|
|
28
29
|
//# sourceMappingURL=webgl-command-encoder.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webgl-command-encoder.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-command-encoder.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"webgl-command-encoder.d.ts","sourceRoot":"","sources":["../../../src/adapter/resources/webgl-command-encoder.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,kBAAkB,EAAE,cAAc,EAAE,mBAAmB,EAAC,MAAM,eAAe,CAAC;AACtF,OAAO,KAAK,EACV,eAAe,EACf,WAAW,EACX,gBAAgB,EAChB,QAAQ,EACR,MAAM,EACN,yBAAyB,EACzB,0BAA0B,EAC1B,0BAA0B,EAC1B,2BAA2B,EAG5B,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAC,kBAAkB,EAAC,kCAA+B;AAC1D,OAAO,EAAC,eAAe,EAAC,+BAA4B;AACpD,OAAO,EAAC,WAAW,EAAC,2BAAwB;AAG5C,qBAAa,mBAAoB,SAAQ,cAAc;IACrD,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,OAAQ;IAEvB,QAAQ,CAAC,aAAa,EAAE,kBAAkB,CAAC;gBAE/B,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,mBAAmB;IAQlD,OAAO,IAAI,IAAI;IAIf,MAAM,CAAC,KAAK,CAAC,EAAE,kBAAkB,GAAG,kBAAkB;IAS/D,eAAe,CAAC,KAAK,GAAE,eAAoB,GAAG,eAAe;IAI7D,gBAAgB,CAAC,KAAK,GAAE,gBAAqB,GAAG,WAAW;IAI3D,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,IAAI;IAI5D,mBAAmB,CAAC,OAAO,EAAE,0BAA0B;IAIvD,mBAAmB,CAAC,OAAO,EAAE,0BAA0B,GAAG,IAAI;IAI9D,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,GAAG,IAAI;IAQvD,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IACxC,aAAa;IAEb,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAE5C,eAAe,CACtB,SAAS,EAAE,QAAQ,EACnB,YAAY,EAAE,MAAM,EACpB,QAAQ,CAAC,EAAE;QACT,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B,GACA,IAAI;IAIP,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;CAI7D"}
|