@luma.gl/webgl 8.6.0-alpha.1 → 8.6.0-alpha.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.
Files changed (651) hide show
  1. package/dist/api/device2.d.ts +52 -0
  2. package/dist/api/device2.d.ts.map +1 -0
  3. package/dist/api/device2.js +23 -0
  4. package/dist/api/device2.js.map +1 -0
  5. package/dist/classes/accessor.js +2 -2
  6. package/dist/classes/accessor.js.map +1 -1
  7. package/dist/classes/accessor.ts.disabled +1 -1
  8. package/dist/classes/clear.d.ts +3 -2
  9. package/dist/classes/clear.d.ts.map +1 -1
  10. package/dist/classes/clear.js +7 -4
  11. package/dist/classes/clear.js.map +1 -1
  12. package/dist/classes/copy-and-blit.d.ts +18 -1
  13. package/dist/classes/copy-and-blit.d.ts.map +1 -1
  14. package/dist/classes/copy-and-blit.js +30 -25
  15. package/dist/classes/copy-and-blit.js.map +1 -1
  16. package/dist/classes/framebuffer.d.ts +10 -1
  17. package/dist/classes/framebuffer.d.ts.map +1 -1
  18. package/dist/classes/framebuffer.js +15 -15
  19. package/dist/classes/framebuffer.js.map +1 -1
  20. package/dist/classes/program-configuration.d.ts +2 -2
  21. package/dist/classes/program-configuration.d.ts.map +1 -1
  22. package/dist/classes/program-configuration.js +1 -1
  23. package/dist/classes/program-configuration.js.map +1 -1
  24. package/dist/classes/program.d.ts +6 -6
  25. package/dist/classes/program.d.ts.map +1 -1
  26. package/dist/classes/program.js +11 -9
  27. package/dist/classes/program.js.map +1 -1
  28. package/dist/classes/query.d.ts.map +1 -1
  29. package/dist/classes/query.js +6 -5
  30. package/dist/classes/query.js.map +1 -1
  31. package/dist/classes/renderbuffer-formats.js +1 -1
  32. package/dist/classes/renderbuffer-formats.js.map +1 -1
  33. package/dist/classes/renderbuffer.d.ts.map +1 -1
  34. package/dist/classes/renderbuffer.js +4 -3
  35. package/dist/classes/renderbuffer.js.map +1 -1
  36. package/dist/classes/texture-2d.d.ts +4 -3
  37. package/dist/classes/texture-2d.d.ts.map +1 -1
  38. package/dist/classes/texture-2d.js +5 -8
  39. package/dist/classes/texture-2d.js.map +1 -1
  40. package/dist/classes/texture-3d.d.ts +3 -2
  41. package/dist/classes/texture-3d.d.ts.map +1 -1
  42. package/dist/classes/texture-3d.js +15 -6
  43. package/dist/classes/texture-3d.js.map +1 -1
  44. package/dist/classes/texture-cube.d.ts +2 -1
  45. package/dist/classes/texture-cube.d.ts.map +1 -1
  46. package/dist/classes/texture-cube.js +3 -4
  47. package/dist/classes/texture-cube.js.map +1 -1
  48. package/dist/classes/texture-formats.js +1 -1
  49. package/dist/classes/texture-formats.js.map +1 -1
  50. package/dist/classes/texture.d.ts +14 -9
  51. package/dist/classes/texture.d.ts.map +1 -1
  52. package/dist/classes/texture.js +19 -18
  53. package/dist/classes/texture.js.map +1 -1
  54. package/dist/classes/transform-feedback.d.ts.map +1 -1
  55. package/dist/classes/transform-feedback.js +5 -4
  56. package/dist/classes/transform-feedback.js.map +1 -1
  57. package/dist/classes/uniform-buffer-layout.js +1 -1
  58. package/dist/classes/uniform-buffer-layout.js.map +1 -1
  59. package/dist/classes/uniforms.d.ts +0 -1
  60. package/dist/classes/uniforms.d.ts.map +1 -1
  61. package/dist/classes/uniforms.js +1 -2
  62. package/dist/classes/uniforms.js.map +1 -1
  63. package/dist/classes/vertex-array-object.d.ts +1 -1
  64. package/dist/classes/vertex-array-object.d.ts.map +1 -1
  65. package/dist/classes/vertex-array-object.js +8 -9
  66. package/dist/classes/vertex-array-object.js.map +1 -1
  67. package/dist/classes/vertex-array.d.ts +1 -1
  68. package/dist/classes/vertex-array.d.ts.map +1 -1
  69. package/dist/classes/vertex-array.js +1 -2
  70. package/dist/classes/vertex-array.js.map +1 -1
  71. package/dist/classes/webgl-buffer.d.ts +2 -0
  72. package/dist/classes/webgl-buffer.d.ts.map +1 -1
  73. package/dist/classes/webgl-buffer.js +8 -5
  74. package/dist/classes/webgl-buffer.js.map +1 -1
  75. package/dist/classes/webgl-resource.d.ts +6 -4
  76. package/dist/classes/webgl-resource.d.ts.map +1 -1
  77. package/dist/classes/webgl-resource.js +12 -8
  78. package/dist/classes/webgl-resource.js.map +1 -1
  79. package/dist/classes/webgl-shader.d.ts +3 -1
  80. package/dist/classes/webgl-shader.d.ts.map +1 -1
  81. package/dist/classes/webgl-shader.js +7 -4
  82. package/dist/classes/webgl-shader.js.map +1 -1
  83. package/dist/context/context/context-state.d.ts +18 -0
  84. package/dist/context/context/context-state.d.ts.map +1 -0
  85. package/dist/context/context/context-state.js +26 -0
  86. package/dist/context/context/context-state.js.map +1 -0
  87. package/dist/context/context/create-context.d.ts +40 -0
  88. package/dist/context/context/create-context.d.ts.map +1 -0
  89. package/dist/context/context/create-context.js +37 -0
  90. package/dist/context/context/create-context.js.map +1 -0
  91. package/dist/context/context/device-pixels.d.ts +25 -0
  92. package/dist/context/context/device-pixels.d.ts.map +1 -0
  93. package/dist/context/context/device-pixels.js +98 -0
  94. package/dist/context/context/device-pixels.js.map +1 -0
  95. package/dist/context/context/get-canvas.d.ts +13 -0
  96. package/dist/context/context/get-canvas.d.ts.map +1 -0
  97. package/dist/context/context/get-canvas.js +31 -0
  98. package/dist/context/context/get-canvas.js.map +1 -0
  99. package/dist/context/context/resize-context.d.ts +20 -0
  100. package/dist/context/context/resize-context.d.ts.map +1 -0
  101. package/dist/context/context/resize-context.js +15 -0
  102. package/dist/context/context/resize-context.js.map +1 -0
  103. package/dist/context/context/webgl-checks.d.ts +13 -0
  104. package/dist/context/context/webgl-checks.d.ts.map +1 -0
  105. package/dist/context/context/webgl-checks.js +34 -0
  106. package/dist/context/context/webgl-checks.js.map +1 -0
  107. package/dist/context/parameters/unified-parameter-api.d.ts +30 -0
  108. package/dist/context/parameters/unified-parameter-api.d.ts.map +1 -0
  109. package/dist/context/parameters/unified-parameter-api.js +65 -0
  110. package/dist/context/parameters/unified-parameter-api.js.map +1 -0
  111. package/dist/context/parameters/webgl-parameter-tables.d.ts +169 -0
  112. package/dist/context/parameters/webgl-parameter-tables.d.ts.map +1 -0
  113. package/dist/context/parameters/webgl-parameter-tables.js +445 -0
  114. package/dist/context/parameters/webgl-parameter-tables.js.map +1 -0
  115. package/dist/context/parameters/webgl-parameters.d.ts +144 -0
  116. package/dist/context/parameters/webgl-parameters.d.ts.map +1 -0
  117. package/dist/context/parameters/webgl-parameters.js +2 -0
  118. package/dist/context/parameters/webgl-parameters.js.map +1 -0
  119. package/dist/context/polyfill/get-parameter-polyfill.d.ts +2 -0
  120. package/dist/context/polyfill/get-parameter-polyfill.d.ts.map +1 -0
  121. package/dist/context/polyfill/get-parameter-polyfill.js +91 -0
  122. package/dist/context/polyfill/get-parameter-polyfill.js.map +1 -0
  123. package/dist/context/polyfill/polyfill-context.d.ts +5 -0
  124. package/dist/context/polyfill/polyfill-context.d.ts.map +1 -0
  125. package/dist/context/polyfill/polyfill-context.js +91 -0
  126. package/dist/context/polyfill/polyfill-context.js.map +1 -0
  127. package/dist/context/polyfill/polyfill-table.d.ts +48 -0
  128. package/dist/context/polyfill/polyfill-table.d.ts.map +1 -0
  129. package/dist/context/polyfill/polyfill-table.js +160 -0
  130. package/dist/context/polyfill/polyfill-table.js.map +1 -0
  131. package/dist/context/polyfill/polyfill-vertex-array-object.d.ts +2 -0
  132. package/dist/context/polyfill/polyfill-vertex-array-object.d.ts.map +1 -0
  133. package/dist/context/polyfill/polyfill-vertex-array-object.js +335 -0
  134. package/dist/context/polyfill/polyfill-vertex-array-object.js.map +1 -0
  135. package/dist/context/state-tracker/deep-array-equal.d.ts +3 -0
  136. package/dist/context/state-tracker/deep-array-equal.d.ts.map +1 -0
  137. package/dist/context/state-tracker/deep-array-equal.js +21 -0
  138. package/dist/context/state-tracker/deep-array-equal.js.map +1 -0
  139. package/dist/context/state-tracker/track-context-state.d.ts +22 -0
  140. package/dist/context/state-tracker/track-context-state.d.ts.map +1 -0
  141. package/dist/context/state-tracker/track-context-state.js +169 -0
  142. package/dist/context/state-tracker/track-context-state.js.map +1 -0
  143. package/dist/context/state-tracker/with-parameters.d.ts +13 -0
  144. package/dist/context/state-tracker/with-parameters.d.ts.map +1 -0
  145. package/dist/context/state-tracker/with-parameters.js +36 -0
  146. package/dist/context/state-tracker/with-parameters.js.map +1 -0
  147. package/dist/debug/debug-uniforms.js +1 -1
  148. package/dist/debug/debug-uniforms.js.map +1 -1
  149. package/dist/debug/debug-vertex-array.js +2 -2
  150. package/dist/debug/debug-vertex-array.js.map +1 -1
  151. package/dist/device/check-glsl-extension.d.ts +4 -0
  152. package/dist/device/check-glsl-extension.d.ts.map +1 -0
  153. package/dist/device/check-glsl-extension.js +22 -0
  154. package/dist/device/check-glsl-extension.js.map +1 -0
  155. package/dist/device/device-features.d.ts +12 -0
  156. package/dist/device/device-features.d.ts.map +1 -0
  157. package/dist/device/device-features.js +123 -0
  158. package/dist/device/device-features.js.map +1 -0
  159. package/dist/device/device-limits.d.ts +51 -0
  160. package/dist/device/device-limits.d.ts.map +1 -0
  161. package/dist/device/device-limits.js +90 -0
  162. package/dist/device/device-limits.js.map +1 -0
  163. package/dist/device/get-device-info.d.ts +4 -0
  164. package/dist/device/get-device-info.d.ts.map +1 -0
  165. package/dist/device/get-device-info.js +44 -0
  166. package/dist/device/get-device-info.js.map +1 -0
  167. package/dist/device/webgl-device.d.ts +111 -0
  168. package/dist/device/webgl-device.d.ts.map +1 -0
  169. package/dist/device/webgl-device.js +208 -0
  170. package/dist/device/webgl-device.js.map +1 -0
  171. package/dist/es5/api/device2.js +42 -0
  172. package/dist/es5/api/device2.js.map +1 -0
  173. package/dist/es5/bundle.js +1 -1
  174. package/dist/es5/bundle.js.map +1 -1
  175. package/dist/es5/classes/accessor.js +104 -74
  176. package/dist/es5/classes/accessor.js.map +1 -1
  177. package/dist/es5/classes/accessor.ts.disabled +1 -1
  178. package/dist/es5/classes/clear.js +55 -34
  179. package/dist/es5/classes/clear.js.map +1 -1
  180. package/dist/es5/classes/copy-and-blit.js +175 -156
  181. package/dist/es5/classes/copy-and-blit.js.map +1 -1
  182. package/dist/es5/classes/framebuffer.js +647 -518
  183. package/dist/es5/classes/framebuffer.js.map +1 -1
  184. package/dist/es5/classes/program-configuration.js +138 -121
  185. package/dist/es5/classes/program-configuration.js.map +1 -1
  186. package/dist/es5/classes/program.js +368 -292
  187. package/dist/es5/classes/program.js.map +1 -1
  188. package/dist/es5/classes/query.js +172 -107
  189. package/dist/es5/classes/query.js.map +1 -1
  190. package/dist/es5/classes/renderbuffer-formats.js +126 -164
  191. package/dist/es5/classes/renderbuffer-formats.js.map +1 -1
  192. package/dist/es5/classes/renderbuffer.js +151 -98
  193. package/dist/es5/classes/renderbuffer.js.map +1 -1
  194. package/dist/es5/classes/texture-2d.js +44 -17
  195. package/dist/es5/classes/texture-2d.js.map +1 -1
  196. package/dist/es5/classes/texture-3d.js +107 -48
  197. package/dist/es5/classes/texture-3d.js.map +1 -1
  198. package/dist/es5/classes/texture-cube.js +169 -110
  199. package/dist/es5/classes/texture-cube.js.map +1 -1
  200. package/dist/es5/classes/texture-formats.js +42 -71
  201. package/dist/es5/classes/texture-formats.js.map +1 -1
  202. package/dist/es5/classes/texture.js +780 -665
  203. package/dist/es5/classes/texture.js.map +1 -1
  204. package/dist/es5/classes/transform-feedback.js +206 -150
  205. package/dist/es5/classes/transform-feedback.js.map +1 -1
  206. package/dist/es5/classes/uniform-buffer-layout.js +103 -89
  207. package/dist/es5/classes/uniform-buffer-layout.js.map +1 -1
  208. package/dist/es5/classes/uniforms.js +39 -80
  209. package/dist/es5/classes/uniforms.js.map +1 -1
  210. package/dist/es5/classes/vertex-array-object.js +268 -209
  211. package/dist/es5/classes/vertex-array-object.js.map +1 -1
  212. package/dist/es5/classes/vertex-array.js +348 -303
  213. package/dist/es5/classes/vertex-array.js.map +1 -1
  214. package/dist/es5/classes/webgl-buffer.js +374 -303
  215. package/dist/es5/classes/webgl-buffer.js.map +1 -1
  216. package/dist/es5/classes/webgl-resource.js +231 -161
  217. package/dist/es5/classes/webgl-resource.js.map +1 -1
  218. package/dist/es5/classes/webgl-shader.js +230 -134
  219. package/dist/es5/classes/webgl-shader.js.map +1 -1
  220. package/dist/es5/context/context/context-state.js +31 -0
  221. package/dist/es5/context/context/context-state.js.map +1 -0
  222. package/dist/es5/context/context/create-context.js +57 -0
  223. package/dist/es5/context/context/create-context.js.map +1 -0
  224. package/dist/es5/context/context/device-pixels.js +115 -0
  225. package/dist/es5/context/context/device-pixels.js.map +1 -0
  226. package/dist/es5/context/context/get-canvas.js +40 -0
  227. package/dist/es5/context/context/get-canvas.js.map +1 -0
  228. package/dist/es5/context/context/resize-context.js +23 -0
  229. package/dist/es5/context/context/resize-context.js.map +1 -0
  230. package/dist/es5/context/context/webgl-checks.js +54 -0
  231. package/dist/es5/context/context/webgl-checks.js.map +1 -0
  232. package/dist/es5/context/parameters/unified-parameter-api.js +95 -0
  233. package/dist/es5/context/parameters/unified-parameter-api.js.map +1 -0
  234. package/dist/es5/context/parameters/webgl-parameter-tables.js +392 -0
  235. package/dist/es5/context/parameters/webgl-parameter-tables.js.map +1 -0
  236. package/dist/es5/context/parameters/webgl-parameters.js +6 -0
  237. package/dist/es5/context/parameters/webgl-parameters.js.map +1 -0
  238. package/dist/es5/context/polyfill/get-parameter-polyfill.js +81 -0
  239. package/dist/es5/context/polyfill/get-parameter-polyfill.js.map +1 -0
  240. package/dist/es5/context/polyfill/polyfill-context.js +134 -0
  241. package/dist/es5/context/polyfill/polyfill-context.js.map +1 -0
  242. package/dist/es5/context/polyfill/polyfill-table.js +166 -0
  243. package/dist/es5/context/polyfill/polyfill-table.js.map +1 -0
  244. package/dist/es5/context/polyfill/polyfill-vertex-array-object.js +341 -0
  245. package/dist/es5/context/polyfill/polyfill-vertex-array-object.js.map +1 -0
  246. package/dist/es5/context/state-tracker/deep-array-equal.js +28 -0
  247. package/dist/es5/context/state-tracker/deep-array-equal.js.map +1 -0
  248. package/dist/es5/context/state-tracker/track-context-state.js +196 -0
  249. package/dist/es5/context/state-tracker/track-context-state.js.map +1 -0
  250. package/dist/es5/context/state-tracker/with-parameters.js +44 -0
  251. package/dist/es5/context/state-tracker/with-parameters.js.map +1 -0
  252. package/dist/es5/debug/debug-program-configuration.js +48 -20
  253. package/dist/es5/debug/debug-program-configuration.js.map +1 -1
  254. package/dist/es5/debug/debug-uniforms.js +110 -70
  255. package/dist/es5/debug/debug-uniforms.js.map +1 -1
  256. package/dist/es5/debug/debug-vertex-array.js +49 -54
  257. package/dist/es5/debug/debug-vertex-array.js.map +1 -1
  258. package/dist/es5/device/check-glsl-extension.js +33 -0
  259. package/dist/es5/device/check-glsl-extension.js.map +1 -0
  260. package/dist/es5/device/device-features.js +152 -0
  261. package/dist/es5/device/device-features.js.map +1 -0
  262. package/dist/es5/device/device-limits.js +64 -0
  263. package/dist/es5/device/device-limits.js.map +1 -0
  264. package/dist/es5/device/get-device-info.js +55 -0
  265. package/dist/es5/device/get-device-info.js.map +1 -0
  266. package/dist/es5/device/webgl-device.js +279 -0
  267. package/dist/es5/device/webgl-device.js.map +1 -0
  268. package/dist/es5/index.js +179 -189
  269. package/dist/es5/index.js.map +1 -1
  270. package/dist/es5/init.js +18 -14
  271. package/dist/es5/init.js.map +1 -1
  272. package/dist/es5/webgl-utils/attribute-utils.js +74 -87
  273. package/dist/es5/webgl-utils/attribute-utils.js.map +1 -1
  274. package/dist/es5/webgl-utils/constants-to-keys.js +7 -7
  275. package/dist/es5/webgl-utils/constants-to-keys.js.map +1 -1
  276. package/dist/es5/webgl-utils/format-utils.js +4 -4
  277. package/dist/es5/webgl-utils/format-utils.js.map +1 -1
  278. package/dist/es5/webgl-utils/get-error.js +18 -18
  279. package/dist/es5/webgl-utils/get-error.js.map +1 -1
  280. package/dist/es5/webgl-utils/index.js +10 -10
  281. package/dist/es5/webgl-utils/is-old-ie.js +16 -0
  282. package/dist/es5/webgl-utils/is-old-ie.js.map +1 -0
  283. package/dist/es5/webgl-utils/parse-shader-compiler-log.js +53 -25
  284. package/dist/es5/webgl-utils/parse-shader-compiler-log.js.map +1 -1
  285. package/dist/es5/webgl-utils/texture-utils.js +32 -36
  286. package/dist/es5/webgl-utils/texture-utils.js.map +1 -1
  287. package/dist/es5/webgl-utils/typed-array-utils.js +33 -32
  288. package/dist/es5/webgl-utils/typed-array-utils.js.map +1 -1
  289. package/dist/es5/webgl-utils/webgl-info.ts.disabled +135 -0
  290. package/dist/esm/api/device2.js +23 -0
  291. package/dist/esm/api/device2.js.map +1 -0
  292. package/dist/esm/classes/accessor.js +2 -2
  293. package/dist/esm/classes/accessor.js.map +1 -1
  294. package/dist/esm/classes/accessor.ts.disabled +1 -1
  295. package/dist/esm/classes/clear.js +7 -4
  296. package/dist/esm/classes/clear.js.map +1 -1
  297. package/dist/esm/classes/copy-and-blit.js +30 -25
  298. package/dist/esm/classes/copy-and-blit.js.map +1 -1
  299. package/dist/esm/classes/framebuffer.js +15 -15
  300. package/dist/esm/classes/framebuffer.js.map +1 -1
  301. package/dist/esm/classes/program-configuration.js +1 -1
  302. package/dist/esm/classes/program-configuration.js.map +1 -1
  303. package/dist/esm/classes/program.js +11 -9
  304. package/dist/esm/classes/program.js.map +1 -1
  305. package/dist/esm/classes/query.js +6 -5
  306. package/dist/esm/classes/query.js.map +1 -1
  307. package/dist/esm/classes/renderbuffer-formats.js +1 -1
  308. package/dist/esm/classes/renderbuffer-formats.js.map +1 -1
  309. package/dist/esm/classes/renderbuffer.js +4 -3
  310. package/dist/esm/classes/renderbuffer.js.map +1 -1
  311. package/dist/esm/classes/texture-2d.js +5 -8
  312. package/dist/esm/classes/texture-2d.js.map +1 -1
  313. package/dist/esm/classes/texture-3d.js +15 -6
  314. package/dist/esm/classes/texture-3d.js.map +1 -1
  315. package/dist/esm/classes/texture-cube.js +3 -4
  316. package/dist/esm/classes/texture-cube.js.map +1 -1
  317. package/dist/esm/classes/texture-formats.js +1 -1
  318. package/dist/esm/classes/texture-formats.js.map +1 -1
  319. package/dist/esm/classes/texture.js +19 -18
  320. package/dist/esm/classes/texture.js.map +1 -1
  321. package/dist/esm/classes/transform-feedback.js +5 -4
  322. package/dist/esm/classes/transform-feedback.js.map +1 -1
  323. package/dist/esm/classes/uniform-buffer-layout.js +1 -1
  324. package/dist/esm/classes/uniform-buffer-layout.js.map +1 -1
  325. package/dist/esm/classes/uniforms.js +1 -2
  326. package/dist/esm/classes/uniforms.js.map +1 -1
  327. package/dist/esm/classes/vertex-array-object.js +8 -9
  328. package/dist/esm/classes/vertex-array-object.js.map +1 -1
  329. package/dist/esm/classes/vertex-array.js +1 -2
  330. package/dist/esm/classes/vertex-array.js.map +1 -1
  331. package/dist/esm/classes/webgl-buffer.js +8 -5
  332. package/dist/esm/classes/webgl-buffer.js.map +1 -1
  333. package/dist/esm/classes/webgl-resource.js +12 -8
  334. package/dist/esm/classes/webgl-resource.js.map +1 -1
  335. package/dist/esm/classes/webgl-shader.js +7 -4
  336. package/dist/esm/classes/webgl-shader.js.map +1 -1
  337. package/dist/esm/context/context/context-state.js +26 -0
  338. package/dist/esm/context/context/context-state.js.map +1 -0
  339. package/dist/esm/context/context/create-context.js +37 -0
  340. package/dist/esm/context/context/create-context.js.map +1 -0
  341. package/dist/esm/context/context/device-pixels.js +98 -0
  342. package/dist/esm/context/context/device-pixels.js.map +1 -0
  343. package/dist/esm/context/context/get-canvas.js +31 -0
  344. package/dist/esm/context/context/get-canvas.js.map +1 -0
  345. package/dist/esm/context/context/resize-context.js +15 -0
  346. package/dist/esm/context/context/resize-context.js.map +1 -0
  347. package/dist/esm/context/context/webgl-checks.js +34 -0
  348. package/dist/esm/context/context/webgl-checks.js.map +1 -0
  349. package/dist/esm/context/parameters/unified-parameter-api.js +65 -0
  350. package/dist/esm/context/parameters/unified-parameter-api.js.map +1 -0
  351. package/dist/esm/context/parameters/webgl-parameter-tables.js +445 -0
  352. package/dist/esm/context/parameters/webgl-parameter-tables.js.map +1 -0
  353. package/dist/esm/context/parameters/webgl-parameters.js +2 -0
  354. package/dist/esm/context/parameters/webgl-parameters.js.map +1 -0
  355. package/dist/esm/context/polyfill/get-parameter-polyfill.js +91 -0
  356. package/dist/esm/context/polyfill/get-parameter-polyfill.js.map +1 -0
  357. package/dist/esm/context/polyfill/polyfill-context.js +91 -0
  358. package/dist/esm/context/polyfill/polyfill-context.js.map +1 -0
  359. package/dist/esm/context/polyfill/polyfill-table.js +160 -0
  360. package/dist/esm/context/polyfill/polyfill-table.js.map +1 -0
  361. package/dist/esm/context/polyfill/polyfill-vertex-array-object.js +335 -0
  362. package/dist/esm/context/polyfill/polyfill-vertex-array-object.js.map +1 -0
  363. package/dist/esm/context/state-tracker/deep-array-equal.js +21 -0
  364. package/dist/esm/context/state-tracker/deep-array-equal.js.map +1 -0
  365. package/dist/esm/context/state-tracker/track-context-state.js +169 -0
  366. package/dist/esm/context/state-tracker/track-context-state.js.map +1 -0
  367. package/dist/esm/context/state-tracker/with-parameters.js +36 -0
  368. package/dist/esm/context/state-tracker/with-parameters.js.map +1 -0
  369. package/dist/esm/debug/debug-uniforms.js +1 -1
  370. package/dist/esm/debug/debug-uniforms.js.map +1 -1
  371. package/dist/esm/debug/debug-vertex-array.js +2 -2
  372. package/dist/esm/debug/debug-vertex-array.js.map +1 -1
  373. package/dist/esm/device/check-glsl-extension.js +22 -0
  374. package/dist/esm/device/check-glsl-extension.js.map +1 -0
  375. package/dist/esm/device/device-features.js +123 -0
  376. package/dist/esm/device/device-features.js.map +1 -0
  377. package/dist/esm/device/device-limits.js +90 -0
  378. package/dist/esm/device/device-limits.js.map +1 -0
  379. package/dist/esm/device/get-device-info.js +44 -0
  380. package/dist/esm/device/get-device-info.js.map +1 -0
  381. package/dist/esm/device/webgl-device.js +208 -0
  382. package/dist/esm/device/webgl-device.js.map +1 -0
  383. package/dist/esm/index.js +22 -20
  384. package/dist/esm/index.js.map +1 -1
  385. package/dist/esm/init.js +11 -8
  386. package/dist/esm/init.js.map +1 -1
  387. package/dist/esm/webgl-utils/attribute-utils.js +1 -1
  388. package/dist/esm/webgl-utils/attribute-utils.js.map +1 -1
  389. package/dist/esm/webgl-utils/constants-to-keys.js +1 -1
  390. package/dist/esm/webgl-utils/constants-to-keys.js.map +1 -1
  391. package/dist/esm/webgl-utils/format-utils.js +1 -1
  392. package/dist/esm/webgl-utils/format-utils.js.map +1 -1
  393. package/dist/esm/{features/check-old-ie.js → webgl-utils/is-old-ie.js} +3 -3
  394. package/dist/esm/webgl-utils/is-old-ie.js.map +1 -0
  395. package/dist/esm/webgl-utils/texture-utils.js +2 -2
  396. package/dist/esm/webgl-utils/texture-utils.js.map +1 -1
  397. package/dist/esm/webgl-utils/typed-array-utils.js +22 -18
  398. package/dist/esm/webgl-utils/typed-array-utils.js.map +1 -1
  399. package/dist/esm/webgl-utils/webgl-info.ts.disabled +135 -0
  400. package/dist/index.d.ts +36 -20
  401. package/dist/index.d.ts.map +1 -1
  402. package/dist/index.js +22 -20
  403. package/dist/index.js.map +1 -1
  404. package/dist/init.d.ts.map +1 -1
  405. package/dist/init.js +11 -8
  406. package/dist/init.js.map +1 -1
  407. package/dist/webgl-utils/attribute-utils.d.ts +1 -1
  408. package/dist/webgl-utils/attribute-utils.js +1 -1
  409. package/dist/webgl-utils/attribute-utils.js.map +1 -1
  410. package/dist/webgl-utils/constants-to-keys.js +1 -1
  411. package/dist/webgl-utils/constants-to-keys.js.map +1 -1
  412. package/dist/webgl-utils/format-utils.d.ts +2 -2
  413. package/dist/webgl-utils/format-utils.js +1 -1
  414. package/dist/webgl-utils/format-utils.js.map +1 -1
  415. package/dist/webgl-utils/is-old-ie.d.ts +2 -0
  416. package/dist/webgl-utils/is-old-ie.d.ts.map +1 -0
  417. package/dist/{features/check-old-ie.js → webgl-utils/is-old-ie.js} +3 -3
  418. package/dist/webgl-utils/is-old-ie.js.map +1 -0
  419. package/dist/webgl-utils/texture-utils.d.ts +12 -8
  420. package/dist/webgl-utils/texture-utils.d.ts.map +1 -1
  421. package/dist/webgl-utils/texture-utils.js +2 -2
  422. package/dist/webgl-utils/texture-utils.js.map +1 -1
  423. package/dist/webgl-utils/typed-array-utils.d.ts +39 -32
  424. package/dist/webgl-utils/typed-array-utils.d.ts.map +1 -1
  425. package/dist/webgl-utils/typed-array-utils.js +22 -18
  426. package/dist/webgl-utils/typed-array-utils.js.map +1 -1
  427. package/dist/webgl-utils/webgl-info.ts.disabled +135 -0
  428. package/package.json +5 -6
  429. package/src/.DS_Store +0 -0
  430. package/src/api/device2.ts +71 -0
  431. package/src/classes/accessor.js +2 -2
  432. package/src/classes/accessor.ts.disabled +1 -1
  433. package/src/classes/clear.ts +9 -4
  434. package/src/classes/copy-and-blit.ts +49 -52
  435. package/src/classes/framebuffer.ts +38 -35
  436. package/src/classes/program-configuration.ts +6 -6
  437. package/src/classes/program.ts +21 -15
  438. package/src/classes/query.ts +6 -6
  439. package/src/classes/renderbuffer-formats.ts +1 -1
  440. package/src/classes/renderbuffer.ts +5 -4
  441. package/src/classes/texture-2d.ts +6 -11
  442. package/src/classes/texture-3d.ts +16 -11
  443. package/src/classes/texture-cube.ts +7 -7
  444. package/src/classes/texture-formats.ts +1 -1
  445. package/src/classes/texture.ts +39 -40
  446. package/src/classes/transform-feedback.ts +14 -13
  447. package/src/classes/uniform-buffer-layout.ts +1 -1
  448. package/src/classes/uniforms.ts +4 -10
  449. package/src/classes/vertex-array-object.ts +10 -14
  450. package/src/classes/vertex-array.ts +2 -3
  451. package/src/classes/webgl-buffer.ts +7 -5
  452. package/src/classes/webgl-resource.ts +20 -18
  453. package/src/classes/webgl-shader.ts +6 -4
  454. package/src/context/context/context-state.ts +39 -0
  455. package/src/context/context/create-context.ts +83 -0
  456. package/src/context/context/device-pixels.ts +147 -0
  457. package/src/context/context/get-canvas.ts +37 -0
  458. package/src/context/context/resize-context.ts +37 -0
  459. package/src/context/context/webgl-checks.ts +49 -0
  460. package/src/context/parameters/unified-parameter-api.ts +127 -0
  461. package/src/context/parameters/webgl-parameter-tables.ts +625 -0
  462. package/src/context/parameters/webgl-parameters.ts +197 -0
  463. package/src/context/polyfill/get-parameter-polyfill.ts +118 -0
  464. package/src/context/polyfill/polyfill-context.ts +98 -0
  465. package/src/context/polyfill/polyfill-table.ts +162 -0
  466. package/src/context/polyfill/polyfill-vertex-array-object.ts +360 -0
  467. package/src/context/state-tracker/deep-array-equal.ts +20 -0
  468. package/src/context/state-tracker/track-context-state.ts +250 -0
  469. package/src/context/state-tracker/with-parameters.ts +50 -0
  470. package/src/debug/debug-uniforms.ts +1 -1
  471. package/src/debug/debug-vertex-array.ts +2 -4
  472. package/src/device/check-glsl-extension.ts +44 -0
  473. package/src/device/device-features.ts +227 -0
  474. package/src/device/device-limits.ts +150 -0
  475. package/src/device/get-device-info.ts +49 -0
  476. package/src/device/webgl-device.ts +406 -0
  477. package/src/index.ts +76 -22
  478. package/src/init.ts +12 -9
  479. package/src/types.ts +1 -1
  480. package/src/webgl-utils/attribute-utils.ts +1 -1
  481. package/src/webgl-utils/constants-to-keys.ts +1 -1
  482. package/src/webgl-utils/format-utils.ts +1 -1
  483. package/src/{features/check-old-ie.ts → webgl-utils/is-old-ie.ts} +3 -3
  484. package/src/webgl-utils/{texture-utils.js → texture-utils.ts} +13 -10
  485. package/src/webgl-utils/{typed-array-utils.js → typed-array-utils.ts} +59 -16
  486. package/src/webgl-utils/webgl-info.ts.disabled +135 -0
  487. package/dist/context/gl-context.d.ts +0 -15
  488. package/dist/context/gl-context.d.ts.map +0 -1
  489. package/dist/context/gl-context.js +0 -32
  490. package/dist/context/gl-context.js.map +0 -1
  491. package/dist/context/luma-context-data.d.ts +0 -31
  492. package/dist/context/luma-context-data.d.ts.map +0 -1
  493. package/dist/context/luma-context-data.js +0 -5
  494. package/dist/context/luma-context-data.js.map +0 -1
  495. package/dist/es5/context/gl-context.js +0 -46
  496. package/dist/es5/context/gl-context.js.map +0 -1
  497. package/dist/es5/context/luma-context-data.js +0 -12
  498. package/dist/es5/context/luma-context-data.js.map +0 -1
  499. package/dist/es5/features/check-glsl-extension.js +0 -40
  500. package/dist/es5/features/check-glsl-extension.js.map +0 -1
  501. package/dist/es5/features/check-old-ie.js +0 -15
  502. package/dist/es5/features/check-old-ie.js.map +0 -1
  503. package/dist/es5/features/features.js +0 -85
  504. package/dist/es5/features/features.js.map +0 -1
  505. package/dist/es5/features/index.js +0 -64
  506. package/dist/es5/features/index.js.map +0 -1
  507. package/dist/es5/features/limits.js +0 -72
  508. package/dist/es5/features/limits.js.map +0 -1
  509. package/dist/es5/features/webgl-features-table.js +0 -84
  510. package/dist/es5/features/webgl-features-table.js.map +0 -1
  511. package/dist/es5/features/webgl-limits-table.js +0 -172
  512. package/dist/es5/features/webgl-limits-table.js.map +0 -1
  513. package/dist/es5/utils/array-utils-flat.js +0 -50
  514. package/dist/es5/utils/array-utils-flat.js.map +0 -1
  515. package/dist/es5/utils/assert.js +0 -13
  516. package/dist/es5/utils/assert.js.map +0 -1
  517. package/dist/es5/utils/check-props.js +0 -50
  518. package/dist/es5/utils/check-props.js.map +0 -1
  519. package/dist/es5/utils/format-value.js +0 -57
  520. package/dist/es5/utils/format-value.js.map +0 -1
  521. package/dist/es5/utils/index.js +0 -68
  522. package/dist/es5/utils/index.js.map +0 -1
  523. package/dist/es5/utils/is-old-ie.js +0 -13
  524. package/dist/es5/utils/is-old-ie.js.map +0 -1
  525. package/dist/es5/utils/load-file.js +0 -43
  526. package/dist/es5/utils/load-file.js.map +0 -1
  527. package/dist/es5/utils/stub-methods.js +0 -25
  528. package/dist/es5/utils/stub-methods.js.map +0 -1
  529. package/dist/es5/utils/utils.js +0 -31
  530. package/dist/es5/utils/utils.js.map +0 -1
  531. package/dist/es5/webgl-utils/texture-utils.d.ts +0 -11
  532. package/dist/es5/webgl-utils/typed-array-utils.d.ts +0 -36
  533. package/dist/esm/context/gl-context.js +0 -32
  534. package/dist/esm/context/gl-context.js.map +0 -1
  535. package/dist/esm/context/luma-context-data.js +0 -5
  536. package/dist/esm/context/luma-context-data.js.map +0 -1
  537. package/dist/esm/features/check-glsl-extension.js +0 -27
  538. package/dist/esm/features/check-glsl-extension.js.map +0 -1
  539. package/dist/esm/features/check-old-ie.js.map +0 -1
  540. package/dist/esm/features/features.js +0 -67
  541. package/dist/esm/features/features.js.map +0 -1
  542. package/dist/esm/features/index.js +0 -5
  543. package/dist/esm/features/index.js.map +0 -1
  544. package/dist/esm/features/limits.js +0 -55
  545. package/dist/esm/features/limits.js.map +0 -1
  546. package/dist/esm/features/webgl-features-table.js +0 -71
  547. package/dist/esm/features/webgl-features-table.js.map +0 -1
  548. package/dist/esm/features/webgl-limits-table.js +0 -161
  549. package/dist/esm/features/webgl-limits-table.js.map +0 -1
  550. package/dist/esm/utils/array-utils-flat.js +0 -39
  551. package/dist/esm/utils/array-utils-flat.js.map +0 -1
  552. package/dist/esm/utils/assert.js +0 -6
  553. package/dist/esm/utils/assert.js.map +0 -1
  554. package/dist/esm/utils/check-props.js +0 -38
  555. package/dist/esm/utils/check-props.js.map +0 -1
  556. package/dist/esm/utils/format-value.js +0 -50
  557. package/dist/esm/utils/format-value.js.map +0 -1
  558. package/dist/esm/utils/index.js +0 -7
  559. package/dist/esm/utils/index.js.map +0 -1
  560. package/dist/esm/utils/is-old-ie.js +0 -5
  561. package/dist/esm/utils/is-old-ie.js.map +0 -1
  562. package/dist/esm/utils/load-file.js +0 -30
  563. package/dist/esm/utils/load-file.js.map +0 -1
  564. package/dist/esm/utils/stub-methods.js +0 -16
  565. package/dist/esm/utils/stub-methods.js.map +0 -1
  566. package/dist/esm/utils/utils.js +0 -20
  567. package/dist/esm/utils/utils.js.map +0 -1
  568. package/dist/esm/webgl-utils/texture-utils.d.ts +0 -11
  569. package/dist/esm/webgl-utils/typed-array-utils.d.ts +0 -36
  570. package/dist/features/check-glsl-extension.d.ts +0 -2
  571. package/dist/features/check-glsl-extension.d.ts.map +0 -1
  572. package/dist/features/check-glsl-extension.js +0 -27
  573. package/dist/features/check-glsl-extension.js.map +0 -1
  574. package/dist/features/check-old-ie.d.ts +0 -2
  575. package/dist/features/check-old-ie.d.ts.map +0 -1
  576. package/dist/features/check-old-ie.js.map +0 -1
  577. package/dist/features/features.d.ts +0 -6
  578. package/dist/features/features.d.ts.map +0 -1
  579. package/dist/features/features.js +0 -67
  580. package/dist/features/features.js.map +0 -1
  581. package/dist/features/index.d.ts +0 -5
  582. package/dist/features/index.d.ts.map +0 -1
  583. package/dist/features/index.js +0 -5
  584. package/dist/features/index.js.map +0 -1
  585. package/dist/features/limits.d.ts +0 -28
  586. package/dist/features/limits.d.ts.map +0 -1
  587. package/dist/features/limits.js +0 -55
  588. package/dist/features/limits.js.map +0 -1
  589. package/dist/features/webgl-features-table.d.ts +0 -30
  590. package/dist/features/webgl-features-table.d.ts.map +0 -1
  591. package/dist/features/webgl-features-table.js +0 -71
  592. package/dist/features/webgl-features-table.js.map +0 -1
  593. package/dist/features/webgl-limits-table.d.ts +0 -161
  594. package/dist/features/webgl-limits-table.d.ts.map +0 -1
  595. package/dist/features/webgl-limits-table.js +0 -161
  596. package/dist/features/webgl-limits-table.js.map +0 -1
  597. package/dist/utils/array-utils-flat.d.ts +0 -9
  598. package/dist/utils/array-utils-flat.d.ts.map +0 -1
  599. package/dist/utils/array-utils-flat.js +0 -39
  600. package/dist/utils/array-utils-flat.js.map +0 -1
  601. package/dist/utils/assert.d.ts +0 -2
  602. package/dist/utils/assert.d.ts.map +0 -1
  603. package/dist/utils/assert.js +0 -6
  604. package/dist/utils/assert.js.map +0 -1
  605. package/dist/utils/check-props.d.ts +0 -2
  606. package/dist/utils/check-props.d.ts.map +0 -1
  607. package/dist/utils/check-props.js +0 -38
  608. package/dist/utils/check-props.js.map +0 -1
  609. package/dist/utils/format-value.d.ts +0 -5
  610. package/dist/utils/format-value.d.ts.map +0 -1
  611. package/dist/utils/format-value.js +0 -50
  612. package/dist/utils/format-value.js.map +0 -1
  613. package/dist/utils/index.d.ts +0 -7
  614. package/dist/utils/index.d.ts.map +0 -1
  615. package/dist/utils/index.js +0 -7
  616. package/dist/utils/index.js.map +0 -1
  617. package/dist/utils/is-old-ie.d.ts +0 -4
  618. package/dist/utils/is-old-ie.d.ts.map +0 -1
  619. package/dist/utils/is-old-ie.js +0 -5
  620. package/dist/utils/is-old-ie.js.map +0 -1
  621. package/dist/utils/load-file.d.ts +0 -4
  622. package/dist/utils/load-file.d.ts.map +0 -1
  623. package/dist/utils/load-file.js +0 -30
  624. package/dist/utils/load-file.js.map +0 -1
  625. package/dist/utils/stub-methods.d.ts +0 -2
  626. package/dist/utils/stub-methods.d.ts.map +0 -1
  627. package/dist/utils/stub-methods.js +0 -16
  628. package/dist/utils/stub-methods.js.map +0 -1
  629. package/dist/utils/utils.d.ts +0 -15
  630. package/dist/utils/utils.d.ts.map +0 -1
  631. package/dist/utils/utils.js +0 -20
  632. package/dist/utils/utils.js.map +0 -1
  633. package/src/context/gl-context.ts +0 -31
  634. package/src/context/luma-context-data.ts +0 -27
  635. package/src/features/check-glsl-extension.ts +0 -34
  636. package/src/features/features.ts +0 -80
  637. package/src/features/index.ts +0 -5
  638. package/src/features/limits.ts +0 -66
  639. package/src/features/webgl-features-table.ts +0 -104
  640. package/src/features/webgl-limits-table.ts +0 -51
  641. package/src/utils/array-utils-flat.ts +0 -56
  642. package/src/utils/assert.ts +0 -7
  643. package/src/utils/check-props.ts +0 -68
  644. package/src/utils/format-value.ts +0 -37
  645. package/src/utils/index.ts +0 -6
  646. package/src/utils/is-old-ie.ts +0 -6
  647. package/src/utils/load-file.ts +0 -40
  648. package/src/utils/stub-methods.ts +0 -20
  649. package/src/utils/utils.ts +0 -35
  650. package/src/webgl-utils/texture-utils.d.ts +0 -11
  651. package/src/webgl-utils/typed-array-utils.d.ts +0 -36
@@ -1,9 +1,10 @@
1
1
  // luma.gl, MIT license
2
- import {isWebGL2, assertWebGLContext} from '@luma.gl/gltools';
3
- import {Resource} from '@luma.gl/api';
2
+ import {Resource, assert, uid, stubRemovedMethods} from '@luma.gl/api';
3
+ import type {Device} from '@luma.gl/api';
4
4
  export type {ResourceProps} from '@luma.gl/api';
5
- import {getKey, getKeyValue} from '../webgl-utils';
6
- import {uid, assert, stubRemovedMethods} from '../utils';
5
+ import {isWebGL2, assertWebGLContext} from '../context/context/webgl-checks';
6
+ import {getKey, getKeyValue} from '../webgl-utils/constants-to-keys';
7
+ import WebGLDevice from '../device/webgl-device';
7
8
 
8
9
  const ERR_RESOURCE_METHOD_UNDEFINED = 'Resource subclass must define virtual methods';
9
10
 
@@ -12,17 +13,21 @@ const ERR_RESOURCE_METHOD_UNDEFINED = 'Resource subclass must define virtual met
12
13
  */
13
14
  export default class WebGLResource<Props> extends Resource<Props> {
14
15
  id: string;
16
+ userData: any;
17
+ readonly device: WebGLDevice;
15
18
  readonly gl: WebGLRenderingContext;
16
19
  readonly gl2: WebGL2RenderingContext;
17
- userData: any;
18
20
  private _handle: any;
19
21
 
20
22
  private _bound = false;
21
23
  // Only meaningful for resources that allocate GPU memory
22
24
  byteLength = 0;
23
25
 
24
- constructor(gl: WebGLRenderingContext, props: Props, defaultProps: Required<Props>) {
25
- super(gl as any, props, defaultProps);
26
+ constructor(device: Device, props: Props, defaultProps: Required<Props>) {
27
+ super(device, props, defaultProps);
28
+
29
+ this.device = WebGLDevice.attach(device);
30
+ const gl = this.device.gl;
26
31
 
27
32
  assertWebGLContext(gl);
28
33
 
@@ -30,9 +35,7 @@ const ERR_RESOURCE_METHOD_UNDEFINED = 'Resource subclass must define virtual met
30
35
  // @ts-expect-error
31
36
  const {id, userData = {}} = props || {};
32
37
  this.gl = gl;
33
- // @ts-ignore
34
- this.gl2 = gl;
35
- // this.ext = polyfillContext(gl);
38
+ this.gl2 = gl as WebGL2RenderingContext;
36
39
  this.id = id || uid(this.constructor.name);
37
40
  this.userData = userData;
38
41
 
@@ -71,7 +74,7 @@ const ERR_RESOURCE_METHOD_UNDEFINED = 'Resource subclass must define virtual met
71
74
 
72
75
  delete({deleteChildren = false} = {}) {
73
76
  // Delete this object, and get refs to any children
74
- // @ts-ignore
77
+ // @ts-expect-error
75
78
  const children = this._handle && this._deleteHandle(this._handle);
76
79
  if (this._handle) {
77
80
  this.removeStats();
@@ -79,9 +82,9 @@ const ERR_RESOURCE_METHOD_UNDEFINED = 'Resource subclass must define virtual met
79
82
  this._handle = null;
80
83
 
81
84
  // Optionally, recursively delete the children
82
- // @ts-ignore
85
+ // @ts-expect-error
83
86
  if (children && deleteChildren) {
84
- // @ts-ignore
87
+ // @ts-expect-error
85
88
  children.filter(Boolean).forEach((child) => child.delete());
86
89
  }
87
90
 
@@ -125,7 +128,7 @@ const ERR_RESOURCE_METHOD_UNDEFINED = 'Resource subclass must define virtual met
125
128
  pname = getKeyValue(this.gl, pname);
126
129
  assert(pname);
127
130
 
128
- // @ts-ignore
131
+ // @ts-expect-error
129
132
  const parameters = this.constructor.PARAMETERS || {};
130
133
 
131
134
  // Use parameter definitions to handle unsupported parameters
@@ -158,7 +161,7 @@ const ERR_RESOURCE_METHOD_UNDEFINED = 'Resource subclass must define virtual met
158
161
  const {parameters, keys} = options;
159
162
 
160
163
  // Get parameter definitions for this Resource
161
- // @ts-ignore
164
+ // @ts-expect-error
162
165
  const PARAMETERS = this.constructor.PARAMETERS || {};
163
166
 
164
167
  const isWebgl2 = isWebGL2(this.gl);
@@ -203,7 +206,7 @@ const ERR_RESOURCE_METHOD_UNDEFINED = 'Resource subclass must define virtual met
203
206
  pname = getKeyValue(this.gl, pname);
204
207
  assert(pname);
205
208
 
206
- // @ts-ignore
209
+ // @ts-expect-error
207
210
  const parameters = this.constructor.PARAMETERS || {};
208
211
 
209
212
  const parameter = parameters[pname];
@@ -268,8 +271,7 @@ const ERR_RESOURCE_METHOD_UNDEFINED = 'Resource subclass must define virtual met
268
271
  throw new Error(ERR_RESOURCE_METHOD_UNDEFINED);
269
272
  }
270
273
 
271
- /** @returns {number} */
272
- _getParameter(pname, props) {
274
+ _getParameter(pname, props): number {
273
275
  throw new Error(ERR_RESOURCE_METHOD_UNDEFINED);
274
276
  }
275
277
 
@@ -1,10 +1,10 @@
1
1
  // luma.gl, MIT license
2
+ import {log, assert, uid, Shader as ShaderAPI, ShaderProps} from '@luma.gl/api';
2
3
  import GL from '@luma.gl/constants';
3
- import {assertWebGLContext, log} from '@luma.gl/gltools';
4
4
  import {getShaderInfo, CompilerMessage, formatCompilerLog} from '@luma.gl/shadertools';
5
- import {Shader as ShaderAPI, ShaderProps} from '@luma.gl/api';
5
+ import {assertWebGLContext} from '../context/context/webgl-checks';
6
6
  import {parseShaderCompilerLog} from '../webgl-utils/parse-shader-compiler-log';
7
- import {uid, assert} from '../utils';
7
+ import WebGLDevice from '../device/webgl-device';
8
8
 
9
9
  const ERR_SOURCE = 'Shader: GLSL source code must be a JavaScript string';
10
10
 
@@ -12,13 +12,15 @@ const ERR_SOURCE = 'Shader: GLSL source code must be a JavaScript string';
12
12
  export type {ShaderProps};
13
13
 
14
14
  export class WEBGLShader extends ShaderAPI {
15
+ readonly device: WebGLDevice;
15
16
  readonly gl: WebGLRenderingContext;
16
17
  readonly handle: WebGLShader;
17
18
 
18
19
  readonly stage: 'vertex' | 'fragment';
19
20
 
20
21
  constructor(gl: WebGLRenderingContext, props: ShaderProps) {
21
- super(gl as any, {id: getShaderIdFromProps(props), ...props});
22
+ super(WebGLDevice.attach(gl), {id: getShaderIdFromProps(props), ...props});
23
+ this.device = WebGLDevice.attach(gl);
22
24
  this.gl = gl;
23
25
  switch (this.props.stage) {
24
26
  case 'vertex':
@@ -0,0 +1,39 @@
1
+ /**
2
+ * Stores luma.gl specific state associated with a context
3
+ */
4
+ export interface ContextState {
5
+ _canvasSizeInfo: {
6
+ clientWidth: number;
7
+ clientHeight: number;
8
+ devicePixelRatio: number;
9
+ };
10
+ _polyfilled: boolean;
11
+ _extensions: Record<string, any>;
12
+ }
13
+
14
+ /**
15
+ * Gets luma.gl specific state from a context
16
+ * @returns context state
17
+ */
18
+ export function getContextState(gl: WebGLRenderingContext): ContextState {
19
+ // @ts-expect-error
20
+ const {device, luma} = gl;
21
+ if (device) {
22
+ return device as ContextState;
23
+ }
24
+ if (!luma) {
25
+ const contextState: ContextState = {
26
+ _canvasSizeInfo: {
27
+ clientWidth: 0,
28
+ clientHeight: 0,
29
+ devicePixelRatio: 1,
30
+ },
31
+ _polyfilled: false,
32
+ _extensions: {}
33
+ };
34
+ // @ts-expect-error
35
+ gl.luma = contextState;
36
+ }
37
+ // @ts-expect-error
38
+ return gl.luma;
39
+ }
@@ -0,0 +1,83 @@
1
+ // luma.gl, MIT license
2
+
3
+ /**
4
+ * ContextProps
5
+ * @param webgl2 Set to false to not create a WebGL2 context (force webgl1)
6
+ * @param webgl1 set to false to not create a WebGL1 context (fail if webgl2 not available)
7
+ * @param onContextLost
8
+ * @param onContextRestored
9
+ *
10
+ * BROWSER CONTEXT PARAMETERS
11
+ * @param debug Instrument context (at the expense of performance).
12
+ * @param alpha Default render target has an alpha buffer.
13
+ * @param depth Default render target has a depth buffer of at least 16 bits.
14
+ * @param stencil Default render target has a stencil buffer of at least 8 bits.
15
+ * @param antialias Boolean that indicates whether or not to perform anti-aliasing.
16
+ * @param premultipliedAlpha Boolean that indicates that the page compositor will assume the drawing buffer contains colors with pre-multiplied alpha.
17
+ * @param preserveDrawingBuffer Default render target buffers will not be automatically cleared and will preserve their values until cleared or overwritten
18
+ * @param failIfMajorPerformanceCaveat Do not create if the system performance is low.
19
+ */
20
+
21
+ type ContextProps = {
22
+ webgl1?: boolean;
23
+ webgl2?: boolean;
24
+ onContextLost?: (event: Event) => void;
25
+ onContextRestored?: (event: Event) => void;
26
+ alpha?: boolean; // indicates if the canvas contains an alpha buffer.
27
+ desynchronized?: boolean; // hints the user agent to reduce the latency by desynchronizing the canvas paint cycle from the event loop
28
+ antialias?: boolean; // indicates whether or not to perform anti-aliasing.
29
+ depth?: boolean; // indicates that the drawing buffer has a depth buffer of at least 16 bits.
30
+ failIfMajorPerformanceCaveat?: boolean, // indicates if a context will be created if the system performance is low or if no hardware GPU is available.
31
+ powerPreference?: 'default' | 'high-performance' | 'low-power',
32
+ premultipliedAlpha?: boolean, // page compositor will assume the drawing buffer contains colors with pre-multiplied alpha.
33
+ preserveDrawingBuffer?: boolean // buffers will not be cleared and will preserve their values until cleared or overwritten by the author.
34
+ };
35
+
36
+ const DEFAULT_CONTEXT_PROPS: ContextProps = {
37
+ webgl2: true, // Attempt to create a WebGL2 context
38
+ webgl1: true, // Attempt to create a WebGL1 context (false to fail if webgl2 not available)
39
+ powerPreference: 'high-performance', // After all, most apps are using WebGL for performance reasons
40
+ onContextLost: () => console.error('WebGL context lost'),
41
+ onContextRestored: () => console.info('WebGL context restored'),
42
+ };
43
+
44
+ /**
45
+ * Create a WebGL context for a canvas
46
+ * Note calling this multiple time on the same canvas does return the same context
47
+ * @param canvas A canvas element or offscreen canvas
48
+ */
49
+ export function createBrowserContext(canvas: HTMLCanvasElement | OffscreenCanvas, props: ContextProps): WebGLRenderingContext {
50
+ props = {...DEFAULT_CONTEXT_PROPS, ...props};
51
+
52
+ // Try to extract any extra information about why context creation failed
53
+ let errorMessage = null;
54
+ const onCreateError = (error) => (errorMessage = error.statusMessage || errorMessage);
55
+ canvas.addEventListener('webglcontextcreationerror', onCreateError, false);
56
+
57
+ // Create the desired context
58
+ let gl = null;
59
+
60
+ // Prefer webgl2 over webgl1 if both are acceptable
61
+ if (props.webgl2) {
62
+ gl = gl || canvas.getContext('webgl2', props);
63
+ }
64
+ if (props.webgl1) {
65
+ gl = gl || canvas.getContext('webgl', props);
66
+ }
67
+
68
+ // TODO are we removing this listener before giving it a chance to fire?
69
+ canvas.removeEventListener('webglcontextcreationerror', onCreateError, false);
70
+
71
+ if (!gl) {
72
+ throw new Error(
73
+ `Failed to create ${props.webgl2 && !props.webgl1 ? 'WebGL2' : 'WebGL'} context: ${
74
+ errorMessage || 'Unknown error'
75
+ }`
76
+ );
77
+ }
78
+
79
+ canvas.addEventListener('webglcontextlost', props.onContextLost, false);
80
+ canvas.addEventListener('webglcontextrestored', props.onContextRestored, false);
81
+
82
+ return gl;
83
+ }
@@ -0,0 +1,147 @@
1
+ import {log} from '@luma.gl/api';
2
+ import {getContextState} from './context-state';
3
+
4
+ /**
5
+ * Returns multiplier need to convert CSS size to Device size
6
+ */
7
+ export function cssToDeviceRatio(gl: WebGLRenderingContext): number {
8
+ const state = getContextState(gl);
9
+
10
+ if (gl.canvas && state) {
11
+ // For headless gl we might have used custom width and height
12
+ // hence use cached clientWidth
13
+ const {clientWidth} = state._canvasSizeInfo;
14
+ return clientWidth ? gl.drawingBufferWidth / clientWidth : 1;
15
+ }
16
+ // use default device pixel ratio
17
+ return 1;
18
+ }
19
+
20
+ /**
21
+ * Maps CSS pixel position to device pixel position
22
+ */
23
+ export function cssToDevicePixels(
24
+ gl: WebGLRenderingContext,
25
+ cssPixel: number[],
26
+ yInvert: boolean = true
27
+ ): {
28
+ x: number;
29
+ y: number;
30
+ width: number;
31
+ height: number;
32
+ } {
33
+ const ratio = cssToDeviceRatio(gl);
34
+ const width = gl.drawingBufferWidth;
35
+ const height = gl.drawingBufferHeight;
36
+ return scalePixels(cssPixel, ratio, width, height, yInvert);
37
+ }
38
+
39
+ /**
40
+ * Calulates device pixel ratio, used during context creation
41
+ *
42
+ * @param useDevicePixels - boolean or a number
43
+ * @return - device pixel ratio
44
+ */
45
+ export function getDevicePixelRatio(useDevicePixels: boolean | number): number {
46
+ const windowRatio = typeof window === 'undefined' ? 1 : window.devicePixelRatio || 1;
47
+ if (Number.isFinite(useDevicePixels)) {
48
+ // @ts-expect-error Can no longer be boolean after previous line
49
+ return useDevicePixels <= 0 ? 1 : useDevicePixels;
50
+ }
51
+ return useDevicePixels ? windowRatio : 1;
52
+ }
53
+
54
+ // use devicePixelRatio to set canvas width and height
55
+ export function setDevicePixelRatio(gl, devicePixelRatio, options: {width?: number, height?: number} = {}) {
56
+ // NOTE: if options.width and options.height not used remove in v8
57
+ let clientWidth = 'width' in options ? options.width : gl.canvas.clientWidth;
58
+ let clientHeight = 'height' in options ? options.height : gl.canvas.clientHeight;
59
+
60
+ if (!clientWidth || !clientHeight) {
61
+ log.log(1, 'Canvas clientWidth/clientHeight is 0')();
62
+ // by forcing devicePixel ratio to 1, we do not scale gl.canvas.width and height in each frame.
63
+ devicePixelRatio = 1;
64
+ clientWidth = gl.canvas.width || 1;
65
+ clientHeight = gl.canvas.height || 1;
66
+ }
67
+
68
+ const contextState = getContextState(gl);
69
+ const cachedSize = contextState._canvasSizeInfo;
70
+ // Check if canvas needs to be resized
71
+ if (
72
+ cachedSize.clientWidth !== clientWidth ||
73
+ cachedSize.clientHeight !== clientHeight ||
74
+ cachedSize.devicePixelRatio !== devicePixelRatio
75
+ ) {
76
+ let clampedPixelRatio = devicePixelRatio;
77
+
78
+ const canvasWidth = Math.floor(clientWidth * clampedPixelRatio);
79
+ const canvasHeight = Math.floor(clientHeight * clampedPixelRatio);
80
+ gl.canvas.width = canvasWidth;
81
+ gl.canvas.height = canvasHeight;
82
+
83
+ // Note: when devicePixelRatio is too high, it is possible we might hit system limit for
84
+ // drawing buffer width and hight, in those cases they get clamped and resulting aspect ration may not be maintained
85
+ // for those cases, reduce devicePixelRatio.
86
+ if (gl.drawingBufferWidth !== canvasWidth || gl.drawingBufferHeight !== canvasHeight) {
87
+ log.warn(`Device pixel ratio clamped`)();
88
+ clampedPixelRatio = Math.min(
89
+ gl.drawingBufferWidth / clientWidth,
90
+ gl.drawingBufferHeight / clientHeight
91
+ );
92
+
93
+ gl.canvas.width = Math.floor(clientWidth * clampedPixelRatio);
94
+ gl.canvas.height = Math.floor(clientHeight * clampedPixelRatio);
95
+ }
96
+
97
+ Object.assign(contextState._canvasSizeInfo, {clientWidth, clientHeight, devicePixelRatio});
98
+ }
99
+ }
100
+
101
+
102
+ // PRIVATE
103
+
104
+ function scalePixels(pixel, ratio, width, height, yInvert) {
105
+ const x = scaleX(pixel[0], ratio, width);
106
+ let y = scaleY(pixel[1], ratio, height, yInvert);
107
+
108
+ // Find boundaries of next pixel to provide valid range of device pixel locaitons
109
+
110
+ let t = scaleX(pixel[0] + 1, ratio, width);
111
+ // If next pixel's position is clamped to boundary, use it as is, otherwise subtract 1 for current pixel boundary
112
+ const xHigh = t === width - 1 ? t : t - 1;
113
+
114
+ t = scaleY(pixel[1] + 1, ratio, height, yInvert);
115
+ let yHigh;
116
+ if (yInvert) {
117
+ // If next pixel's position is clamped to boundary, use it as is, otherwise clamp it to valid range
118
+ t = t === 0 ? t : t + 1;
119
+ // swap y and yHigh
120
+ yHigh = y;
121
+ y = t;
122
+ } else {
123
+ // If next pixel's position is clamped to boundary, use it as is, otherwise clamp it to valid range
124
+ yHigh = t === height - 1 ? t : t - 1;
125
+ // y remains same
126
+ }
127
+ return {
128
+ x,
129
+ y,
130
+ // when ratio < 1, current css pixel and next css pixel may point to same device pixel, set width/height to 1 in those cases.
131
+ width: Math.max(xHigh - x + 1, 1),
132
+ height: Math.max(yHigh - y + 1, 1)
133
+ };
134
+ }
135
+
136
+ function scaleX(x, ratio, width) {
137
+ // since we are rounding to nearest, when ratio > 1, edge pixels may point to out of bounds value, clamp to the limit
138
+ const r = Math.min(Math.round(x * ratio), width - 1);
139
+ return r;
140
+ }
141
+
142
+ function scaleY(y, ratio, height, yInvert) {
143
+ // since we are rounding to nearest, when ratio > 1, edge pixels may point to out of bounds value, clamp to the limit
144
+ return yInvert
145
+ ? Math.max(0, height - 1 - Math.round(y * ratio))
146
+ : Math.min(Math.round(y * ratio), height - 1);
147
+ }
@@ -0,0 +1,37 @@
1
+ // luma.gl, MIT license
2
+ import {isBrowser} from 'probe.gl/env';
3
+ const isPage = isBrowser() && typeof document !== 'undefined';
4
+
5
+ /**
6
+ * Creates a new canvas or returns the HTML element for a canvas.
7
+ * @param width
8
+ * @param height
9
+ * @returns
10
+ */
11
+ export function getCanvas(options: {
12
+ canvas?: string | HTMLCanvasElement | OffscreenCanvas,
13
+ width: number,
14
+ height: number
15
+ }): HTMLCanvasElement | OffscreenCanvas {
16
+ const {canvas, width = 800, height = 600} = options;
17
+
18
+ if (!canvas) {
19
+ const targetCanvas = document.createElement('canvas');
20
+ targetCanvas.id = 'lumagl-canvas';
21
+ targetCanvas.style.width = Number.isFinite(width) ? `${width}px` : '100%';
22
+ targetCanvas.style.height = Number.isFinite(height) ? `${height}px` : '100%';
23
+ document.body.insertBefore(targetCanvas, document.body.firstChild);
24
+ return targetCanvas;
25
+ }
26
+
27
+ if (typeof canvas === 'string') {
28
+ const isPageLoaded = isPage && document.readyState === 'complete';
29
+ if (!isPageLoaded) {
30
+ throw new Error(`createGLContext called on canvas '${canvas}' before page was loaded`);
31
+ }
32
+ // TODO - check type?
33
+ return document.getElementById(canvas) as HTMLCanvasElement;
34
+ }
35
+
36
+ return canvas;
37
+ }
@@ -0,0 +1,37 @@
1
+ // luma.gl, MIT license
2
+ import { getDevicePixelRatio, setDevicePixelRatio } from "./device-pixels";
3
+ /**
4
+ * Resize the canvas' drawing buffer.
5
+ *
6
+ * Can match the canvas CSS size, and optionally also consider devicePixelRatio
7
+ * Can be called every frame
8
+ *
9
+ * Regardless of size, the drawing buffer will always be scaled to the viewport, but
10
+ * for best visual results, usually set to either:
11
+ * canvas CSS width x canvas CSS height
12
+ * canvas CSS width * devicePixelRatio x canvas CSS height * devicePixelRatio
13
+ * See http://webgl2fundamentals.org/webgl/lessons/webgl-resizing-the-canvas.html
14
+ *
15
+ * resizeGLContext(gl, {width, height, useDevicePixels})
16
+ */
17
+ export function resizeGLContext(
18
+ gl: WebGLRenderingContext,
19
+ options?: {
20
+ width?: number;
21
+ height?: number;
22
+ useDevicePixels?: boolean | number;
23
+ }
24
+ ) {
25
+ // Resize browser context .
26
+ if (gl.canvas) {
27
+ const devicePixelRatio = getDevicePixelRatio(options?.useDevicePixels);
28
+ setDevicePixelRatio(gl, devicePixelRatio, options);
29
+ return;
30
+ }
31
+
32
+ // Resize headless gl context
33
+ const ext = gl.getExtension('STACKGL_resize_drawingbuffer');
34
+ if (ext && options && `width` in options && `height` in options) {
35
+ ext.resize(options.width, options.height);
36
+ }
37
+ }
@@ -0,0 +1,49 @@
1
+ // luma.gl, MIT license
2
+ import {assert} from '@luma.gl/api';
3
+
4
+ const ERR_CONTEXT = 'Invalid WebGLRenderingContext';
5
+ export const ERR_WEBGL = ERR_CONTEXT;
6
+ export const ERR_WEBGL2 = 'Requires WebGL2';
7
+
8
+
9
+ /** Check if supplied parameter is a WebGLRenderingContext */
10
+ export function isWebGL(gl: any): boolean {
11
+ if (typeof WebGLRenderingContext !== 'undefined' && gl instanceof WebGLRenderingContext) {
12
+ return true;
13
+ }
14
+ if (typeof WebGL2RenderingContext !== 'undefined' && gl instanceof WebGL2RenderingContext) {
15
+ return true;
16
+ }
17
+ // Look for debug contexts, headless gl etc
18
+ return Boolean(gl && Number.isFinite(gl._version));
19
+ }
20
+
21
+
22
+ /** Check if supplied parameter is a WebGL2RenderingContext */
23
+ export function isWebGL2(gl: any): boolean {
24
+ if (typeof WebGL2RenderingContext !== 'undefined' && gl instanceof WebGL2RenderingContext) {
25
+ return true;
26
+ }
27
+ // Look for debug contexts, headless gl etc
28
+ return Boolean(gl && gl._version === 2);
29
+ }
30
+
31
+
32
+ /** Returns a properly typed WebGL2RenderingContext from a WebGL1 context, or null */
33
+ export function getWebGL2Context(gl: WebGLRenderingContext): WebGL2RenderingContext | null {
34
+ // @ts-expect-error
35
+ return isWebGL2(gl) ? gl : null;
36
+ }
37
+
38
+
39
+ /** Throw if supplied parameter is not a WebGLRenderingContext, otherwise return properly typed value */
40
+ export function assertWebGLContext(gl: any): WebGLRenderingContext {
41
+ assert(isWebGL(gl), ERR_CONTEXT);
42
+ return gl;
43
+ }
44
+
45
+ /** Throw if supplied parameter is not a WebGL2RenderingContext, otherwise return properly typed value */
46
+ export function assertWebGL2Context(gl: any): WebGL2RenderingContext {
47
+ assert(isWebGL2(gl), ERR_WEBGL2);
48
+ return gl;
49
+ }
@@ -0,0 +1,127 @@
1
+ // Provides a unified API for getting and setting any WebGL parameter
2
+ // Also knows default values of all parameters, enabling fast cache initialization
3
+ // Provides base functionality for the state caching.
4
+ import {assert} from '@luma.gl/api';
5
+ import type {GLParameters} from './webgl-parameters';
6
+ import {
7
+ GL_PARAMETER_DEFAULTS,
8
+ GL_PARAMETER_SETTERS,
9
+ GL_COMPOSITE_PARAMETER_SETTERS,
10
+ GL_PARAMETER_GETTERS
11
+ } from './webgl-parameter-tables';
12
+
13
+ import {isWebGL} from '../context/webgl-checks';
14
+
15
+ export type {GLParameters};
16
+
17
+ /**
18
+ * Sets any GL parameter regardless of function (gl.blendMode, ...)
19
+ *
20
+ * @note requires a `cache` object to be set on the context (gl.state.cache)
21
+ * This object is used to fill in any missing values for composite setter functions
22
+ */
23
+ export function setParameters(gl: WebGLRenderingContext, parameters: GLParameters): void {
24
+ assert(isWebGL(gl), 'setParameters requires a WebGL context');
25
+
26
+ if (isObjectEmpty(parameters)) {
27
+ return;
28
+ }
29
+
30
+ const compositeSetters = {};
31
+
32
+ // HANDLE PRIMITIVE SETTERS (and make note of any composite setters)
33
+
34
+ for (const key in parameters) {
35
+ const glConstant = Number(key);
36
+ const setter = GL_PARAMETER_SETTERS[key];
37
+ if (setter) {
38
+ // Composite setters should only be called once, so save them
39
+ if (typeof setter === 'string') {
40
+ compositeSetters[setter] = true;
41
+ } else {
42
+ // if (gl[glConstant] !== undefined) {
43
+ // TODO - added above check since this is being called on WebGL2 parameters in WebGL1...
44
+ // TODO - deep equal on values? only call setter if value has changed?
45
+ // NOTE - the setter will automatically update this.state
46
+ setter(gl, parameters[key], glConstant);
47
+ }
48
+ }
49
+ }
50
+
51
+ // HANDLE COMPOSITE SETTERS
52
+
53
+ // NOTE: any non-provided values needed by composite setters are filled in from state cache
54
+ // The cache parameter is automatically retrieved from the context
55
+ // This depends on `trackContextState`, which is technically a "circular" dependency.
56
+ // But it is too inconvenient to always require a cache parameter here.
57
+ // This is the ONLY external dependency in this module/
58
+ // @ts-expect-error
59
+ const cache = gl.state && gl.state.cache;
60
+ if (cache) {
61
+ for (const key in compositeSetters) {
62
+ // TODO - avoid calling composite setters if values have not changed.
63
+ const compositeSetter = GL_COMPOSITE_PARAMETER_SETTERS[key];
64
+ // Note - if `trackContextState` has been called,
65
+ // the setter will automatically update this.state.cache
66
+ compositeSetter(gl, parameters, cache);
67
+ }
68
+ }
69
+
70
+ // Add a log for the else case?
71
+ }
72
+
73
+ /**
74
+ * Reads the entire WebGL state from a context
75
+ * @returns - a newly created map, with values keyed by GL parameters
76
+ *
77
+ * @note Copies the state from a context (gl.getParameter should not be overriden)
78
+ * Reads the entire WebGL state from a context
79
+ *
80
+ * @note This can generates a huge amount of synchronous driver roundtrips and should be
81
+ * considered a very slow operation, to be used only if/when a context already manipulated
82
+ * by external code needs to be synchronized for the first time
83
+ */
84
+ export function getParameters(gl: WebGLRenderingContext, parameters?: Record<keyof GLParameters, any>): GLParameters;
85
+ export function getParameters(gl: WebGLRenderingContext, parameters: number): any;
86
+
87
+ export function getParameters(gl, parameters) {
88
+ // default to querying all parameters
89
+ parameters = parameters || GL_PARAMETER_DEFAULTS;
90
+ // support both arrays of parameters and objects (keys represent parameters)
91
+
92
+ if (typeof parameters === 'number') {
93
+ // single GL enum
94
+ const key = parameters;
95
+ const getter = GL_PARAMETER_GETTERS[key];
96
+ return getter ? getter(gl, key) : gl.getParameter(key);
97
+ }
98
+
99
+ const parameterKeys = Array.isArray(parameters) ? parameters : Object.keys(parameters);
100
+
101
+ const state = {};
102
+ for (const key of parameterKeys) {
103
+ const getter = GL_PARAMETER_GETTERS[key];
104
+ state[key] = getter ? getter(gl, Number(key)) : gl.getParameter(Number(key));
105
+ }
106
+ return state;
107
+ }
108
+
109
+ /**
110
+ * Reset all parameters to a (almost) pure context state
111
+ * @note viewport and scissor will be set to the values in GL_PARAMETER_DEFAULTS,
112
+ * NOT the canvas size dimensions, so they will have to be properly set after
113
+ * calling this function.
114
+ */
115
+ export function resetParameters(gl: WebGLRenderingContext): void {
116
+ setParameters(gl, GL_PARAMETER_DEFAULTS);
117
+ }
118
+
119
+ // Helpers
120
+
121
+ // Returns true if given object is empty, false otherwise.
122
+ function isObjectEmpty(object) {
123
+ for (const key in object) {
124
+ return false;
125
+ }
126
+ return true;
127
+ }