Changeset 207644 in webkit
- Timestamp:
- Oct 20, 2016 4:51:26 PM (8 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r207642 r207644 1 2016-10-20 Myles C. Maxfield <mmaxfield@apple.com> 2 3 Many WebGL functions which don't throw are marked as possibly throwing 4 https://bugs.webkit.org/show_bug.cgi?id=163747 5 6 Reviewed by Dean Jackson. 7 8 Mechanically remove the exception code. 9 10 No new tests because there is no behavior change. 11 12 * bindings/js/JSWebGLRenderingContextBaseCustom.cpp: 13 (WebCore::getObjectParameter): 14 (WebCore::JSWebGLRenderingContextBase::getAttachedShaders): 15 (WebCore::JSWebGLRenderingContextBase::getProgramParameter): 16 (WebCore::JSWebGLRenderingContextBase::getShaderParameter): 17 (WebCore::JSWebGLRenderingContextBase::getUniform): 18 (WebCore::dataFunctionf): 19 (WebCore::dataFunctioni): 20 (WebCore::dataFunctionMatrix): 21 * html/canvas/WebGL2RenderingContext.cpp: 22 (WebCore::WebGL2RenderingContext::texSubImage2D): 23 * html/canvas/WebGLRenderingContext.cpp: 24 (WebCore::WebGLRenderingContext::texSubImage2D): 25 * html/canvas/WebGLRenderingContextBase.cpp: 26 (WebCore::WebGLRenderingContextBase::activeTexture): 27 (WebCore::WebGLRenderingContextBase::attachShader): 28 (WebCore::WebGLRenderingContextBase::bindAttribLocation): 29 (WebCore::WebGLRenderingContextBase::bindBuffer): 30 (WebCore::WebGLRenderingContextBase::bindFramebuffer): 31 (WebCore::WebGLRenderingContextBase::bindRenderbuffer): 32 (WebCore::WebGLRenderingContextBase::bindTexture): 33 (WebCore::WebGLRenderingContextBase::bufferData): 34 (WebCore::WebGLRenderingContextBase::bufferSubData): 35 (WebCore::WebGLRenderingContextBase::compileShader): 36 (WebCore::WebGLRenderingContextBase::createShader): 37 (WebCore::WebGLRenderingContextBase::detachShader): 38 (WebCore::WebGLRenderingContextBase::disableVertexAttribArray): 39 (WebCore::WebGLRenderingContextBase::drawArrays): 40 (WebCore::WebGLRenderingContextBase::drawElements): 41 (WebCore::WebGLRenderingContextBase::enableVertexAttribArray): 42 (WebCore::WebGLRenderingContextBase::framebufferRenderbuffer): 43 (WebCore::WebGLRenderingContextBase::framebufferTexture2D): 44 (WebCore::WebGLRenderingContextBase::getActiveAttrib): 45 (WebCore::WebGLRenderingContextBase::getActiveUniform): 46 (WebCore::WebGLRenderingContextBase::getAttachedShaders): 47 (WebCore::WebGLRenderingContextBase::getBufferParameter): 48 (WebCore::WebGLRenderingContextBase::getProgramParameter): 49 (WebCore::WebGLRenderingContextBase::getProgramInfoLog): 50 (WebCore::WebGLRenderingContextBase::getRenderbufferParameter): 51 (WebCore::WebGLRenderingContextBase::getShaderParameter): 52 (WebCore::WebGLRenderingContextBase::getShaderInfoLog): 53 (WebCore::WebGLRenderingContextBase::getShaderPrecisionFormat): 54 (WebCore::WebGLRenderingContextBase::getShaderSource): 55 (WebCore::WebGLRenderingContextBase::getTexParameter): 56 (WebCore::WebGLRenderingContextBase::getUniform): 57 (WebCore::WebGLRenderingContextBase::getUniformLocation): 58 (WebCore::WebGLRenderingContextBase::getVertexAttrib): 59 (WebCore::WebGLRenderingContextBase::linkProgram): 60 (WebCore::WebGLRenderingContextBase::readPixels): 61 (WebCore::WebGLRenderingContextBase::shaderSource): 62 (WebCore::WebGLRenderingContextBase::videoFrameToImage): 63 (WebCore::WebGLRenderingContextBase::texImage2D): 64 (WebCore::WebGLRenderingContextBase::uniform1f): 65 (WebCore::WebGLRenderingContextBase::uniform1fv): 66 (WebCore::WebGLRenderingContextBase::uniform1i): 67 (WebCore::WebGLRenderingContextBase::uniform1iv): 68 (WebCore::WebGLRenderingContextBase::uniform2f): 69 (WebCore::WebGLRenderingContextBase::uniform2fv): 70 (WebCore::WebGLRenderingContextBase::uniform2i): 71 (WebCore::WebGLRenderingContextBase::uniform2iv): 72 (WebCore::WebGLRenderingContextBase::uniform3f): 73 (WebCore::WebGLRenderingContextBase::uniform3fv): 74 (WebCore::WebGLRenderingContextBase::uniform3i): 75 (WebCore::WebGLRenderingContextBase::uniform3iv): 76 (WebCore::WebGLRenderingContextBase::uniform4f): 77 (WebCore::WebGLRenderingContextBase::uniform4fv): 78 (WebCore::WebGLRenderingContextBase::uniform4i): 79 (WebCore::WebGLRenderingContextBase::uniform4iv): 80 (WebCore::WebGLRenderingContextBase::uniformMatrix2fv): 81 (WebCore::WebGLRenderingContextBase::uniformMatrix3fv): 82 (WebCore::WebGLRenderingContextBase::uniformMatrix4fv): 83 (WebCore::WebGLRenderingContextBase::useProgram): 84 (WebCore::WebGLRenderingContextBase::validateProgram): 85 (WebCore::WebGLRenderingContextBase::vertexAttribPointer): 86 (WebCore::WebGLRenderingContextBase::restoreCurrentFramebuffer): 87 (WebCore::WebGLRenderingContextBase::restoreCurrentTexture2D): 88 * html/canvas/WebGLRenderingContextBase.h: 89 * html/canvas/WebGLRenderingContextBase.idl: 90 1 91 2016-10-19 Myles C. Maxfield <mmaxfield@apple.com> 2 92 -
trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextBaseCustom.cpp
r206386 r207644 206 206 switch (objectType) { 207 207 case kBuffer: 208 info = context.getBufferParameter(target, pname , ec);208 info = context.getBufferParameter(target, pname); 209 209 break; 210 210 case kRenderbuffer: 211 info = context.getRenderbufferParameter(target, pname , ec);211 info = context.getRenderbufferParameter(target, pname); 212 212 break; 213 213 case kTexture: 214 info = context.getTexParameter(target, pname , ec);214 info = context.getTexParameter(target, pname); 215 215 break; 216 216 case kVertexAttrib: 217 217 // target => index 218 info = context.getVertexAttrib(target, pname , ec);218 info = context.getVertexAttrib(target, pname); 219 219 break; 220 220 default: … … 311 311 return throwTypeError(&state, scope); 312 312 Vector<RefPtr<WebGLShader>> shaders; 313 bool succeed = context.getAttachedShaders(program, shaders , ec);313 bool succeed = context.getAttachedShaders(program, shaders); 314 314 if (ec) { 315 315 setDOMException(&state, ec); … … 403 403 unsigned pname = state.uncheckedArgument(1).toInt32(&state); 404 404 RETURN_IF_EXCEPTION(scope, JSValue()); 405 WebGLGetInfo info = context.getProgramParameter(program, pname , ec);405 WebGLGetInfo info = context.getProgramParameter(program, pname); 406 406 if (ec) { 407 407 setDOMException(&state, ec); … … 431 431 unsigned pname = state.uncheckedArgument(1).toInt32(&state); 432 432 RETURN_IF_EXCEPTION(scope, JSValue()); 433 WebGLGetInfo info = context.getShaderParameter(shader, pname , ec);433 WebGLGetInfo info = context.getShaderParameter(shader, pname); 434 434 if (ec) { 435 435 setDOMException(&state, ec); … … 472 472 if (!location && !state.uncheckedArgument(1).isUndefinedOrNull()) 473 473 return throwTypeError(&state, scope); 474 WebGLGetInfo info = context.getUniform(program, location , ec);474 WebGLGetInfo info = context.getUniform(program, location); 475 475 if (ec) { 476 476 setDOMException(&state, ec); … … 559 559 switch (f) { 560 560 case f_uniform1v: 561 context.uniform1fv(location, *webGLArray , ec);561 context.uniform1fv(location, *webGLArray); 562 562 break; 563 563 case f_uniform2v: 564 context.uniform2fv(location, *webGLArray , ec);564 context.uniform2fv(location, *webGLArray); 565 565 break; 566 566 case f_uniform3v: 567 context.uniform3fv(location, *webGLArray , ec);567 context.uniform3fv(location, *webGLArray); 568 568 break; 569 569 case f_uniform4v: 570 context.uniform4fv(location, *webGLArray , ec);570 context.uniform4fv(location, *webGLArray); 571 571 break; 572 572 case f_vertexAttrib1v: … … 594 594 switch (f) { 595 595 case f_uniform1v: 596 context.uniform1fv(location, array.data(), array.size() , ec);596 context.uniform1fv(location, array.data(), array.size()); 597 597 break; 598 598 case f_uniform2v: 599 context.uniform2fv(location, array.data(), array.size() , ec);599 context.uniform2fv(location, array.data(), array.size()); 600 600 break; 601 601 case f_uniform3v: 602 context.uniform3fv(location, array.data(), array.size() , ec);602 context.uniform3fv(location, array.data(), array.size()); 603 603 break; 604 604 case f_uniform4v: 605 context.uniform4fv(location, array.data(), array.size() , ec);605 context.uniform4fv(location, array.data(), array.size()); 606 606 break; 607 607 case f_vertexAttrib1v: … … 641 641 switch (f) { 642 642 case f_uniform1v: 643 context.uniform1iv(location, *webGLArray , ec);643 context.uniform1iv(location, *webGLArray); 644 644 break; 645 645 case f_uniform2v: 646 context.uniform2iv(location, *webGLArray , ec);646 context.uniform2iv(location, *webGLArray); 647 647 break; 648 648 case f_uniform3v: 649 context.uniform3iv(location, *webGLArray , ec);649 context.uniform3iv(location, *webGLArray); 650 650 break; 651 651 case f_uniform4v: 652 context.uniform4iv(location, *webGLArray , ec);652 context.uniform4iv(location, *webGLArray); 653 653 break; 654 654 default: … … 667 667 switch (f) { 668 668 case f_uniform1v: 669 context.uniform1iv(location, array.data(), array.size() , ec);669 context.uniform1iv(location, array.data(), array.size()); 670 670 break; 671 671 case f_uniform2v: 672 context.uniform2iv(location, array.data(), array.size() , ec);672 context.uniform2iv(location, array.data(), array.size()); 673 673 break; 674 674 case f_uniform3v: 675 context.uniform3iv(location, array.data(), array.size() , ec);675 context.uniform3iv(location, array.data(), array.size()); 676 676 break; 677 677 case f_uniform4v: 678 context.uniform4iv(location, array.data(), array.size() , ec);678 context.uniform4iv(location, array.data(), array.size()); 679 679 break; 680 680 default: … … 702 702 703 703 RefPtr<Float32Array> webGLArray = toFloat32Array(state.uncheckedArgument(2)); 704 705 ExceptionCode ec = 0; 704 706 705 if (webGLArray) { 707 706 switch (f) { 708 707 case f_uniformMatrix2fv: 709 context.uniformMatrix2fv(location, transpose, *webGLArray , ec);708 context.uniformMatrix2fv(location, transpose, *webGLArray); 710 709 break; 711 710 case f_uniformMatrix3fv: 712 context.uniformMatrix3fv(location, transpose, *webGLArray , ec);711 context.uniformMatrix3fv(location, transpose, *webGLArray); 713 712 break; 714 713 case f_uniformMatrix4fv: 715 context.uniformMatrix4fv(location, transpose, *webGLArray , ec);714 context.uniformMatrix4fv(location, transpose, *webGLArray); 716 715 break; 717 716 } 718 717 718 ExceptionCode ec = 0; 719 719 setDOMException(&state, ec); 720 720 return jsUndefined(); … … 727 727 switch (f) { 728 728 case f_uniformMatrix2fv: 729 context.uniformMatrix2fv(location, transpose, array.data(), array.size() , ec);729 context.uniformMatrix2fv(location, transpose, array.data(), array.size()); 730 730 break; 731 731 case f_uniformMatrix3fv: 732 context.uniformMatrix3fv(location, transpose, array.data(), array.size() , ec);732 context.uniformMatrix3fv(location, transpose, array.data(), array.size()); 733 733 break; 734 734 case f_uniformMatrix4fv: 735 context.uniformMatrix4fv(location, transpose, array.data(), array.size(), ec); 736 break; 737 } 738 735 context.uniformMatrix4fv(location, transpose, array.data(), array.size()); 736 break; 737 } 738 739 ExceptionCode ec = 0; 739 740 setDOMException(&state, ec); 740 741 return jsUndefined(); -
trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp
r201782 r207644 1176 1176 return; 1177 1177 1178 RefPtr<Image> image = videoFrameToImage(video, ImageBuffer::fastCopyImageMode() , ec);1178 RefPtr<Image> image = videoFrameToImage(video, ImageBuffer::fastCopyImageMode()); 1179 1179 if (!image) 1180 1180 return; -
trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
r201782 r207644 658 658 return; 659 659 660 RefPtr<Image> image = videoFrameToImage(video, ImageBuffer::fastCopyImageMode() , ec);660 RefPtr<Image> image = videoFrameToImage(video, ImageBuffer::fastCopyImageMode()); 661 661 if (!image) 662 662 return; -
trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp
r207632 r207644 846 846 } 847 847 848 void WebGLRenderingContextBase::activeTexture(GC3Denum texture , ExceptionCode&)848 void WebGLRenderingContextBase::activeTexture(GC3Denum texture) 849 849 { 850 850 if (isContextLostOrPending()) … … 858 858 } 859 859 860 void WebGLRenderingContextBase::attachShader(WebGLProgram* program, WebGLShader* shader , ExceptionCode&)860 void WebGLRenderingContextBase::attachShader(WebGLProgram* program, WebGLShader* shader) 861 861 { 862 862 if (isContextLostOrPending() || !validateWebGLObject("attachShader", program) || !validateWebGLObject("attachShader", shader)) … … 870 870 } 871 871 872 void WebGLRenderingContextBase::bindAttribLocation(WebGLProgram* program, GC3Duint index, const String& name , ExceptionCode&)872 void WebGLRenderingContextBase::bindAttribLocation(WebGLProgram* program, GC3Duint index, const String& name) 873 873 { 874 874 if (isContextLostOrPending() || !validateWebGLObject("bindAttribLocation", program)) … … 904 904 } 905 905 906 void WebGLRenderingContextBase::bindBuffer(GC3Denum target, WebGLBuffer* buffer , ExceptionCode&)906 void WebGLRenderingContextBase::bindBuffer(GC3Denum target, WebGLBuffer* buffer) 907 907 { 908 908 bool deleted; … … 929 929 } 930 930 931 void WebGLRenderingContextBase::bindFramebuffer(GC3Denum target, WebGLFramebuffer* buffer , ExceptionCode&)931 void WebGLRenderingContextBase::bindFramebuffer(GC3Denum target, WebGLFramebuffer* buffer) 932 932 { 933 933 bool deleted; … … 947 947 } 948 948 949 void WebGLRenderingContextBase::bindRenderbuffer(GC3Denum target, WebGLRenderbuffer* renderBuffer , ExceptionCode&)949 void WebGLRenderingContextBase::bindRenderbuffer(GC3Denum target, WebGLRenderbuffer* renderBuffer) 950 950 { 951 951 bool deleted; … … 964 964 } 965 965 966 void WebGLRenderingContextBase::bindTexture(GC3Denum target, WebGLTexture* texture , ExceptionCode&)966 void WebGLRenderingContextBase::bindTexture(GC3Denum target, WebGLTexture* texture) 967 967 { 968 968 bool deleted; … … 1046 1046 } 1047 1047 1048 void WebGLRenderingContextBase::bufferData(GC3Denum target, long long size, GC3Denum usage , ExceptionCode&)1048 void WebGLRenderingContextBase::bufferData(GC3Denum target, long long size, GC3Denum usage) 1049 1049 { 1050 1050 if (isContextLostOrPending()) … … 1076 1076 } 1077 1077 1078 void WebGLRenderingContextBase::bufferData(GC3Denum target, ArrayBuffer* data, GC3Denum usage , ExceptionCode&)1078 void WebGLRenderingContextBase::bufferData(GC3Denum target, ArrayBuffer* data, GC3Denum usage) 1079 1079 { 1080 1080 if (isContextLostOrPending()) … … 1102 1102 } 1103 1103 1104 void WebGLRenderingContextBase::bufferData(GC3Denum target, RefPtr<ArrayBufferView>&& data, GC3Denum usage , ExceptionCode&)1104 void WebGLRenderingContextBase::bufferData(GC3Denum target, RefPtr<ArrayBufferView>&& data, GC3Denum usage) 1105 1105 { 1106 1106 if (isContextLostOrPending()) … … 1128 1128 } 1129 1129 1130 void WebGLRenderingContextBase::bufferSubData(GC3Denum target, long long offset, ArrayBuffer* data , ExceptionCode&)1130 void WebGLRenderingContextBase::bufferSubData(GC3Denum target, long long offset, ArrayBuffer* data) 1131 1131 { 1132 1132 if (isContextLostOrPending()) … … 1156 1156 } 1157 1157 1158 void WebGLRenderingContextBase::bufferSubData(GC3Denum target, long long offset, RefPtr<ArrayBufferView>&& data , ExceptionCode&)1158 void WebGLRenderingContextBase::bufferSubData(GC3Denum target, long long offset, RefPtr<ArrayBufferView>&& data) 1159 1159 { 1160 1160 if (isContextLostOrPending()) … … 1250 1250 } 1251 1251 1252 void WebGLRenderingContextBase::compileShader(WebGLShader* shader , ExceptionCode&)1252 void WebGLRenderingContextBase::compileShader(WebGLShader* shader) 1253 1253 { 1254 1254 if (isContextLostOrPending() || !validateWebGLObject("compileShader", shader)) … … 1446 1446 } 1447 1447 1448 RefPtr<WebGLShader> WebGLRenderingContextBase::createShader(GC3Denum type , ExceptionCode&)1448 RefPtr<WebGLShader> WebGLRenderingContextBase::createShader(GC3Denum type) 1449 1449 { 1450 1450 if (isContextLostOrPending()) … … 1571 1571 } 1572 1572 1573 void WebGLRenderingContextBase::detachShader(WebGLProgram* program, WebGLShader* shader , ExceptionCode&)1573 void WebGLRenderingContextBase::detachShader(WebGLProgram* program, WebGLShader* shader) 1574 1574 { 1575 1575 if (isContextLostOrPending() || !validateWebGLObject("detachShader", program) || !validateWebGLObject("detachShader", shader)) … … 1597 1597 } 1598 1598 1599 void WebGLRenderingContextBase::disableVertexAttribArray(GC3Duint index , ExceptionCode&)1599 void WebGLRenderingContextBase::disableVertexAttribArray(GC3Duint index) 1600 1600 { 1601 1601 if (isContextLostOrPending()) … … 1939 1939 } 1940 1940 1941 void WebGLRenderingContextBase::drawArrays(GC3Denum mode, GC3Dint first, GC3Dsizei count , ExceptionCode&)1941 void WebGLRenderingContextBase::drawArrays(GC3Denum mode, GC3Dint first, GC3Dsizei count) 1942 1942 { 1943 1943 if (!validateDrawArrays("drawArrays", mode, first, count, 0)) … … 1962 1962 } 1963 1963 1964 void WebGLRenderingContextBase::drawElements(GC3Denum mode, GC3Dsizei count, GC3Denum type, long long offset , ExceptionCode&)1964 void WebGLRenderingContextBase::drawElements(GC3Denum mode, GC3Dsizei count, GC3Denum type, long long offset) 1965 1965 { 1966 1966 unsigned numElements = 0; … … 2004 2004 } 2005 2005 2006 void WebGLRenderingContextBase::enableVertexAttribArray(GC3Duint index , ExceptionCode&)2006 void WebGLRenderingContextBase::enableVertexAttribArray(GC3Duint index) 2007 2007 { 2008 2008 if (isContextLostOrPending()) … … 2033 2033 } 2034 2034 2035 void WebGLRenderingContextBase::framebufferRenderbuffer(GC3Denum target, GC3Denum attachment, GC3Denum renderbuffertarget, WebGLRenderbuffer* buffer , ExceptionCode&)2035 void WebGLRenderingContextBase::framebufferRenderbuffer(GC3Denum target, GC3Denum attachment, GC3Denum renderbuffertarget, WebGLRenderbuffer* buffer) 2036 2036 { 2037 2037 if (isContextLostOrPending() || !validateFramebufferFuncParameters("framebufferRenderbuffer", target, attachment)) … … 2065 2065 } 2066 2066 2067 void WebGLRenderingContextBase::framebufferTexture2D(GC3Denum target, GC3Denum attachment, GC3Denum textarget, WebGLTexture* texture, GC3Dint level , ExceptionCode&)2067 void WebGLRenderingContextBase::framebufferTexture2D(GC3Denum target, GC3Denum attachment, GC3Denum textarget, WebGLTexture* texture, GC3Dint level) 2068 2068 { 2069 2069 if (isContextLostOrPending() || !validateFramebufferFuncParameters("framebufferTexture2D", target, attachment)) … … 2146 2146 } 2147 2147 2148 RefPtr<WebGLActiveInfo> WebGLRenderingContextBase::getActiveAttrib(WebGLProgram* program, GC3Duint index , ExceptionCode&)2148 RefPtr<WebGLActiveInfo> WebGLRenderingContextBase::getActiveAttrib(WebGLProgram* program, GC3Duint index) 2149 2149 { 2150 2150 if (isContextLostOrPending() || !validateWebGLObject("getActiveAttrib", program)) … … 2159 2159 } 2160 2160 2161 RefPtr<WebGLActiveInfo> WebGLRenderingContextBase::getActiveUniform(WebGLProgram* program, GC3Duint index , ExceptionCode&)2161 RefPtr<WebGLActiveInfo> WebGLRenderingContextBase::getActiveUniform(WebGLProgram* program, GC3Duint index) 2162 2162 { 2163 2163 if (isContextLostOrPending() || !validateWebGLObject("getActiveUniform", program)) … … 2175 2175 } 2176 2176 2177 bool WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program, Vector<RefPtr<WebGLShader>>& shaderObjects , ExceptionCode&)2177 bool WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program, Vector<RefPtr<WebGLShader>>& shaderObjects) 2178 2178 { 2179 2179 shaderObjects.clear(); … … 2210 2210 } 2211 2211 2212 WebGLGetInfo WebGLRenderingContextBase::getBufferParameter(GC3Denum target, GC3Denum pname , ExceptionCode&)2212 WebGLGetInfo WebGLRenderingContextBase::getBufferParameter(GC3Denum target, GC3Denum pname) 2213 2213 { 2214 2214 if (isContextLostOrPending()) … … 2256 2256 } 2257 2257 2258 WebGLGetInfo WebGLRenderingContextBase::getProgramParameter(WebGLProgram* program, GC3Denum pname , ExceptionCode&)2258 WebGLGetInfo WebGLRenderingContextBase::getProgramParameter(WebGLProgram* program, GC3Denum pname) 2259 2259 { 2260 2260 if (isContextLostOrPending() || !validateWebGLObject("getProgramParameter", program)) … … 2283 2283 } 2284 2284 2285 String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program , ExceptionCode&)2285 String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program) 2286 2286 { 2287 2287 if (isContextLostOrPending() || !validateWebGLObject("getProgramInfoLog", program)) … … 2290 2290 } 2291 2291 2292 WebGLGetInfo WebGLRenderingContextBase::getRenderbufferParameter(GC3Denum target, GC3Denum pname , ExceptionCode&)2292 WebGLGetInfo WebGLRenderingContextBase::getRenderbufferParameter(GC3Denum target, GC3Denum pname) 2293 2293 { 2294 2294 if (isContextLostOrPending()) … … 2355 2355 } 2356 2356 2357 WebGLGetInfo WebGLRenderingContextBase::getShaderParameter(WebGLShader* shader, GC3Denum pname , ExceptionCode&)2357 WebGLGetInfo WebGLRenderingContextBase::getShaderParameter(WebGLShader* shader, GC3Denum pname) 2358 2358 { 2359 2359 if (isContextLostOrPending() || !validateWebGLObject("getShaderParameter", shader)) … … 2375 2375 } 2376 2376 2377 String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader , ExceptionCode&)2377 String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader) 2378 2378 { 2379 2379 if (isContextLostOrPending() || !validateWebGLObject("getShaderInfoLog", shader)) … … 2382 2382 } 2383 2383 2384 RefPtr<WebGLShaderPrecisionFormat> WebGLRenderingContextBase::getShaderPrecisionFormat(GC3Denum shaderType, GC3Denum precisionType , ExceptionCode&)2384 RefPtr<WebGLShaderPrecisionFormat> WebGLRenderingContextBase::getShaderPrecisionFormat(GC3Denum shaderType, GC3Denum precisionType) 2385 2385 { 2386 2386 if (isContextLostOrPending()) … … 2413 2413 } 2414 2414 2415 String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader , ExceptionCode&)2415 String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader) 2416 2416 { 2417 2417 if (isContextLostOrPending() || !validateWebGLObject("getShaderSource", shader)) … … 2420 2420 } 2421 2421 2422 WebGLGetInfo WebGLRenderingContextBase::getTexParameter(GC3Denum target, GC3Denum pname , ExceptionCode&)2422 WebGLGetInfo WebGLRenderingContextBase::getTexParameter(GC3Denum target, GC3Denum pname) 2423 2423 { 2424 2424 if (isContextLostOrPending()) … … 2448 2448 } 2449 2449 2450 WebGLGetInfo WebGLRenderingContextBase::getUniform(WebGLProgram* program, const WebGLUniformLocation* uniformLocation , ExceptionCode&)2450 WebGLGetInfo WebGLRenderingContextBase::getUniform(WebGLProgram* program, const WebGLUniformLocation* uniformLocation) 2451 2451 { 2452 2452 if (isContextLostOrPending() || !validateWebGLObject("getUniform", program)) … … 2575 2575 } 2576 2576 2577 RefPtr<WebGLUniformLocation> WebGLRenderingContextBase::getUniformLocation(WebGLProgram* program, const String& name , ExceptionCode&)2577 RefPtr<WebGLUniformLocation> WebGLRenderingContextBase::getUniformLocation(WebGLProgram* program, const String& name) 2578 2578 { 2579 2579 if (isContextLostOrPending() || !validateWebGLObject("getUniformLocation", program)) … … 2613 2613 } 2614 2614 2615 WebGLGetInfo WebGLRenderingContextBase::getVertexAttrib(GC3Duint index, GC3Denum pname , ExceptionCode&)2615 WebGLGetInfo WebGLRenderingContextBase::getVertexAttrib(GC3Duint index, GC3Denum pname) 2616 2616 { 2617 2617 if (isContextLostOrPending()) … … 2760 2760 } 2761 2761 2762 void WebGLRenderingContextBase::linkProgram(WebGLProgram* program , ExceptionCode&)2762 void WebGLRenderingContextBase::linkProgram(WebGLProgram* program) 2763 2763 { 2764 2764 if (isContextLostOrPending() || !validateWebGLObject("linkProgram", program)) … … 2820 2820 } 2821 2821 2822 void WebGLRenderingContextBase::readPixels(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, ArrayBufferView& pixels , ExceptionCode&)2822 void WebGLRenderingContextBase::readPixels(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, ArrayBufferView& pixels) 2823 2823 { 2824 2824 if (isContextLostOrPending()) … … 2928 2928 } 2929 2929 2930 void WebGLRenderingContextBase::shaderSource(WebGLShader* shader, const String& string , ExceptionCode&)2930 void WebGLRenderingContextBase::shaderSource(WebGLShader* shader, const String& string) 2931 2931 { 2932 2932 if (isContextLostOrPending() || !validateWebGLObject("shaderSource", shader)) … … 3250 3250 3251 3251 #if ENABLE(VIDEO) 3252 RefPtr<Image> WebGLRenderingContextBase::videoFrameToImage(HTMLVideoElement* video, BackingStoreCopy backingStoreCopy , ExceptionCode&)3252 RefPtr<Image> WebGLRenderingContextBase::videoFrameToImage(HTMLVideoElement* video, BackingStoreCopy backingStoreCopy) 3253 3253 { 3254 3254 IntSize size(video->videoWidth(), video->videoHeight()); … … 3289 3289 3290 3290 // Normal pure SW path. 3291 RefPtr<Image> image = videoFrameToImage(video, ImageBuffer::fastCopyImageMode() , ec);3291 RefPtr<Image> image = videoFrameToImage(video, ImageBuffer::fastCopyImageMode()); 3292 3292 if (!image) 3293 3293 return; … … 3344 3344 } 3345 3345 3346 void WebGLRenderingContextBase::uniform1f(const WebGLUniformLocation* location, GC3Dfloat x , ExceptionCode&)3346 void WebGLRenderingContextBase::uniform1f(const WebGLUniformLocation* location, GC3Dfloat x) 3347 3347 { 3348 3348 if (isContextLostOrPending() || !location) … … 3357 3357 } 3358 3358 3359 void WebGLRenderingContextBase::uniform1fv(const WebGLUniformLocation* location, Float32Array& v , ExceptionCode&)3359 void WebGLRenderingContextBase::uniform1fv(const WebGLUniformLocation* location, Float32Array& v) 3360 3360 { 3361 3361 if (isContextLostOrPending() || !validateUniformParameters("uniform1fv", location, v, 1)) … … 3365 3365 } 3366 3366 3367 void WebGLRenderingContextBase::uniform1fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size , ExceptionCode&)3367 void WebGLRenderingContextBase::uniform1fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size) 3368 3368 { 3369 3369 if (isContextLostOrPending() || !validateUniformParameters("uniform1fv", location, v, size, 1)) … … 3373 3373 } 3374 3374 3375 void WebGLRenderingContextBase::uniform1i(const WebGLUniformLocation* location, GC3Dint x , ExceptionCode&)3375 void WebGLRenderingContextBase::uniform1i(const WebGLUniformLocation* location, GC3Dint x) 3376 3376 { 3377 3377 if (isContextLostOrPending() || !location) … … 3391 3391 } 3392 3392 3393 void WebGLRenderingContextBase::uniform1iv(const WebGLUniformLocation* location, Int32Array& v , ExceptionCode&)3393 void WebGLRenderingContextBase::uniform1iv(const WebGLUniformLocation* location, Int32Array& v) 3394 3394 { 3395 3395 if (isContextLostOrPending() || !validateUniformParameters("uniform1iv", location, v, 1)) … … 3408 3408 } 3409 3409 3410 void WebGLRenderingContextBase::uniform1iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size , ExceptionCode&)3410 void WebGLRenderingContextBase::uniform1iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size) 3411 3411 { 3412 3412 if (isContextLostOrPending() || !validateUniformParameters("uniform1iv", location, v, size, 1)) … … 3424 3424 } 3425 3425 3426 void WebGLRenderingContextBase::uniform2f(const WebGLUniformLocation* location, GC3Dfloat x, GC3Dfloat y , ExceptionCode&)3426 void WebGLRenderingContextBase::uniform2f(const WebGLUniformLocation* location, GC3Dfloat x, GC3Dfloat y) 3427 3427 { 3428 3428 if (isContextLostOrPending() || !location) … … 3437 3437 } 3438 3438 3439 void WebGLRenderingContextBase::uniform2fv(const WebGLUniformLocation* location, Float32Array& v , ExceptionCode&)3439 void WebGLRenderingContextBase::uniform2fv(const WebGLUniformLocation* location, Float32Array& v) 3440 3440 { 3441 3441 if (isContextLostOrPending() || !validateUniformParameters("uniform2fv", location, v, 2)) … … 3445 3445 } 3446 3446 3447 void WebGLRenderingContextBase::uniform2fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size , ExceptionCode&)3447 void WebGLRenderingContextBase::uniform2fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size) 3448 3448 { 3449 3449 if (isContextLostOrPending() || !validateUniformParameters("uniform2fv", location, v, size, 2)) … … 3453 3453 } 3454 3454 3455 void WebGLRenderingContextBase::uniform2i(const WebGLUniformLocation* location, GC3Dint x, GC3Dint y , ExceptionCode&)3455 void WebGLRenderingContextBase::uniform2i(const WebGLUniformLocation* location, GC3Dint x, GC3Dint y) 3456 3456 { 3457 3457 if (isContextLostOrPending() || !location) … … 3466 3466 } 3467 3467 3468 void WebGLRenderingContextBase::uniform2iv(const WebGLUniformLocation* location, Int32Array& v , ExceptionCode&)3468 void WebGLRenderingContextBase::uniform2iv(const WebGLUniformLocation* location, Int32Array& v) 3469 3469 { 3470 3470 if (isContextLostOrPending() || !validateUniformParameters("uniform2iv", location, v, 2)) … … 3474 3474 } 3475 3475 3476 void WebGLRenderingContextBase::uniform2iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size , ExceptionCode&)3476 void WebGLRenderingContextBase::uniform2iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size) 3477 3477 { 3478 3478 if (isContextLostOrPending() || !validateUniformParameters("uniform2iv", location, v, size, 2)) … … 3482 3482 } 3483 3483 3484 void WebGLRenderingContextBase::uniform3f(const WebGLUniformLocation* location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z , ExceptionCode&)3484 void WebGLRenderingContextBase::uniform3f(const WebGLUniformLocation* location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z) 3485 3485 { 3486 3486 if (isContextLostOrPending() || !location) … … 3495 3495 } 3496 3496 3497 void WebGLRenderingContextBase::uniform3fv(const WebGLUniformLocation* location, Float32Array& v , ExceptionCode&)3497 void WebGLRenderingContextBase::uniform3fv(const WebGLUniformLocation* location, Float32Array& v) 3498 3498 { 3499 3499 if (isContextLostOrPending() || !validateUniformParameters("uniform3fv", location, v, 3)) … … 3503 3503 } 3504 3504 3505 void WebGLRenderingContextBase::uniform3fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size , ExceptionCode&)3505 void WebGLRenderingContextBase::uniform3fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size) 3506 3506 { 3507 3507 if (isContextLostOrPending() || !validateUniformParameters("uniform3fv", location, v, size, 3)) … … 3511 3511 } 3512 3512 3513 void WebGLRenderingContextBase::uniform3i(const WebGLUniformLocation* location, GC3Dint x, GC3Dint y, GC3Dint z , ExceptionCode&)3513 void WebGLRenderingContextBase::uniform3i(const WebGLUniformLocation* location, GC3Dint x, GC3Dint y, GC3Dint z) 3514 3514 { 3515 3515 if (isContextLostOrPending() || !location) … … 3524 3524 } 3525 3525 3526 void WebGLRenderingContextBase::uniform3iv(const WebGLUniformLocation* location, Int32Array& v , ExceptionCode&)3526 void WebGLRenderingContextBase::uniform3iv(const WebGLUniformLocation* location, Int32Array& v) 3527 3527 { 3528 3528 if (isContextLostOrPending() || !validateUniformParameters("uniform3iv", location, v, 3)) … … 3532 3532 } 3533 3533 3534 void WebGLRenderingContextBase::uniform3iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size , ExceptionCode&)3534 void WebGLRenderingContextBase::uniform3iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size) 3535 3535 { 3536 3536 if (isContextLostOrPending() || !validateUniformParameters("uniform3iv", location, v, size, 3)) … … 3540 3540 } 3541 3541 3542 void WebGLRenderingContextBase::uniform4f(const WebGLUniformLocation* location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z, GC3Dfloat w , ExceptionCode&)3542 void WebGLRenderingContextBase::uniform4f(const WebGLUniformLocation* location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z, GC3Dfloat w) 3543 3543 { 3544 3544 if (isContextLostOrPending() || !location) … … 3553 3553 } 3554 3554 3555 void WebGLRenderingContextBase::uniform4fv(const WebGLUniformLocation* location, Float32Array& v , ExceptionCode&)3555 void WebGLRenderingContextBase::uniform4fv(const WebGLUniformLocation* location, Float32Array& v) 3556 3556 { 3557 3557 if (isContextLostOrPending() || !validateUniformParameters("uniform4fv", location, v, 4)) … … 3561 3561 } 3562 3562 3563 void WebGLRenderingContextBase::uniform4fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size , ExceptionCode&)3563 void WebGLRenderingContextBase::uniform4fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size) 3564 3564 { 3565 3565 if (isContextLostOrPending() || !validateUniformParameters("uniform4fv", location, v, size, 4)) … … 3569 3569 } 3570 3570 3571 void WebGLRenderingContextBase::uniform4i(const WebGLUniformLocation* location, GC3Dint x, GC3Dint y, GC3Dint z, GC3Dint w , ExceptionCode&)3571 void WebGLRenderingContextBase::uniform4i(const WebGLUniformLocation* location, GC3Dint x, GC3Dint y, GC3Dint z, GC3Dint w) 3572 3572 { 3573 3573 if (isContextLostOrPending() || !location) … … 3582 3582 } 3583 3583 3584 void WebGLRenderingContextBase::uniform4iv(const WebGLUniformLocation* location, Int32Array& v , ExceptionCode&)3584 void WebGLRenderingContextBase::uniform4iv(const WebGLUniformLocation* location, Int32Array& v) 3585 3585 { 3586 3586 if (isContextLostOrPending() || !validateUniformParameters("uniform4iv", location, v, 4)) … … 3590 3590 } 3591 3591 3592 void WebGLRenderingContextBase::uniform4iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size , ExceptionCode&)3592 void WebGLRenderingContextBase::uniform4iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size) 3593 3593 { 3594 3594 if (isContextLostOrPending() || !validateUniformParameters("uniform4iv", location, v, size, 4)) … … 3598 3598 } 3599 3599 3600 void WebGLRenderingContextBase::uniformMatrix2fv(const WebGLUniformLocation* location, GC3Dboolean transpose, Float32Array& v , ExceptionCode&)3600 void WebGLRenderingContextBase::uniformMatrix2fv(const WebGLUniformLocation* location, GC3Dboolean transpose, Float32Array& v) 3601 3601 { 3602 3602 if (isContextLostOrPending() || !validateUniformMatrixParameters("uniformMatrix2fv", location, transpose, v, 4)) … … 3605 3605 } 3606 3606 3607 void WebGLRenderingContextBase::uniformMatrix2fv(const WebGLUniformLocation* location, GC3Dboolean transpose, GC3Dfloat* v, GC3Dsizei size , ExceptionCode&)3607 void WebGLRenderingContextBase::uniformMatrix2fv(const WebGLUniformLocation* location, GC3Dboolean transpose, GC3Dfloat* v, GC3Dsizei size) 3608 3608 { 3609 3609 if (isContextLostOrPending() || !validateUniformMatrixParameters("uniformMatrix2fv", location, transpose, v, size, 4)) … … 3612 3612 } 3613 3613 3614 void WebGLRenderingContextBase::uniformMatrix3fv(const WebGLUniformLocation* location, GC3Dboolean transpose, Float32Array& v , ExceptionCode&)3614 void WebGLRenderingContextBase::uniformMatrix3fv(const WebGLUniformLocation* location, GC3Dboolean transpose, Float32Array& v) 3615 3615 { 3616 3616 if (isContextLostOrPending() || !validateUniformMatrixParameters("uniformMatrix3fv", location, transpose, v, 9)) … … 3619 3619 } 3620 3620 3621 void WebGLRenderingContextBase::uniformMatrix3fv(const WebGLUniformLocation* location, GC3Dboolean transpose, GC3Dfloat* v, GC3Dsizei size , ExceptionCode&)3621 void WebGLRenderingContextBase::uniformMatrix3fv(const WebGLUniformLocation* location, GC3Dboolean transpose, GC3Dfloat* v, GC3Dsizei size) 3622 3622 { 3623 3623 if (isContextLostOrPending() || !validateUniformMatrixParameters("uniformMatrix3fv", location, transpose, v, size, 9)) … … 3626 3626 } 3627 3627 3628 void WebGLRenderingContextBase::uniformMatrix4fv(const WebGLUniformLocation* location, GC3Dboolean transpose, Float32Array& v , ExceptionCode&)3628 void WebGLRenderingContextBase::uniformMatrix4fv(const WebGLUniformLocation* location, GC3Dboolean transpose, Float32Array& v) 3629 3629 { 3630 3630 if (isContextLostOrPending() || !validateUniformMatrixParameters("uniformMatrix4fv", location, transpose, v, 16)) … … 3633 3633 } 3634 3634 3635 void WebGLRenderingContextBase::uniformMatrix4fv(const WebGLUniformLocation* location, GC3Dboolean transpose, GC3Dfloat* v, GC3Dsizei size , ExceptionCode&)3635 void WebGLRenderingContextBase::uniformMatrix4fv(const WebGLUniformLocation* location, GC3Dboolean transpose, GC3Dfloat* v, GC3Dsizei size) 3636 3636 { 3637 3637 if (isContextLostOrPending() || !validateUniformMatrixParameters("uniformMatrix4fv", location, transpose, v, size, 16)) … … 3640 3640 } 3641 3641 3642 void WebGLRenderingContextBase::useProgram(WebGLProgram* program , ExceptionCode&)3642 void WebGLRenderingContextBase::useProgram(WebGLProgram* program) 3643 3643 { 3644 3644 bool deleted; … … 3661 3661 } 3662 3662 3663 void WebGLRenderingContextBase::validateProgram(WebGLProgram* program , ExceptionCode&)3663 void WebGLRenderingContextBase::validateProgram(WebGLProgram* program) 3664 3664 { 3665 3665 if (isContextLostOrPending() || !validateWebGLObject("validateProgram", program)) … … 3728 3728 } 3729 3729 3730 void WebGLRenderingContextBase::vertexAttribPointer(GC3Duint index, GC3Dint size, GC3Denum type, GC3Dboolean normalized, GC3Dsizei stride, long long offset , ExceptionCode&)3730 void WebGLRenderingContextBase::vertexAttribPointer(GC3Duint index, GC3Dint size, GC3Denum type, GC3Dboolean normalized, GC3Dsizei stride, long long offset) 3731 3731 { 3732 3732 if (isContextLostOrPending()) … … 4984 4984 void WebGLRenderingContextBase::restoreCurrentFramebuffer() 4985 4985 { 4986 ExceptionCode ec; 4987 bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_framebufferBinding.get(), ec); 4986 bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_framebufferBinding.get()); 4988 4987 } 4989 4988 4990 4989 void WebGLRenderingContextBase::restoreCurrentTexture2D() 4991 4990 { 4992 ExceptionCode ec;4993 4991 auto texture = m_textureUnits[m_activeTextureUnit].texture2DBinding.get(); 4994 bindTexture(GraphicsContext3D::TEXTURE_2D, texture , ec);4992 bindTexture(GraphicsContext3D::TEXTURE_2D, texture); 4995 4993 if (texture && texture->needToUseBlackTexture(textureExtensionFlags())) 4996 4994 m_unrenderableTextureUnits.add(m_activeTextureUnit); -
trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h
r207632 r207644 126 126 int drawingBufferHeight() const; 127 127 128 void activeTexture(GC3Denum texture , ExceptionCode&);129 void attachShader(WebGLProgram*, WebGLShader* , ExceptionCode&);130 void bindAttribLocation(WebGLProgram*, GC3Duint index, const String& name , ExceptionCode&);131 void bindBuffer(GC3Denum target, WebGLBuffer* , ExceptionCode&);132 void bindFramebuffer(GC3Denum target, WebGLFramebuffer* , ExceptionCode&);133 void bindRenderbuffer(GC3Denum target, WebGLRenderbuffer* , ExceptionCode&);134 void bindTexture(GC3Denum target, WebGLTexture* , ExceptionCode&);128 void activeTexture(GC3Denum texture); 129 void attachShader(WebGLProgram*, WebGLShader*); 130 void bindAttribLocation(WebGLProgram*, GC3Duint index, const String& name); 131 void bindBuffer(GC3Denum target, WebGLBuffer*); 132 void bindFramebuffer(GC3Denum target, WebGLFramebuffer*); 133 void bindRenderbuffer(GC3Denum target, WebGLRenderbuffer*); 134 void bindTexture(GC3Denum target, WebGLTexture*); 135 135 void blendColor(GC3Dfloat red, GC3Dfloat green, GC3Dfloat blue, GC3Dfloat alpha); 136 136 void blendEquation(GC3Denum mode); … … 139 139 void blendFuncSeparate(GC3Denum srcRGB, GC3Denum dstRGB, GC3Denum srcAlpha, GC3Denum dstAlpha); 140 140 141 void bufferData(GC3Denum target, long long size, GC3Denum usage , ExceptionCode&);142 void bufferData(GC3Denum target, ArrayBuffer* data, GC3Denum usage , ExceptionCode&);143 void bufferData(GC3Denum target, RefPtr<ArrayBufferView>&& data, GC3Denum usage , ExceptionCode&);144 void bufferSubData(GC3Denum target, long long offset, ArrayBuffer* data , ExceptionCode&);145 void bufferSubData(GC3Denum target, long long offset, RefPtr<ArrayBufferView>&& data , ExceptionCode&);141 void bufferData(GC3Denum target, long long size, GC3Denum usage); 142 void bufferData(GC3Denum target, ArrayBuffer* data, GC3Denum usage); 143 void bufferData(GC3Denum target, RefPtr<ArrayBufferView>&& data, GC3Denum usage); 144 void bufferSubData(GC3Denum target, long long offset, ArrayBuffer* data); 145 void bufferSubData(GC3Denum target, long long offset, RefPtr<ArrayBufferView>&& data); 146 146 147 147 GC3Denum checkFramebufferStatus(GC3Denum target); … … 151 151 void clearStencil(GC3Dint); 152 152 void colorMask(GC3Dboolean red, GC3Dboolean green, GC3Dboolean blue, GC3Dboolean alpha); 153 void compileShader(WebGLShader* , ExceptionCode&);153 void compileShader(WebGLShader*); 154 154 155 155 void compressedTexImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, ArrayBufferView& data); … … 163 163 RefPtr<WebGLProgram> createProgram(); 164 164 RefPtr<WebGLRenderbuffer> createRenderbuffer(); 165 RefPtr<WebGLShader> createShader(GC3Denum type , ExceptionCode&);165 RefPtr<WebGLShader> createShader(GC3Denum type); 166 166 RefPtr<WebGLTexture> createTexture(); 167 167 … … 178 178 void depthMask(GC3Dboolean); 179 179 void depthRange(GC3Dfloat zNear, GC3Dfloat zFar); 180 void detachShader(WebGLProgram*, WebGLShader* , ExceptionCode&);180 void detachShader(WebGLProgram*, WebGLShader*); 181 181 void disable(GC3Denum cap); 182 void disableVertexAttribArray(GC3Duint index , ExceptionCode&);183 void drawArrays(GC3Denum mode, GC3Dint first, GC3Dsizei count , ExceptionCode&);184 void drawElements(GC3Denum mode, GC3Dsizei count, GC3Denum type, long long offset , ExceptionCode&);182 void disableVertexAttribArray(GC3Duint index); 183 void drawArrays(GC3Denum mode, GC3Dint first, GC3Dsizei count); 184 void drawElements(GC3Denum mode, GC3Dsizei count, GC3Denum type, long long offset); 185 185 186 186 void enable(GC3Denum cap); 187 void enableVertexAttribArray(GC3Duint index , ExceptionCode&);187 void enableVertexAttribArray(GC3Duint index); 188 188 void finish(); 189 189 void flush(); 190 void framebufferRenderbuffer(GC3Denum target, GC3Denum attachment, GC3Denum renderbuffertarget, WebGLRenderbuffer* , ExceptionCode&);191 void framebufferTexture2D(GC3Denum target, GC3Denum attachment, GC3Denum textarget, WebGLTexture*, GC3Dint level , ExceptionCode&);190 void framebufferRenderbuffer(GC3Denum target, GC3Denum attachment, GC3Denum renderbuffertarget, WebGLRenderbuffer*); 191 void framebufferTexture2D(GC3Denum target, GC3Denum attachment, GC3Denum textarget, WebGLTexture*, GC3Dint level); 192 192 void frontFace(GC3Denum mode); 193 193 void generateMipmap(GC3Denum target); 194 194 195 RefPtr<WebGLActiveInfo> getActiveAttrib(WebGLProgram*, GC3Duint index , ExceptionCode&);196 RefPtr<WebGLActiveInfo> getActiveUniform(WebGLProgram*, GC3Duint index , ExceptionCode&);197 bool getAttachedShaders(WebGLProgram*, Vector<RefPtr<WebGLShader>>& , ExceptionCode&);195 RefPtr<WebGLActiveInfo> getActiveAttrib(WebGLProgram*, GC3Duint index); 196 RefPtr<WebGLActiveInfo> getActiveUniform(WebGLProgram*, GC3Duint index); 197 bool getAttachedShaders(WebGLProgram*, Vector<RefPtr<WebGLShader>>&); 198 198 GC3Dint getAttribLocation(WebGLProgram*, const String& name); 199 WebGLGetInfo getBufferParameter(GC3Denum target, GC3Denum pname , ExceptionCode&);199 WebGLGetInfo getBufferParameter(GC3Denum target, GC3Denum pname); 200 200 RefPtr<WebGLContextAttributes> getContextAttributes(); 201 201 GC3Denum getError(); … … 203 203 virtual WebGLGetInfo getFramebufferAttachmentParameter(GC3Denum target, GC3Denum attachment, GC3Denum pname, ExceptionCode&) = 0; 204 204 virtual WebGLGetInfo getParameter(GC3Denum pname, ExceptionCode&) = 0; 205 WebGLGetInfo getProgramParameter(WebGLProgram*, GC3Denum pname , ExceptionCode&);206 String getProgramInfoLog(WebGLProgram* , ExceptionCode&);207 WebGLGetInfo getRenderbufferParameter(GC3Denum target, GC3Denum pname , ExceptionCode&);208 WebGLGetInfo getShaderParameter(WebGLShader*, GC3Denum pname , ExceptionCode&);209 String getShaderInfoLog(WebGLShader* , ExceptionCode&);210 RefPtr<WebGLShaderPrecisionFormat> getShaderPrecisionFormat(GC3Denum shaderType, GC3Denum precisionType , ExceptionCode&);211 String getShaderSource(WebGLShader* , ExceptionCode&);205 WebGLGetInfo getProgramParameter(WebGLProgram*, GC3Denum pname); 206 String getProgramInfoLog(WebGLProgram*); 207 WebGLGetInfo getRenderbufferParameter(GC3Denum target, GC3Denum pname); 208 WebGLGetInfo getShaderParameter(WebGLShader*, GC3Denum pname); 209 String getShaderInfoLog(WebGLShader*); 210 RefPtr<WebGLShaderPrecisionFormat> getShaderPrecisionFormat(GC3Denum shaderType, GC3Denum precisionType); 211 String getShaderSource(WebGLShader*); 212 212 virtual Vector<String> getSupportedExtensions() = 0; 213 WebGLGetInfo getTexParameter(GC3Denum target, GC3Denum pname , ExceptionCode&);214 WebGLGetInfo getUniform(WebGLProgram*, const WebGLUniformLocation* , ExceptionCode&);215 RefPtr<WebGLUniformLocation> getUniformLocation(WebGLProgram*, const String& , ExceptionCode&);216 WebGLGetInfo getVertexAttrib(GC3Duint index, GC3Denum pname , ExceptionCode&);213 WebGLGetInfo getTexParameter(GC3Denum target, GC3Denum pname); 214 WebGLGetInfo getUniform(WebGLProgram*, const WebGLUniformLocation*); 215 RefPtr<WebGLUniformLocation> getUniformLocation(WebGLProgram*, const String&); 216 WebGLGetInfo getVertexAttrib(GC3Duint index, GC3Denum pname); 217 217 long long getVertexAttribOffset(GC3Duint index, GC3Denum pname); 218 218 … … 228 228 229 229 void lineWidth(GC3Dfloat); 230 void linkProgram(WebGLProgram* , ExceptionCode&);230 void linkProgram(WebGLProgram*); 231 231 void pixelStorei(GC3Denum pname, GC3Dint param); 232 232 void polygonOffset(GC3Dfloat factor, GC3Dfloat units); 233 void readPixels(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, ArrayBufferView& pixels , ExceptionCode&);233 void readPixels(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, ArrayBufferView& pixels); 234 234 void releaseShaderCompiler(); 235 235 virtual void renderbufferStorage(GC3Denum target, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height) = 0; 236 236 void sampleCoverage(GC3Dfloat value, GC3Dboolean invert); 237 237 void scissor(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height); 238 void shaderSource(WebGLShader*, const String& , ExceptionCode&);238 void shaderSource(WebGLShader*, const String&); 239 239 void stencilFunc(GC3Denum func, GC3Dint ref, GC3Duint mask); 240 240 void stencilFuncSeparate(GC3Denum face, GC3Denum func, GC3Dint ref, GC3Duint mask); … … 275 275 #endif 276 276 277 void uniform1f(const WebGLUniformLocation*, GC3Dfloat x , ExceptionCode&);278 void uniform1fv(const WebGLUniformLocation*, Float32Array& v , ExceptionCode&);279 void uniform1fv(const WebGLUniformLocation*, GC3Dfloat* v, GC3Dsizei , ExceptionCode&);280 void uniform1i(const WebGLUniformLocation*, GC3Dint x , ExceptionCode&);281 void uniform1iv(const WebGLUniformLocation*, Int32Array& v , ExceptionCode&);282 void uniform1iv(const WebGLUniformLocation*, GC3Dint* v, GC3Dsizei , ExceptionCode&);283 void uniform2f(const WebGLUniformLocation*, GC3Dfloat x, GC3Dfloat y , ExceptionCode&);284 void uniform2fv(const WebGLUniformLocation*, Float32Array& v , ExceptionCode&);285 void uniform2fv(const WebGLUniformLocation*, GC3Dfloat* v, GC3Dsizei , ExceptionCode&);286 void uniform2i(const WebGLUniformLocation*, GC3Dint x, GC3Dint y , ExceptionCode&);287 void uniform2iv(const WebGLUniformLocation*, Int32Array& v , ExceptionCode&);288 void uniform2iv(const WebGLUniformLocation*, GC3Dint* v, GC3Dsizei , ExceptionCode&);289 void uniform3f(const WebGLUniformLocation*, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z , ExceptionCode&);290 void uniform3fv(const WebGLUniformLocation*, Float32Array& v , ExceptionCode&);291 void uniform3fv(const WebGLUniformLocation*, GC3Dfloat* v, GC3Dsizei , ExceptionCode&);292 void uniform3i(const WebGLUniformLocation*, GC3Dint x, GC3Dint y, GC3Dint z , ExceptionCode&);293 void uniform3iv(const WebGLUniformLocation*, Int32Array& v , ExceptionCode&);294 void uniform3iv(const WebGLUniformLocation*, GC3Dint* v, GC3Dsizei , ExceptionCode&);295 void uniform4f(const WebGLUniformLocation*, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z, GC3Dfloat w , ExceptionCode&);296 void uniform4fv(const WebGLUniformLocation*, Float32Array& v , ExceptionCode&);297 void uniform4fv(const WebGLUniformLocation*, GC3Dfloat* v, GC3Dsizei , ExceptionCode&);298 void uniform4i(const WebGLUniformLocation*, GC3Dint x, GC3Dint y, GC3Dint z, GC3Dint w , ExceptionCode&);299 void uniform4iv(const WebGLUniformLocation*, Int32Array& v , ExceptionCode&);300 void uniform4iv(const WebGLUniformLocation*, GC3Dint* v, GC3Dsizei , ExceptionCode&);301 void uniformMatrix2fv(const WebGLUniformLocation*, GC3Dboolean transpose, Float32Array& value , ExceptionCode&);302 void uniformMatrix2fv(const WebGLUniformLocation*, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei , ExceptionCode&);303 void uniformMatrix3fv(const WebGLUniformLocation*, GC3Dboolean transpose, Float32Array& value , ExceptionCode&);304 void uniformMatrix3fv(const WebGLUniformLocation*, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei , ExceptionCode&);305 void uniformMatrix4fv(const WebGLUniformLocation*, GC3Dboolean transpose, Float32Array& value , ExceptionCode&);306 void uniformMatrix4fv(const WebGLUniformLocation*, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei , ExceptionCode&);307 308 void useProgram(WebGLProgram* , ExceptionCode&);309 void validateProgram(WebGLProgram* , ExceptionCode&);277 void uniform1f(const WebGLUniformLocation*, GC3Dfloat x); 278 void uniform1fv(const WebGLUniformLocation*, Float32Array& v); 279 void uniform1fv(const WebGLUniformLocation*, GC3Dfloat* v, GC3Dsizei); 280 void uniform1i(const WebGLUniformLocation*, GC3Dint x); 281 void uniform1iv(const WebGLUniformLocation*, Int32Array& v); 282 void uniform1iv(const WebGLUniformLocation*, GC3Dint* v, GC3Dsizei); 283 void uniform2f(const WebGLUniformLocation*, GC3Dfloat x, GC3Dfloat y); 284 void uniform2fv(const WebGLUniformLocation*, Float32Array& v); 285 void uniform2fv(const WebGLUniformLocation*, GC3Dfloat* v, GC3Dsizei); 286 void uniform2i(const WebGLUniformLocation*, GC3Dint x, GC3Dint y); 287 void uniform2iv(const WebGLUniformLocation*, Int32Array& v); 288 void uniform2iv(const WebGLUniformLocation*, GC3Dint* v, GC3Dsizei); 289 void uniform3f(const WebGLUniformLocation*, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z); 290 void uniform3fv(const WebGLUniformLocation*, Float32Array& v); 291 void uniform3fv(const WebGLUniformLocation*, GC3Dfloat* v, GC3Dsizei); 292 void uniform3i(const WebGLUniformLocation*, GC3Dint x, GC3Dint y, GC3Dint z); 293 void uniform3iv(const WebGLUniformLocation*, Int32Array& v); 294 void uniform3iv(const WebGLUniformLocation*, GC3Dint* v, GC3Dsizei); 295 void uniform4f(const WebGLUniformLocation*, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z, GC3Dfloat w); 296 void uniform4fv(const WebGLUniformLocation*, Float32Array& v); 297 void uniform4fv(const WebGLUniformLocation*, GC3Dfloat* v, GC3Dsizei); 298 void uniform4i(const WebGLUniformLocation*, GC3Dint x, GC3Dint y, GC3Dint z, GC3Dint w); 299 void uniform4iv(const WebGLUniformLocation*, Int32Array& v); 300 void uniform4iv(const WebGLUniformLocation*, GC3Dint* v, GC3Dsizei); 301 void uniformMatrix2fv(const WebGLUniformLocation*, GC3Dboolean transpose, Float32Array& value); 302 void uniformMatrix2fv(const WebGLUniformLocation*, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei); 303 void uniformMatrix3fv(const WebGLUniformLocation*, GC3Dboolean transpose, Float32Array& value); 304 void uniformMatrix3fv(const WebGLUniformLocation*, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei); 305 void uniformMatrix4fv(const WebGLUniformLocation*, GC3Dboolean transpose, Float32Array& value); 306 void uniformMatrix4fv(const WebGLUniformLocation*, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei); 307 308 void useProgram(WebGLProgram*); 309 void validateProgram(WebGLProgram*); 310 310 311 311 void vertexAttrib1f(GC3Duint index, GC3Dfloat x); … … 322 322 void vertexAttrib4fv(GC3Duint index, GC3Dfloat* values, GC3Dsizei size); 323 323 void vertexAttribPointer(GC3Duint index, GC3Dint size, GC3Denum type, GC3Dboolean normalized, 324 GC3Dsizei stride, long long offset, ExceptionCode&);324 GC3Dsizei stride, long long offset); 325 325 326 326 void viewport(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height); … … 430 430 431 431 #if ENABLE(VIDEO) 432 RefPtr<Image> videoFrameToImage(HTMLVideoElement*, BackingStoreCopy , ExceptionCode&);432 RefPtr<Image> videoFrameToImage(HTMLVideoElement*, BackingStoreCopy); 433 433 #endif 434 434 -
trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl
r207632 r207644 473 473 readonly attribute GLsizei drawingBufferHeight; 474 474 475 [MayThrowLegacyException]void activeTexture(GLenum texture);476 [MayThrowLegacyException]void attachShader(WebGLProgram? program, WebGLShader? shader);477 [MayThrowLegacyException]void bindAttribLocation(WebGLProgram? program, GLuint index, DOMString name);478 [MayThrowLegacyException]void bindBuffer(GLenum target, WebGLBuffer? buffer);479 [MayThrowLegacyException]void bindFramebuffer(GLenum target, WebGLFramebuffer? framebuffer);480 [MayThrowLegacyException]void bindRenderbuffer(GLenum target, WebGLRenderbuffer? renderbuffer);481 [MayThrowLegacyException]void bindTexture(GLenum target, WebGLTexture? texture);475 void activeTexture(GLenum texture); 476 void attachShader(WebGLProgram? program, WebGLShader? shader); 477 void bindAttribLocation(WebGLProgram? program, GLuint index, DOMString name); 478 void bindBuffer(GLenum target, WebGLBuffer? buffer); 479 void bindFramebuffer(GLenum target, WebGLFramebuffer? framebuffer); 480 void bindRenderbuffer(GLenum target, WebGLRenderbuffer? renderbuffer); 481 void bindTexture(GLenum target, WebGLTexture? texture); 482 482 void blendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); 483 483 void blendEquation(GLenum mode); … … 485 485 void blendFunc(GLenum sfactor, GLenum dfactor); 486 486 void blendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); 487 [MayThrowLegacyException]void bufferData(GLenum target, ArrayBuffer? data, GLenum usage);488 [MayThrowLegacyException]void bufferData(GLenum target, ArrayBufferView? data, GLenum usage);489 [MayThrowLegacyException]void bufferData(GLenum target, GLsizeiptr size, GLenum usage);490 [MayThrowLegacyException]void bufferSubData(GLenum target, GLintptr offset, ArrayBuffer? data);491 [MayThrowLegacyException]void bufferSubData(GLenum target, GLintptr offset, ArrayBufferView? data);487 void bufferData(GLenum target, ArrayBuffer? data, GLenum usage); 488 void bufferData(GLenum target, ArrayBufferView? data, GLenum usage); 489 void bufferData(GLenum target, GLsizeiptr size, GLenum usage); 490 void bufferSubData(GLenum target, GLintptr offset, ArrayBuffer? data); 491 void bufferSubData(GLenum target, GLintptr offset, ArrayBufferView? data); 492 492 493 493 GLenum checkFramebufferStatus(GLenum target); … … 497 497 void clearStencil(GLint s); 498 498 void colorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); 499 [MayThrowLegacyException]void compileShader(WebGLShader? shader);499 void compileShader(WebGLShader? shader); 500 500 501 501 void compressedTexImage2D(GLenum target, GLint level, GLenum internalformat, 502 502 GLsizei width, GLsizei height, GLint border, ArrayBufferView data); 503 503 void compressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, 504 GLsizei width, GLsizei height, GLenum format, ArrayBufferView data);504 GLsizei width, GLsizei height, GLenum format, ArrayBufferView data); 505 505 506 506 void copyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); … … 511 511 WebGLProgram createProgram(); 512 512 WebGLRenderbuffer createRenderbuffer(); 513 [MayThrowLegacyException]WebGLShader createShader(GLenum type);513 WebGLShader createShader(GLenum type); 514 514 WebGLTexture createTexture(); 515 515 … … 526 526 void depthMask(GLboolean flag); 527 527 void depthRange(GLclampf zNear, GLclampf zFar); 528 [MayThrowLegacyException]void detachShader(WebGLProgram? program, WebGLShader? shader);528 void detachShader(WebGLProgram? program, WebGLShader? shader); 529 529 void disable(GLenum cap); 530 [MayThrowLegacyException]void disableVertexAttribArray(GLuint index);531 [MayThrowLegacyException]void drawArrays(GLenum mode, GLint first, GLsizei count);532 [MayThrowLegacyException]void drawElements(GLenum mode, GLsizei count, GLenum type, GLintptr offset);530 void disableVertexAttribArray(GLuint index); 531 void drawArrays(GLenum mode, GLint first, GLsizei count); 532 void drawElements(GLenum mode, GLsizei count, GLenum type, GLintptr offset); 533 533 534 534 void enable(GLenum cap); 535 [MayThrowLegacyException]void enableVertexAttribArray(GLuint index);535 void enableVertexAttribArray(GLuint index); 536 536 void finish(); 537 537 void flush(); 538 [MayThrowLegacyException]void framebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, WebGLRenderbuffer? renderbuffer);539 [MayThrowLegacyException]void framebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, WebGLTexture? texture, GLint level);538 void framebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, WebGLRenderbuffer? renderbuffer); 539 void framebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, WebGLTexture? texture, GLint level); 540 540 void frontFace(GLenum mode); 541 541 void generateMipmap(GLenum target); 542 542 543 [MayThrowLegacyException]WebGLActiveInfo getActiveAttrib(WebGLProgram? program, GLuint index);544 [MayThrowLegacyException]WebGLActiveInfo getActiveUniform(WebGLProgram? program, GLuint index);543 WebGLActiveInfo getActiveAttrib(WebGLProgram? program, GLuint index); 544 WebGLActiveInfo getActiveUniform(WebGLProgram? program, GLuint index); 545 545 546 546 [Custom, MayThrowLegacyException] void getAttachedShaders(WebGLProgram? program); … … 560 560 [Custom, MayThrowLegacyException] any getParameter(GLenum pname); 561 561 [Custom, MayThrowLegacyException] any getProgramParameter(WebGLProgram? program, GLenum pname); 562 [MayThrowLegacyException]DOMString? getProgramInfoLog(WebGLProgram? program);562 DOMString? getProgramInfoLog(WebGLProgram? program); 563 563 [Custom, MayThrowLegacyException] any getRenderbufferParameter(GLenum target, GLenum pname); 564 564 [Custom, MayThrowLegacyException] any getShaderParameter(WebGLShader? shader, GLenum pname); 565 565 566 [MayThrowLegacyException]DOMString? getShaderInfoLog(WebGLShader? shader);567 568 [MayThrowLegacyException]WebGLShaderPrecisionFormat getShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype);569 570 [MayThrowLegacyException]DOMString? getShaderSource(WebGLShader? shader);566 DOMString? getShaderInfoLog(WebGLShader? shader); 567 568 WebGLShaderPrecisionFormat getShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype); 569 570 DOMString? getShaderSource(WebGLShader? shader); 571 571 572 572 [Custom] sequence<DOMString> getSupportedExtensions(); … … 576 576 [Custom, MayThrowLegacyException] any getUniform(WebGLProgram? program, WebGLUniformLocation? location); 577 577 578 [MayThrowLegacyException]WebGLUniformLocation getUniformLocation(WebGLProgram? program, DOMString name);578 WebGLUniformLocation getUniformLocation(WebGLProgram? program, DOMString name); 579 579 580 580 [Custom, MayThrowLegacyException] any getVertexAttrib(GLuint index, GLenum pname); … … 592 592 GLboolean isTexture(WebGLTexture? texture); 593 593 void lineWidth(GLfloat width); 594 [MayThrowLegacyException]void linkProgram(WebGLProgram? program);594 void linkProgram(WebGLProgram? program); 595 595 void pixelStorei(GLenum pname, GLint param); 596 596 void polygonOffset(GLfloat factor, GLfloat units); 597 597 598 [MayThrowLegacyException]void readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, ArrayBufferView pixels);598 void readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, ArrayBufferView pixels); 599 599 600 600 void releaseShaderCompiler(); … … 602 602 void sampleCoverage(GLclampf value, GLboolean invert); 603 603 void scissor(GLint x, GLint y, GLsizei width, GLsizei height); 604 [MayThrowLegacyException]void shaderSource(WebGLShader? shader, DOMString string);604 void shaderSource(WebGLShader? shader, DOMString string); 605 605 void stencilFunc(GLenum func, GLint ref, GLuint mask); 606 606 void stencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask); … … 641 641 #endif 642 642 643 [MayThrowLegacyException]void uniform1f(WebGLUniformLocation? location, GLfloat x);643 void uniform1f(WebGLUniformLocation? location, GLfloat x); 644 644 [Custom, MayThrowLegacyException] void uniform1fv(WebGLUniformLocation? location, Float32Array v); 645 [MayThrowLegacyException]void uniform1i(WebGLUniformLocation? location, GLint x);645 void uniform1i(WebGLUniformLocation? location, GLint x); 646 646 [Custom, MayThrowLegacyException] void uniform1iv(WebGLUniformLocation? location, Int32Array v); 647 [MayThrowLegacyException]void uniform2f(WebGLUniformLocation? location, GLfloat x, GLfloat y);647 void uniform2f(WebGLUniformLocation? location, GLfloat x, GLfloat y); 648 648 [Custom, MayThrowLegacyException] void uniform2fv(WebGLUniformLocation? location, Float32Array v); 649 [MayThrowLegacyException]void uniform2i(WebGLUniformLocation? location, GLint x, GLint y);649 void uniform2i(WebGLUniformLocation? location, GLint x, GLint y); 650 650 [Custom, MayThrowLegacyException] void uniform2iv(WebGLUniformLocation? location, Int32Array v); 651 [MayThrowLegacyException]void uniform3f(WebGLUniformLocation? location, GLfloat x, GLfloat y, GLfloat z);651 void uniform3f(WebGLUniformLocation? location, GLfloat x, GLfloat y, GLfloat z); 652 652 [Custom, MayThrowLegacyException] void uniform3fv(WebGLUniformLocation? location, Float32Array v); 653 [MayThrowLegacyException]void uniform3i(WebGLUniformLocation? location, GLint x, GLint y, GLint z);653 void uniform3i(WebGLUniformLocation? location, GLint x, GLint y, GLint z); 654 654 [Custom, MayThrowLegacyException] void uniform3iv(WebGLUniformLocation? location, Int32Array v); 655 [MayThrowLegacyException]void uniform4f(WebGLUniformLocation? location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);655 void uniform4f(WebGLUniformLocation? location, GLfloat x, GLfloat y, GLfloat z, GLfloat w); 656 656 [Custom, MayThrowLegacyException] void uniform4fv(WebGLUniformLocation? location, Float32Array v); 657 [MayThrowLegacyException]void uniform4i(WebGLUniformLocation? location, GLint x, GLint y, GLint z, GLint w);657 void uniform4i(WebGLUniformLocation? location, GLint x, GLint y, GLint z, GLint w); 658 658 [Custom, MayThrowLegacyException] void uniform4iv(WebGLUniformLocation? location, Int32Array v); 659 659 … … 662 662 [Custom, MayThrowLegacyException] void uniformMatrix4fv(WebGLUniformLocation? location, GLboolean transpose, Float32Array array); 663 663 664 [MayThrowLegacyException]void useProgram(WebGLProgram? program);665 [MayThrowLegacyException]void validateProgram(WebGLProgram? program);664 void useProgram(WebGLProgram? program); 665 void validateProgram(WebGLProgram? program); 666 666 667 667 void vertexAttrib1f(GLuint indx, GLfloat x); … … 673 673 void vertexAttrib4f(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w); 674 674 [Custom] void vertexAttrib4fv(GLuint indx, Float32Array values); 675 [MayThrowLegacyException]void vertexAttribPointer(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLintptr offset);675 void vertexAttribPointer(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLintptr offset); 676 676 677 677 void viewport(GLint x, GLint y, GLsizei width, GLsizei height);
Note: See TracChangeset
for help on using the changeset viewer.