Merge pull request #254 from cabanier/gputexturecreation

cabanier · web-flow · commit 608bacd69468 · 2021-03-10T08:20:09.000-08:00
Removed synchronous GPU allocation in layer creation + added validation in getsubimage/getviewsubimage
diff --git a/webxrlayers-1.bs b/webxrlayers-1.bs
@@ -1334,8 +1334,7 @@ When this method is invoked, the user agent MUST run the following steps:
         <dt> Otherwise
           <dd> Let [=XRProjectionLayer/depthstenciltextures for secondary views=] be <code>null</code>.
       </dl>
-  1. Allocate and initialize resources compatible with |session|'s [=/XR device=], including GPU accessible memory buffers, as required to support the compositing of |layer|.
-  1. If |layer|’s resources were unable to be created for any reason, throw an {{OperationError}} and abort these steps.
+  1. If the [=XR Compositor=] knows that it will be unable to create the resources for the |layer| for any reason, throw an {{OperationError}} and abort these steps.
   1. Return |layer|.
 
 </div>
@@ -1359,8 +1358,7 @@ When this method is invoked, the user agent MUST run the following steps:
   1. Initialize |layer|'s {{XRCompositionLayer/needsRedraw}} to <code>true</code>.
   1. let |layer|'s [=colorTextures=] be the result of [=allocate color textures|allocating color textures=] with |layer|, |init|'s {{XRQuadLayerInit/textureType}} and |init|.
   1. let |layer|'s [=depthStencilTextures=] be the result of [=allocate depth textures|allocating depth textures=] with |layer|, |init|'s {{XRQuadLayerInit/textureType}} and |init|.
-  1. Allocate and initialize resources compatible with |session|'s [=/XR device=], including GPU accessible memory buffers, as required to support the compositing of |layer|.
-  1. If |layer|’s resources were unable to be created for any reason, throw an {{OperationError}} and abort these steps.
+  1. If the [=XR Compositor=] knows that it will be unable to create the resources for the |layer| for any reason, throw an {{OperationError}} and abort these steps.
   1. return |layer|.
 
 </div>
@@ -1384,8 +1382,7 @@ When this method is invoked, the user agent MUST run the following steps:
   1. Initialize |layer|'s {{XRCompositionLayer/needsRedraw}} to <code>true</code>.
   1. let |layer|'s [=colorTextures=] be the result of [=allocate color textures|allocating color textures=] with |layer|, |init|'s {{XRCylinderLayerInit/textureType}} and |init|.
   1. let |layer|'s [=depthStencilTextures=] be the result of [=allocate depth textures|allocating depth textures=] with |layer|, |init|'s {{XRCylinderLayerInit/textureType}} and |init|.
-  1. Allocate and initialize resources compatible with |session|'s [=/XR device=], including GPU accessible memory buffers, as required to support the compositing of |layer|.
-  1. If |layer|’s resources were unable to be created for any reason, throw an {{OperationError}} and abort these steps.
+  1. If the [=XR Compositor=] knows that it will be unable to create the resources for the |layer| for any reason, throw an {{OperationError}} and abort these steps.
   1. return |layer|.
 
 </div>
@@ -1411,8 +1408,7 @@ When this method is invoked, the user agent MUST run the following steps:
   1. Initialize |layer|'s {{XRCompositionLayer/needsRedraw}} to <code>true</code>.
   1. let |layer|'s [=colorTextures=] be the result of [=allocate color textures|allocating color textures=] with |layer|, |init|'s {{XRCylinderLayerInit/textureType}} and |init|.
   1. let |layer|'s [=depthStencilTextures=] be the result of [=allocate depth textures|allocating depth textures=] with |layer|, |init|'s {{XRCylinderLayerInit/textureType}} and |init|.
-  1. Allocate and initialize resources compatible with |session|'s [=/XR device=], including GPU accessible memory buffers, as required to support the compositing of |layer|.
-  1. If |layer|’s resources were unable to be created for any reason, throw an {{OperationError}} and abort these steps.
+  1. If the [=XR Compositor=] knows that it will be unable to create the resources for the |layer| for any reason, throw an {{OperationError}} and abort these steps.
   1. return |layer|.
 
 </div>
@@ -1462,8 +1458,7 @@ When this method is invoked, the user agent MUST run the following steps:
       <dt> Otherwise
         <dd> Initialize [=depthStencilTextures=] with 2 [=new=] instances of an [=opaque texture=] in the [=relevant realm=] of this {{XRCubeLayer}} created as a {{TEXTURE_CUBE_MAP}} texture with |context| and |init|'s {{XRLayerInit/depthFormat}}, {{XRLayerInit/viewPixelWidth}} and {{XRLayerInit/viewPixelHeight}} values.
     </dl>
-  1. Allocate and initialize resources compatible with |session|'s [=/XR device=], including GPU accessible memory buffers, as required to support the compositing of |layer|.
-  1. If |layer|’s resources were unable to be created for any reason, throw an {{OperationError}} and abort these steps.
+  1. If the [=XR Compositor=] knows that it will be unable to create the resources for the |layer| for any reason, throw an {{OperationError}} and abort these steps.
   1. return |layer|.
 
 </div>
@@ -1521,6 +1516,7 @@ When this method is invoked on an {{XRWebGLBinding}} |binding|, it MUST run the
         <dd> Let |subimage| be a [=new=] {{XRWebGLSubImage}} in the [=relevant realm=] of [=this=].
         <dd> Let |subimage|'s {{XRSubImage/viewport}} be a [=new=] {{XRViewport}} in the [=relevant realm=] of [=this=].
     </dl>
+  1. If |layer| is not in the |session|'s {{XRRenderState/layers}} array, throw a {{TypeError}} and abort these steps.
   1. If |layer|'s type is {{XRProjectionLayer}}, throw a {{TypeError}} and abort these steps.
   1. If |layer|'s {{XRCompositionLayer/layout}} attribute is {{XRLayerLayout/"default"}}, throw a {{TypeError}} and abort these steps.
   1. Let |index| be <code>0</code>.
@@ -1579,6 +1575,7 @@ When this method is invoked on an {{XRWebGLBinding}} |binding|, it MUST run the
   1. Let |frame| be |view|'s {{frame}}.
   1. Let |session| be [=this=] [=XRWebGLBinding/session=].
   1. If [=validate the state of the XRWebGLSubImage creation function=] with |layer| and |frame| is <code>false</code>, throw an {{InvalidStateError}} and abort these steps.
+  1. If |layer| is not in the |session|'s {{XRRenderState/layers}} array, throw a {{TypeError}} and abort these steps.
   1. If |view|'s [=view/active=] flag is <code>false</code>, throw an {{InvalidStateError}} and abort these steps.
   1. Initialize |index| as follows:
     <dl class="switch">
@@ -1791,8 +1788,7 @@ When this method is invoked, the user agent MUST run the following steps:
   1. If |init|'s {{XRMediaQuadLayerInit/height}} is <code>undefined</code>, set {{XRMediaQuadLayerInit/height}} to {{XRMediaQuadLayerInit/width}} divided by |aspectRatio|.
   1. If |init|'s {{XRMediaQuadLayerInit/width}} is <code>undefined</code>, set {{XRMediaQuadLayerInit/width}} to {{XRMediaQuadLayerInit/height}} multiplied by |aspectRatio|.
   1. Run [=initialize a quad layer=] with |layer| and |init|.
-  1. Allocate and initialize resources compatible with |session|'s [=/XR device=], including GPU accessible memory buffers, as required to support the compositing of |layer|.
-  1. If |layer|’s resources were unable to be created for any reason, throw an {{OperationError}} and abort these steps.
+  1. If the [=XR Compositor=] knows that it will be unable to create the resources for the |layer| for any reason, throw an {{OperationError}} and abort these steps.
   1. return |layer|.
 
 </div>
@@ -1813,8 +1809,7 @@ When this method is invoked, the user agent MUST run the following steps:
   1. Let |aspectRatio| be the result of [=calculate the aspect ratio=] with |video| and |init|'s {{XRMediaLayerInit/layout}}.
   1. If |init|'s {{XRMediaCylinderLayerInit/aspectRatio}} is <code>undefined</code>, set {{XRMediaCylinderLayerInit/aspectRatio}} to |aspectRatio|.
   1. Run [=initialize a cylinder layer=] with |layer| and |init|.
-  1. Allocate and initialize resources compatible with |session|'s [=/XR device=], including GPU accessible memory buffers, as required to support the compositing of |layer|.
-  1. If |layer|’s resources were unable to be created for any reason, throw an {{OperationError}} and abort these steps.
+  1. If the [=XR Compositor=] knows that it will be unable to create the resources for the |layer| for any reason, throw an {{OperationError}} and abort these steps.
   1. return |layer|.
 
 </div>
@@ -1835,8 +1830,7 @@ When this method is invoked, the user agent MUST run the following steps:
   1. Initialize |layer|'s [=XRCompositionLayer/media=] to |video|.
   1. Initialize |layer|'s {{XRCompositionLayer/needsRedraw}} to <code>false</code>.
   1. Run [=initialize a equirect layer=] with |layer| and |init|.
-  1. Allocate and initialize resources compatible with |session|'s [=/XR device=], including GPU accessible memory buffers, as required to support the compositing of |layer|.
-  1. If |layer|’s resources were unable to be created for any reason, throw an {{OperationError}} and abort these steps.
+  1. If the [=XR Compositor=] knows that it will be unable to create the resources for the |layer| for any reason, throw an {{OperationError}} and abort these steps.
   1. return |layer|.
 
 </div>
