<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[161688] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/161688">161688</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2014-01-10 15:53:04 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement OES texture half float linear
https://bugs.webkit.org/show_bug.cgi?id=125060
Reviewed by Brent Fulgham.
Source/WebCore:
Test: fast/canvas/webgl/oes-texture-half-float-linear.html
* CMakeLists.txt: Add new files.
* DerivedSources.cpp: Ditto.
* DerivedSources.make: Generate new file from IDL.
* GNUmakefile.list.am: Add new files.
* WebCore.vcxproj/WebCore.vcxproj: Ditto.
* WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
* WebCore.xcodeproj/project.pbxproj: New files for OESTextureHalfFloatLinear.
* bindings/js/JSWebGLRenderingContextCustom.cpp:
(WebCore::toJS): Map from extension name to native object.
* html/canvas/OESTextureHalfFloatLinear.cpp: Added. New files. These are boiler-plate.
* html/canvas/OESTextureHalfFloatLinear.h: Added.
* html/canvas/OESTextureHalfFloatLinear.idl: Added.
* html/canvas/WebGLExtension.h: Add new enum for the new extension.
* html/canvas/WebGLRenderingContext.cpp:
(WebCore::WebGLRenderingContext::getExtension): Create the extension object if the
context is asked for one.
(WebCore::WebGLRenderingContext::getSupportedExtensions): Add the new extension to the
list of supported extensions. Actually remember to do it this time :)
(WebCore::WebGLRenderingContext::checkTextureCompleteness): Need to check for the half-float
extension as well, and update the log message.
* html/canvas/WebGLRenderingContext.h: New extension object.
* html/canvas/WebGLTexture.cpp:
(WebCore::WebGLTexture::WebGLTexture):
(WebCore::WebGLTexture::needToUseBlackTexture): Check for half-float type.
(WebCore::WebGLTexture::update): Mark a texture as half-float if necessary.
* html/canvas/WebGLTexture.h:
* platform/graphics/Extensions3D.h: Add a comment about the new extension.
* platform/graphics/opengl/Extensions3DOpenGL.cpp:
(WebCore::Extensions3DOpenGL::supportsExtension): This extension is available
when GL_ARB_texture_float is supported, so add the name to the translation.
LayoutTests:
Exercise the OES_texture_half_float_linear extension. The new test
is copied from the official Khronos WebGL repository.
* fast/canvas/webgl/oes-texture-float-linear-expected.txt: Change the console log
messages, which now also mention half float linear.
* fast/canvas/webgl/oes-texture-half-float-linear-expected.txt: Added.
* fast/canvas/webgl/oes-texture-half-float-linear.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcanvaswebgloestexturefloatlinearexpectedtxt">trunk/LayoutTests/fast/canvas/webgl/oes-texture-float-linear-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcescpp">trunk/Source/WebCore/DerivedSources.cpp</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreGNUmakefilelistam">trunk/Source/WebCore/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSWebGLRenderingContextCustomcpp">trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLExtensionh">trunk/Source/WebCore/html/canvas/WebGLExtension.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContexth">trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLTexturecpp">trunk/Source/WebCore/html/canvas/WebGLTexture.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLTextureh">trunk/Source/WebCore/html/canvas/WebGLTexture.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsExtensions3Dh">trunk/Source/WebCore/platform/graphics/Extensions3D.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLcpp">trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcanvaswebgloestexturehalffloatlinearexpectedtxt">trunk/LayoutTests/fast/canvas/webgl/oes-texture-half-float-linear-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvaswebgloestexturehalffloatlinearhtml">trunk/LayoutTests/fast/canvas/webgl/oes-texture-half-float-linear.html</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasOESTextureHalfFloatLinearcpp">trunk/Source/WebCore/html/canvas/OESTextureHalfFloatLinear.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasOESTextureHalfFloatLinearh">trunk/Source/WebCore/html/canvas/OESTextureHalfFloatLinear.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasOESTextureHalfFloatLinearidl">trunk/Source/WebCore/html/canvas/OESTextureHalfFloatLinear.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (161687 => 161688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-10 23:48:54 UTC (rev 161687)
+++ trunk/LayoutTests/ChangeLog 2014-01-10 23:53:04 UTC (rev 161688)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-01-10 Dean Jackson <dino@apple.com>
+
+ Implement OES texture half float linear
+ https://bugs.webkit.org/show_bug.cgi?id=125060
+
+ Reviewed by Brent Fulgham.
+
+ Exercise the OES_texture_half_float_linear extension. The new test
+ is copied from the official Khronos WebGL repository.
+
+ * fast/canvas/webgl/oes-texture-float-linear-expected.txt: Change the console log
+ messages, which now also mention half float linear.
+ * fast/canvas/webgl/oes-texture-half-float-linear-expected.txt: Added.
+ * fast/canvas/webgl/oes-texture-half-float-linear.html: Added.
+
</ins><span class="cx"> 2014-01-10 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebGL] Correct uniform input validation for texture sampler uniforms.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvaswebgloestexturefloatlinearexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/canvas/webgl/oes-texture-float-linear-expected.txt (161687 => 161688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/oes-texture-float-linear-expected.txt 2014-01-10 23:48:54 UTC (rev 161687)
+++ trunk/LayoutTests/fast/canvas/webgl/oes-texture-float-linear-expected.txt 2014-01-10 23:53:04 UTC (rev 161688)
</span><span class="lines">@@ -1,25 +1,25 @@
</span><del>-CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a Float type with linear filtering and without the relevant float linear extension enabled.
-CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a Float type with linear filtering and without the relevant float linear extension enabled.
-CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a Float type with linear filtering and without the relevant float linear extension enabled.
-CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a Float type with linear filtering and without the relevant float linear extension enabled.
-CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a Float type with linear filtering and without the relevant float linear extension enabled.
-CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a Float type with linear filtering and without the relevant float linear extension enabled.
-CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a Float type with linear filtering and without the relevant float linear extension enabled.
-CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a Float type with linear filtering and without the relevant float linear extension enabled.
-CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a Float type with linear filtering and without the relevant float linear extension enabled.
-CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a Float type with linear filtering and without the relevant float linear extension enabled.
-CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a Float type with linear filtering and without the relevant float linear extension enabled.
-CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a Float type with linear filtering and without the relevant float linear extension enabled.
-CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a Float type with linear filtering and without the relevant float linear extension enabled.
-CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a Float type with linear filtering and without the relevant float linear extension enabled.
-CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a Float type with linear filtering and without the relevant float linear extension enabled.
-CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a Float type with linear filtering and without the relevant float linear extension enabled.
-CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a Float type with linear filtering and without the relevant float linear extension enabled.
-CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a Float type with linear filtering and without the relevant float linear extension enabled.
-CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a Float type with linear filtering and without the relevant float linear extension enabled.
-CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a Float type with linear filtering and without the relevant float linear extension enabled.
-CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a Float type with linear filtering and without the relevant float linear extension enabled.
-CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a Float type with linear filtering and without the relevant float linear extension enabled.
</del><ins>+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
</ins><span class="cx"> This test verifies the functionality of the OES_texture_float_linear extension, if it is available.
</span><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvaswebgloestexturehalffloatlinearexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/webgl/oes-texture-half-float-linear-expected.txt (0 => 161688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/oes-texture-half-float-linear-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/canvas/webgl/oes-texture-half-float-linear-expected.txt 2014-01-10 23:53:04 UTC (rev 161688)
</span><span class="lines">@@ -0,0 +1,220 @@
</span><ins>+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+CONSOLE MESSAGE: WebGL: drawArrays: texture bound to texture unit 0 is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete', or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.
+This test verifies the functionality of the OES_texture_half_float_linear extension, if it is available.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+ PASS Successfully enabled OES_texture_half_float extension
+
+testing target: TEXTURE_2D, testing format: RGBA, magFilter is: NEAREST, minFilter is: NEAREST, OES_texture_half_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with non-Linear filter should succeed with NO_ERROR no matter whether OES_texture_half_float_linear is enabled or not
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_2D, testing format: RGBA, magFilter is: NEAREST, minFilter is: LINEAR, OES_texture_half_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
+PASS should be 0,0,0,255
+
+testing target: TEXTURE_2D, testing format: RGBA, magFilter is: NEAREST, minFilter is: NEAREST_MIPMAP_NEAREST, OES_texture_half_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with non-Linear filter should succeed with NO_ERROR no matter whether OES_texture_half_float_linear is enabled or not
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_2D, testing format: RGBA, magFilter is: NEAREST, minFilter is: NEAREST_MIPMAP_LINEAR, OES_texture_half_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
+PASS should be 0,0,0,255
+
+testing target: TEXTURE_2D, testing format: RGBA, magFilter is: NEAREST, minFilter is: LINEAR_MIPMAP_NEAREST, OES_texture_half_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
+PASS should be 0,0,0,255
+
+testing target: TEXTURE_2D, testing format: RGBA, magFilter is: NEAREST, minFilter is: LINEAR_MIPMAP_LINEAR, OES_texture_half_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
+PASS should be 0,0,0,255
+
+testing target: TEXTURE_2D, testing format: RGBA, magFilter is: LINEAR, minFilter is: NEAREST, OES_texture_half_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
+PASS should be 0,0,0,255
+
+testing target: TEXTURE_2D, testing format: RGBA, magFilter is: LINEAR, minFilter is: LINEAR, OES_texture_half_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
+PASS should be 0,0,0,255
+
+testing target: TEXTURE_2D, testing format: RGBA, magFilter is: LINEAR, minFilter is: NEAREST_MIPMAP_NEAREST, OES_texture_half_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
+PASS should be 0,0,0,255
+
+testing target: TEXTURE_2D, testing format: RGBA, magFilter is: LINEAR, minFilter is: NEAREST_MIPMAP_LINEAR, OES_texture_half_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
+PASS should be 0,0,0,255
+
+testing target: TEXTURE_2D, testing format: RGBA, magFilter is: LINEAR, minFilter is: LINEAR_MIPMAP_NEAREST, OES_texture_half_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
+PASS should be 0,0,0,255
+
+testing target: TEXTURE_2D, testing format: RGBA, magFilter is: LINEAR, minFilter is: LINEAR_MIPMAP_LINEAR, OES_texture_half_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
+PASS should be 0,0,0,255
+
+testing target: TEXTURE_CUBE_MAP, testing format: RGBA, magFilter is: NEAREST, minFilter is: NEAREST, OES_texture_half_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with non-Linear filter should succeed with NO_ERROR no matter whether OES_texture_half_float_linear is enabled or not
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_CUBE_MAP, testing format: RGBA, magFilter is: NEAREST, minFilter is: LINEAR, OES_texture_half_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
+PASS should be 0,0,0,255
+
+testing target: TEXTURE_CUBE_MAP, testing format: RGBA, magFilter is: NEAREST, minFilter is: NEAREST_MIPMAP_NEAREST, OES_texture_half_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with non-Linear filter should succeed with NO_ERROR no matter whether OES_texture_half_float_linear is enabled or not
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_CUBE_MAP, testing format: RGBA, magFilter is: NEAREST, minFilter is: NEAREST_MIPMAP_LINEAR, OES_texture_half_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
+PASS should be 0,0,0,255
+
+testing target: TEXTURE_CUBE_MAP, testing format: RGBA, magFilter is: NEAREST, minFilter is: LINEAR_MIPMAP_NEAREST, OES_texture_half_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
+PASS should be 0,0,0,255
+
+testing target: TEXTURE_CUBE_MAP, testing format: RGBA, magFilter is: NEAREST, minFilter is: LINEAR_MIPMAP_LINEAR, OES_texture_half_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
+PASS should be 0,0,0,255
+
+testing target: TEXTURE_CUBE_MAP, testing format: RGBA, magFilter is: LINEAR, minFilter is: NEAREST, OES_texture_half_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
+PASS should be 0,0,0,255
+
+testing target: TEXTURE_CUBE_MAP, testing format: RGBA, magFilter is: LINEAR, minFilter is: LINEAR, OES_texture_half_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
+PASS should be 0,0,0,255
+
+testing target: TEXTURE_CUBE_MAP, testing format: RGBA, magFilter is: LINEAR, minFilter is: NEAREST_MIPMAP_NEAREST, OES_texture_half_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
+PASS should be 0,0,0,255
+
+testing target: TEXTURE_CUBE_MAP, testing format: RGBA, magFilter is: LINEAR, minFilter is: NEAREST_MIPMAP_LINEAR, OES_texture_half_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
+PASS should be 0,0,0,255
+
+testing target: TEXTURE_CUBE_MAP, testing format: RGBA, magFilter is: LINEAR, minFilter is: LINEAR_MIPMAP_NEAREST, OES_texture_half_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
+PASS should be 0,0,0,255
+
+testing target: TEXTURE_CUBE_MAP, testing format: RGBA, magFilter is: LINEAR, minFilter is: LINEAR_MIPMAP_LINEAR, OES_texture_half_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
+PASS should be 0,0,0,255
+
+testing target: TEXTURE_2D, testing format: RGBA, magFilter is: NEAREST, minFilter is: NEAREST, OES_texture_half_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with non-Linear filter should succeed with NO_ERROR no matter whether OES_texture_half_float_linear is enabled or not
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_2D, testing format: RGBA, magFilter is: NEAREST, minFilter is: LINEAR, OES_texture_half_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_2D, testing format: RGBA, magFilter is: NEAREST, minFilter is: NEAREST_MIPMAP_NEAREST, OES_texture_half_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with non-Linear filter should succeed with NO_ERROR no matter whether OES_texture_half_float_linear is enabled or not
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_2D, testing format: RGBA, magFilter is: NEAREST, minFilter is: NEAREST_MIPMAP_LINEAR, OES_texture_half_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_2D, testing format: RGBA, magFilter is: NEAREST, minFilter is: LINEAR_MIPMAP_NEAREST, OES_texture_half_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_2D, testing format: RGBA, magFilter is: NEAREST, minFilter is: LINEAR_MIPMAP_LINEAR, OES_texture_half_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_2D, testing format: RGBA, magFilter is: LINEAR, minFilter is: NEAREST, OES_texture_half_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_2D, testing format: RGBA, magFilter is: LINEAR, minFilter is: LINEAR, OES_texture_half_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_2D, testing format: RGBA, magFilter is: LINEAR, minFilter is: NEAREST_MIPMAP_NEAREST, OES_texture_half_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_2D, testing format: RGBA, magFilter is: LINEAR, minFilter is: NEAREST_MIPMAP_LINEAR, OES_texture_half_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_2D, testing format: RGBA, magFilter is: LINEAR, minFilter is: LINEAR_MIPMAP_NEAREST, OES_texture_half_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_2D, testing format: RGBA, magFilter is: LINEAR, minFilter is: LINEAR_MIPMAP_LINEAR, OES_texture_half_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_CUBE_MAP, testing format: RGBA, magFilter is: NEAREST, minFilter is: NEAREST, OES_texture_half_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with non-Linear filter should succeed with NO_ERROR no matter whether OES_texture_half_float_linear is enabled or not
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_CUBE_MAP, testing format: RGBA, magFilter is: NEAREST, minFilter is: LINEAR, OES_texture_half_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_CUBE_MAP, testing format: RGBA, magFilter is: NEAREST, minFilter is: NEAREST_MIPMAP_NEAREST, OES_texture_half_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with non-Linear filter should succeed with NO_ERROR no matter whether OES_texture_half_float_linear is enabled or not
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_CUBE_MAP, testing format: RGBA, magFilter is: NEAREST, minFilter is: NEAREST_MIPMAP_LINEAR, OES_texture_half_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_CUBE_MAP, testing format: RGBA, magFilter is: NEAREST, minFilter is: LINEAR_MIPMAP_NEAREST, OES_texture_half_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_CUBE_MAP, testing format: RGBA, magFilter is: NEAREST, minFilter is: LINEAR_MIPMAP_LINEAR, OES_texture_half_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_CUBE_MAP, testing format: RGBA, magFilter is: LINEAR, minFilter is: NEAREST, OES_texture_half_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_CUBE_MAP, testing format: RGBA, magFilter is: LINEAR, minFilter is: LINEAR, OES_texture_half_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_CUBE_MAP, testing format: RGBA, magFilter is: LINEAR, minFilter is: NEAREST_MIPMAP_NEAREST, OES_texture_half_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_CUBE_MAP, testing format: RGBA, magFilter is: LINEAR, minFilter is: NEAREST_MIPMAP_LINEAR, OES_texture_half_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_CUBE_MAP, testing format: RGBA, magFilter is: LINEAR, minFilter is: LINEAR_MIPMAP_NEAREST, OES_texture_half_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
+PASS should be 255,255,255,255
+
+testing target: TEXTURE_CUBE_MAP, testing format: RGBA, magFilter is: LINEAR, minFilter is: LINEAR_MIPMAP_LINEAR, OES_texture_half_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
+PASS should be 255,255,255,255
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/canvas/webgl/oes-texture-half-float-linear-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsfastcanvaswebgloestexturehalffloatlinearhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/webgl/oes-texture-half-float-linear.html (0 => 161688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/oes-texture-half-float-linear.html (rev 0)
+++ trunk/LayoutTests/fast/canvas/webgl/oes-texture-half-float-linear.html 2014-01-10 23:53:04 UTC (rev 161688)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+<!--
+
+/*
+** Copyright (c) 2013 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+-->
+
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<script src="../../../resources/js-test-pre.js"></script>
+<script src="resources/webgl-test.js"></script>
+<script src="resources/webgl-test-utils.js"></script>
+<script src="resources/oes-texture-float-and-half-float-linear.js"></script>
+<script>
+"use strict";
+function testPrologue(gl, extensionTypeName) {
+ var ext = null;
+ if (!(ext = gl.getExtension(extensionTypeName))) {
+ testPassed("No " + extensionTypeName + " support -- this is legal");
+ return false;
+ }
+ // Required by the test harness.
+ gl.HALF_FLOAT_OES = ext.HALF_FLOAT_OES;
+ testPassed("Successfully enabled " + extensionTypeName + " extension");
+ return true;
+}
+</script>
+</head>
+<body onload='generateTest("OES_texture_half_float", "OES_texture_half_float_linear", "HALF_FLOAT_OES", testPrologue)()'>
+<div id="description"></div>
+<canvas id="canvas" style="width: 50px; height: 50px;"> </canvas>
+<div id="console"></div>
+</body>
+</html>
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/canvas/webgl/oes-texture-half-float-linear.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (161687 => 161688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-01-10 23:48:54 UTC (rev 161687)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-01-10 23:53:04 UTC (rev 161688)
</span><span class="lines">@@ -508,6 +508,7 @@
</span><span class="cx"> html/canvas/OESTextureFloat.idl
</span><span class="cx"> html/canvas/OESTextureFloatLinear.idl
</span><span class="cx"> html/canvas/OESTextureHalfFloat.idl
</span><ins>+ html/canvas/OESTextureHalfFloatLinear.idl
</ins><span class="cx"> html/canvas/OESVertexArrayObject.idl
</span><span class="cx"> html/canvas/WebGLActiveInfo.idl
</span><span class="cx"> html/canvas/WebGLBuffer.idl
</span><span class="lines">@@ -1505,6 +1506,7 @@
</span><span class="cx"> html/canvas/OESTextureFloat.cpp
</span><span class="cx"> html/canvas/OESTextureFloatLinear.cpp
</span><span class="cx"> html/canvas/OESTextureHalfFloat.cpp
</span><ins>+ html/canvas/OESTextureHalfFloatLinear.cpp
</ins><span class="cx"> html/canvas/OESVertexArrayObject.cpp
</span><span class="cx"> html/canvas/WebGLBuffer.cpp
</span><span class="cx"> html/canvas/WebGLCompressedTextureATC.cpp
</span><span class="lines">@@ -2674,6 +2676,7 @@
</span><span class="cx"> html/canvas/OESTextureFloat.cpp
</span><span class="cx"> html/canvas/OESTextureFloatLinear.cpp
</span><span class="cx"> html/canvas/OESTextureHalfFloat.cpp
</span><ins>+ html/canvas/OESTextureHalfFloatLinear.cpp
</ins><span class="cx"> html/canvas/OESVertexArrayObject.cpp
</span><span class="cx"> html/canvas/WebGLBuffer.cpp
</span><span class="cx"> html/canvas/WebGLCompressedTextureATC.cpp
</span><span class="lines">@@ -2709,6 +2712,7 @@
</span><span class="cx"> html/canvas/OESTextureFloat.idl
</span><span class="cx"> html/canvas/OESTextureFloatLinear.idl
</span><span class="cx"> html/canvas/OESTextureHalfFloat.idl
</span><ins>+ html/canvas/OESTextureHalfFloatLinear.idl
</ins><span class="cx"> html/canvas/OESVertexArrayObject.idl
</span><span class="cx"> html/canvas/WebGLActiveInfo.idl
</span><span class="cx"> html/canvas/WebGLBuffer.idl
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161687 => 161688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-10 23:48:54 UTC (rev 161687)
+++ trunk/Source/WebCore/ChangeLog 2014-01-10 23:53:04 UTC (rev 161688)
</span><span class="lines">@@ -1,3 +1,49 @@
</span><ins>+2014-01-10 Dean Jackson <dino@apple.com>
+
+ Implement OES texture half float linear
+ https://bugs.webkit.org/show_bug.cgi?id=125060
+
+ Reviewed by Brent Fulgham.
+
+ Test: fast/canvas/webgl/oes-texture-half-float-linear.html
+
+ * CMakeLists.txt: Add new files.
+ * DerivedSources.cpp: Ditto.
+ * DerivedSources.make: Generate new file from IDL.
+ * GNUmakefile.list.am: Add new files.
+ * WebCore.vcxproj/WebCore.vcxproj: Ditto.
+ * WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
+ * WebCore.xcodeproj/project.pbxproj: New files for OESTextureHalfFloatLinear.
+
+ * bindings/js/JSWebGLRenderingContextCustom.cpp:
+ (WebCore::toJS): Map from extension name to native object.
+
+ * html/canvas/OESTextureHalfFloatLinear.cpp: Added. New files. These are boiler-plate.
+ * html/canvas/OESTextureHalfFloatLinear.h: Added.
+ * html/canvas/OESTextureHalfFloatLinear.idl: Added.
+
+ * html/canvas/WebGLExtension.h: Add new enum for the new extension.
+
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::getExtension): Create the extension object if the
+ context is asked for one.
+ (WebCore::WebGLRenderingContext::getSupportedExtensions): Add the new extension to the
+ list of supported extensions. Actually remember to do it this time :)
+ (WebCore::WebGLRenderingContext::checkTextureCompleteness): Need to check for the half-float
+ extension as well, and update the log message.
+ * html/canvas/WebGLRenderingContext.h: New extension object.
+
+ * html/canvas/WebGLTexture.cpp:
+ (WebCore::WebGLTexture::WebGLTexture):
+ (WebCore::WebGLTexture::needToUseBlackTexture): Check for half-float type.
+ (WebCore::WebGLTexture::update): Mark a texture as half-float if necessary.
+ * html/canvas/WebGLTexture.h:
+
+ * platform/graphics/Extensions3D.h: Add a comment about the new extension.
+ * platform/graphics/opengl/Extensions3DOpenGL.cpp:
+ (WebCore::Extensions3DOpenGL::supportsExtension): This extension is available
+ when GL_ARB_texture_float is supported, so add the name to the translation.
+
</ins><span class="cx"> 2014-01-10 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebGL] Correct uniform input validation for texture sampler uniform
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.cpp (161687 => 161688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.cpp 2014-01-10 23:48:54 UTC (rev 161687)
+++ trunk/Source/WebCore/DerivedSources.cpp 2014-01-10 23:53:04 UTC (rev 161688)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> #include "JSOESTextureFloat.cpp"
</span><span class="cx"> #include "JSOESTextureFloatLinear.cpp"
</span><span class="cx"> #include "JSOESTextureHalfFloat.cpp"
</span><ins>+#include "JSOESTextureHalfFloatLinear.cpp"
</ins><span class="cx"> #include "JSOESVertexArrayObject.cpp"
</span><span class="cx"> #include "JSWebGLActiveInfo.cpp"
</span><span class="cx"> #include "JSWebGLBuffer.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (161687 => 161688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2014-01-10 23:48:54 UTC (rev 161687)
+++ trunk/Source/WebCore/DerivedSources.make 2014-01-10 23:53:04 UTC (rev 161688)
</span><span class="lines">@@ -421,6 +421,7 @@
</span><span class="cx"> $(WebCore)/html/canvas/OESTextureFloat.idl \
</span><span class="cx"> $(WebCore)/html/canvas/OESTextureFloatLinear.idl \
</span><span class="cx"> $(WebCore)/html/canvas/OESTextureHalfFloat.idl \
</span><ins>+ $(WebCore)/html/canvas/OESTextureHalfFloatLinear.idl \
</ins><span class="cx"> $(WebCore)/html/canvas/OESVertexArrayObject.idl \
</span><span class="cx"> $(WebCore)/html/canvas/WebGLActiveInfo.idl \
</span><span class="cx"> $(WebCore)/html/canvas/WebGLBuffer.idl \
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.list.am (161687 => 161688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.list.am 2014-01-10 23:48:54 UTC (rev 161687)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2014-01-10 23:53:04 UTC (rev 161688)
</span><span class="lines">@@ -547,6 +547,8 @@
</span><span class="cx"> DerivedSources/WebCore/JSOESTextureFloatLinear.h \
</span><span class="cx"> DerivedSources/WebCore/JSOESTextureHalfFloat.cpp \
</span><span class="cx"> DerivedSources/WebCore/JSOESTextureHalfFloat.h \
</span><ins>+ DerivedSources/WebCore/JSOESTextureHalfFloatLinear.cpp \
+ DerivedSources/WebCore/JSOESTextureHalfFloatLinear.h \
</ins><span class="cx"> DerivedSources/WebCore/JSOESVertexArrayObject.cpp \
</span><span class="cx"> DerivedSources/WebCore/JSOESVertexArrayObject.h \
</span><span class="cx"> DerivedSources/WebCore/JSOESElementIndexUint.cpp \
</span><span class="lines">@@ -1516,6 +1518,7 @@
</span><span class="cx"> $(WebCore)/html/canvas/OESTextureFloat.idl \
</span><span class="cx"> $(WebCore)/html/canvas/OESTextureFloatLinear.idl \
</span><span class="cx"> $(WebCore)/html/canvas/OESTextureHalfFloat.idl \
</span><ins>+ $(WebCore)/html/canvas/OESTextureHalfFloatLinear.idl \
</ins><span class="cx"> $(WebCore)/html/canvas/OESVertexArrayObject.idl \
</span><span class="cx"> $(WebCore)/html/canvas/OESElementIndexUint.idl \
</span><span class="cx"> $(WebCore)/html/canvas/WebGLActiveInfo.idl \
</span><span class="lines">@@ -3266,6 +3269,8 @@
</span><span class="cx"> Source/WebCore/html/canvas/OESTextureFloatLinear.h \
</span><span class="cx"> Source/WebCore/html/canvas/OESTextureHalfFloat.cpp \
</span><span class="cx"> Source/WebCore/html/canvas/OESTextureHalfFloat.h \
</span><ins>+ Source/WebCore/html/canvas/OESTextureHalfFloatLinear.cpp \
+ Source/WebCore/html/canvas/OESTextureHalfFloatLinear.h \
</ins><span class="cx"> Source/WebCore/html/canvas/OESVertexArrayObject.cpp \
</span><span class="cx"> Source/WebCore/html/canvas/OESVertexArrayObject.h \
</span><span class="cx"> Source/WebCore/html/canvas/OESElementIndexUint.cpp \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (161687 => 161688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-01-10 23:48:54 UTC (rev 161687)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-01-10 23:53:04 UTC (rev 161688)
</span><span class="lines">@@ -388,6 +388,20 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSOESTextureHalfFloatLinear.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSOESVertexArrayObject.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -6537,6 +6551,7 @@
</span><span class="cx"> <ClCompile Include="..\html\canvas\OESTextureFloat.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\OESTextureFloatLinear.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\OESTextureHalfFloat.cpp" />
</span><ins>+ <ClCompile Include="..\html\canvas\OESTextureHalfFloatLinear.cpp" />
</ins><span class="cx"> <ClCompile Include="..\html\canvas\OESVertexArrayObject.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\WebGLBuffer.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\WebGLCompressedTextureATC.cpp" />
</span><span class="lines">@@ -18540,6 +18555,7 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSOESTextureFloat.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSOESTextureFloatLinear.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSOESTextureHalfFloat.h" />
</span><ins>+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSOESTextureHalfFloatLinear.h" />
</ins><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSOESVertexArrayObject.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLActiveInfo.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLBuffer.h" />
</span><span class="lines">@@ -18640,6 +18656,7 @@
</span><span class="cx"> <ClInclude Include="..\html\canvas\OESTextureFloat.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\OESTextureFloatLinear.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\OESTextureHalfFloat.h" />
</span><ins>+ <ClInclude Include="..\html\canvas\OESTextureHalfFloatLinear.h" />
</ins><span class="cx"> <ClInclude Include="..\html\canvas\OESVertexArrayObject.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\WebGLActiveInfo.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\WebGLBuffer.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (161687 => 161688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-01-10 23:48:54 UTC (rev 161687)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-01-10 23:53:04 UTC (rev 161688)
</span><span class="lines">@@ -6631,6 +6631,9 @@
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSOESTextureHalfFloat.cpp">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSOESTextureHalfFloatLinear.cpp">
+ <Filter>DerivedSources</Filter>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSOESVertexArrayObject.cpp">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -6724,6 +6727,9 @@
</span><span class="cx"> <ClCompile Include="..\html\canvas\OESTextureHalfFloat.cpp">
</span><span class="cx"> <Filter>html\canvas</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\html\canvas\OESTextureHalfFloatLinear.cpp">
+ <Filter>html\canvas</Filter>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\html\canvas\OESVertexArrayObject.cpp">
</span><span class="cx"> <Filter>html\canvas</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -14470,6 +14476,9 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSOESTextureHalfFloat.h">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSOESTextureHalfFloatLinear.h">
+ <Filter>DerivedSources</Filter>
+ </ClInclude>
</ins><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSOESVertexArrayObject.h">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -14566,6 +14575,9 @@
</span><span class="cx"> <ClInclude Include="..\html\canvas\OESTextureHalfFloat.h">
</span><span class="cx"> <Filter>html\canvas</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\html\canvas\OESTextureHalfFloatLinear.h">
+ <Filter>html\canvas</Filter>
+ </ClInclude>
</ins><span class="cx"> <ClInclude Include="..\html\canvas\OESVertexArrayObject.h">
</span><span class="cx"> <Filter>html\canvas</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (161687 => 161688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-10 23:48:54 UTC (rev 161687)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-10 23:53:04 UTC (rev 161688)
</span><span class="lines">@@ -1094,6 +1094,10 @@
</span><span class="cx"> 31060379143281CD00ABF4BA /* DOMWebKitCSSFilterValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 31060376143281CD00ABF4BA /* DOMWebKitCSSFilterValue.h */; };
</span><span class="cx"> 3106037A143281CD00ABF4BA /* DOMWebKitCSSFilterValue.mm in Sources */ = {isa = PBXBuildFile; fileRef = 31060377143281CD00ABF4BA /* DOMWebKitCSSFilterValue.mm */; };
</span><span class="cx"> 3106037B143281CD00ABF4BA /* DOMWebKitCSSFilterValueInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 31060378143281CD00ABF4BA /* DOMWebKitCSSFilterValueInternal.h */; };
</span><ins>+ 31078CC71880AAB5008099DC /* OESTextureHalfFloatLinear.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31078CC21880A6A6008099DC /* OESTextureHalfFloatLinear.cpp */; };
+ 31078CC81880AABB008099DC /* OESTextureHalfFloatLinear.h in Headers */ = {isa = PBXBuildFile; fileRef = 31078CC31880A6A6008099DC /* OESTextureHalfFloatLinear.h */; };
+ 31078CC91880AAC9008099DC /* JSOESTextureHalfFloatLinear.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31078CC51880AAAA008099DC /* JSOESTextureHalfFloatLinear.cpp */; };
+ 31078CCA1880AACE008099DC /* JSOESTextureHalfFloatLinear.h in Headers */ = {isa = PBXBuildFile; fileRef = 31078CC61880AAAA008099DC /* JSOESTextureHalfFloatLinear.h */; };
</ins><span class="cx"> 31288E720E3005D6003619AE /* WebKitCSSKeyframeRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31288E6E0E3005D6003619AE /* WebKitCSSKeyframeRule.cpp */; };
</span><span class="cx"> 31288E730E3005D6003619AE /* WebKitCSSKeyframeRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 31288E6F0E3005D6003619AE /* WebKitCSSKeyframeRule.h */; };
</span><span class="cx"> 31288E740E3005D6003619AE /* WebKitCSSKeyframesRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31288E700E3005D6003619AE /* WebKitCSSKeyframesRule.cpp */; };
</span><span class="lines">@@ -7910,6 +7914,11 @@
</span><span class="cx"> 31060376143281CD00ABF4BA /* DOMWebKitCSSFilterValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWebKitCSSFilterValue.h; sourceTree = "<group>"; };
</span><span class="cx"> 31060377143281CD00ABF4BA /* DOMWebKitCSSFilterValue.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMWebKitCSSFilterValue.mm; sourceTree = "<group>"; };
</span><span class="cx"> 31060378143281CD00ABF4BA /* DOMWebKitCSSFilterValueInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWebKitCSSFilterValueInternal.h; sourceTree = "<group>"; };
</span><ins>+ 31078CC21880A6A6008099DC /* OESTextureHalfFloatLinear.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OESTextureHalfFloatLinear.cpp; path = canvas/OESTextureHalfFloatLinear.cpp; sourceTree = "<group>"; };
+ 31078CC31880A6A6008099DC /* OESTextureHalfFloatLinear.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OESTextureHalfFloatLinear.h; path = canvas/OESTextureHalfFloatLinear.h; sourceTree = "<group>"; };
+ 31078CC41880A6A6008099DC /* OESTextureHalfFloatLinear.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OESTextureHalfFloatLinear.idl; path = canvas/OESTextureHalfFloatLinear.idl; sourceTree = "<group>"; };
+ 31078CC51880AAAA008099DC /* JSOESTextureHalfFloatLinear.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSOESTextureHalfFloatLinear.cpp; sourceTree = "<group>"; };
+ 31078CC61880AAAA008099DC /* JSOESTextureHalfFloatLinear.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSOESTextureHalfFloatLinear.h; sourceTree = "<group>"; };
</ins><span class="cx"> 31288E6E0E3005D6003619AE /* WebKitCSSKeyframeRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitCSSKeyframeRule.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 31288E6F0E3005D6003619AE /* WebKitCSSKeyframeRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitCSSKeyframeRule.h; sourceTree = "<group>"; };
</span><span class="cx"> 31288E700E3005D6003619AE /* WebKitCSSKeyframesRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitCSSKeyframesRule.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -15386,6 +15395,9 @@
</span><span class="cx"> A31C4E4C16E02AA6002F7957 /* OESTextureHalfFloat.cpp */,
</span><span class="cx"> A31C4E4E16E02AB4002F7957 /* OESTextureHalfFloat.h */,
</span><span class="cx"> A31C4E5016E02AC5002F7957 /* OESTextureHalfFloat.idl */,
</span><ins>+ 31078CC21880A6A6008099DC /* OESTextureHalfFloatLinear.cpp */,
+ 31078CC31880A6A6008099DC /* OESTextureHalfFloatLinear.h */,
+ 31078CC41880A6A6008099DC /* OESTextureHalfFloatLinear.idl */,
</ins><span class="cx"> 77A17A6E12F28182004E02F6 /* OESVertexArrayObject.cpp */,
</span><span class="cx"> 77A17A6F12F28182004E02F6 /* OESVertexArrayObject.h */,
</span><span class="cx"> 77A17A7012F28182004E02F6 /* OESVertexArrayObject.idl */,
</span><span class="lines">@@ -18261,6 +18273,8 @@
</span><span class="cx"> 3146FE7118442367001A937C /* JSOESTextureFloatLinear.h */,
</span><span class="cx"> A31C4E5116E02B08002F7957 /* JSOESTextureHalfFloat.cpp */,
</span><span class="cx"> A31C4E5316E02B40002F7957 /* JSOESTextureHalfFloat.h */,
</span><ins>+ 31078CC51880AAAA008099DC /* JSOESTextureHalfFloatLinear.cpp */,
+ 31078CC61880AAAA008099DC /* JSOESTextureHalfFloatLinear.h */,
</ins><span class="cx"> 77A17AA212F28B2A004E02F6 /* JSOESVertexArrayObject.cpp */,
</span><span class="cx"> 77A17AA312F28B2A004E02F6 /* JSOESVertexArrayObject.h */,
</span><span class="cx"> B658FF9F1522EF3A00DD5595 /* JSRadioNodeList.cpp */,
</span><span class="lines">@@ -23157,6 +23171,7 @@
</span><span class="cx"> A8185F3909765766005826D9 /* DocumentType.h in Headers */,
</span><span class="cx"> 973889A1116EA9DC00ADF313 /* DocumentWriter.h in Headers */,
</span><span class="cx"> BC1A37AD097C715F0019F3D8 /* DOM.h in Headers */,
</span><ins>+ 31078CC81880AABB008099DC /* OESTextureHalfFloatLinear.h in Headers */,
</ins><span class="cx"> 8538F0190AD718D8006A81D1 /* DOMAbstractView.h in Headers */,
</span><span class="cx"> BC99812E0DBE807A008CE9EF /* DOMAbstractViewFrame.h in Headers */,
</span><span class="cx"> 8538F01B0AD718D8006A81D1 /* DOMAbstractViewInternal.h in Headers */,
</span><span class="lines">@@ -23311,6 +23326,7 @@
</span><span class="cx"> 85E711AB0AC5D5350053270F /* DOMHTMLFrameElementInternal.h in Headers */,
</span><span class="cx"> 85DF81970AA77E4B00486AD7 /* DOMHTMLFrameSetElement.h in Headers */,
</span><span class="cx"> 85E711AC0AC5D5350053270F /* DOMHTMLFrameSetElementInternal.h in Headers */,
</span><ins>+ 31078CCA1880AACE008099DC /* JSOESTextureHalfFloatLinear.h in Headers */,
</ins><span class="cx"> 85992EBA0AA5069500AC0785 /* DOMHTMLHeadElement.h in Headers */,
</span><span class="cx"> 85E711AD0AC5D5350053270F /* DOMHTMLHeadElementInternal.h in Headers */,
</span><span class="cx"> 85183B440AA6926100F19FA3 /* DOMHTMLHeadingElement.h in Headers */,
</span><span class="lines">@@ -26865,6 +26881,7 @@
</span><span class="cx"> 853BF4DC0ABB6B55008647BB /* DOMNode.mm in Sources */,
</span><span class="cx"> 85526C380AB0A17E000302EA /* DOMNodeIterator.mm in Sources */,
</span><span class="cx"> 85ACAA8E0A9B759C00671E90 /* DOMNodeList.mm in Sources */,
</span><ins>+ 31078CC91880AAC9008099DC /* JSOESTextureHalfFloatLinear.cpp in Sources */,
</ins><span class="cx"> 85CA96EB0A9624E900690CCF /* DOMNotation.mm in Sources */,
</span><span class="cx"> 856C8AE50A912649005C687B /* DOMObject.mm in Sources */,
</span><span class="cx"> BC53DA62114314BD000D817E /* DOMObjectHashTableMap.cpp in Sources */,
</span><span class="lines">@@ -27953,6 +27970,7 @@
</span><span class="cx"> 1A750D5C0A90DEE1000FF215 /* JSTreeWalker.cpp in Sources */,
</span><span class="cx"> 516BB7940CE91E6800512F79 /* JSTreeWalkerCustom.cpp in Sources */,
</span><span class="cx"> A86629D009DA2B48009633A5 /* JSUIEvent.cpp in Sources */,
</span><ins>+ 31078CC71880AAB5008099DC /* OESTextureHalfFloatLinear.cpp in Sources */,
</ins><span class="cx"> AAA4FAD3175D5CB300743873 /* JSUIRequestEvent.cpp in Sources */,
</span><span class="cx"> 15C77094100D3CA8005BA267 /* JSValidityState.cpp in Sources */,
</span><span class="cx"> BE8EF04A171C9014009B48C3 /* JSVideoTrack.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSWebGLRenderingContextCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp (161687 => 161688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp 2014-01-10 23:48:54 UTC (rev 161687)
+++ trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp 2014-01-10 23:53:04 UTC (rev 161688)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> #include "JSOESTextureFloat.h"
</span><span class="cx"> #include "JSOESTextureFloatLinear.h"
</span><span class="cx"> #include "JSOESTextureHalfFloat.h"
</span><ins>+#include "JSOESTextureHalfFloatLinear.h"
</ins><span class="cx"> #include "JSOESVertexArrayObject.h"
</span><span class="cx"> #include "JSWebGLBuffer.h"
</span><span class="cx"> #include "JSWebGLCompressedTextureATC.h"
</span><span class="lines">@@ -67,6 +68,7 @@
</span><span class="cx"> #include "OESTextureFloat.h"
</span><span class="cx"> #include "OESTextureFloatLinear.h"
</span><span class="cx"> #include "OESTextureHalfFloat.h"
</span><ins>+#include "OESTextureHalfFloatLinear.h"
</ins><span class="cx"> #include "OESVertexArrayObject.h"
</span><span class="cx"> #include "WebGLBuffer.h"
</span><span class="cx"> #include "WebGLCompressedTextureATC.h"
</span><span class="lines">@@ -213,6 +215,8 @@
</span><span class="cx"> return toJS(exec, globalObject, static_cast<OESTextureFloatLinear*>(extension));
</span><span class="cx"> case WebGLExtension::OESTextureHalfFloatName:
</span><span class="cx"> return toJS(exec, globalObject, static_cast<OESTextureHalfFloat*>(extension));
</span><ins>+ case WebGLExtension::OESTextureHalfFloatLinearName:
+ return toJS(exec, globalObject, static_cast<OESTextureHalfFloatLinear*>(extension));
</ins><span class="cx"> case WebGLExtension::OESVertexArrayObjectName:
</span><span class="cx"> return toJS(exec, globalObject, static_cast<OESVertexArrayObject*>(extension));
</span><span class="cx"> case WebGLExtension::OESElementIndexUintName:
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasOESTextureHalfFloatLinearcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/html/canvas/OESTextureHalfFloatLinear.cpp (0 => 161688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/OESTextureHalfFloatLinear.cpp (rev 0)
+++ trunk/Source/WebCore/html/canvas/OESTextureHalfFloatLinear.cpp 2014-01-10 23:53:04 UTC (rev 161688)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#if ENABLE(WEBGL)
+#include "OESTextureHalfFloatLinear.h"
+
+namespace WebCore {
+
+OESTextureHalfFloatLinear::OESTextureHalfFloatLinear(WebGLRenderingContext* context)
+ : WebGLExtension(context)
+{
+}
+
+OESTextureHalfFloatLinear::~OESTextureHalfFloatLinear()
+{
+}
+
+WebGLExtension::ExtensionName OESTextureHalfFloatLinear::getName() const
+{
+ return OESTextureHalfFloatLinearName;
+}
+
+OwnPtr<OESTextureHalfFloatLinear> OESTextureHalfFloatLinear::create(WebGLRenderingContext* context)
+{
+ return adoptPtr(new OESTextureHalfFloatLinear(context));
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(WEBGL)
</ins><span class="cx">Property changes on: trunk/Source/WebCore/html/canvas/OESTextureHalfFloatLinear.cpp
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCorehtmlcanvasOESTextureHalfFloatLinearh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/html/canvas/OESTextureHalfFloatLinear.h (0 => 161688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/OESTextureHalfFloatLinear.h (rev 0)
+++ trunk/Source/WebCore/html/canvas/OESTextureHalfFloatLinear.h 2014-01-10 23:53:04 UTC (rev 161688)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef OESTextureHalfFloatLinear_h
+#define OESTextureHalfFloatLinear_h
+
+#include "WebGLExtension.h"
+#include <wtf/PassOwnPtr.h>
+
+namespace WebCore {
+
+class OESTextureHalfFloatLinear : public WebGLExtension {
+public:
+ static OwnPtr<OESTextureHalfFloatLinear> create(WebGLRenderingContext*);
+
+ virtual ~OESTextureHalfFloatLinear();
+ virtual ExtensionName getName() const;
+
+private:
+ OESTextureHalfFloatLinear(WebGLRenderingContext*);
+};
+
+} // namespace WebCore
+
+#endif // OESTextureHalfFloatLinear_h
</ins><span class="cx">Property changes on: trunk/Source/WebCore/html/canvas/OESTextureHalfFloatLinear.h
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCorehtmlcanvasOESTextureHalfFloatLinearidl"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/html/canvas/OESTextureHalfFloatLinear.idl (0 => 161688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/OESTextureHalfFloatLinear.idl (rev 0)
+++ trunk/Source/WebCore/html/canvas/OESTextureHalfFloatLinear.idl 2014-01-10 23:53:04 UTC (rev 161688)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+[
+ NoInterfaceObject,
+ Conditional=WEBGL,
+ GenerateIsReachable=ImplWebGLRenderingContext,
+] interface OESTextureHalfFloatLinear {
+};
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLExtensionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLExtension.h (161687 => 161688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLExtension.h 2014-01-10 23:48:54 UTC (rev 161687)
+++ trunk/Source/WebCore/html/canvas/WebGLExtension.h 2014-01-10 23:53:04 UTC (rev 161688)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> OESTextureFloatName,
</span><span class="cx"> OESTextureFloatLinearName,
</span><span class="cx"> OESTextureHalfFloatName,
</span><ins>+ OESTextureHalfFloatLinearName,
</ins><span class="cx"> OESStandardDerivativesName,
</span><span class="cx"> OESVertexArrayObjectName,
</span><span class="cx"> WebGLDebugRendererInfoName,
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (161687 => 161688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-01-10 23:48:54 UTC (rev 161687)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-01-10 23:53:04 UTC (rev 161688)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> #include "OESTextureFloat.h"
</span><span class="cx"> #include "OESTextureFloatLinear.h"
</span><span class="cx"> #include "OESTextureHalfFloat.h"
</span><ins>+#include "OESTextureHalfFloatLinear.h"
</ins><span class="cx"> #include "OESVertexArrayObject.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "RenderBox.h"
</span><span class="lines">@@ -2415,6 +2416,14 @@
</span><span class="cx"> }
</span><span class="cx"> return m_oesTextureHalfFloat.get();
</span><span class="cx"> }
</span><ins>+ if (equalIgnoringCase(name, "OES_texture_half_float_linear")
+ && m_context->getExtensions()->supports("GL_OES_texture_half_float_linear")) {
+ if (!m_oesTextureHalfFloatLinear) {
+ m_context->getExtensions()->ensureEnabled("GL_OES_texture_half_float_linear");
+ m_oesTextureHalfFloatLinear = OESTextureHalfFloatLinear::create(this);
+ }
+ return m_oesTextureHalfFloatLinear.get();
+ }
</ins><span class="cx"> if (equalIgnoringCase(name, "OES_vertex_array_object")
</span><span class="cx"> && m_context->getExtensions()->supports("GL_OES_vertex_array_object")) {
</span><span class="cx"> if (!m_oesVertexArrayObject) {
</span><span class="lines">@@ -2968,6 +2977,8 @@
</span><span class="cx"> result.append("OES_texture_float_linear");
</span><span class="cx"> if (m_context->getExtensions()->supports("GL_OES_texture_half_float"))
</span><span class="cx"> result.append("OES_texture_half_float");
</span><ins>+ if (m_context->getExtensions()->supports("GL_OES_texture_half_float_linear"))
+ result.append("OES_texture_half_float_linear");
</ins><span class="cx"> if (m_context->getExtensions()->supports("GL_OES_standard_derivatives"))
</span><span class="cx"> result.append("OES_standard_derivatives");
</span><span class="cx"> if (m_context->getExtensions()->supports("GL_EXT_texture_filter_anisotropic"))
</span><span class="lines">@@ -4854,7 +4865,7 @@
</span><span class="cx"> void WebGLRenderingContext::checkTextureCompleteness(const char* functionName, bool prepareToDraw)
</span><span class="cx"> {
</span><span class="cx"> bool resetActiveUnit = false;
</span><del>- WebGLTexture::TextureExtensionFlag extensions = static_cast<WebGLTexture::TextureExtensionFlag>(m_oesTextureFloatLinear ? WebGLTexture::TextureExtensionFloatLinearEnabled : 0);
</del><ins>+ WebGLTexture::TextureExtensionFlag extensions = static_cast<WebGLTexture::TextureExtensionFlag>((m_oesTextureFloatLinear ? WebGLTexture::TextureExtensionFloatLinearEnabled : 0) | (m_oesTextureHalfFloatLinear ? WebGLTexture::TextureExtensionHalfFloatLinearEnabled : 0));
</ins><span class="cx">
</span><span class="cx"> for (unsigned ii = 0; ii < m_textureUnits.size(); ++ii) {
</span><span class="cx"> if ((m_textureUnits[ii].texture2DBinding && m_textureUnits[ii].texture2DBinding->needToUseBlackTexture(extensions))
</span><span class="lines">@@ -4871,7 +4882,7 @@
</span><span class="cx"> if (prepareToDraw) {
</span><span class="cx"> String msg(String("texture bound to texture unit ") + String::number(ii)
</span><span class="cx"> + " is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete',"
</span><del>- + " or it is a Float type with linear filtering and without the relevant float linear extension enabled.");
</del><ins>+ + " or it is a float/half-float type with linear filtering and without the relevant float/half-float linear extension enabled.");
</ins><span class="cx"> printGLWarningToConsole(functionName, msg.utf8().data());
</span><span class="cx"> tex2D = m_blackTexture2D.get();
</span><span class="cx"> texCubeMap = m_blackTextureCubeMap.get();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h (161687 => 161688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h 2014-01-10 23:48:54 UTC (rev 161687)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h 2014-01-10 23:53:04 UTC (rev 161688)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> class OESTextureFloat;
</span><span class="cx"> class OESTextureFloatLinear;
</span><span class="cx"> class OESTextureHalfFloat;
</span><ins>+class OESTextureHalfFloatLinear;
</ins><span class="cx"> class OESVertexArrayObject;
</span><span class="cx"> class OESElementIndexUint;
</span><span class="cx"> class WebGLActiveInfo;
</span><span class="lines">@@ -528,6 +529,7 @@
</span><span class="cx"> OwnPtr<OESTextureFloat> m_oesTextureFloat;
</span><span class="cx"> OwnPtr<OESTextureFloatLinear> m_oesTextureFloatLinear;
</span><span class="cx"> OwnPtr<OESTextureHalfFloat> m_oesTextureHalfFloat;
</span><ins>+ OwnPtr<OESTextureHalfFloatLinear> m_oesTextureHalfFloatLinear;
</ins><span class="cx"> OwnPtr<OESStandardDerivatives> m_oesStandardDerivatives;
</span><span class="cx"> OwnPtr<OESVertexArrayObject> m_oesVertexArrayObject;
</span><span class="cx"> OwnPtr<OESElementIndexUint> m_oesElementIndexUint;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLTexturecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLTexture.cpp (161687 => 161688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLTexture.cpp 2014-01-10 23:48:54 UTC (rev 161687)
+++ trunk/Source/WebCore/html/canvas/WebGLTexture.cpp 2014-01-10 23:53:04 UTC (rev 161688)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> , m_needToUseBlackTexture(false)
</span><span class="cx"> , m_isCompressed(false)
</span><span class="cx"> , m_isFloatType(false)
</span><ins>+ , m_isHalfFloatType(false)
</ins><span class="cx"> {
</span><span class="cx"> setObject(ctx->graphicsContext3D()->createTexture());
</span><span class="cx"> }
</span><span class="lines">@@ -240,7 +241,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (m_needToUseBlackTexture)
</span><span class="cx"> return true;
</span><del>- if (m_isFloatType && !(extensions & TextureExtensionFloatLinearEnabled)) {
</del><ins>+ if ((m_isFloatType && !(extensions & TextureExtensionFloatLinearEnabled)) || (m_isHalfFloatType && !(extensions & TextureExtensionHalfFloatLinearEnabled))) {
</ins><span class="cx"> if (m_magFilter != GraphicsContext3D::NEAREST || (m_minFilter != GraphicsContext3D::NEAREST && m_minFilter != GraphicsContext3D::NEAREST_MIPMAP_NEAREST))
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -259,7 +260,7 @@
</span><span class="cx"> ASSERT(object());
</span><span class="cx"> m_isCompressed = true;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> void WebGLTexture::deleteObjectImpl(GraphicsContext3D* context3d, Platform3DObject object)
</span><span class="cx"> {
</span><span class="cx"> context3d->deleteTexture(object);
</span><span class="lines">@@ -376,6 +377,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ m_isHalfFloatType = false;
+ if (m_isComplete)
+ m_isHalfFloatType = m_info[0][0].type == GraphicsContext3D::HALF_FLOAT_OES;
+ else {
+ for (size_t ii = 0; ii < m_info.size(); ++ii) {
+ if (m_info[ii][0].type == GraphicsContext3D::HALF_FLOAT_OES) {
+ m_isHalfFloatType = true;
+ break;
+ }
+ }
+ }
+
</ins><span class="cx"> m_needToUseBlackTexture = false;
</span><span class="cx"> // NPOT
</span><span class="cx"> if (m_isNPOT && ((m_minFilter != GraphicsContext3D::NEAREST && m_minFilter != GraphicsContext3D::LINEAR)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLTextureh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLTexture.h (161687 => 161688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLTexture.h 2014-01-10 23:48:54 UTC (rev 161687)
+++ trunk/Source/WebCore/html/canvas/WebGLTexture.h 2014-01-10 23:53:04 UTC (rev 161688)
</span><span class="lines">@@ -38,7 +38,8 @@
</span><span class="cx">
</span><span class="cx"> enum TextureExtensionFlag {
</span><span class="cx"> TextureExtensionsDisabled = 0,
</span><del>- TextureExtensionFloatLinearEnabled = 1 << 0
</del><ins>+ TextureExtensionFloatLinearEnabled = 1 << 0,
+ TextureExtensionHalfFloatLinearEnabled = 2 << 0
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> virtual ~WebGLTexture();
</span><span class="lines">@@ -134,6 +135,7 @@
</span><span class="cx"> bool m_needToUseBlackTexture;
</span><span class="cx"> bool m_isCompressed;
</span><span class="cx"> bool m_isFloatType;
</span><ins>+ bool m_isHalfFloatType;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsExtensions3Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Extensions3D.h (161687 => 161688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Extensions3D.h 2014-01-10 23:48:54 UTC (rev 161687)
+++ trunk/Source/WebCore/platform/graphics/Extensions3D.h 2014-01-10 23:53:04 UTC (rev 161688)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> // GL_OES_texture_float
</span><span class="cx"> // GL_OES_texture_float_linear
</span><span class="cx"> // GL_OES_texture_half_float
</span><ins>+ // GL_OES_texture_half_float_linear
</ins><span class="cx"> // GL_OES_standard_derivatives
</span><span class="cx"> // GL_OES_rgb8_rgba8
</span><span class="cx"> // GL_OES_vertex_array_object
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp (161687 => 161688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2014-01-10 23:48:54 UTC (rev 161687)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2014-01-10 23:53:04 UTC (rev 161688)
</span><span class="lines">@@ -179,8 +179,8 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> // If GL_ARB_texture_float is available then we report GL_OES_texture_float,
</span><del>- // GL_OES_texture_half_float and GL_OES_texture_float_linear as available.
- if (name == "GL_OES_texture_float" || name == "GL_OES_texture_half_float" || name == "GL_OES_texture_float_linear")
</del><ins>+ // GL_OES_texture_half_float, GL_OES_texture_float_linear and GL_OES_texture_half_float_linear as available.
+ if (name == "GL_OES_texture_float" || name == "GL_OES_texture_half_float" || name == "GL_OES_texture_float_linear" || name == "GL_OES_texture_half_float_linear")
</ins><span class="cx"> return m_availableExtensions.contains("GL_ARB_texture_float");
</span><span class="cx">
</span><span class="cx"> // GL_OES_vertex_array_object
</span></span></pre>
</div>
</div>
</body>
</html>