Changeset 164477 in webkit


Ignore:
Timestamp:
Feb 20, 2014 11:46:30 PM (10 years ago)
Author:
ChangSeok Oh
Message:

Rename EXT_draw_buffers to WEBGL_draw_buffers
​https://bugs.webkit.org/show_bug.cgi?id=128894

Reviewed by Dean Jackson.

Source/WebCore:

I noticed the related spec has changed. Accordingly chromium also changed its implementation
to meet the spec. So here I'd like to apply it to webkit as well.

Merged from Blink (patch by bajones):
​https://src.chromium.org/viewvc/blink?revision=152065&view=revision

Test: fast/canvas/webgl/webgl-draw-buffers.html

  • CMakeLists.txt:
  • DerivedSources.cpp:
  • DerivedSources.make:
  • GNUmakefile.list.am:
  • WebCore.vcxproj/WebCore.vcxproj:
  • WebCore.vcxproj/WebCore.vcxproj.filters:
  • WebCore.xcodeproj/project.pbxproj:
  • bindings/js/JSWebGLRenderingContextCustom.cpp:

(WebCore::toJS):

  • html/canvas/EXTDrawBuffers.idl: Removed.
  • html/canvas/WebGLDrawBuffers.cpp: Renamed from Source/WebCore/html/canvas/EXTDrawBuffers.cpp.

(WebCore::WebGLDrawBuffers::WebGLDrawBuffers):
(WebCore::WebGLDrawBuffers::~WebGLDrawBuffers):
(WebCore::WebGLDrawBuffers::getName):
(WebCore::WebGLDrawBuffers::create):
(WebCore::WebGLDrawBuffers::supported):
(WebCore::WebGLDrawBuffers::drawBuffersWEBGL):
(WebCore::WebGLDrawBuffers::satisfiesWebGLRequirements):

  • html/canvas/WebGLDrawBuffers.h: Renamed from Source/WebCore/html/canvas/EXTDrawBuffers.h.
  • html/canvas/WebGLDrawBuffers.idl: Added.
  • html/canvas/WebGLExtension.h:
  • html/canvas/WebGLFramebuffer.cpp:

(WebCore::WebGLFramebuffer::drawBuffersIfNecessary):

  • html/canvas/WebGLRenderingContext.cpp:

(WebCore::WebGLRenderingContext::getExtension):
(WebCore::WebGLRenderingContext::getParameter):
(WebCore::WebGLRenderingContext::getSupportedExtensions):
(WebCore::WebGLRenderingContext::validateFramebufferFuncParameters):
(WebCore::WebGLRenderingContext::supportsDrawBuffers):

  • html/canvas/WebGLRenderingContext.h:

LayoutTests:

webgl-draw-buffers.html came from Khronos's webgl conformace tests. It requires
some new apis in webgl-test-utils.js so that it is updated as well. The attached
test results are for mac. But they're expected to fail since EXT_draw_buffers are
disabled with some reason. See WebGLDrawBuffers::supported. So I add a line
for webgl-draw-buffers.html to mac/TestExpectations.

  • fast/canvas/webgl/resources/webgl-test-utils.js:

(WebGLTestUtils):
(WebGLTestUtils.):

  • fast/canvas/webgl/webgl-draw-buffers-expected.txt: Added.
  • fast/canvas/webgl/webgl-draw-buffers.html: Added.
  • platform/mac-mountainlion/fast/canvas/webgl/webgl-draw-buffers-expected.txt: Added.
  • platform/mac/TestExpectations:
Location:
trunk
Files:
4 added
1 deleted
16 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r164476 r164477  
     12014-02-20  ChangSeok Oh  <changseok.oh@collabora.com>
     2
     3        Rename EXT_draw_buffers to WEBGL_draw_buffers
     4        https://bugs.webkit.org/show_bug.cgi?id=128894
     5
     6        Reviewed by Dean Jackson.
     7
     8        webgl-draw-buffers.html came from Khronos's webgl conformace tests. It requires
     9        some new apis in webgl-test-utils.js so that it is updated as well. The attached
     10        test results are for mac. But they're expected to fail since EXT_draw_buffers are
     11        disabled with some reason. See WebGLDrawBuffers::supported. So I add a line
     12        for webgl-draw-buffers.html to mac/TestExpectations.
     13
     14        * fast/canvas/webgl/resources/webgl-test-utils.js:
     15        (WebGLTestUtils):
     16        (WebGLTestUtils.):
     17        * fast/canvas/webgl/webgl-draw-buffers-expected.txt: Added.
     18        * fast/canvas/webgl/webgl-draw-buffers.html: Added.
     19        * platform/mac-mountainlion/fast/canvas/webgl/webgl-draw-buffers-expected.txt: Added.
     20        * platform/mac/TestExpectations:
     21
    1222014-02-20  Ryosuke Niwa  <rniwa@webkit.org>
    223

  • trunk/LayoutTests/fast/canvas/webgl/resources/webgl-test-utils.js

    r162565 r164477  
    294294      [opt_positionLocation]);
    295295  setupUnitQuad(gl, opt_positionLocation);
     296  return program;
     297};
     298
     299/**
     300 * Creates a program, attaches shaders, binds attrib locations, links the
     301 * program and calls useProgram.
     302 * @param {!WebGLRenderingContext} gl The WebGLRenderingContext to use.
     303 * @param {!Array.<!WebGLShader|string>} shaders The shaders to
     304 *        attach, or the source, or the id of a script to get
     305 *        the source from.
     306 * @param {!Array.<string>} opt_attribs The attribs names.
     307 * @param {!Array.<number>} opt_locations The locations for the attribs.
     308 */
     309var setupProgram = function(gl, shaders, opt_attribs, opt_locations) {
     310  var realShaders = [];
     311  var program = gl.createProgram();
     312  var shaderCount = 0;
     313  for (var ii = 0; ii < shaders.length; ++ii) {
     314    var shader = shaders[ii];
     315    var shaderType = undefined;
     316    if (typeof shader == 'string') {
     317      var element = document.getElementById(shader);
     318      if (element) {
     319        if (element.type != "x-shader/x-vertex" && element.type != "x-shader/x-fragment")
     320          shaderType = ii ? gl.FRAGMENT_SHADER : gl.VERTEX_SHADER;
     321        shader = loadShaderFromScript(gl, shader, shaderType);
     322      } else if (endsWith(shader, ".vert")) {
     323        shader = loadShaderFromFile(gl, shader, gl.VERTEX_SHADER);
     324      } else if (endsWith(shader, ".frag")) {
     325        shader = loadShaderFromFile(gl, shader, gl.FRAGMENT_SHADER);
     326      } else {
     327        shader = loadShader(gl, shader, ii ? gl.FRAGMENT_SHADER : gl.VERTEX_SHADER);
     328      }
     329    }
     330    if (shader) {
     331      ++shaderCount;
     332      gl.attachShader(program, shader);
     333    }
     334  }
     335  if (shaderCount != 2) {
     336    error("Error in compiling shader");
     337    return null;
     338  }
     339  if (opt_attribs) {
     340    for (var ii = 0; ii < opt_attribs.length; ++ii) {
     341      gl.bindAttribLocation(
     342          program,
     343          opt_locations ? opt_locations[ii] : ii,
     344          opt_attribs[ii]);
     345    }
     346  }
     347  gl.linkProgram(program);
     348
     349  // Check the link status
     350  var linked = gl.getProgramParameter(program, gl.LINK_STATUS);
     351  if (!linked) {
     352      // something went wrong with the link
     353      lastError = gl.getProgramInfoLog (program);
     354      error("Error in program linking:" + lastError);
     355
     356      gl.deleteProgram(program);
     357      return null;
     358  }
     359
     360  gl.useProgram(program);
    296361  return program;
    297362};
    … …  
    573638  gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
    574639  gl.drawArrays(gl.TRIANGLES, 0, 6);
     640};
     641
     642/**
     643 * Draws a previously setupUnitQuad.
     644 * @param {!WebGLRenderingContext} gl The WebGLRenderingContext to use.
     645 */
     646var drawUnitQuad = function(gl) {
     647  gl.drawArrays(gl.TRIANGLES, 0, 6);
     648};
     649
     650/**
     651 * Clears then Draws a previously setupUnitQuad.
     652 * @param {!WebGLRenderingContext} gl The WebGLRenderingContext to use.
     653 * @param {!Array.<number>} opt_color The color to fill clear with before
     654 *        drawing. A 4 element array where each element is in the range 0 to
     655 *        255. Default [255, 255, 255, 255]
     656 */
     657var clearAndDrawUnitQuad = function(gl, opt_color) {
     658  opt_color = opt_color || [255, 255, 255, 255];
     659  gl.clearColor(
     660      opt_color[0] / 255,
     661      opt_color[1] / 255,
     662      opt_color[2] / 255,
     663      opt_color[3] / 255);
     664  gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
     665  drawUnitQuad(gl);
    575666};
    576667
    … …  
    12491340
    12501341/**
     1342 * Gets the content of script.
     1343 * @param {string} scriptId The id of the script tag.
     1344 * @return {string} The content of the script.
     1345 */
     1346var getScript = function(scriptId) {
     1347  var shaderScript = document.getElementById(scriptId);
     1348  if (!shaderScript) {
     1349    throw("*** Error: unknown script element" + scriptId);
     1350  }
     1351  return shaderScript.text;
     1352};
     1353
     1354/**
    12511355 * Loads a shader from a script tag.
    12521356 * @param {!WebGLContext} gl The WebGLContext to use.
    … …  
    14551559};
    14561560
     1561/**
     1562 * Inserts a 'label' that when clicked expands to the pre
     1563 * formatted text supplied by 'source'.
     1564 * @param {!HTMLElement} element element to append label to.
     1565 * @param {string} label label for anchor.
     1566 * @param {string} source preformatted text to expand to.
     1567 * @param {string} opt_url url of source. If provided a 2nd link
     1568 *     will be added.
     1569 */
     1570var addShaderSource = function(element, label, source, opt_url) {
     1571  var div = document.createElement("div");
     1572  var s = document.createElement("pre");
     1573  s.className = "shader-source";
     1574  s.style.display = "none";
     1575  var ol = document.createElement("ol");
     1576  //s.appendChild(document.createTextNode(source));
     1577  var lines = source.split("\n");
     1578  for (var ii = 0; ii < lines.length; ++ii) {
     1579    var line = lines[ii];
     1580    var li = document.createElement("li");
     1581    li.appendChild(document.createTextNode(line));
     1582    ol.appendChild(li);
     1583  }
     1584  s.appendChild(ol);
     1585  var l = document.createElement("a");
     1586  l.href = "show-shader-source";
     1587  l.appendChild(document.createTextNode(label));
     1588  l.addEventListener('click', function(event) {
     1589      if (event.preventDefault) {
     1590        event.preventDefault();
     1591      }
     1592      s.style.display = (s.style.display == 'none') ? 'block' : 'none';
     1593      return false;
     1594    }, false);
     1595  div.appendChild(l);
     1596  if (opt_url) {
     1597    var u = document.createElement("a");
     1598    u.href = opt_url;
     1599    div.appendChild(document.createTextNode(" "));
     1600    u.appendChild(document.createTextNode("(" + opt_url + ")"));
     1601    div.appendChild(u);
     1602  }
     1603  div.appendChild(s);
     1604  element.appendChild(div);
     1605};
     1606
    14571607// Add your prefix here.
    14581608var browserPrefixes = [
    … …  
    14971647    }
    14981648  }
     1649};
     1650
     1651var replaceRE = /\$\((\w+)\)/g;
     1652
     1653/**
     1654 * Replaces strings with property values.
     1655 * Given a string like "hello $(first) $(last)" and an object
     1656 * like {first:"John", last:"Smith"} will return
     1657 * "hello John Smith".
     1658 * @param {string} str String to do replacements in.
     1659 * @param {...} 1 or more objects containing properties.
     1660 */
     1661var replaceParams = function(str) {
     1662  var args = arguments;
     1663  return str.replace(replaceRE, function(str, p1, offset, s) {
     1664    for (var ii = 1; ii < args.length; ++ii) {
     1665      if (args[ii][p1] !== undefined) {
     1666        return args[ii][p1];
     1667      }
     1668    }
     1669    throw "unknown string param '" + p1 + "'";
     1670  });
    14991671};
    15001672
    … …  
    15751747
    15761748return {
     1749  addShaderSource: addShaderSource,
    15771750  cancelAnimFrame: cancelAnimFrame,
    15781751  clipToRange: clipToRange,
    … …  
    15841757  checkCanvasRectColor: checkCanvasRectColor,
    15851758  createColoredTexture: createColoredTexture,
     1759  clearAndDrawUnitQuad: clearAndDrawUnitQuad,
    15861760  drawQuad: drawQuad,
     1761  drawUnitQuad: drawUnitQuad,
    15871762  drawIndexedQuad: drawIndexedQuad,
    15881763  drawUByteColorQuad: drawUByteColorQuad,
    … …  
    15921767  getFileListAsync: getFileListAsync,
    15931768  getLastError: getLastError,
     1769  getScript: getScript,
    15941770  getSupportedExtensionWithKnownPrefixes: getSupportedExtensionWithKnownPrefixes,
    15951771  getUrlArguments: getUrlArguments,
    … …  
    16281804  readFile: readFile,
    16291805  readFileList: readFileList,
     1806  replaceParams: replaceParams,
    16301807  requestAnimFrame: requestAnimFrame,
    16311808  waitFrames: waitFrames,

  • trunk/LayoutTests/platform/mac/TestExpectations

    r164013 r164477  
    947947webkit.org/b/98257 fast/canvas/webgl/oes-element-index-uint.html [ Failure Pass ]
    948948
     949# Expected to fail until GL_EXT_draw_buffers works properly for DARWIN. See WebGLDrawBuffers::supported
     950webkit.org/b/112486 fast/canvas/webgl/webgl-draw-buffers.html [ Failure Pass ]
     951
    949952# Resource Timing is not enable yet, skip it.
    950953webkit.org/b/61138 http/tests/w3c/webperf/submission/Intel/resource-timing [ Skip ]

  • trunk/Source/WebCore/CMakeLists.txt

    r164254 r164477  
    504504    html/canvas/CanvasRenderingContext2D.idl
    505505    html/canvas/DOMPath.idl
    506     html/canvas/EXTDrawBuffers.idl
    507506    html/canvas/EXTTextureFilterAnisotropic.idl
    508507    html/canvas/OESElementIndexUint.idl
    … …  
    523522    html/canvas/WebGLDebugShaders.idl
    524523    html/canvas/WebGLDepthTexture.idl
     524    html/canvas/WebGLDrawBuffers.idl
    525525    html/canvas/WebGLFramebuffer.idl
    526526    html/canvas/WebGLLoseContext.idl
    … …  
    14941494    html/canvas/CanvasRenderingContext2D.cpp
    14951495    html/canvas/CanvasStyle.cpp
    1496     html/canvas/EXTDrawBuffers.cpp
    14971496    html/canvas/EXTTextureFilterAnisotropic.cpp
    14981497    html/canvas/OESElementIndexUint.cpp
    … …  
    15141513    html/canvas/WebGLDebugShaders.cpp
    15151514    html/canvas/WebGLDepthTexture.cpp
     1515    html/canvas/WebGLDrawBuffers.cpp
    15161516    html/canvas/WebGLExtension.cpp
    15171517    html/canvas/WebGLFramebuffer.cpp
    … …  
    26182618    list(APPEND WebCore_SOURCES
    26192619        html/canvas/ANGLEInstancedArrays.cpp
    2620         html/canvas/EXTDrawBuffers.cpp
    26212620        html/canvas/EXTTextureFilterAnisotropic.cpp
    26222621        html/canvas/OESElementIndexUint.cpp
    … …  
    26382637        html/canvas/WebGLDebugShaders.cpp
    26392638        html/canvas/WebGLDepthTexture.cpp
     2639        html/canvas/WebGLDrawBuffers.cpp
    26402640        html/canvas/WebGLExtension.cpp
    26412641        html/canvas/WebGLFramebuffer.cpp
    … …  
    26552655    list(APPEND WebCore_IDL_FILES
    26562656        html/canvas/ANGLEInstancedArrays.idl
    2657         html/canvas/EXTDrawBuffers.idl
    26582657        html/canvas/EXTTextureFilterAnisotropic.idl
    26592658        html/canvas/OESElementIndexUint.idl
    … …  
    26742673        html/canvas/WebGLDebugShaders.idl
    26752674        html/canvas/WebGLDepthTexture.idl
     2675        html/canvas/WebGLDrawBuffers.idl
    26762676        html/canvas/WebGLFramebuffer.idl
    26772677        html/canvas/WebGLLoseContext.idl

  • trunk/Source/WebCore/ChangeLog

    r164475 r164477  
     12014-02-20  ChangSeok Oh  <changseok.oh@collabora.com>
     2
     3        Rename EXT_draw_buffers to WEBGL_draw_buffers
     4        https://bugs.webkit.org/show_bug.cgi?id=128894
     5
     6        Reviewed by Dean Jackson.
     7
     8        I noticed the related spec has changed. Accordingly chromium also changed its implementation
     9        to meet the spec. So here I'd like to apply it to webkit as well.
     10
     11        Merged from Blink (patch by bajones):
     12        https://src.chromium.org/viewvc/blink?revision=152065&view=revision
     13
     14        Test: fast/canvas/webgl/webgl-draw-buffers.html
     15
     16        * CMakeLists.txt:
     17        * DerivedSources.cpp:
     18        * DerivedSources.make:
     19        * GNUmakefile.list.am:
     20        * WebCore.vcxproj/WebCore.vcxproj:
     21        * WebCore.vcxproj/WebCore.vcxproj.filters:
     22        * WebCore.xcodeproj/project.pbxproj:
     23        * bindings/js/JSWebGLRenderingContextCustom.cpp:
     24        (WebCore::toJS):
     25        * html/canvas/EXTDrawBuffers.idl: Removed.
     26        * html/canvas/WebGLDrawBuffers.cpp: Renamed from Source/WebCore/html/canvas/EXTDrawBuffers.cpp.
     27        (WebCore::WebGLDrawBuffers::WebGLDrawBuffers):
     28        (WebCore::WebGLDrawBuffers::~WebGLDrawBuffers):
     29        (WebCore::WebGLDrawBuffers::getName):
     30        (WebCore::WebGLDrawBuffers::create):
     31        (WebCore::WebGLDrawBuffers::supported):
     32        (WebCore::WebGLDrawBuffers::drawBuffersWEBGL):
     33        (WebCore::WebGLDrawBuffers::satisfiesWebGLRequirements):
     34        * html/canvas/WebGLDrawBuffers.h: Renamed from Source/WebCore/html/canvas/EXTDrawBuffers.h.
     35        * html/canvas/WebGLDrawBuffers.idl: Added.
     36        * html/canvas/WebGLExtension.h:
     37        * html/canvas/WebGLFramebuffer.cpp:
     38        (WebCore::WebGLFramebuffer::drawBuffersIfNecessary):
     39        * html/canvas/WebGLRenderingContext.cpp:
     40        (WebCore::WebGLRenderingContext::getExtension):
     41        (WebCore::WebGLRenderingContext::getParameter):
     42        (WebCore::WebGLRenderingContext::getSupportedExtensions):
     43        (WebCore::WebGLRenderingContext::validateFramebufferFuncParameters):
     44        (WebCore::WebGLRenderingContext::supportsDrawBuffers):
     45        * html/canvas/WebGLRenderingContext.h:
     46
    1472014-02-20  Ryosuke Niwa  <rniwa@webkit.org>
    248

  • trunk/Source/WebCore/DerivedSources.cpp

    r164131 r164477  
    4242#include "JSCanvasRenderingContext2D.cpp"
    4343#if ENABLE(WEBGL)
    44 #include "JSEXTDrawBuffers.cpp"
    4544#include "JSEXTTextureFilterAnisotropic.cpp"
    4645#include "JSOESElementIndexUint.cpp"
    … …  
    6160#include "JSWebGLDebugShaders.cpp"
    6261#include "JSWebGLDepthTexture.cpp"
     62#include "JSWebGLDrawBuffers.cpp"
    6363#include "JSWebGLFramebuffer.cpp"
    6464#include "JSWebGLLoseContext.cpp"

  • trunk/Source/WebCore/DerivedSources.make

    r164473 r164477  
    413413    $(WebCore)/html/canvas/CanvasRenderingContext2D.idl \
    414414    $(WebCore)/html/canvas/DOMPath.idl \
    415     $(WebCore)/html/canvas/EXTDrawBuffers.idl \
    416415    $(WebCore)/html/canvas/EXTTextureFilterAnisotropic.idl \
    417416    $(WebCore)/html/canvas/OESElementIndexUint.idl \
    … …  
    432431    $(WebCore)/html/canvas/WebGLDebugShaders.idl \
    433432    $(WebCore)/html/canvas/WebGLDepthTexture.idl \
     433    $(WebCore)/html/canvas/WebGLDrawBuffers.idl \
    434434    $(WebCore)/html/canvas/WebGLFramebuffer.idl \
    435435    $(WebCore)/html/canvas/WebGLLoseContext.idl \

  • trunk/Source/WebCore/GNUmakefile.list.am

    r164254 r164477  
    237237        DerivedSources/WebCore/JSErrorEvent.cpp \
    238238        DerivedSources/WebCore/JSErrorEvent.h \
    239         DerivedSources/WebCore/JSEXTDrawBuffers.cpp \
    240         DerivedSources/WebCore/JSEXTDrawBuffers.h \
    241239        DerivedSources/WebCore/JSEXTTextureFilterAnisotropic.cpp \
    242240        DerivedSources/WebCore/JSEXTTextureFilterAnisotropic.h \
    … …  
    772770        DerivedSources/WebCore/JSWebGLDepthTexture.cpp \
    773771        DerivedSources/WebCore/JSWebGLDepthTexture.h \
     772        DerivedSources/WebCore/JSWebGLDrawBuffers.cpp \
     773        DerivedSources/WebCore/JSWebGLDrawBuffers.h \
    774774        DerivedSources/WebCore/JSWebGLFramebuffer.cpp \
    775775        DerivedSources/WebCore/JSWebGLFramebuffer.h \
    … …  
    15121512        $(WebCore)/html/canvas/CanvasRenderingContext2D.idl \
    15131513        $(WebCore)/html/canvas/DOMPath.idl \
    1514         $(WebCore)/html/canvas/EXTDrawBuffers.idl \
    15151514        $(WebCore)/html/canvas/EXTTextureFilterAnisotropic.idl \
    15161515        $(WebCore)/html/canvas/OESStandardDerivatives.idl \
    … …  
    15311530        $(WebCore)/html/canvas/WebGLDebugShaders.idl \
    15321531        $(WebCore)/html/canvas/WebGLDepthTexture.idl \
     1532        $(WebCore)/html/canvas/WebGLDrawBuffers.idl \
    15331533        $(WebCore)/html/canvas/WebGLFramebuffer.idl \
    15341534        $(WebCore)/html/canvas/WebGLLoseContext.idl \
    … …  
    32483248        Source/WebCore/html/canvas/CanvasStyle.h \
    32493249        Source/WebCore/html/canvas/DOMPath.h \
    3250         Source/WebCore/html/canvas/EXTDrawBuffers.cpp \
    3251         Source/WebCore/html/canvas/EXTDrawBuffers.h \
    32523250        Source/WebCore/html/canvas/EXTTextureFilterAnisotropic.cpp \
    32533251        Source/WebCore/html/canvas/EXTTextureFilterAnisotropic.h \
    … …  
    32893287        Source/WebCore/html/canvas/WebGLDepthTexture.cpp \
    32903288        Source/WebCore/html/canvas/WebGLDepthTexture.h \
     3289        Source/WebCore/html/canvas/WebGLDrawBuffers.cpp \
     3290        Source/WebCore/html/canvas/WebGLDrawBuffers.h \
    32913291        Source/WebCore/html/canvas/WebGLFramebuffer.cpp \
    32923292        Source/WebCore/html/canvas/WebGLFramebuffer.h \

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r164254 r164477  
    305305      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
    306306    </ClCompile>
    307     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSEXTDrawBuffers.cpp">
    308       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    309       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    310       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
    311       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
    312       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
    313       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
    314       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    315       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    316       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
    317       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
    318       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
    319       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
    320     </ClCompile>
    321307    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSEXTTextureFilterAnisotropic.cpp">
    322308      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    … …  
    558544    </ClCompile>
    559545    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLDepthTexture.cpp">
     546      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     547      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     548      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
     549      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
     550      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
     551      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
     552      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     553      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     554      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
     555      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
     556      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
     557      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     558    </ClCompile>
     559    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLDrawBuffers.cpp">
    560560      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    561561      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    … …  
    65106510    <ClCompile Include="..\html\canvas\CanvasContextAttributes.cpp" />
    65116511    <ClCompile Include="..\html\canvas\CanvasPathMethods.cpp" />
    6512     <ClCompile Include="..\html\canvas\EXTDrawBuffers.cpp" />
    65136512    <ClCompile Include="..\html\canvas\EXTTextureFilterAnisotropic.cpp" />
    65146513    <ClCompile Include="..\html\canvas\OESElementIndexUint.cpp" />
    … …  
    65306529    <ClCompile Include="..\html\canvas\WebGLDebugShaders.cpp" />
    65316530    <ClCompile Include="..\html\canvas\WebGLDepthTexture.cpp" />
     6531    <ClCompile Include="..\html\canvas\WebGLDrawBuffers.cpp" />
    65326532    <ClCompile Include="..\html\canvas\WebGLExtension.cpp" />
    65336533    <ClCompile Include="..\html\canvas\WebGLFramebuffer.cpp" />
    … …  
    1836018360    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\XPathGrammar.h" />
    1836118361    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSANGLEInstancedArrays.h" />
    18362     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSEXTDrawBuffers.h" />
    1836318362    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSEXTTextureFilterAnisotropic.h" />
    1836418363    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSOESElementIndexUint.h" />
    … …  
    1837918378    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLDebugShaders.h" />
    1838018379    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLDepthTexture.h" />
     18380    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLDrawBuffers.h" />
    1838118381    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLFramebuffer.h" />
    1838218382    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLLoseContext.h" />
    … …  
    1847518475    <ClInclude Include="..\html\canvas\CanvasContextAttributes.h" />
    1847618476    <ClInclude Include="..\html\canvas\CanvasPathMethods.h" />
    18477     <ClInclude Include="..\html\canvas\EXTDrawBuffers.h" />
    1847818477    <ClInclude Include="..\html\canvas\EXTTextureFilterAnisotropic.h" />
    1847918478    <ClInclude Include="..\html\canvas\OESElementIndexUint.h" />
    … …  
    1849618495    <ClInclude Include="..\html\canvas\WebGLDebugShaders.h" />
    1849718496    <ClInclude Include="..\html\canvas\WebGLDepthTexture.h" />
     18497    <ClInclude Include="..\html\canvas\WebGLDrawBuffers.h" />
    1849818498    <ClInclude Include="..\html\canvas\WebGLExtension.h" />
    1849918499    <ClInclude Include="..\html\canvas\WebGLFramebuffer.h" />

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

    r164254 r164477  
    64646464      <Filter>DerivedSources</Filter>
    64656465    </ClCompile>
     6466    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLDrawBuffers.cpp">
     6467      <Filter>DerivedSources</Filter>
     6468    </ClCompile>
    64666469    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLFramebuffer.cpp">
    64676470      <Filter>DerivedSources</Filter>
    … …  
    64956498    </ClCompile>
    64966499    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSANGLEInstancedArrays.cpp">
    6497       <Filter>DerivedSources</Filter>
    6498     </ClCompile>
    6499     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSEXTDrawBuffers.cpp">
    65006500      <Filter>DerivedSources</Filter>
    65016501    </ClCompile>
    … …  
    65606560      <Filter>html\canvas</Filter>
    65616561    </ClCompile>
     6562    <ClCompile Include="..\html\canvas\WebGLDrawBuffers.cpp">
     6563      <Filter>html\canvas</Filter>
     6564    </ClCompile>
    65626565    <ClCompile Include="..\html\canvas\WebGLExtension.cpp">
    65636566      <Filter>html\canvas</Filter>
    … …  
    66216624    </ClCompile>
    66226625    <ClCompile Include="..\html\canvas\OESVertexArrayObject.cpp">
    6623       <Filter>html\canvas</Filter>
    6624     </ClCompile>
    6625     <ClCompile Include="..\html\canvas\EXTDrawBuffers.cpp">
    66266626      <Filter>html\canvas</Filter>
    66276627    </ClCompile>
    … …  
    1422514225      <Filter>DerivedSources</Filter>
    1422614226    </ClInclude>
     14227    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLDrawBuffers.h">
     14228      <Filter>DerivedSources</Filter>
     14229    </ClInclude>
    1422714230    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLFramebuffer.h">
    1422814231      <Filter>DerivedSources</Filter>
    … …  
    1425314256    </ClInclude>
    1425414257    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWebGLVertexArrayObjectOES.h">
    14255       <Filter>DerivedSources</Filter>
    14256     </ClInclude>
    14257     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSEXTDrawBuffers.h">
    1425814258      <Filter>DerivedSources</Filter>
    1425914259    </ClInclude>
    … …  
    1432414324      <Filter>html\canvas</Filter>
    1432514325    </ClInclude>
     14326    <ClInclude Include="..\html\canvas\WebGLDrawBuffers.h">
     14327      <Filter>html\canvas</Filter>
     14328    </ClInclude>
    1432614329    <ClInclude Include="..\html\canvas\WebGLExtension.h">
    1432714330      <Filter>html\canvas</Filter>
    … …  
    1438514388    </ClInclude>
    1438614389    <ClInclude Include="..\html\canvas\OESVertexArrayObject.h">
    14387       <Filter>html\canvas</Filter>
    14388     </ClInclude>
    14389     <ClInclude Include="..\html\canvas\EXTDrawBuffers.h">
    1439014390      <Filter>html\canvas</Filter>
    1439114391    </ClInclude>

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r164457 r164477  
    20112011                5A574F28131DB96D00471B88 /* QuotesData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5A574F26131DB96D00471B88 /* QuotesData.cpp */; };
    20122012                5A574F29131DB96D00471B88 /* QuotesData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A574F27131DB96D00471B88 /* QuotesData.h */; };
     2013                5B30695D18B3D3450099D5E8 /* WebGLDrawBuffers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5B30695A18B3D3450099D5E8 /* WebGLDrawBuffers.cpp */; };
     2014                5B30695E18B3D3450099D5E8 /* WebGLDrawBuffers.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B30695B18B3D3450099D5E8 /* WebGLDrawBuffers.h */; };
    20132015                5B7A208D2E12979B4AE19DE6 /* RenderMathMLSpace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DBFCB0EBFF5CD77EBEB35395 /* RenderMathMLSpace.cpp */; };
    20142016                5D21A80213ECE5DF00BB7064 /* WebVTTParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D21A80013ECE5DF00BB7064 /* WebVTTParser.cpp */; };
    … …  
    21682170                6EBF0E5512A8929800DB1709 /* WebGLExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EBF0E5312A8929800DB1709 /* WebGLExtension.h */; };
    21692171                6EBF0E7612A9868800DB1709 /* JSOESTextureFloat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EBF0E7412A9868800DB1709 /* JSOESTextureFloat.cpp */; };
    2170                 6EBF0E7612A9868800DB170A /* JSEXTDrawBuffers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EBF0E7412A9868800DB170A /* JSEXTDrawBuffers.cpp */; };
     2172                6EBF0E7612A9868800DB170A /* JSWebGLDrawBuffers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EBF0E7412A9868800DB170A /* JSWebGLDrawBuffers.cpp */; };
    21712173                6EBF0E7712A9868800DB1709 /* JSOESTextureFloat.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EBF0E7512A9868800DB1709 /* JSOESTextureFloat.h */; };
    2172                 6EBF0E7712A9868800DB170A /* JSEXTDrawBuffers.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EBF0E7512A9868800DB170A /* JSEXTDrawBuffers.h */; };
     2174                6EBF0E7712A9868800DB170A /* JSWebGLDrawBuffers.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EBF0E7512A9868800DB170A /* JSWebGLDrawBuffers.h */; };
    21732175                6EC480A116EA638A00A48DCB /* FloatPolygon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6EC4809F16EA638A00A48DCB /* FloatPolygon.cpp */; };
    21742176                6EC480A216EA638A00A48DCB /* FloatPolygon.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EC480A016EA638A00A48DCB /* FloatPolygon.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    35213523                9FA37EFC1172FDA600C4CD55 /* JSScriptProfileNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FA37EF81172FD9300C4CD55 /* JSScriptProfileNode.cpp */; };
    35223524                9FA37EFD1172FDA600C4CD55 /* JSScriptProfileNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FA37EF91172FD9300C4CD55 /* JSScriptProfileNode.h */; };
    3523                 A024575116CEAA27000E5671 /* EXTDrawBuffers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A024574E16CEAA27000E5671 /* EXTDrawBuffers.cpp */; };
    3524                 A024575216CEAA27000E5671 /* EXTDrawBuffers.h in Headers */ = {isa = PBXBuildFile; fileRef = A024574F16CEAA27000E5671 /* EXTDrawBuffers.h */; };
    35253525                A07D3355152B630E001B6393 /* JSWebGLShaderPrecisionFormat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A07D3353152B630E001B6393 /* JSWebGLShaderPrecisionFormat.cpp */; };
    35263526                A07D3356152B630E001B6393 /* JSWebGLShaderPrecisionFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = A07D3354152B630E001B6393 /* JSWebGLShaderPrecisionFormat.h */; };
    … …  
    89218921                5A574F27131DB96D00471B88 /* QuotesData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QuotesData.h; path = style/QuotesData.h; sourceTree = "<group>"; };
    89228922                5A91469E8E9F8485C37A2876 /* JSSVGGraphicsElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGGraphicsElement.cpp; sourceTree = "<group>"; };
     8923                5B30695A18B3D3450099D5E8 /* WebGLDrawBuffers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebGLDrawBuffers.cpp; path = canvas/WebGLDrawBuffers.cpp; sourceTree = "<group>"; };
     8924                5B30695B18B3D3450099D5E8 /* WebGLDrawBuffers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebGLDrawBuffers.h; path = canvas/WebGLDrawBuffers.h; sourceTree = "<group>"; };
     8925                5B30695C18B3D3450099D5E8 /* WebGLDrawBuffers.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebGLDrawBuffers.idl; path = canvas/WebGLDrawBuffers.idl; sourceTree = "<group>"; };
    89238926                5D21A80013ECE5DF00BB7064 /* WebVTTParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebVTTParser.cpp; sourceTree = "<group>"; };
    89248927                5D21A80113ECE5DF00BB7064 /* WebVTTParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVTTParser.h; sourceTree = "<group>"; };
    … …  
    90919094                6EBF0E5312A8929800DB1709 /* WebGLExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebGLExtension.h; path = canvas/WebGLExtension.h; sourceTree = "<group>"; };
    90929095                6EBF0E7412A9868800DB1709 /* JSOESTextureFloat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSOESTextureFloat.cpp; sourceTree = "<group>"; };
    9093                 6EBF0E7412A9868800DB170A /* JSEXTDrawBuffers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSEXTDrawBuffers.cpp; sourceTree = "<group>"; };
     9096                6EBF0E7412A9868800DB170A /* JSWebGLDrawBuffers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebGLDrawBuffers.cpp; sourceTree = "<group>"; };
    90949097                6EBF0E7512A9868800DB1709 /* JSOESTextureFloat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSOESTextureFloat.h; sourceTree = "<group>"; };
    9095                 6EBF0E7512A9868800DB170A /* JSEXTDrawBuffers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSEXTDrawBuffers.h; sourceTree = "<group>"; };
     9098                6EBF0E7512A9868800DB170A /* JSWebGLDrawBuffers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebGLDrawBuffers.h; sourceTree = "<group>"; };
    90969099                6EC4809F16EA638A00A48DCB /* FloatPolygon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FloatPolygon.cpp; sourceTree = "<group>"; };
    90979100                6EC480A016EA638A00A48DCB /* FloatPolygon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FloatPolygon.h; sourceTree = "<group>"; };
    … …  
    1047710480                9FA37EF81172FD9300C4CD55 /* JSScriptProfileNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSScriptProfileNode.cpp; sourceTree = "<group>"; };
    1047810481                9FA37EF91172FD9300C4CD55 /* JSScriptProfileNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSScriptProfileNode.h; sourceTree = "<group>"; };
    10479                 A024574E16CEAA27000E5671 /* EXTDrawBuffers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EXTDrawBuffers.cpp; path = canvas/EXTDrawBuffers.cpp; sourceTree = "<group>"; };
    10480                 A024574F16CEAA27000E5671 /* EXTDrawBuffers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EXTDrawBuffers.h; path = canvas/EXTDrawBuffers.h; sourceTree = "<group>"; };
    10481                 A024575016CEAA27000E5671 /* EXTDrawBuffers.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = EXTDrawBuffers.idl; path = canvas/EXTDrawBuffers.idl; sourceTree = "<group>"; };
    1048210482                A07D3353152B630E001B6393 /* JSWebGLShaderPrecisionFormat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebGLShaderPrecisionFormat.cpp; sourceTree = "<group>"; };
    1048310483                A07D3354152B630E001B6393 /* JSWebGLShaderPrecisionFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebGLShaderPrecisionFormat.h; sourceTree = "<group>"; };
    … …  
    1532715327                                FB91392016AE4B0B001FE682 /* DOMPath.h */,
    1532815328                                FB91392116AE4B0B001FE682 /* DOMPath.idl */,
    15329                                 A024574E16CEAA27000E5671 /* EXTDrawBuffers.cpp */,
    15330                                 A024574F16CEAA27000E5671 /* EXTDrawBuffers.h */,
    15331                                 A024575016CEAA27000E5671 /* EXTDrawBuffers.idl */,
    1533215329                                7728694B14F8882500F484DC /* EXTTextureFilterAnisotropic.cpp */,
    1533315330                                7728694C14F8882500F484DC /* EXTTextureFilterAnisotropic.h */,
    … …  
    1538715384                                6E3FAE8D14733FDB00E42307 /* WebGLDepthTexture.h */,
    1538815385                                6E3FAE9014733FEA00E42307 /* WebGLDepthTexture.idl */,
     15386                                5B30695A18B3D3450099D5E8 /* WebGLDrawBuffers.cpp */,
     15387                                5B30695B18B3D3450099D5E8 /* WebGLDrawBuffers.h */,
     15388                                5B30695C18B3D3450099D5E8 /* WebGLDrawBuffers.idl */,
    1538915389                                6EBF0E5212A8929800DB1709 /* WebGLExtension.cpp */,
    1539015390                                6EBF0E5312A8929800DB1709 /* WebGLExtension.h */,
    … …  
    1806518065                                2E37E00312DBC5A400A6B233 /* JSDOMURL.cpp */,
    1806618066                                2E37E00412DBC5A400A6B233 /* JSDOMURL.h */,
    18067                                 6EBF0E7412A9868800DB170A /* JSEXTDrawBuffers.cpp */,
    18068                                 6EBF0E7512A9868800DB170A /* JSEXTDrawBuffers.h */,
    1806918067                                7728698114FD9ADA00F484DC /* JSEXTTextureFilterAnisotropic.cpp */,
    1807018068                                7728698214FD9ADA00F484DC /* JSEXTTextureFilterAnisotropic.h */,
    … …  
    1828818286                                6E3FAD3614733F4000E42307 /* JSWebGLDepthTexture.cpp */,
    1828918287                                6E3FAD3714733F4000E42307 /* JSWebGLDepthTexture.h */,
     18288                                6EBF0E7412A9868800DB170A /* JSWebGLDrawBuffers.cpp */,
     18289                                6EBF0E7512A9868800DB170A /* JSWebGLDrawBuffers.h */,
    1829018290                                49C7B9841042D2D30009D447 /* JSWebGLFramebuffer.cpp */,
    1829118291                                49C7B9851042D2D30009D447 /* JSWebGLFramebuffer.h */,
    … …  
    2354923549                                3FBC4AEC1898810E0046EE38 /* WebVideoFullscreenInterface.h in Headers */,
    2355023550                                9767CE0C145ABC13005E64DB /* ExceptionInterfaces.h in Headers */,
    23551                                 A024575216CEAA27000E5671 /* EXTDrawBuffers.h in Headers */,
    2355223551                                6E67D2A91280E8BD008758F7 /* Extensions3D.h in Headers */,
    2355323552                                6E67D2A71280E8A4008758F7 /* Extensions3DOpenGL.h in Headers */,
    … …  
    2409824097                                5FC7DC26CFE2563200B85AE4 /* JSEventTarget.h in Headers */,
    2409924098                                3314ACEC10892086000F0E56 /* JSExceptionBase.h in Headers */,
    24100                                 6EBF0E7712A9868800DB170A /* JSEXTDrawBuffers.h in Headers */,
     24099                                6EBF0E7712A9868800DB170A /* JSWebGLDrawBuffers.h in Headers */,
    2410124100                                7728698414FD9ADA00F484DC /* JSEXTTextureFilterAnisotropic.h in Headers */,
    2410224101                                E4E39AFB1330EFA8003AB274 /* TileLayerPool.h in Headers */,
    … …  
    2595725956                                CD3E251C18046B0600E27F56 /* GridCoordinate.h in Headers */,
    2595825957                                CD3E252418046BCD00E27F56 /* CSSGridTemplateAreasValue.h in Headers */,
     25958                                5B30695E18B3D3450099D5E8 /* WebGLDrawBuffers.h in Headers */,
    2595925959                                CDEF4FD717E85C8F00AEE24B /* GridLength.h in Headers */,
    2596025960                                CDE7FC45181904B1002BBB77 /* OrderIterator.h in Headers */,
    … …  
    2692526925                                A7CACDB113CE875C00BBBE3F /* ExceptionCodePlaceholder.cpp in Sources */,
    2692626926                                148AFDA60AF58360008CC700 /* ExceptionHandlers.mm in Sources */,
    26927                                 A024575116CEAA27000E5671 /* EXTDrawBuffers.cpp in Sources */,
    2692826927                                6E67D2A61280E8A4008758F7 /* Extensions3DOpenGL.cpp in Sources */,
    2692926928                                26F9A83818A046AC00AEB88A /* ViewportConfiguration.cpp in Sources */,
    … …  
    2745927458                                BC6090200E91B8EC000C68B5 /* JSEventTargetCustom.cpp in Sources */,
    2746027459                                3314ACEB10892086000F0E56 /* JSExceptionBase.cpp in Sources */,
    27461                                 6EBF0E7612A9868800DB170A /* JSEXTDrawBuffers.cpp in Sources */,
     27460                                6EBF0E7612A9868800DB170A /* JSWebGLDrawBuffers.cpp in Sources */,
    2746227461                                E45390490EAFD637003695C8 /* WebCoreSystemInterfaceIOS.mm in Sources */,
    2746327462                                7728698314FD9ADA00F484DC /* JSEXTTextureFilterAnisotropic.cpp in Sources */,
    … …  
    2758127580                                1A85B2100A1B258700D8C87C /* JSHTMLUListElement.cpp in Sources */,
    2758227581                                6E4ABCD4138EA0B70071D291 /* JSHTMLUnknownElement.cpp in Sources */,
     27582                                5B30695D18B3D3450099D5E8 /* WebGLDrawBuffers.cpp in Sources */,
    2758327583                                E44614160CD6826900FADA75 /* JSHTMLVideoElement.cpp in Sources */,
    2758427584                                BC6C49F30D7DBA0500FFA558 /* JSImageConstructor.cpp in Sources */,

  • trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp

    r162565 r164477  
    3131
    3232#include "ANGLEInstancedArrays.h"
    33 #include "EXTDrawBuffers.h"
    3433#include "EXTTextureFilterAnisotropic.h"
    3534#include "ExceptionCode.h"
    … …  
    3736#include "HTMLImageElement.h"
    3837#include "JSANGLEInstancedArrays.h"
    39 #include "JSEXTDrawBuffers.h"
    4038#include "JSEXTTextureFilterAnisotropic.h"
    4139#include "JSHTMLCanvasElement.h"
    … …  
    5654#include "JSWebGLDebugShaders.h"
    5755#include "JSWebGLDepthTexture.h"
     56#include "JSWebGLDrawBuffers.h"
    5857#include "JSWebGLFramebuffer.h"
    5958#include "JSWebGLLoseContext.h"
    … …  
    8079#include "WebGLDebugShaders.h"
    8180#include "WebGLDepthTexture.h"
     81#include "WebGLDrawBuffers.h"
    8282#include "WebGLExtension.h"
    8383#include "WebGLFramebuffer.h"
    … …  
    206206    case WebGLExtension::WebGLLoseContextName:
    207207        return toJS(exec, globalObject, static_cast<WebGLLoseContext*>(extension));
    208     case WebGLExtension::EXTDrawBuffersName:
    209         return toJS(exec, globalObject, static_cast<EXTDrawBuffers*>(extension));
    210208    case WebGLExtension::EXTTextureFilterAnisotropicName:
    211209        return toJS(exec, globalObject, static_cast<EXTTextureFilterAnisotropic*>(extension));
    … …  
    236234    case WebGLExtension::WebGLDepthTextureName:
    237235        return toJS(exec, globalObject, static_cast<WebGLDepthTexture*>(extension));
     236    case WebGLExtension::WebGLDrawBuffersName:
     237        return toJS(exec, globalObject, static_cast<WebGLDrawBuffers*>(extension));
    238238    case WebGLExtension::ANGLEInstancedArraysName:
    239239        return toJS(exec, globalObject, static_cast<ANGLEInstancedArrays*>(extension));

  • trunk/Source/WebCore/html/canvas/WebGLDrawBuffers.cpp

    r164476 r164477  
    2727
    2828#if ENABLE(WEBGL)
    29 
    30 #include "EXTDrawBuffers.h"
     29#include "WebGLDrawBuffers.h"
    3130
    3231#include "Extensions3D.h"
    … …  
    3433namespace WebCore {
    3534
    36 EXTDrawBuffers::EXTDrawBuffers(WebGLRenderingContext* context)
     35WebGLDrawBuffers::WebGLDrawBuffers(WebGLRenderingContext* context)
    3736    : WebGLExtension(context)
    3837{
    3938}
    4039
    41 EXTDrawBuffers::~EXTDrawBuffers()
     40WebGLDrawBuffers::~WebGLDrawBuffers()
    4241{
    4342}
    4443
    45 WebGLExtension::ExtensionName EXTDrawBuffers::getName() const
     44WebGLExtension::ExtensionName WebGLDrawBuffers::getName() const
    4645{
    47     return WebGLExtension::EXTDrawBuffersName;
     46    return WebGLExtension::WebGLDrawBuffersName;
    4847}
    4948
    50 OwnPtr<EXTDrawBuffers> EXTDrawBuffers::create(WebGLRenderingContext* context)
     49OwnPtr<WebGLDrawBuffers> WebGLDrawBuffers::create(WebGLRenderingContext* context)
    5150{
    52     return adoptPtr(new EXTDrawBuffers(context));
     51    return adoptPtr(new WebGLDrawBuffers(context));
    5352}
    5453
    5554// static
    56 bool EXTDrawBuffers::supported(WebGLRenderingContext* context)
     55bool WebGLDrawBuffers::supported(WebGLRenderingContext* context)
    5756{
    5857#if OS(DARWIN)
    … …  
    6564}
    6665
    67 void EXTDrawBuffers::drawBuffersEXT(const Vector<GC3Denum>& buffers)
     66void WebGLDrawBuffers::drawBuffersWEBGL(const Vector<GC3Denum>& buffers)
    6867{
    6968    if (m_context->isContextLost())
    … …  
    7372    if (!m_context->m_framebufferBinding) {
    7473        if (n != 1) {
    75             m_context->synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "drawBuffersEXT", "more than one buffer");
     74            m_context->synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "drawBuffersWEBGL", "more than one buffer");
    7675            return;
    7776        }
    7877        if (bufs[0] != GraphicsContext3D::BACK && bufs[0] != GraphicsContext3D::NONE) {
    79             m_context->synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, "drawBuffersEXT", "BACK or NONE");
     78            m_context->synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, "drawBuffersWEBGL", "BACK or NONE");
    8079            return;
    8180        }
    … …  
    8685    } else {
    8786        if (n > m_context->getMaxDrawBuffers()) {
    88             m_context->synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "drawBuffersEXT", "more than max draw buffers");
     87            m_context->synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "drawBuffersWEBGL", "more than max draw buffers");
    8988            return;
    9089        }
    9190        for (GC3Dsizei i = 0; i < n; ++i) {
    9291            if (bufs[i] != GraphicsContext3D::NONE && bufs[i] != static_cast<GC3Denum>(Extensions3D::COLOR_ATTACHMENT0_EXT + i)) {
    93                 m_context->synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, "drawBuffersEXT", "COLOR_ATTACHMENTi_EXT or NONE");
     92                m_context->synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, "drawBuffersWEBGL", "COLOR_ATTACHMENTi_EXT or NONE");
    9493                return;
    9594            }
    … …  
    10099
    101100// static
    102 bool EXTDrawBuffers::satisfiesWebGLRequirements(WebGLRenderingContext* webglContext)
     101bool WebGLDrawBuffers::satisfiesWebGLRequirements(WebGLRenderingContext* webglContext)
    103102{
    104103    GraphicsContext3D* context = webglContext->graphicsContext3D();

  • trunk/Source/WebCore/html/canvas/WebGLDrawBuffers.h

    r164476 r164477  
    2424 */
    2525
    26 #ifndef EXTDrawBuffers_h
    27 #define EXTDrawBuffers_h
     26#ifndef WebGLDrawBuffers_h
     27#define WebGLDrawBuffers_h
    2828
    2929#include "WebGLExtension.h"
    … …  
    3232namespace WebCore {
    3333
    34 class EXTDrawBuffers : public WebGLExtension {
     34class WebGLDrawBuffers : public WebGLExtension {
    3535public:
    36     static OwnPtr<EXTDrawBuffers> create(WebGLRenderingContext*);
     36    static OwnPtr<WebGLDrawBuffers> create(WebGLRenderingContext*);
    3737
    3838    static bool supported(WebGLRenderingContext*);
    3939
    40     virtual ~EXTDrawBuffers();
     40    virtual ~WebGLDrawBuffers();
    4141    virtual ExtensionName getName() const override;
    4242
    43     void drawBuffersEXT(const Vector<GC3Denum>& buffers);
     43    void drawBuffersWEBGL(const Vector<GC3Denum>& buffers);
    4444
    4545private:
    46     EXTDrawBuffers(WebGLRenderingContext*);
     46    WebGLDrawBuffers(WebGLRenderingContext*);
    4747
    4848    static bool satisfiesWebGLRequirements(WebGLRenderingContext*);
    … …  
    5151} // namespace WebCore
    5252
    53 #endif // EXTDrawBuffers_h
     53#endif // WebGLDrawBuffers_h

  • trunk/Source/WebCore/html/canvas/WebGLExtension.h

    r162565 r164477  
    3737    enum ExtensionName {
    3838        WebGLLoseContextName,
    39         EXTDrawBuffersName,
    4039        EXTTextureFilterAnisotropicName,
    4140        OESTextureFloatName,
    … …  
    4948        WebGLCompressedTextureS3TCName,
    5049        WebGLDepthTextureName,
     50        WebGLDrawBuffersName,
    5151        OESElementIndexUintName,
    5252        WebGLCompressedTextureATCName,

  • trunk/Source/WebCore/html/canvas/WebGLFramebuffer.cpp

    r162180 r164477  
    3030#include "WebGLFramebuffer.h"
    3131
    32 #include "EXTDrawBuffers.h"
    3332#include "Extensions3D.h"
    3433#include "WebGLContextGroup.h"
     34#include "WebGLDrawBuffers.h"
    3535#include "WebGLRenderingContext.h"
    3636
    … …  
    602602void WebGLFramebuffer::drawBuffersIfNecessary(bool force)
    603603{
    604     if (!context()->m_extDrawBuffers)
     604    if (!context()->m_webglDrawBuffers)
    605605        return;
    606606    bool reset = force;

  • trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp

    r164452 r164477  
    3434#include "DOMWindow.h"
    3535#include "Document.h"
    36 #include "EXTDrawBuffers.h"
    3736#include "EXTTextureFilterAnisotropic.h"
    3837#include "ExceptionCode.h"
    … …  
    7271#include "WebGLDebugShaders.h"
    7372#include "WebGLDepthTexture.h"
     73#include "WebGLDrawBuffers.h"
    7474#include "WebGLFramebuffer.h"
    7575#include "WebGLLoseContext.h"
    … …  
    24792479        return m_webglDepthTexture.get();
    24802480    }
    2481     if (equalIgnoringCase(name, "EXT_draw_buffers") && supportsDrawBuffers()) {
    2482         if (!m_extDrawBuffers) {
     2481    if (equalIgnoringCase(name, "WEBGL_draw_buffers") && supportsDrawBuffers()) {
     2482        if (!m_webglDrawBuffers) {
    24832483            m_context->getExtensions()->ensureEnabled("GL_EXT_draw_buffers");
    2484             m_extDrawBuffers = EXTDrawBuffers::create(this);
    2485         }
    2486         return m_extDrawBuffers.get();
     2484            m_webglDrawBuffers = WebGLDrawBuffers::create(this);
     2485        }
     2486        return m_webglDrawBuffers.get();
    24872487    }
    24882488    if (equalIgnoringCase(name, "ANGLE_instanced_arrays") && ANGLEInstancedArrays::supported(this)) {
    … …  
    27752775        return WebGLGetInfo();
    27762776    case Extensions3D::MAX_COLOR_ATTACHMENTS_EXT: // EXT_draw_buffers BEGIN
    2777         if (m_extDrawBuffers)
     2777        if (m_webglDrawBuffers)
    27782778            return WebGLGetInfo(getMaxColorAttachments());
    2779         synthesizeGLError(GraphicsContext3D::INVALID_ENUM, "getParameter", "invalid parameter name, EXT_draw_buffers not enabled");
     2779        synthesizeGLError(GraphicsContext3D::INVALID_ENUM, "getParameter", "invalid parameter name, WEBGL_draw_buffers not enabled");
    27802780        return WebGLGetInfo();
    27812781    case Extensions3D::MAX_DRAW_BUFFERS_EXT:
    2782         if (m_extDrawBuffers)
     2782        if (m_webglDrawBuffers)
    27832783            return WebGLGetInfo(getMaxDrawBuffers());
    2784         synthesizeGLError(GraphicsContext3D::INVALID_ENUM, "getParameter", "invalid parameter name, EXT_draw_buffers not enabled");
     2784        synthesizeGLError(GraphicsContext3D::INVALID_ENUM, "getParameter", "invalid parameter name, WEBGL_draw_buffers not enabled");
    27852785        return WebGLGetInfo();
    27862786    default:
    2787         if (m_extDrawBuffers
     2787        if (m_webglDrawBuffers
    27882788            && pname >= Extensions3D::DRAW_BUFFER0_EXT
    27892789            && pname < static_cast<GC3Denum>(Extensions3D::DRAW_BUFFER0_EXT + getMaxDrawBuffers())) {
    … …  
    30063006        result.append("WEBGL_depth_texture");
    30073007    if (supportsDrawBuffers())
    3008         result.append("EXT_draw_buffers");
     3008        result.append("WEBGL_draw_buffers");
    30093009    if (ANGLEInstancedArrays::supported(this))
    30103010        result.append("ANGLE_instanced_arrays");
    … …  
    54925492        break;
    54935493    default:
    5494         if (m_extDrawBuffers
     5494        if (m_webglDrawBuffers
    54955495            && attachment > GraphicsContext3D::COLOR_ATTACHMENT0
    54965496            && attachment < static_cast<GC3Denum>(GraphicsContext3D::COLOR_ATTACHMENT0 + getMaxColorAttachments()))
    … …  
    60816081    if (!m_drawBuffersWebGLRequirementsChecked) {
    60826082        m_drawBuffersWebGLRequirementsChecked = true;
    6083         m_drawBuffersSupported = EXTDrawBuffers::supported(this);
     6083        m_drawBuffersSupported = WebGLDrawBuffers::supported(this);
    60846084    }
    60856085    return m_drawBuffersSupported;

  • trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h

    r164452 r164477  
    4343
    4444class ANGLEInstancedArrays;
    45 class EXTDrawBuffers;
    4645class EXTTextureFilterAnisotropic;
    4746class HTMLImageElement;
    … …  
    6867class WebGLDebugShaders;
    6968class WebGLDepthTexture;
     69class WebGLDrawBuffers;
    7070class WebGLExtension;
    7171class WebGLFramebuffer;
    … …  
    329329
    330330private:
    331     friend class EXTDrawBuffers;
     331    friend class WebGLDrawBuffers;
    332332    friend class WebGLFramebuffer;
    333333    friend class WebGLObject;
    … …  
    534534
    535535    // Enabled extension objects.
    536     OwnPtr<EXTDrawBuffers> m_extDrawBuffers;
    537536    OwnPtr<EXTTextureFilterAnisotropic> m_extTextureFilterAnisotropic;
    538537    OwnPtr<OESTextureFloat> m_oesTextureFloat;
    … …  
    550549    OwnPtr<WebGLCompressedTextureS3TC> m_webglCompressedTextureS3TC;
    551550    OwnPtr<WebGLDepthTexture> m_webglDepthTexture;
     551    OwnPtr<WebGLDrawBuffers> m_webglDrawBuffers;
    552552    OwnPtr<ANGLEInstancedArrays> m_angleInstancedArrays;
    553553
Note: See TracChangeset for help on using the changeset viewer.