<!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>[160030] 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/160030">160030</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2013-12-03 12:21:29 -0800 (Tue, 03 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebGL] Implement OES texture float linear
https://bugs.webkit.org/show_bug.cgi?id=124871
Reviewed by Brent Fulgham.
Source/WebCore:
Implement the OES_texture_float_linear extension. Generally
we'd also enable OES_texture_half_float_linear at the same
time, but that's blocked on webkit.org/b/110936.
Test: fast/canvas/webgl/oes-texture-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 OESTextureFloatLinear.
* bindings/js/JSWebGLRenderingContextCustom.cpp:
(WebCore::toJS): Map the new name into the appropriate type.
* html/canvas/OESTextureFloatLinear.cpp: Added. This is a very simple class
that's mostly empty.
(WebCore::OESTextureFloatLinear::OESTextureFloatLinear):
(WebCore::OESTextureFloatLinear::~OESTextureFloatLinear):
(WebCore::OESTextureFloatLinear::getName):
(WebCore::OESTextureFloatLinear::create):
* html/canvas/OESTextureFloatLinear.h: Added.
* html/canvas/OESTextureFloatLinear.idl: Added.
* html/canvas/WebGLExtension.h: Declare the new name in the enum of extensions.
* html/canvas/WebGLRenderingContext.cpp:
(WebCore::WebGLRenderingContext::drawArrays): Call new name.
(WebCore::WebGLRenderingContext::drawElements): Call new name.
(WebCore::WebGLRenderingContext::getExtension): Create the new extension if asked.
(WebCore::WebGLRenderingContext::checkTextureCompleteness): Renamed from handleNPOTTextures. Now
checks for the type of the texture too.
* html/canvas/WebGLRenderingContext.h: Member variable for new extension.
* html/canvas/WebGLTexture.cpp:
(WebCore::WebGLTexture::WebGLTexture):
(WebCore::WebGLTexture::needToUseBlackTexture): Takes an extra parameter which indicates
if it has an extension enabled.
(WebCore::WebGLTexture::update): Note it is a float type when updating.
* html/canvas/WebGLTexture.h: New flag to indicate float type.
* platform/graphics/Extensions3D.h: New flag type.
* platform/graphics/opengl/Extensions3DOpenGL.cpp:
(WebCore::Extensions3DOpenGL::supportsExtension): Add a comment about the extension.
LayoutTests:
Add the Khronos test files for this extension.
Add the JS test file for OES_texture_float_linear and OES_texture_half_float_linear
even though it's only used for the former at the moment.
* fast/canvas/webgl/oes-texture-float-linear.html: Added.
* fast/canvas/webgl/resources/oes-texture-float-and-half-float-linear.js: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</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="#trunkLayoutTestsfastcanvaswebgloestexturefloatlinearexpectedtxt">trunk/LayoutTests/fast/canvas/webgl/oes-texture-float-linear-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvaswebgloestexturefloatlinearhtml">trunk/LayoutTests/fast/canvas/webgl/oes-texture-float-linear.html</a></li>
<li><a href="#trunkLayoutTestsfastcanvaswebglresourcesoestexturefloatandhalffloatlinearjs">trunk/LayoutTests/fast/canvas/webgl/resources/oes-texture-float-and-half-float-linear.js</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasOESTextureFloatLinearcpp">trunk/Source/WebCore/html/canvas/OESTextureFloatLinear.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasOESTextureFloatLinearh">trunk/Source/WebCore/html/canvas/OESTextureFloatLinear.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasOESTextureFloatLinearidl">trunk/Source/WebCore/html/canvas/OESTextureFloatLinear.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (160029 => 160030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-12-03 20:18:14 UTC (rev 160029)
+++ trunk/LayoutTests/ChangeLog 2013-12-03 20:21:29 UTC (rev 160030)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2013-12-03 Dean Jackson <dino@apple.com>
+
+ [WebGL] Implement OES texture float linear
+ https://bugs.webkit.org/show_bug.cgi?id=124871
+
+ Reviewed by Brent Fulgham.
+
+ Add the Khronos test files for this extension.
+
+ Add the JS test file for OES_texture_float_linear and OES_texture_half_float_linear
+ even though it's only used for the former at the moment.
+
+ * fast/canvas/webgl/oes-texture-float-linear.html: Added.
+ * fast/canvas/webgl/resources/oes-texture-float-and-half-float-linear.js: Added.
+
</ins><span class="cx"> 2013-12-03 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Support exporting private WebCrypto RSA keys
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvaswebgloestexturefloatlinearexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/webgl/oes-texture-float-linear-expected.txt (0 => 160030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/oes-texture-float-linear-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/canvas/webgl/oes-texture-float-linear-expected.txt 2013-12-03 20:21:29 UTC (rev 160030)
</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 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.
+This test verifies the functionality of the OES_texture_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_float extension
+
+testing target: TEXTURE_2D, testing format: RGBA, magFilter is: NEAREST, minFilter is: NEAREST, OES_texture_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with non-Linear filter should succeed with NO_ERROR no matter whether OES_texture_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_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_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_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with non-Linear filter should succeed with NO_ERROR no matter whether OES_texture_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_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_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_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_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_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_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_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_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_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_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_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_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_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_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_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_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_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_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_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with non-Linear filter should succeed with NO_ERROR no matter whether OES_texture_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_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_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_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with non-Linear filter should succeed with NO_ERROR no matter whether OES_texture_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_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_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_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_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_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_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_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_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_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_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_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_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_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_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_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_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_float_linear is not enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_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_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with non-Linear filter should succeed with NO_ERROR no matter whether OES_texture_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_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should succeed with NO_ERROR if OES_texture_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_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with non-Linear filter should succeed with NO_ERROR no matter whether OES_texture_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_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should succeed with NO_ERROR if OES_texture_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_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should succeed with NO_ERROR if OES_texture_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_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should succeed with NO_ERROR if OES_texture_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_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should succeed with NO_ERROR if OES_texture_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_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should succeed with NO_ERROR if OES_texture_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_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should succeed with NO_ERROR if OES_texture_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_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should succeed with NO_ERROR if OES_texture_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_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should succeed with NO_ERROR if OES_texture_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_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should succeed with NO_ERROR if OES_texture_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_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with non-Linear filter should succeed with NO_ERROR no matter whether OES_texture_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_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should succeed with NO_ERROR if OES_texture_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_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with non-Linear filter should succeed with NO_ERROR no matter whether OES_texture_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_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should succeed with NO_ERROR if OES_texture_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_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should succeed with NO_ERROR if OES_texture_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_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should succeed with NO_ERROR if OES_texture_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_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should succeed with NO_ERROR if OES_texture_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_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should succeed with NO_ERROR if OES_texture_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_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should succeed with NO_ERROR if OES_texture_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_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should succeed with NO_ERROR if OES_texture_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_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should succeed with NO_ERROR if OES_texture_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_float_linear is enabled
+PASS getError was expected value: NO_ERROR : OES_texture_float texture with Linear filter should succeed with NO_ERROR if OES_texture_float is enabled
+PASS should be 255,255,255,255
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/canvas/webgl/oes-texture-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="trunkLayoutTestsfastcanvaswebgloestexturefloatlinearhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/webgl/oes-texture-float-linear.html (0 => 160030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/oes-texture-float-linear.html (rev 0)
+++ trunk/LayoutTests/fast/canvas/webgl/oes-texture-float-linear.html 2013-12-03 20:21:29 UTC (rev 160030)
</span><span class="lines">@@ -0,0 +1,53 @@
</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) {
+ if (!gl.getExtension(extensionTypeName)) {
+ testPassed("No " + extensionTypeName + " support -- this is legal");
+ return false;
+ }
+ testPassed("Successfully enabled " + extensionTypeName + " extension");
+ return true;
+}
+</script>
+</head>
+<body onload='generateTest("OES_texture_float", "OES_texture_float_linear", "FLOAT", 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-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="trunkLayoutTestsfastcanvaswebglresourcesoestexturefloatandhalffloatlinearjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/webgl/resources/oes-texture-float-and-half-float-linear.js (0 => 160030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/resources/oes-texture-float-and-half-float-linear.js (rev 0)
+++ trunk/LayoutTests/fast/canvas/webgl/resources/oes-texture-float-and-half-float-linear.js 2013-12-03 20:21:29 UTC (rev 160030)
</span><span class="lines">@@ -0,0 +1,172 @@
</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.
+*/
+
+function generateTest(extensionTypeName, extensionName, pixelType, prologue) {
+ var wtu = WebGLTestUtils;
+ var gl = null;
+ var successfullyParsed = false;
+
+ var init = function()
+ {
+ description("This test verifies the functionality of the " + extensionName + " extension, if it is available.");
+
+ var canvas = document.getElementById("canvas");
+ gl = wtu.create3DContext(canvas);
+
+ if (!prologue(gl, extensionTypeName)) {
+ finishTest();
+ return;
+ }
+
+ // Before the extension is enabled
+ var extensionEnabled = false;
+ runTestSuite(extensionEnabled);
+
+ if (!gl.getExtension(extensionName))
+ testPassed("No " + extensionName + " support -- this is legal");
+ else {
+ // After the extension is enabled
+ extensionEnabled = true;
+ runTestSuite(extensionEnabled);
+ }
+
+ finishTest();
+ }
+
+ function runTestSuite(extensionEnabled)
+ {
+ var magF = [gl.NEAREST, gl.LINEAR];
+ var minF = [gl.NEAREST, gl.LINEAR, gl.NEAREST_MIPMAP_NEAREST, gl.NEAREST_MIPMAP_LINEAR, gl.LINEAR_MIPMAP_NEAREST, gl.LINEAR_MIPMAP_LINEAR];
+ var tex2DFShader = [
+ 'uniform sampler2D tex;',
+ 'void main() {',
+ ' gl_FragData[0] = texture2D(tex, vec2(0.5, 0.5)) * vec4(4.0, 2.0, 2.0, 1);',
+ '}'].join('\n');
+
+ var positionVertexShader = [
+ 'attribute vec4 vPosition;',
+ 'void main() {',
+ ' gl_Position = vPosition;',
+ '}'].join('\n');
+
+ var texCubeFShader = [
+ 'uniform samplerCube tex;',
+ 'void main() {',
+ ' gl_FragColor = textureCube(tex, normalize(vec3(0.5, 0.5, 1))) * vec4(4.0, 2.0, 2.0, 1);',
+ '}'].join('\n');
+
+ var vs = wtu.loadShader(gl, positionVertexShader, gl.VERTEX_SHADER);
+ var fs_2d = wtu.loadShader(gl, tex2DFShader, gl.FRAGMENT_SHADER);
+ var fs_cube = wtu.loadShader(gl, texCubeFShader, gl.FRAGMENT_SHADER);
+
+ // TEXTURE_2D
+ var program = wtu.setupProgram(gl, [vs, fs_2d]);
+ gl.useProgram(program);
+ wtu.setupUnitQuad(gl);
+ for (var kk = 0; kk < 2; ++kk) {
+ for (var ii = 0; ii < 6; ++ii) {
+ var linear = false;
+ if (magF[kk] == gl.LINEAR || (minF[ii] != gl.NEAREST && minF[ii] != gl.NEAREST_MIPMAP_NEAREST))
+ linear = true;
+ var color = (!extensionEnabled && linear) ? [0, 0, 0, 255] : [255, 255, 255, 255];
+ runEachTest(gl.TEXTURE_2D, magF[kk], minF[ii], linear, extensionEnabled, color);
+ }
+ }
+
+ // TEXTURE_CUBE_MAP
+ var programCube = wtu.setupProgram(gl, [vs, fs_cube]);
+ gl.useProgram(programCube);
+ wtu.setupUnitQuad(gl);
+ for (var kk = 0; kk < 2; ++kk) {
+ for (var ii = 0; ii < 6; ++ii) {
+ var linear = false;
+ if (magF[kk] == gl.LINEAR || (minF[ii] != gl.NEAREST && minF[ii] != gl.NEAREST_MIPMAP_NEAREST))
+ linear = true;
+ var color = (!extensionEnabled && linear) ? [0, 0, 0, 255] : [255, 255, 255, 255];
+ runEachTest(gl.TEXTURE_CUBE_MAP, magF[kk], minF[ii], linear, extensionEnabled, color);
+ }
+ }
+ }
+
+ function runEachTest(textureTarget, magFilter, minFilter, linear, extensionEnabled, expected)
+ {
+ var format = gl.RGBA;
+ var numberOfChannels = 4;
+ debug("");
+ debug("testing target: " + wtu.glEnumToString(gl,textureTarget) +
+ ", testing format: " + wtu.glEnumToString(gl, format) +
+ ", magFilter is: " + wtu.glEnumToString(gl, magFilter) +
+ ", minFilter is: " + wtu.glEnumToString(gl, minFilter) +
+ ", " + extensionName + " is " + (extensionEnabled ? "enabled": "not enabled")
+ );
+
+ // Generate data.
+ var width = 4;
+ var height = 4;
+ var canvas2d = document.createElement('canvas');
+ canvas2d.width = width;
+ canvas2d.height = height;
+ var ctx2d = canvas2d.getContext('2d');
+ var color = [64, 128, 128, 255];
+ ctx2d.fillStyle = "rgba(" + color[0] + "," + color[1] + "," + color[2] + "," + color[3] + ")";
+ ctx2d.fillRect(0, 0, width, height);
+
+ var texture = gl.createTexture();
+ gl.bindTexture(textureTarget, texture);
+ gl.texParameteri(textureTarget, gl.TEXTURE_MAG_FILTER, magFilter);
+ gl.texParameteri(textureTarget, gl.TEXTURE_MIN_FILTER, minFilter);
+ gl.texParameteri(textureTarget, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
+ gl.texParameteri(textureTarget, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
+
+ if (textureTarget == gl.TEXTURE_2D) {
+ gl.texImage2D(gl.TEXTURE_2D, 0, format, format, gl[pixelType], canvas2d);
+ if (minFilter != gl.NEAREST && minFilter != gl.LINEAR)
+ gl.generateMipmap(gl.TEXTURE_2D);
+ }
+ else if (textureTarget == gl.TEXTURE_CUBE_MAP) {
+ var targets = [
+ gl.TEXTURE_CUBE_MAP_POSITIVE_X,
+ gl.TEXTURE_CUBE_MAP_NEGATIVE_X,
+ gl.TEXTURE_CUBE_MAP_POSITIVE_Y,
+ gl.TEXTURE_CUBE_MAP_NEGATIVE_Y,
+ gl.TEXTURE_CUBE_MAP_POSITIVE_Z,
+ gl.TEXTURE_CUBE_MAP_NEGATIVE_Z];
+ for (var tt = 0; tt < targets.length; ++tt)
+ gl.texImage2D(targets[tt], 0, format, format, gl[pixelType], canvas2d);
+ if (minFilter != gl.NEAREST && minFilter != gl.LINEAR)
+ gl.generateMipmap(gl.TEXTURE_CUBE_MAP);
+ }
+ wtu.drawQuad(gl);
+ if (!linear) {
+ wtu.glErrorShouldBe(gl, gl.NO_ERROR, extensionTypeName + " texture with non-Linear filter should succeed with NO_ERROR no matter whether " + extensionName + " is enabled or not");
+ } else if (!extensionEnabled) {
+ wtu.glErrorShouldBe(gl, gl.NO_ERROR, extensionTypeName + " texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if " + extensionName + " isn't enabled");
+ } else {
+ wtu.glErrorShouldBe(gl, gl.NO_ERROR, extensionTypeName + " texture with Linear filter should succeed with NO_ERROR if " + extensionTypeName + " is enabled");
+ }
+
+ wtu.checkCanvas(gl, expected, "should be " + expected[0] + "," + expected[1] + "," + expected[2] + "," + expected[3]);
+ }
+
+ return init;
+}
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/canvas/webgl/resources/oes-texture-float-and-half-float-linear.js
</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 (160029 => 160030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2013-12-03 20:18:14 UTC (rev 160029)
+++ trunk/Source/WebCore/CMakeLists.txt 2013-12-03 20:21:29 UTC (rev 160030)
</span><span class="lines">@@ -502,6 +502,7 @@
</span><span class="cx"> html/canvas/OESElementIndexUint.idl
</span><span class="cx"> html/canvas/OESStandardDerivatives.idl
</span><span class="cx"> html/canvas/OESTextureFloat.idl
</span><ins>+ html/canvas/OESTextureFloatLinear.idl
</ins><span class="cx"> html/canvas/OESTextureHalfFloat.idl
</span><span class="cx"> html/canvas/OESVertexArrayObject.idl
</span><span class="cx"> html/canvas/WebGLActiveInfo.idl
</span><span class="lines">@@ -1491,6 +1492,7 @@
</span><span class="cx"> html/canvas/OESElementIndexUint.cpp
</span><span class="cx"> html/canvas/OESStandardDerivatives.cpp
</span><span class="cx"> html/canvas/OESTextureFloat.cpp
</span><ins>+ html/canvas/OESTextureFloatLinear.cpp
</ins><span class="cx"> html/canvas/OESTextureHalfFloat.cpp
</span><span class="cx"> html/canvas/OESVertexArrayObject.cpp
</span><span class="cx"> html/canvas/WebGLBuffer.cpp
</span><span class="lines">@@ -2657,6 +2659,7 @@
</span><span class="cx"> html/canvas/OESElementIndexUint.cpp
</span><span class="cx"> html/canvas/OESStandardDerivatives.cpp
</span><span class="cx"> html/canvas/OESTextureFloat.cpp
</span><ins>+ html/canvas/OESTextureFloatLinear.cpp
</ins><span class="cx"> html/canvas/OESTextureHalfFloat.cpp
</span><span class="cx"> html/canvas/OESVertexArrayObject.cpp
</span><span class="cx"> html/canvas/WebGLBuffer.cpp
</span><span class="lines">@@ -2691,6 +2694,7 @@
</span><span class="cx"> html/canvas/OESElementIndexUint.idl
</span><span class="cx"> html/canvas/OESStandardDerivatives.idl
</span><span class="cx"> html/canvas/OESTextureFloat.idl
</span><ins>+ html/canvas/OESTextureFloatLinear.idl
</ins><span class="cx"> html/canvas/OESTextureHalfFloat.idl
</span><span class="cx"> html/canvas/OESVertexArrayObject.idl
</span><span class="cx"> html/canvas/WebGLActiveInfo.idl
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160029 => 160030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-03 20:18:14 UTC (rev 160029)
+++ trunk/Source/WebCore/ChangeLog 2013-12-03 20:21:29 UTC (rev 160030)
</span><span class="lines">@@ -1,3 +1,57 @@
</span><ins>+2013-12-03 Dean Jackson <dino@apple.com>
+
+ [WebGL] Implement OES texture float linear
+ https://bugs.webkit.org/show_bug.cgi?id=124871
+
+ Reviewed by Brent Fulgham.
+
+ Implement the OES_texture_float_linear extension. Generally
+ we'd also enable OES_texture_half_float_linear at the same
+ time, but that's blocked on webkit.org/b/110936.
+
+ Test: fast/canvas/webgl/oes-texture-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 OESTextureFloatLinear.
+
+ * bindings/js/JSWebGLRenderingContextCustom.cpp:
+ (WebCore::toJS): Map the new name into the appropriate type.
+
+ * html/canvas/OESTextureFloatLinear.cpp: Added. This is a very simple class
+ that's mostly empty.
+ (WebCore::OESTextureFloatLinear::OESTextureFloatLinear):
+ (WebCore::OESTextureFloatLinear::~OESTextureFloatLinear):
+ (WebCore::OESTextureFloatLinear::getName):
+ (WebCore::OESTextureFloatLinear::create):
+ * html/canvas/OESTextureFloatLinear.h: Added.
+ * html/canvas/OESTextureFloatLinear.idl: Added.
+
+ * html/canvas/WebGLExtension.h: Declare the new name in the enum of extensions.
+
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::drawArrays): Call new name.
+ (WebCore::WebGLRenderingContext::drawElements): Call new name.
+ (WebCore::WebGLRenderingContext::getExtension): Create the new extension if asked.
+ (WebCore::WebGLRenderingContext::checkTextureCompleteness): Renamed from handleNPOTTextures. Now
+ checks for the type of the texture too.
+ * html/canvas/WebGLRenderingContext.h: Member variable for new extension.
+
+ * html/canvas/WebGLTexture.cpp:
+ (WebCore::WebGLTexture::WebGLTexture):
+ (WebCore::WebGLTexture::needToUseBlackTexture): Takes an extra parameter which indicates
+ if it has an extension enabled.
+ (WebCore::WebGLTexture::update): Note it is a float type when updating.
+ * html/canvas/WebGLTexture.h: New flag to indicate float type.
+
+ * platform/graphics/Extensions3D.h: New flag type.
+ * platform/graphics/opengl/Extensions3DOpenGL.cpp:
+ (WebCore::Extensions3DOpenGL::supportsExtension): Add a comment about the extension.
+
</ins><span class="cx"> 2013-12-03 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Support exporting private WebCrypto RSA keys
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.cpp (160029 => 160030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.cpp 2013-12-03 20:18:14 UTC (rev 160029)
+++ trunk/Source/WebCore/DerivedSources.cpp 2013-12-03 20:21:29 UTC (rev 160030)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> #include "JSOESElementIndexUint.cpp"
</span><span class="cx"> #include "JSOESStandardDerivatives.cpp"
</span><span class="cx"> #include "JSOESTextureFloat.cpp"
</span><ins>+#include "JSOESTextureFloatLinear.cpp"
</ins><span class="cx"> #include "JSOESTextureHalfFloat.cpp"
</span><span class="cx"> #include "JSOESVertexArrayObject.cpp"
</span><span class="cx"> #include "JSWebGLActiveInfo.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (160029 => 160030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2013-12-03 20:18:14 UTC (rev 160029)
+++ trunk/Source/WebCore/DerivedSources.make 2013-12-03 20:21:29 UTC (rev 160030)
</span><span class="lines">@@ -419,6 +419,7 @@
</span><span class="cx"> $(WebCore)/html/canvas/OESElementIndexUint.idl \
</span><span class="cx"> $(WebCore)/html/canvas/OESStandardDerivatives.idl \
</span><span class="cx"> $(WebCore)/html/canvas/OESTextureFloat.idl \
</span><ins>+ $(WebCore)/html/canvas/OESTextureFloatLinear.idl \
</ins><span class="cx"> $(WebCore)/html/canvas/OESTextureHalfFloat.idl \
</span><span class="cx"> $(WebCore)/html/canvas/OESVertexArrayObject.idl \
</span><span class="cx"> $(WebCore)/html/canvas/WebGLActiveInfo.idl \
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.list.am (160029 => 160030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.list.am 2013-12-03 20:18:14 UTC (rev 160029)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2013-12-03 20:21:29 UTC (rev 160030)
</span><span class="lines">@@ -543,6 +543,8 @@
</span><span class="cx"> DerivedSources/WebCore/JSOESStandardDerivatives.h \
</span><span class="cx"> DerivedSources/WebCore/JSOESTextureFloat.cpp \
</span><span class="cx"> DerivedSources/WebCore/JSOESTextureFloat.h \
</span><ins>+ DerivedSources/WebCore/JSOESTextureFloatLinear.cpp \
+ DerivedSources/WebCore/JSOESTextureFloatLinear.h \
</ins><span class="cx"> DerivedSources/WebCore/JSOESTextureHalfFloat.cpp \
</span><span class="cx"> DerivedSources/WebCore/JSOESTextureHalfFloat.h \
</span><span class="cx"> DerivedSources/WebCore/JSOESVertexArrayObject.cpp \
</span><span class="lines">@@ -1509,6 +1511,7 @@
</span><span class="cx"> $(WebCore)/html/canvas/EXTTextureFilterAnisotropic.idl \
</span><span class="cx"> $(WebCore)/html/canvas/OESStandardDerivatives.idl \
</span><span class="cx"> $(WebCore)/html/canvas/OESTextureFloat.idl \
</span><ins>+ $(WebCore)/html/canvas/OESTextureFloatLinear.idl \
</ins><span class="cx"> $(WebCore)/html/canvas/OESTextureHalfFloat.idl \
</span><span class="cx"> $(WebCore)/html/canvas/OESVertexArrayObject.idl \
</span><span class="cx"> $(WebCore)/html/canvas/OESElementIndexUint.idl \
</span><span class="lines">@@ -3245,6 +3248,8 @@
</span><span class="cx"> Source/WebCore/html/canvas/OESStandardDerivatives.h \
</span><span class="cx"> Source/WebCore/html/canvas/OESTextureFloat.cpp \
</span><span class="cx"> Source/WebCore/html/canvas/OESTextureFloat.h \
</span><ins>+ Source/WebCore/html/canvas/OESTextureFloatLinear.cpp \
+ Source/WebCore/html/canvas/OESTextureFloatLinear.h \
</ins><span class="cx"> Source/WebCore/html/canvas/OESTextureHalfFloat.cpp \
</span><span class="cx"> Source/WebCore/html/canvas/OESTextureHalfFloat.h \
</span><span class="cx"> Source/WebCore/html/canvas/OESVertexArrayObject.cpp \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (160029 => 160030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-12-03 20:18:14 UTC (rev 160029)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-12-03 20:21:29 UTC (rev 160030)
</span><span class="lines">@@ -340,6 +340,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\JSOESTextureFloatLinear.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\JSOESTextureHalfFloat.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">@@ -6501,6 +6515,7 @@
</span><span class="cx"> <ClCompile Include="..\html\canvas\OESElementIndexUint.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\OESStandardDerivatives.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\OESTextureFloat.cpp" />
</span><ins>+ <ClCompile Include="..\html\canvas\OESTextureFloatLinear.cpp" />
</ins><span class="cx"> <ClCompile Include="..\html\canvas\OESTextureHalfFloat.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\OESVertexArrayObject.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\WebGLBuffer.cpp" />
</span><span class="lines">@@ -18533,6 +18548,7 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSOESElementIndexUint.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSOESStandardDerivatives.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSOESTextureFloat.h" />
</span><ins>+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSOESTextureFloatLinear.h" />
</ins><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSOESTextureHalfFloat.h" />
</span><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="lines">@@ -18614,6 +18630,7 @@
</span><span class="cx"> <ClInclude Include="..\html\canvas\OESElementIndexUint.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\OESStandardDerivatives.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\OESTextureFloat.h" />
</span><ins>+ <ClInclude Include="..\html\canvas\OESTextureFloatLinear.h" />
</ins><span class="cx"> <ClInclude Include="..\html\canvas\OESTextureHalfFloat.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\OESVertexArrayObject.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\WebGLActiveInfo.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (160029 => 160030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-12-03 20:18:14 UTC (rev 160029)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-12-03 20:21:29 UTC (rev 160030)
</span><span class="lines">@@ -6625,6 +6625,9 @@
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSOESTextureFloat.cpp">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSOESTextureFloatLinear.cpp">
+ <Filter>DerivedSources</Filter>
+ </ClCompile>
</ins><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><span class="lines">@@ -6715,6 +6718,9 @@
</span><span class="cx"> <ClCompile Include="..\html\canvas\OESTextureFloat.cpp">
</span><span class="cx"> <Filter>html\canvas</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\html\canvas\OESTextureFloatLinear.cpp">
+ <Filter>html\canvas</Filter>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\html\canvas\OESTextureHalfFloat.cpp">
</span><span class="cx"> <Filter>html\canvas</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -14402,6 +14408,9 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSOESTextureFloat.h">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSOESTextureFloatLinear.h">
+ <Filter>DerivedSources</Filter>
+ </ClInclude>
</ins><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><span class="lines">@@ -14495,6 +14504,9 @@
</span><span class="cx"> <ClInclude Include="..\html\canvas\OESTextureFloat.h">
</span><span class="cx"> <Filter>html\canvas</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\html\canvas\OESTextureFloatLinear.h">
+ <Filter>html\canvas</Filter>
+ </ClInclude>
</ins><span class="cx"> <ClInclude Include="..\html\canvas\OESTextureHalfFloat.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 (160029 => 160030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-12-03 20:18:14 UTC (rev 160029)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-12-03 20:21:29 UTC (rev 160030)
</span><span class="lines">@@ -1066,6 +1066,10 @@
</span><span class="cx"> 31313F651443B35F006E2A90 /* FilterEffectRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31313F631443B35E006E2A90 /* FilterEffectRenderer.cpp */; };
</span><span class="cx"> 31313F661443B35F006E2A90 /* FilterEffectRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 31313F641443B35E006E2A90 /* FilterEffectRenderer.h */; };
</span><span class="cx"> 3138A9E51474434600B0ED12 /* StyleShader.h in Headers */ = {isa = PBXBuildFile; fileRef = 3138A9E41474434600B0ED12 /* StyleShader.h */; };
</span><ins>+ 3146FE6E184420A8001A937C /* OESTextureFloatLinear.h in Headers */ = {isa = PBXBuildFile; fileRef = 3146FE6618442087001A937C /* OESTextureFloatLinear.h */; };
+ 3146FE6F184420AA001A937C /* OESTextureFloatLinear.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3146FE6518442087001A937C /* OESTextureFloatLinear.cpp */; };
+ 3146FE7418442370001A937C /* JSOESTextureFloatLinear.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3146FE7018442367001A937C /* JSOESTextureFloatLinear.cpp */; };
+ 3146FE7518442370001A937C /* JSOESTextureFloatLinear.h in Headers */ = {isa = PBXBuildFile; fileRef = 3146FE7118442367001A937C /* JSOESTextureFloatLinear.h */; };
</ins><span class="cx"> 316023F01532C40C00D50FF4 /* Dictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 316023EF1532C40C00D50FF4 /* Dictionary.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 31611E5A0E1C4DE000F6A579 /* JSWebKitCSSTransformValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31611E580E1C4DE000F6A579 /* JSWebKitCSSTransformValue.cpp */; };
</span><span class="cx"> 31611E5B0E1C4DE000F6A579 /* JSWebKitCSSTransformValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 31611E590E1C4DE000F6A579 /* JSWebKitCSSTransformValue.h */; };
</span><span class="lines">@@ -7718,6 +7722,11 @@
</span><span class="cx"> 31313F631443B35E006E2A90 /* FilterEffectRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FilterEffectRenderer.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 31313F641443B35E006E2A90 /* FilterEffectRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilterEffectRenderer.h; sourceTree = "<group>"; };
</span><span class="cx"> 3138A9E41474434600B0ED12 /* StyleShader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleShader.h; path = style/StyleShader.h; sourceTree = "<group>"; };
</span><ins>+ 3146FE6518442087001A937C /* OESTextureFloatLinear.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OESTextureFloatLinear.cpp; path = canvas/OESTextureFloatLinear.cpp; sourceTree = "<group>"; };
+ 3146FE6618442087001A937C /* OESTextureFloatLinear.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OESTextureFloatLinear.h; path = canvas/OESTextureFloatLinear.h; sourceTree = "<group>"; };
+ 3146FE6718442087001A937C /* OESTextureFloatLinear.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OESTextureFloatLinear.idl; path = canvas/OESTextureFloatLinear.idl; sourceTree = "<group>"; };
+ 3146FE7018442367001A937C /* JSOESTextureFloatLinear.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSOESTextureFloatLinear.cpp; path = JSOESTextureFloatLinear.cpp; sourceTree = "<group>"; };
+ 3146FE7118442367001A937C /* JSOESTextureFloatLinear.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSOESTextureFloatLinear.h; path = JSOESTextureFloatLinear.h; sourceTree = "<group>"; };
</ins><span class="cx"> 316023EF1532C40C00D50FF4 /* Dictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Dictionary.h; sourceTree = "<group>"; };
</span><span class="cx"> 31611E540E1C4D4A00F6A579 /* WebKitCSSTransformValue.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKitCSSTransformValue.idl; sourceTree = "<group>"; };
</span><span class="cx"> 31611E580E1C4DE000F6A579 /* JSWebKitCSSTransformValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitCSSTransformValue.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -14964,6 +14973,9 @@
</span><span class="cx"> 6EBF0E4512A8926100DB1709 /* OESTextureFloat.cpp */,
</span><span class="cx"> 6EBF0E4612A8926100DB1709 /* OESTextureFloat.h */,
</span><span class="cx"> 6EBF0E4712A8926100DB1709 /* OESTextureFloat.idl */,
</span><ins>+ 3146FE6518442087001A937C /* OESTextureFloatLinear.cpp */,
+ 3146FE6618442087001A937C /* OESTextureFloatLinear.h */,
+ 3146FE6718442087001A937C /* OESTextureFloatLinear.idl */,
</ins><span class="cx"> A31C4E4C16E02AA6002F7957 /* OESTextureHalfFloat.cpp */,
</span><span class="cx"> A31C4E4E16E02AB4002F7957 /* OESTextureHalfFloat.h */,
</span><span class="cx"> A31C4E5016E02AC5002F7957 /* OESTextureHalfFloat.idl */,
</span><span class="lines">@@ -17693,6 +17705,8 @@
</span><span class="cx"> 9001787F12E0370700648462 /* JSOESStandardDerivatives.h */,
</span><span class="cx"> 6EBF0E7412A9868800DB1709 /* JSOESTextureFloat.cpp */,
</span><span class="cx"> 6EBF0E7512A9868800DB1709 /* JSOESTextureFloat.h */,
</span><ins>+ 3146FE7018442367001A937C /* JSOESTextureFloatLinear.cpp */,
+ 3146FE7118442367001A937C /* JSOESTextureFloatLinear.h */,
</ins><span class="cx"> A31C4E5116E02B08002F7957 /* JSOESTextureHalfFloat.cpp */,
</span><span class="cx"> A31C4E5316E02B40002F7957 /* JSOESTextureHalfFloat.h */,
</span><span class="cx"> 77A17AA212F28B2A004E02F6 /* JSOESVertexArrayObject.cpp */,
</span><span class="lines">@@ -23449,6 +23463,7 @@
</span><span class="cx"> 59A86008119DAFA100DEF1EF /* JSDeviceOrientationEvent.h in Headers */,
</span><span class="cx"> BCE4389C140B1BA8005E437E /* JSDictionary.h in Headers */,
</span><span class="cx"> E4AE7C1A17D232350009FB31 /* ElementAncestorIterator.h in Headers */,
</span><ins>+ 3146FE7518442370001A937C /* JSOESTextureFloatLinear.h in Headers */,
</ins><span class="cx"> 659DDC8309E198BA001BF3C6 /* JSDocument.h in Headers */,
</span><span class="cx"> 1A494EDF0A123F4C00FDAFC1 /* JSDocumentFragment.h in Headers */,
</span><span class="cx"> 65DF31F609D1CC60000BE325 /* JSDocumentType.h in Headers */,
</span><span class="lines">@@ -23710,6 +23725,7 @@
</span><span class="cx"> B2FA3D390AB75A6F000E5AC4 /* JSSVGAnimatedAngle.h in Headers */,
</span><span class="cx"> B2FA3D3B0AB75A6F000E5AC4 /* JSSVGAnimatedBoolean.h in Headers */,
</span><span class="cx"> B2FA3D3D0AB75A6F000E5AC4 /* JSSVGAnimatedEnumeration.h in Headers */,
</span><ins>+ 3146FE6E184420A8001A937C /* OESTextureFloatLinear.h in Headers */,
</ins><span class="cx"> B2FA3D3F0AB75A6F000E5AC4 /* JSSVGAnimatedInteger.h in Headers */,
</span><span class="cx"> B2FA3D410AB75A6F000E5AC4 /* JSSVGAnimatedLength.h in Headers */,
</span><span class="cx"> B2FA3D430AB75A6F000E5AC4 /* JSSVGAnimatedLengthList.h in Headers */,
</span><span class="lines">@@ -25807,6 +25823,7 @@
</span><span class="cx"> 93309DDC099E64920056E581 /* CompositeEditCommand.cpp in Sources */,
</span><span class="cx"> 79F2F5A11091939A000D87CB /* CompositionEvent.cpp in Sources */,
</span><span class="cx"> FD31608E12B026F700C1A359 /* Cone.cpp in Sources */,
</span><ins>+ 3146FE6F184420AA001A937C /* OESTextureFloatLinear.cpp in Sources */,
</ins><span class="cx"> BC0B36A40CD3C67C00AC7EB5 /* Console.cpp in Sources */,
</span><span class="cx"> 41F0618F0F5F069800A07EAC /* ConsoleMessage.cpp in Sources */,
</span><span class="cx"> A818721F0977D3C0005826D9 /* ContainerNode.cpp in Sources */,
</span><span class="lines">@@ -26492,6 +26509,7 @@
</span><span class="cx"> A871DC260A15205700B12A68 /* HTMLStyleElement.cpp in Sources */,
</span><span class="cx"> D3D4E972130C7CFE007BA540 /* HTMLSummaryElement.cpp in Sources */,
</span><span class="cx"> A871DB320A150BD600B12A68 /* HTMLTableCaptionElement.cpp in Sources */,
</span><ins>+ 3146FE7418442370001A937C /* JSOESTextureFloatLinear.cpp in Sources */,
</ins><span class="cx"> A871DB2E0A150BD600B12A68 /* HTMLTableCellElement.cpp in Sources */,
</span><span class="cx"> A871DB290A150BD600B12A68 /* HTMLTableColElement.cpp in Sources */,
</span><span class="cx"> A871DB280A150BD600B12A68 /* HTMLTableElement.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSWebGLRenderingContextCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp (160029 => 160030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp 2013-12-03 20:18:14 UTC (rev 160029)
+++ trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp 2013-12-03 20:21:29 UTC (rev 160030)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> #include "JSOESElementIndexUint.h"
</span><span class="cx"> #include "JSOESStandardDerivatives.h"
</span><span class="cx"> #include "JSOESTextureFloat.h"
</span><ins>+#include "JSOESTextureFloatLinear.h"
</ins><span class="cx"> #include "JSOESTextureHalfFloat.h"
</span><span class="cx"> #include "JSOESVertexArrayObject.h"
</span><span class="cx"> #include "JSWebGLBuffer.h"
</span><span class="lines">@@ -64,6 +65,7 @@
</span><span class="cx"> #include "OESElementIndexUint.h"
</span><span class="cx"> #include "OESStandardDerivatives.h"
</span><span class="cx"> #include "OESTextureFloat.h"
</span><ins>+#include "OESTextureFloatLinear.h"
</ins><span class="cx"> #include "OESTextureHalfFloat.h"
</span><span class="cx"> #include "OESVertexArrayObject.h"
</span><span class="cx"> #include "WebGLBuffer.h"
</span><span class="lines">@@ -207,6 +209,8 @@
</span><span class="cx"> return toJS(exec, globalObject, static_cast<OESStandardDerivatives*>(extension));
</span><span class="cx"> case WebGLExtension::OESTextureFloatName:
</span><span class="cx"> return toJS(exec, globalObject, static_cast<OESTextureFloat*>(extension));
</span><ins>+ case WebGLExtension::OESTextureFloatLinearName:
+ return toJS(exec, globalObject, static_cast<OESTextureFloatLinear*>(extension));
</ins><span class="cx"> case WebGLExtension::OESTextureHalfFloatName:
</span><span class="cx"> return toJS(exec, globalObject, static_cast<OESTextureHalfFloat*>(extension));
</span><span class="cx"> case WebGLExtension::OESVertexArrayObjectName:
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasOESTextureFloatLinearcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/html/canvas/OESTextureFloatLinear.cpp (0 => 160030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/OESTextureFloatLinear.cpp (rev 0)
+++ trunk/Source/WebCore/html/canvas/OESTextureFloatLinear.cpp 2013-12-03 20:21:29 UTC (rev 160030)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+/*
+ * Copyright (C) 2013 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 "OESTextureFloatLinear.h"
+
+namespace WebCore {
+
+OESTextureFloatLinear::OESTextureFloatLinear(WebGLRenderingContext* context)
+ : WebGLExtension(context)
+{
+}
+
+OESTextureFloatLinear::~OESTextureFloatLinear()
+{
+}
+
+WebGLExtension::ExtensionName OESTextureFloatLinear::getName() const
+{
+ return OESTextureFloatLinearName;
+}
+
+OwnPtr<OESTextureFloatLinear> OESTextureFloatLinear::create(WebGLRenderingContext* context)
+{
+ return adoptPtr(new OESTextureFloatLinear(context));
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(WEBGL)
</ins><span class="cx">Property changes on: trunk/Source/WebCore/html/canvas/OESTextureFloatLinear.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="trunkSourceWebCorehtmlcanvasOESTextureFloatLinearh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/html/canvas/OESTextureFloatLinear.h (0 => 160030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/OESTextureFloatLinear.h (rev 0)
+++ trunk/Source/WebCore/html/canvas/OESTextureFloatLinear.h 2013-12-03 20:21:29 UTC (rev 160030)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+/*
+ * Copyright (C) 2013 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 OESTextureFloatLinear_h
+#define OESTextureFloatLinear_h
+
+#include "WebGLExtension.h"
+#include <wtf/PassOwnPtr.h>
+
+namespace WebCore {
+
+class OESTextureFloatLinear : public WebGLExtension {
+public:
+ static OwnPtr<OESTextureFloatLinear> create(WebGLRenderingContext*);
+
+ virtual ~OESTextureFloatLinear();
+ virtual ExtensionName getName() const;
+
+private:
+ OESTextureFloatLinear(WebGLRenderingContext*);
+};
+
+} // namespace WebCore
+
+#endif // OESTextureFloat_h
</ins><span class="cx">Property changes on: trunk/Source/WebCore/html/canvas/OESTextureFloatLinear.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="trunkSourceWebCorehtmlcanvasOESTextureFloatLinearidl"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/html/canvas/OESTextureFloatLinear.idl (0 => 160030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/OESTextureFloatLinear.idl (rev 0)
+++ trunk/Source/WebCore/html/canvas/OESTextureFloatLinear.idl 2013-12-03 20:21:29 UTC (rev 160030)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+/*
+ * Copyright (C) 2013 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 OESTextureFloatLinear {
+};
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLExtensionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLExtension.h (160029 => 160030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLExtension.h 2013-12-03 20:18:14 UTC (rev 160029)
+++ trunk/Source/WebCore/html/canvas/WebGLExtension.h 2013-12-03 20:21:29 UTC (rev 160030)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> EXTDrawBuffersName,
</span><span class="cx"> EXTTextureFilterAnisotropicName,
</span><span class="cx"> OESTextureFloatName,
</span><ins>+ OESTextureFloatLinearName,
</ins><span class="cx"> OESTextureHalfFloatName,
</span><span class="cx"> OESStandardDerivativesName,
</span><span class="cx"> OESVertexArrayObjectName,
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (160029 => 160030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2013-12-03 20:18:14 UTC (rev 160029)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2013-12-03 20:21:29 UTC (rev 160030)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx"> #include "OESElementIndexUint.h"
</span><span class="cx"> #include "OESStandardDerivatives.h"
</span><span class="cx"> #include "OESTextureFloat.h"
</span><ins>+#include "OESTextureFloatLinear.h"
</ins><span class="cx"> #include "OESTextureHalfFloat.h"
</span><span class="cx"> #include "OESVertexArrayObject.h"
</span><span class="cx"> #include "Page.h"
</span><span class="lines">@@ -1986,12 +1987,12 @@
</span><span class="cx"> if (!isGLES2Compliant())
</span><span class="cx"> vertexAttrib0Simulated = simulateVertexAttrib0(first + count - 1);
</span><span class="cx"> if (!isGLES2NPOTStrict())
</span><del>- handleNPOTTextures("drawArrays", true);
</del><ins>+ checkTextureCompleteness("drawArrays", true);
</ins><span class="cx"> m_context->drawArrays(mode, first, count);
</span><span class="cx"> if (!isGLES2Compliant() && vertexAttrib0Simulated)
</span><span class="cx"> restoreStatesAfterVertexAttrib0Simulation();
</span><span class="cx"> if (!isGLES2NPOTStrict())
</span><del>- handleNPOTTextures("drawArrays", false);
</del><ins>+ checkTextureCompleteness("drawArrays", false);
</ins><span class="cx"> cleanupAfterGraphicsCall(true);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2070,12 +2071,12 @@
</span><span class="cx"> vertexAttrib0Simulated = simulateVertexAttrib0(numElements);
</span><span class="cx"> }
</span><span class="cx"> if (!isGLES2NPOTStrict())
</span><del>- handleNPOTTextures("drawElements", true);
</del><ins>+ checkTextureCompleteness("drawElements", true);
</ins><span class="cx"> m_context->drawElements(mode, count, type, static_cast<GC3Dintptr>(offset));
</span><span class="cx"> if (!isGLES2Compliant() && vertexAttrib0Simulated)
</span><span class="cx"> restoreStatesAfterVertexAttrib0Simulation();
</span><span class="cx"> if (!isGLES2NPOTStrict())
</span><del>- handleNPOTTextures("drawElements", false);
</del><ins>+ checkTextureCompleteness("drawElements", false);
</ins><span class="cx"> cleanupAfterGraphicsCall(true);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2391,6 +2392,14 @@
</span><span class="cx"> }
</span><span class="cx"> return m_oesTextureFloat.get();
</span><span class="cx"> }
</span><ins>+ if (equalIgnoringCase(name, "OES_texture_float_linear")
+ && m_context->getExtensions()->supports("GL_OES_texture_float_linear")) {
+ if (!m_oesTextureFloatLinear) {
+ m_context->getExtensions()->ensureEnabled("GL_OES_texture_float_linear");
+ m_oesTextureFloatLinear = OESTextureFloatLinear::create(this);
+ }
+ return m_oesTextureFloatLinear.get();
+ }
</ins><span class="cx"> if (equalIgnoringCase(name, "OES_texture_half_float")
</span><span class="cx"> && m_context->getExtensions()->supports("GL_OES_texture_half_float")) {
</span><span class="cx"> if (!m_oesTextureHalfFloat) {
</span><span class="lines">@@ -4844,12 +4853,14 @@
</span><span class="cx"> return WebGLGetInfo(Int32Array::create(value, length));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContext::handleNPOTTextures(const char* functionName, bool prepareToDraw)
</del><ins>+void WebGLRenderingContext::checkTextureCompleteness(const char* functionName, bool prepareToDraw)
</ins><span class="cx"> {
</span><span class="cx"> bool resetActiveUnit = false;
</span><ins>+ WebGLTexture::TextureExtensionFlag extensions = static_cast<WebGLTexture::TextureExtensionFlag>(m_oesTextureFloatLinear ? WebGLTexture::TextureExtensionFloatLinearEnabled : 0);
+
</ins><span class="cx"> for (unsigned ii = 0; ii < m_textureUnits.size(); ++ii) {
</span><del>- if ((m_textureUnits[ii].texture2DBinding && m_textureUnits[ii].texture2DBinding->needToUseBlackTexture())
- || (m_textureUnits[ii].textureCubeMapBinding && m_textureUnits[ii].textureCubeMapBinding->needToUseBlackTexture())) {
</del><ins>+ if ((m_textureUnits[ii].texture2DBinding && m_textureUnits[ii].texture2DBinding->needToUseBlackTexture(extensions))
+ || (m_textureUnits[ii].textureCubeMapBinding && m_textureUnits[ii].textureCubeMapBinding->needToUseBlackTexture(extensions))) {
</ins><span class="cx"> if (ii != m_activeTextureUnit) {
</span><span class="cx"> m_context->activeTexture(ii);
</span><span class="cx"> resetActiveUnit = true;
</span><span class="lines">@@ -4861,7 +4872,8 @@
</span><span class="cx"> WebGLTexture* texCubeMap;
</span><span class="cx"> if (prepareToDraw) {
</span><span class="cx"> String msg(String("texture bound to texture unit ") + String::number(ii)
</span><del>- + " is not renderable. It maybe non-power-of-2 and have incompatible texture filtering or is not 'texture complete'");
</del><ins>+ + " 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.");
</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 class="lines">@@ -4869,9 +4881,9 @@
</span><span class="cx"> tex2D = m_textureUnits[ii].texture2DBinding.get();
</span><span class="cx"> texCubeMap = m_textureUnits[ii].textureCubeMapBinding.get();
</span><span class="cx"> }
</span><del>- if (m_textureUnits[ii].texture2DBinding && m_textureUnits[ii].texture2DBinding->needToUseBlackTexture())
</del><ins>+ if (m_textureUnits[ii].texture2DBinding && m_textureUnits[ii].texture2DBinding->needToUseBlackTexture(extensions))
</ins><span class="cx"> m_context->bindTexture(GraphicsContext3D::TEXTURE_2D, objectOrZero(tex2D));
</span><del>- if (m_textureUnits[ii].textureCubeMapBinding && m_textureUnits[ii].textureCubeMapBinding->needToUseBlackTexture())
</del><ins>+ if (m_textureUnits[ii].textureCubeMapBinding && m_textureUnits[ii].textureCubeMapBinding->needToUseBlackTexture(extensions))
</ins><span class="cx"> m_context->bindTexture(GraphicsContext3D::TEXTURE_CUBE_MAP, objectOrZero(texCubeMap));
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h (160029 => 160030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h 2013-12-03 20:18:14 UTC (rev 160029)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h 2013-12-03 20:21:29 UTC (rev 160030)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> class IntSize;
</span><span class="cx"> class OESStandardDerivatives;
</span><span class="cx"> class OESTextureFloat;
</span><ins>+class OESTextureFloatLinear;
</ins><span class="cx"> class OESTextureHalfFloat;
</span><span class="cx"> class OESVertexArrayObject;
</span><span class="cx"> class OESElementIndexUint;
</span><span class="lines">@@ -525,6 +526,7 @@
</span><span class="cx"> OwnPtr<EXTDrawBuffers> m_extDrawBuffers;
</span><span class="cx"> OwnPtr<EXTTextureFilterAnisotropic> m_extTextureFilterAnisotropic;
</span><span class="cx"> OwnPtr<OESTextureFloat> m_oesTextureFloat;
</span><ins>+ OwnPtr<OESTextureFloatLinear> m_oesTextureFloatLinear;
</ins><span class="cx"> OwnPtr<OESTextureHalfFloat> m_oesTextureHalfFloat;
</span><span class="cx"> OwnPtr<OESStandardDerivatives> m_oesStandardDerivatives;
</span><span class="cx"> OwnPtr<OESVertexArrayObject> m_oesVertexArrayObject;
</span><span class="lines">@@ -559,7 +561,7 @@
</span><span class="cx"> void texSubImage2DBase(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, const void* pixels, ExceptionCode&);
</span><span class="cx"> void texSubImage2DImpl(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Denum format, GC3Denum type, Image*, GraphicsContext3D::ImageHtmlDomSource, bool flipY, bool premultiplyAlpha, ExceptionCode&);
</span><span class="cx">
</span><del>- void handleNPOTTextures(const char*, bool);
</del><ins>+ void checkTextureCompleteness(const char*, bool);
</ins><span class="cx">
</span><span class="cx"> void createFallbackBlackTextures1x1();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLTexturecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLTexture.cpp (160029 => 160030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLTexture.cpp 2013-12-03 20:18:14 UTC (rev 160029)
+++ trunk/Source/WebCore/html/canvas/WebGLTexture.cpp 2013-12-03 20:21:29 UTC (rev 160030)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> , m_isComplete(false)
</span><span class="cx"> , m_needToUseBlackTexture(false)
</span><span class="cx"> , m_isCompressed(false)
</span><ins>+ , m_isFloatType(false)
</ins><span class="cx"> {
</span><span class="cx"> setObject(ctx->graphicsContext3D()->createTexture());
</span><span class="cx"> }
</span><span class="lines">@@ -233,11 +234,17 @@
</span><span class="cx"> return m_isNPOT;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebGLTexture::needToUseBlackTexture() const
</del><ins>+bool WebGLTexture::needToUseBlackTexture(TextureExtensionFlag extensions) const
</ins><span class="cx"> {
</span><span class="cx"> if (!object())
</span><span class="cx"> return false;
</span><del>- return m_needToUseBlackTexture;
</del><ins>+ if (m_needToUseBlackTexture)
+ return true;
+ if (m_isFloatType && !(extensions & TextureExtensionFloatLinearEnabled)) {
+ if (m_magFilter != GraphicsContext3D::NEAREST || (m_minFilter != GraphicsContext3D::NEAREST && m_minFilter != GraphicsContext3D::NEAREST_MIPMAP_NEAREST))
+ return true;
+ }
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebGLTexture::isCompressed() const
</span><span class="lines">@@ -357,6 +364,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ m_isFloatType = false;
+ if (m_isComplete)
+ m_isFloatType = m_info[0][0].type == GraphicsContext3D::FLOAT;
+ else {
+ for (size_t ii = 0; ii < m_info.size(); ++ii) {
+ if (m_info[ii][0].type == GraphicsContext3D::FLOAT) {
+ m_isFloatType = 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 (160029 => 160030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLTexture.h 2013-12-03 20:18:14 UTC (rev 160029)
+++ trunk/Source/WebCore/html/canvas/WebGLTexture.h 2013-12-03 20:21:29 UTC (rev 160030)
</span><span class="lines">@@ -35,6 +35,12 @@
</span><span class="cx">
</span><span class="cx"> class WebGLTexture : public WebGLSharedObject {
</span><span class="cx"> public:
</span><ins>+
+ enum TextureExtensionFlag {
+ TextureExtensionsDisabled = 0,
+ TextureExtensionFloatLinearEnabled = 1 << 0
+ };
+
</ins><span class="cx"> virtual ~WebGLTexture();
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<WebGLTexture> create(WebGLRenderingContext*);
</span><span class="lines">@@ -64,7 +70,7 @@
</span><span class="cx">
</span><span class="cx"> bool isNPOT() const;
</span><span class="cx"> // Determine if texture sampling should always return [0, 0, 0, 1] (OpenGL ES 2.0 Sec 3.8.2).
</span><del>- bool needToUseBlackTexture() const;
</del><ins>+ bool needToUseBlackTexture(TextureExtensionFlag) const;
</ins><span class="cx">
</span><span class="cx"> bool isCompressed() const;
</span><span class="cx"> void setCompressed();
</span><span class="lines">@@ -127,6 +133,7 @@
</span><span class="cx"> bool m_isComplete;
</span><span class="cx"> bool m_needToUseBlackTexture;
</span><span class="cx"> bool m_isCompressed;
</span><ins>+ bool m_isFloatType;
</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 (160029 => 160030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Extensions3D.h 2013-12-03 20:18:14 UTC (rev 160029)
+++ trunk/Source/WebCore/platform/graphics/Extensions3D.h 2013-12-03 20:21:29 UTC (rev 160030)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> // GL_EXT_packed_depth_stencil / GL_OES_packed_depth_stencil
</span><span class="cx"> // GL_ANGLE_framebuffer_blit / GL_ANGLE_framebuffer_multisample
</span><span class="cx"> // GL_OES_texture_float
</span><ins>+ // GL_OES_texture_float_linear
</ins><span class="cx"> // GL_OES_texture_half_float
</span><span class="cx"> // GL_OES_standard_derivatives
</span><span class="cx"> // GL_OES_rgb8_rgba8
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp (160029 => 160030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2013-12-03 20:18:14 UTC (rev 160029)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2013-12-03 20:21:29 UTC (rev 160030)
</span><span class="lines">@@ -153,9 +153,9 @@
</span><span class="cx"> if (name == "GL_OES_rgb8_rgba8")
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- // If GL_ARB_texture_float is available then we report GL_OES_texture_float and
- // GL_OES_texture_half_float as available.
- if (name == "GL_OES_texture_float" || name == "GL_OES_texture_half_float")
</del><ins>+ // If GL_ARB_texture_float is available then we report GL_OES_texture_float,
+ // 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")
</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>