Skip to content

Commit

Permalink
Merge pull request #100 from msc-hi/master
Browse files Browse the repository at this point in the history
Require texture{_half,}_float to implicitly enable color_buffer{_half,}_float
  • Loading branch information
kenrussell committed Dec 8, 2012
2 parents f363ccc + ac53e47 commit 4e174ac
Show file tree
Hide file tree
Showing 10 changed files with 799 additions and 154 deletions.
77 changes: 48 additions & 29 deletions extensions/OES_texture_float/extension.xml
Original file line number Diff line number Diff line change
@@ -1,57 +1,76 @@
<?xml version="1.0"?>

<?xml version="1.0" encoding="UTF-8"?>
<extension href="OES_texture_float/">
<name>OES_texture_float</name>
<contact>
<a href="https://www.khronos.org/webgl/public-mailing-list/">WebGL working group</a> (public_webgl 'at' khronos.org)
</contact>

<contact> <a href="https://www.khronos.org/webgl/public-mailing-list/">WebGL
working group</a> (public_webgl 'at' khronos.org) </contact>

<contributors>
<contributor>Members of the WebGL working group</contributor>
</contributors>

<number>1</number>

<depends>
<api version="1.0"/>
</depends>

<overview>
<mirrors href="http://www.khronos.org/registry/gles/extensions/OES/OES_texture_float.txt" name="OES_texture_float">
<addendum>Optional support for <code>FLOAT</code> textures as FBO attachments.</addendum>
<mirrors href="http://www.khronos.org/registry/gles/extensions/OES/OES_texture_float.txt"
name="OES_texture_float">
<addendum>Optional support for <code>FLOAT</code> textures as FBO
attachments (deprecated).</addendum>
</mirrors>

<features>
<feature>
The <code>texImage2D</code> and <code>texSubImage2D</code> entry points
taking <code>ArrayBufferView</code> are extended to accept <code>Float32Array</code> with
the pixel type <code>FLOAT</code>.
</feature>
<feature>
The <code>texImage2D</code> and <code>texSubImage2D</code> entry points
taking <code>ImageData</code>, <code>HTMLImageElement</code>, <code>HTMLCanvasElement</code>
and <code>HTMLVideoElement</code> are extended to accept the pixel type <code>FLOAT</code>.
</feature>
<feature>
The WebGL implementation may optionally accept a texture with pixel
type <code>FLOAT</code> as the color attachment to an FBO. Applications must check such
an FBO for completeness after attempting to make this attachment.
<feature> The <code>texImage2D</code> and <code>texSubImage2D</code>
entry points taking <code>ArrayBufferView</code> are extended to accept
<code>Float32Array</code> with the pixel type <code>FLOAT</code>.
</feature>

<feature> The <code>texImage2D</code> and <code>texSubImage2D</code>
entry points taking <code>ImageData</code>,
<code>HTMLImageElement</code>, <code>HTMLCanvasElement</code> and
<code>HTMLVideoElement</code> are extended to accept the pixel type
<code>FLOAT</code>. </feature>

<feature>Implementations supporting float rendering via this extension
will implicitly enable the <a
href="WEBGL_color_buffer_float.html">WEBGL_color_buffer_float</a>
extension and follow its requirements. This ensures correct behavior
when a texture with pixel type <code>FLOAT</code> is attached to an FBO.
Although this feature has historically been allowed, new implementations
should not implicitly support float rendering and applications should be
modified to explicitly enable <a
href="WEBGL_color_buffer_float.html">WEBGL_color_buffer_float</a>.</feature>
</features>
</overview>
<idl>
interface OES_texture_float {
};
</idl>

<idl> interface OES_texture_float { }; </idl>

<history>
<revision date="2010/11/29">
<change>Initial revision.</change>
</revision>

<revision date="2010/12/13">
<change>Extended to support pixel type FLOAT for texImage2D and texSubImage2D entry points taking ImageData, HTMLImageElement, HTMLCanvasElement and HTMLVideoElement.
</change>
<change>Extended to support pixel type FLOAT for texImage2D and
texSubImage2D entry points taking ImageData, HTMLImageElement,
HTMLCanvasElement and HTMLVideoElement. </change>
</revision>

<revision date="2011/09/12">
<change>Added optional ability to use a FLOAT type texture as an FBO's color attachment.
</change>
<change>Added optional ability to use a FLOAT type texture as an FBO's
color attachment. </change>
</revision>

<revision date="2012/01/03">
<change>Removed webgl module per changes to Web IDL spec.</change>
</revision>

<revision date="2012/12/04">
<change>Specify that implementations supporting FLOAT color attachments
implicitly enable WEBGL_color_buffer_float.</change>
</revision>
</history>
</extension>
59 changes: 31 additions & 28 deletions extensions/OES_texture_float/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,13 @@
<h2 class="no-toc">Name</h2>
<p>OES_texture_float</p>
<h2 class="no-toc">Contact</h2>
<p>
<a href="https://www.khronos.org/webgl/public-mailing-list/">WebGL working group</a> (public_webgl 'at' khronos.org)
</p>
<p> <a href="https://www.khronos.org/webgl/public-mailing-list/">WebGL
working group</a> (public_webgl 'at' khronos.org) </p>
<h2 class="no-toc">Contributors</h2>
<p>Members of the WebGL working group</p>
<h2 class="no-toc">Version</h2>
<p> Last modified date: January 03, 2012<br>
Revision: 4</p>
<p> Last modified date: December 04, 2012<br>
Revision: 5</p>
<h2 class="no-toc">Number</h2>
<p> WebGL extension #1</p>
<h2 class="no-toc">Dependencies</h2>
Expand All @@ -30,43 +29,47 @@ <h2 class="no-toc">Overview</h2>
<a href="http://www.khronos.org/registry/gles/extensions/OES/OES_texture_float.txt">OES_texture_float</a> functionality to

WebGL. The following WebGL-specific behavioral changes apply:
<ul><li>Optional support for <code>FLOAT</code> textures as FBO attachments.</li></ul></p>
<ul><li>Optional support for <code>FLOAT</code> textures as FBO
attachments (deprecated).</li></ul></p>
<p>
Consult the above extension for documentation, issues and new functions and enumerants.
</p>

<p> When this extension is enabled: </p>
<ul>
<li>
The <code>texImage2D</code> and <code>texSubImage2D</code> entry points
taking <code>ArrayBufferView</code> are extended to accept <code>Float32Array</code> with
the pixel type <code>FLOAT</code>.
</li>
<li>
The <code>texImage2D</code> and <code>texSubImage2D</code> entry points
taking <code>ImageData</code>, <code>HTMLImageElement</code>, <code>HTMLCanvasElement</code>
and <code>HTMLVideoElement</code> are extended to accept the pixel type <code>FLOAT</code>.
</li>
<li>
The WebGL implementation may optionally accept a texture with pixel
type <code>FLOAT</code> as the color attachment to an FBO. Applications must check such
an FBO for completeness after attempting to make this attachment.
<li> The <code>texImage2D</code> and <code>texSubImage2D</code>
entry points taking <code>ArrayBufferView</code> are extended to accept
<code>Float32Array</code> with the pixel type <code>FLOAT</code>.
</li>
<li> The <code>texImage2D</code> and <code>texSubImage2D</code>
entry points taking <code>ImageData</code>,
<code>HTMLImageElement</code>, <code>HTMLCanvasElement</code> and
<code>HTMLVideoElement</code> are extended to accept the pixel type
<code>FLOAT</code>. </li>
<li>Implementations supporting float rendering via this extension
will implicitly enable the <a href="WEBGL_color_buffer_float.html">WEBGL_color_buffer_float</a>
extension and follow its requirements. This ensures correct behavior
when a texture with pixel type <code>FLOAT</code> is attached to an FBO.
Although this feature has historically been allowed, new implementations
should not implicitly support float rendering and applications should be
modified to explicitly enable <a href="WEBGL_color_buffer_float.html">WEBGL_color_buffer_float</a>.</li>
</ul>
<h2 class="no-toc">IDL</h2>
<p><pre class="idl">
interface OES_texture_float {
};
</pre></p>
<p><pre class="idl"> interface OES_texture_float { }; </pre></p>
<h2 class="no-toc">Revision History</h2>
<p>Revision 1, 2010/11/29</p>
<ul><li>Initial revision.</li></ul>
<p>Revision 2, 2010/12/13</p>
<ul><li>Extended to support pixel type FLOAT for texImage2D and texSubImage2D entry points taking ImageData, HTMLImageElement, HTMLCanvasElement and HTMLVideoElement.
</li></ul>
<ul><li>Extended to support pixel type FLOAT for texImage2D and
texSubImage2D entry points taking ImageData, HTMLImageElement,
HTMLCanvasElement and HTMLVideoElement. </li></ul>
<p>Revision 3, 2011/09/12</p>
<ul><li>Added optional ability to use a FLOAT type texture as an FBO's color attachment.
</li></ul>
<ul><li>Added optional ability to use a FLOAT type texture as an FBO's
color attachment. </li></ul>
<p>Revision 4, 2012/01/03</p>
<ul><li>Removed webgl module per changes to Web IDL spec.</li></ul>
<p>Revision 5, 2012/12/04</p>
<ul><li>Specify that implementations supporting FLOAT color attachments
implicitly enable WEBGL_color_buffer_float.</li></ul>
</body>
</html>
80 changes: 48 additions & 32 deletions extensions/OES_texture_half_float/extension.xml
Original file line number Diff line number Diff line change
@@ -1,58 +1,74 @@
<?xml version="1.0"?>

<?xml version="1.0" encoding="UTF-8"?>
<extension href="OES_texture_half_float/">
<name>OES_texture_half_float</name>
<contact>
<a href="https://www.khronos.org/webgl/public-mailing-list/">WebGL working group</a> (public_webgl 'at' khronos.org)
</contact>

<contact> <a href="https://www.khronos.org/webgl/public-mailing-list/">WebGL
working group</a> (public_webgl 'at' khronos.org) </contact>

<contributors>
<contributor>Members of the WebGL working group</contributor>
</contributors>

<number>2</number>

<depends>
<api version="1.0"/>
</depends>

<overview>
<mirrors href="http://www.khronos.org/registry/gles/extensions/OES/OES_texture_float.txt" name="OES_texture_half_float">
<addendum>Optional support for <code>HALF_FLOAT</code> textures as FBO attachments.</addendum>
<mirrors href="http://www.khronos.org/registry/gles/extensions/OES/OES_texture_float.txt"
name="OES_texture_half_float">
<addendum>Optional support for <code>HALF_FLOAT</code> textures as FBO
attachments (deprecated).</addendum>
</mirrors>

<features>
<feature>
The <code>texImage2D</code> and <code>texSubImage2D</code> entry points
taking <code>ArrayBufferView</code> are extended to accept <code>null</code> with
the pixel type <code>HALF_FLOAT_OES</code>.
</feature>
<feature>
The <code>texImage2D</code> and <code>texSubImage2D</code> entry points
taking <code>ImageData</code>, <code>HTMLImageElement</code>, <code>HTMLCanvasElement</code>
and <code>HTMLVideoElement</code> are extended to accept the pixel type <code>HALF_FLOAT_OES</code>.
</feature>
<feature>
The WebGL implementation may optionally accept a texture with pixel
type <code>HALF_FLOAT_OES</code> as the color attachment to an FBO. Applications must
check such an FBO for completeness after attempting to make this attachment.
<feature> The <code>texImage2D</code> and <code>texSubImage2D</code>
entry points taking <code>ArrayBufferView</code> are extended to accept
<code>null</code> with the pixel type <code>HALF_FLOAT_OES</code>.
</feature>

<feature> The <code>texImage2D</code> and <code>texSubImage2D</code>
entry points taking <code>ImageData</code>,
<code>HTMLImageElement</code>, <code>HTMLCanvasElement</code> and
<code>HTMLVideoElement</code> are extended to accept the pixel type
<code>HALF_FLOAT_OES</code>. </feature>

<feature>Implementations supporting float rendering via this extension
will implicitly enable the <a
href="OES_color_buffer_half_float.html">OES_color_buffer_half_float</a>
extension and follow its requirements. This ensures correct behavior
when a texture with pixel type <code>HALF_FLOAT_OES</code> is attached
to an FBO. Although this feature has historically been allowed, new
implementations should not implicitly support float rendering and
applications should be modified to explicitly enable <a
href="OES_color_buffer_half_float.html">OES_color_buffer_half_float</a>.</feature>
</features>
</overview>
<idl>
interface OES_texture_half_float {
const GLenum HALF_FLOAT_OES = 0x8D61;
};
</idl>

<idl> interface OES_texture_half_float { const GLenum HALF_FLOAT_OES =
0x8D61; }; </idl>

<history>
<revision date="2010/11/29">
<change>Initial revision.</change>
</revision>

<revision date="2011/09/12">
<change>
Added similar text about <code>texImage2D</code> and <code>texSubImage2D</code> as in OES_texture_float spec.
</change>
<change>
Added optional ability to use a HALF_FLOAT_OES type texture as an FBO's color attachment.
</change>
<change> Added similar text about <code>texImage2D</code> and
<code>texSubImage2D</code> as in OES_texture_float spec. </change>

<change> Added optional ability to use a HALF_FLOAT_OES type texture as
an FBO's color attachment. </change>
</revision>

<revision date="2012/01/03">
<change>Removed webgl module per changes to Web IDL spec.</change>
</revision>

<revision date="2012/12/04">
<change>Specify that implementations supporting HALF_FLOAT_OES color
attachments implicitly enable EXT_color_buffer_half_float.</change>
</revision>
</history>
</extension>
62 changes: 31 additions & 31 deletions extensions/OES_texture_half_float/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,13 @@
<h2 class="no-toc">Name</h2>
<p>OES_texture_half_float</p>
<h2 class="no-toc">Contact</h2>
<p>
<a href="https://www.khronos.org/webgl/public-mailing-list/">WebGL working group</a> (public_webgl 'at' khronos.org)
</p>
<p> <a href="https://www.khronos.org/webgl/public-mailing-list/">WebGL
working group</a> (public_webgl 'at' khronos.org) </p>
<h2 class="no-toc">Contributors</h2>
<p>Members of the WebGL working group</p>
<h2 class="no-toc">Version</h2>
<p> Last modified date: January 03, 2012<br>
Revision: 3</p>
<p> Last modified date: December 04, 2012<br>
Revision: 4</p>
<h2 class="no-toc">Number</h2>
<p> WebGL extension #2</p>
<h2 class="no-toc">Dependencies</h2>
Expand All @@ -30,47 +29,48 @@ <h2 class="no-toc">Overview</h2>
<a href="http://www.khronos.org/registry/gles/extensions/OES/OES_texture_float.txt">OES_texture_half_float</a> functionality to

WebGL. The following WebGL-specific behavioral changes apply:
<ul><li>Optional support for <code>HALF_FLOAT</code> textures as FBO attachments.</li></ul></p>
<ul><li>Optional support for <code>HALF_FLOAT</code> textures as FBO
attachments (deprecated).</li></ul></p>
<p>
Consult the above extension for documentation, issues and new functions and enumerants.
</p>

<p> When this extension is enabled: </p>
<ul>
<li>
The <code>texImage2D</code> and <code>texSubImage2D</code> entry points
taking <code>ArrayBufferView</code> are extended to accept <code>null</code> with
the pixel type <code>HALF_FLOAT_OES</code>.
</li>
<li>
The <code>texImage2D</code> and <code>texSubImage2D</code> entry points
taking <code>ImageData</code>, <code>HTMLImageElement</code>, <code>HTMLCanvasElement</code>
and <code>HTMLVideoElement</code> are extended to accept the pixel type <code>HALF_FLOAT_OES</code>.
</li>
<li>
The WebGL implementation may optionally accept a texture with pixel
type <code>HALF_FLOAT_OES</code> as the color attachment to an FBO. Applications must
check such an FBO for completeness after attempting to make this attachment.
<li> The <code>texImage2D</code> and <code>texSubImage2D</code>
entry points taking <code>ArrayBufferView</code> are extended to accept
<code>null</code> with the pixel type <code>HALF_FLOAT_OES</code>.
</li>
<li> The <code>texImage2D</code> and <code>texSubImage2D</code>
entry points taking <code>ImageData</code>,
<code>HTMLImageElement</code>, <code>HTMLCanvasElement</code> and
<code>HTMLVideoElement</code> are extended to accept the pixel type
<code>HALF_FLOAT_OES</code>. </li>
<li>Implementations supporting float rendering via this extension
will implicitly enable the <a href="OES_color_buffer_half_float.html">OES_color_buffer_half_float</a>
extension and follow its requirements. This ensures correct behavior
when a texture with pixel type <code>HALF_FLOAT_OES</code> is attached
to an FBO. Although this feature has historically been allowed, new
implementations should not implicitly support float rendering and
applications should be modified to explicitly enable <a href="OES_color_buffer_half_float.html">OES_color_buffer_half_float</a>.</li>
</ul>
<h2 class="no-toc">IDL</h2>
<p><pre class="idl">
interface OES_texture_half_float {
const GLenum HALF_FLOAT_OES = 0x8D61;
};
</pre></p>
<p><pre class="idl"> interface OES_texture_half_float { const GLenum HALF_FLOAT_OES =
0x8D61; }; </pre></p>
<h2 class="no-toc">Revision History</h2>
<p>Revision 1, 2010/11/29</p>
<ul><li>Initial revision.</li></ul>
<p>Revision 2, 2011/09/12</p>
<ul>
<li>
Added similar text about <code>texImage2D</code> and <code>texSubImage2D</code> as in OES_texture_float spec.
</li>
<li>
Added optional ability to use a HALF_FLOAT_OES type texture as an FBO's color attachment.
</li>
<li> Added similar text about <code>texImage2D</code> and
<code>texSubImage2D</code> as in OES_texture_float spec. </li>
<li> Added optional ability to use a HALF_FLOAT_OES type texture as
an FBO's color attachment. </li>
</ul>
<p>Revision 3, 2012/01/03</p>
<ul><li>Removed webgl module per changes to Web IDL spec.</li></ul>
<p>Revision 4, 2012/12/04</p>
<ul><li>Specify that implementations supporting HALF_FLOAT_OES color
attachments implicitly enable EXT_color_buffer_half_float.</li></ul>
</body>
</html>
Loading

0 comments on commit 4e174ac

Please sign in to comment.