Changeset 100191 in webkit
- Timestamp:
- Nov 14, 2011 2:25:51 PM (12 years ago)
- Location:
- trunk/Source
- Files:
-
- 3 deleted
- 20 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r100178 r100191 2139 2139 html/canvas/WebGLDebugRendererInfo.cpp 2140 2140 html/canvas/WebGLDebugShaders.cpp 2141 html/canvas/WebGLExperimentalCompressedTextures.cpp2142 2141 html/canvas/WebGLFramebuffer.cpp 2143 2142 html/canvas/WebGLGetInfo.cpp … … 2171 2170 html/canvas/WebGLDebugRendererInfo.idl 2172 2171 html/canvas/WebGLDebugShaders.idl 2173 html/canvas/WebGLExperimentalCompressedTextures.idl2174 2172 html/canvas/WebGLFramebuffer.idl 2175 2173 html/canvas/WebGLProgram.idl -
trunk/Source/WebCore/ChangeLog
r100187 r100191 1 2011-11-14 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r100176. 4 http://trac.webkit.org/changeset/100176 5 https://bugs.webkit.org/show_bug.cgi?id=72309 6 7 it broke the Mac builds (missing symbols) in a non-obvious way 8 (Requested by jchaffraix on #webkit). 9 10 * CMakeLists.txt: 11 * GNUmakefile.list.am: 12 * Target.pri: 13 * WebCore.gypi: 14 * bindings/js/JSWebGLRenderingContextCustom.cpp: 15 (WebCore::toJS): 16 * bindings/v8/custom/V8WebGLRenderingContextCustom.cpp: 17 (WebCore::toV8Object): 18 * html/canvas/WebGLExperimentalCompressedTextures.cpp: Removed. 19 * html/canvas/WebGLExperimentalCompressedTextures.h: Removed. 20 * html/canvas/WebGLExperimentalCompressedTextures.idl: Removed. 21 * html/canvas/WebGLExtension.h: 22 * html/canvas/WebGLRenderingContext.cpp: 23 (WebCore::WebGLRenderingContext::getExtension): 24 (WebCore::WebGLRenderingContext::getParameter): 25 (WebCore::WebGLRenderingContext::getSupportedExtensions): 26 * html/canvas/WebGLRenderingContext.h: 27 * platform/graphics/Extensions3D.h: 28 * platform/graphics/GraphicsContext3D.h: 29 * platform/graphics/efl/GraphicsContext3DEfl.cpp: 30 * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp: 31 * platform/graphics/qt/GraphicsContext3DQt.cpp: 32 1 33 2011-11-14 Tony Chang <tony@chromium.org> 2 34 -
trunk/Source/WebCore/GNUmakefile.list.am
r100178 r100191 4979 4979 Source/WebCore/html/canvas/WebGLDebugShaders.cpp \ 4980 4980 Source/WebCore/html/canvas/WebGLDebugShaders.h \ 4981 Source/WebCore/html/canvas/WebGLExperimentalCompressedTextures.cpp \4982 Source/WebCore/html/canvas/WebGLExperimentalCompressedTextures.h \4983 4981 Source/WebCore/html/canvas/WebGLFramebuffer.cpp \ 4984 4982 Source/WebCore/html/canvas/WebGLFramebuffer.h \ -
trunk/Source/WebCore/Target.pri
r100178 r100191 3627 3627 html/canvas/WebGLDebugRendererInfo.h \ 3628 3628 html/canvas/WebGLDebugShaders.h \ 3629 html/canvas/WebGLExperimentalCompressedTextures.h \3630 3629 html/canvas/WebGLExtension.h \ 3631 3630 html/canvas/WebGLFramebuffer.h \ … … 3661 3660 html/canvas/WebGLDebugRendererInfo.cpp \ 3662 3661 html/canvas/WebGLDebugShaders.cpp \ 3663 html/canvas/WebGLExperimentalCompressedTextures.cpp \3664 3662 html/canvas/WebGLExtension.cpp \ 3665 3663 html/canvas/WebGLFramebuffer.cpp \ -
trunk/Source/WebCore/WebCore.gypi
r100178 r100191 1367 1367 'html/canvas/WebGLDebugShaders.idl', 1368 1368 'html/canvas/WebGLFramebuffer.idl', 1369 'html/canvas/WebGLExperimentalCompressedTextures.idl',1370 1369 'html/canvas/WebGLProgram.idl', 1371 1370 'html/canvas/WebGLRenderbuffer.idl', … … 5721 5720 'html/canvas/WebGLDebugShaders.cpp', 5722 5721 'html/canvas/WebGLDebugShaders.h', 5723 'html/canvas/WebGLExperimentalCompressedTextures.cpp',5724 'html/canvas/WebGLExperimentalCompressedTextures.h',5725 5722 'html/canvas/WebGLExtension.cpp', 5726 5723 'html/canvas/WebGLExtension.h', -
trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp
r100176 r100191 61 61 #include "WebGLDebugRendererInfo.h" 62 62 #include "WebGLDebugShaders.h" 63 #include "WebGLExperimentalCompressedTextures.h"64 63 #include "WebGLExtension.h" 65 64 #include "WebGLFramebuffer.h" … … 195 194 case WebGLExtension::WebGLDebugShadersName: 196 195 return toJS(exec, globalObject, static_cast<WebGLDebugShaders*>(extension)); 197 case WebGLExtension::WebGLExperimentalCompressedTexturesName:198 return toJS(exec, globalObject, static_cast<WebGLExperimentalCompressedTextures*>(extension));199 196 } 200 197 ASSERT_NOT_REACHED(); -
trunk/Source/WebCore/bindings/v8/custom/V8WebGLRenderingContextCustom.cpp
r100176 r100191 59 59 #include "V8WebGLDebugRendererInfo.h" 60 60 #include "V8WebGLDebugShaders.h" 61 #include "V8WebGLExperimentalCompressedTextures.h"62 61 #include "V8WebGLFramebuffer.h" 63 62 #include "V8WebGLProgram.h" … … 194 193 referenceName = "webGLDebugShadersName"; 195 194 break; 196 case WebGLExtension::WebGLExperimentalCompressedTexturesName:197 extensionObject = toV8(static_cast<WebGLExperimentalCompressedTextures*>(extension));198 referenceName = "webGLExperimentalCompressedTexturesName";199 break;200 195 } 201 196 ASSERT(!extensionObject.IsEmpty()); -
trunk/Source/WebCore/html/canvas/WebGLExtension.h
r100176 r100191 41 41 WebGLDebugRendererInfoName, 42 42 WebGLDebugShadersName, 43 WebGLExperimentalCompressedTexturesName,44 43 }; 45 44 -
trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
r100176 r100191 60 60 #include "WebGLDebugRendererInfo.h" 61 61 #include "WebGLDebugShaders.h" 62 #include "WebGLExperimentalCompressedTextures.h"63 62 #include "WebGLFramebuffer.h" 64 63 #include "WebGLProgram.h" … … 2126 2125 } 2127 2126 return m_oesVertexArrayObject.get(); 2128 }2129 if (equalIgnoringCase(name, "WEBGL_EXPERIMENTAL_compressed_textures")) {2130 if (!m_webglExperimentalCompressedTextures)2131 m_webglExperimentalCompressedTextures = WebGLExperimentalCompressedTextures::create(this);2132 return m_webglExperimentalCompressedTextures.get();2133 2127 } 2134 2128 if (equalIgnoringCase(name, "WEBKIT_lose_context")) { … … 2248 2242 return getBooleanArrayParameter(pname); 2249 2243 case GraphicsContext3D::COMPRESSED_TEXTURE_FORMATS: 2250 if (m_webglExperimentalCompressedTextures)2251 return m_webglExperimentalCompressedTextures->getCompressedTextureFormats();2252 2244 // Defined as null in the spec 2253 2245 return WebGLGetInfo(); … … 2580 2572 if (m_context->getExtensions()->supports("GL_OES_vertex_array_object")) 2581 2573 result.append("OES_vertex_array_object"); 2582 if (WebGLExperimentalCompressedTextures::supported(this))2583 result.append("WEBGL_EXPERIMENTAL_compressed_textures");2584 2574 result.append("WEBKIT_lose_context"); 2585 2575 -
trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h
r100176 r100191 63 63 class WebGLUniformLocation; 64 64 class WebGLVertexArrayObjectOES; 65 class WebGLExperimentalCompressedTextures;66 65 class WebKitLoseContext; 67 66 … … 313 312 friend class OESVertexArrayObject; 314 313 friend class WebGLDebugShaders; 315 friend class WebGLExperimentalCompressedTextures;316 314 317 315 WebGLRenderingContext(HTMLCanvasElement*, PassRefPtr<GraphicsContext3D>, GraphicsContext3D::Attributes); … … 488 486 OwnPtr<WebGLDebugRendererInfo> m_webglDebugRendererInfo; 489 487 OwnPtr<WebGLDebugShaders> m_webglDebugShaders; 490 OwnPtr<WebGLExperimentalCompressedTextures> m_webglExperimentalCompressedTextures;491 488 492 489 // Helpers for getParameter and others -
trunk/Source/WebCore/platform/graphics/Extensions3D.h
r100176 r100191 58 58 // GL_OES_vertex_array_object 59 59 // GL_ANGLE_translated_shader_source 60 // GL_EXT_texture_compression_dxt161 // GL_EXT_texture_compression_s3tc62 // GL_OES_compressed_ETC1_RGB8_texture63 // GL_IMG_texture_compression_pvrtc64 60 65 61 // Takes full name of extension; for example, … … 112 108 // GL_ANGLE_translated_shader_source 113 109 TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE = 0x93A0, 114 115 // GL_EXT_texture_compression_dxt1116 // GL_EXT_texture_compression_s3tc117 COMPRESSED_RGB_S3TC_DXT1_EXT = 0x83F0,118 COMPRESSED_RGBA_S3TC_DXT1_EXT = 0x83F1,119 COMPRESSED_RGBA_S3TC_DXT3_EXT = 0x83F2,120 COMPRESSED_RGBA_S3TC_DXT5_EXT = 0x83F3,121 122 // GL_OES_compressed_ETC1_RGB8_texture123 ETC1_RGB8_OES = 0x8D64,124 125 // GL_IMG_texture_compression_pvrtc126 COMPRESSED_RGB_PVRTC_4BPPV1_IMG = 0x8C00,127 COMPRESSED_RGB_PVRTC_2BPPV1_IMG = 0x8C01,128 COMPRESSED_RGBA_PVRTC_4BPPV1_IMG = 0x8C02,129 COMPRESSED_RGBA_PVRTC_2BPPV1_IMG = 0x8C03,130 110 }; 131 111 -
trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h
r100176 r100191 651 651 void compileShader(Platform3DObject); 652 652 653 void compressedTexImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, GC3Dsizei imageSize, const void* data); 654 void compressedTexSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Dsizei imageSize, const void* data); 653 // void compressedTexImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, GC3Dsizei imageSize, const void* data); 654 // void compressedTexSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Dsizei imageSize, const void* data); 655 655 656 void copyTexImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Dint border); 656 657 void copyTexSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height); -
trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp
r100176 r100191 197 197 } 198 198 199 void GraphicsContext3D::compressedTexImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, GC3Dsizei imageSize, const void* data)200 {201 // FIXME: Add support for compressedTexImage2D.202 // m_internal->compressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);203 }204 205 void GraphicsContext3D::compressedTexSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Dsizei imageSize, const void* data)206 {207 // FIXME: Add support for compressedTexSubImage2D.208 // m_internal->compressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);209 }210 211 199 void GraphicsContext3D::cullFace(GC3Denum mode) 212 200 { -
trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
r100176 r100191 1435 1435 } 1436 1436 1437 void GraphicsContext3D::compressedTexImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, GC3Dsizei imageSize, const void* data)1438 {1439 makeContextCurrent();1440 ::glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);1441 }1442 1443 void GraphicsContext3D::compressedTexSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Dsizei imageSize, const void* data)1444 {1445 makeContextCurrent();1446 ::glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);1447 }1448 1449 1437 Platform3DObject GraphicsContext3D::createBuffer() 1450 1438 { -
trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp
r100176 r100191 654 654 } 655 655 656 void GraphicsContext3D::compressedTexImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, GC3Dsizei imageSize, const void* data)657 {658 m_private->m_glWidget->makeCurrent();659 glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);660 }661 662 void GraphicsContext3D::compressedTexSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Dsizei imageSize, const void* data)663 {664 m_private->m_glWidget->makeCurrent();665 glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);666 }667 668 656 void GraphicsContext3D::copyTexImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Dint border) 669 657 { -
trunk/Source/WebKit/chromium/ChangeLog
r100182 r100191 1 2011-11-14 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r100176. 4 http://trac.webkit.org/changeset/100176 5 https://bugs.webkit.org/show_bug.cgi?id=72309 6 7 it broke the Mac builds (missing symbols) in a non-obvious way 8 (Requested by jchaffraix on #webkit). 9 10 * public/WebGraphicsContext3D.h: 11 * src/GraphicsContext3DChromium.cpp: 12 * src/GraphicsContext3DPrivate.h: 13 * tests/MockWebGraphicsContext3D.h: 14 1 15 2011-11-14 Adam Barth <abarth@webkit.org> 2 16 -
trunk/Source/WebKit/chromium/public/WebGraphicsContext3D.h
r100176 r100191 226 226 virtual void compileShader(WebGLId shader) = 0; 227 227 228 virtual void compressedTexImage2D(WGC3Denum target, WGC3Dint level, WGC3Denum internalformat, WGC3Dsizei width, WGC3Dsizei height, WGC3Dint border, WGC3Dsizei imageSize, const void* data) = 0;229 virtual void compressedTexSubImage2D(WGC3Denum target, WGC3Dint level, WGC3Dint xoffset, WGC3Dint yoffset, WGC3Dsizei width, WGC3Dsizei height, WGC3Denum format, WGC3Dsizei imageSize, const void* data) = 0;230 228 virtual void copyTexImage2D(WGC3Denum target, WGC3Dint level, WGC3Denum internalformat, WGC3Dint x, WGC3Dint y, WGC3Dsizei width, WGC3Dsizei height, WGC3Dint border) = 0; 231 229 virtual void copyTexSubImage2D(WGC3Denum target, WGC3Dint level, WGC3Dint xoffset, WGC3Dint yoffset, WGC3Dint x, WGC3Dint y, WGC3Dsizei width, WGC3Dsizei height) = 0; -
trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp
r100176 r100191 474 474 } 475 475 476 #define DELEGATE_TO_IMPL_9(name, t1, t2, t3, t4, t5, t6, t7, t8, t9) \477 void GraphicsContext3DPrivate::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7, t8 a8, t9 a9) \478 { \479 m_impl->name(a1, a2, a3, a4, a5, a6, a7, a8, a9); \480 }481 482 476 #define DELEGATE_TO_IMPL_9R(name, t1, t2, t3, t4, t5, t6, t7, t8, t9, rt) \ 483 477 rt GraphicsContext3DPrivate::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7, t8 a8, t9 a9) \ … … 540 534 DELEGATE_TO_IMPL_1(compileShader, Platform3DObject) 541 535 542 DELEGATE_TO_IMPL_8(compressedTexImage2D, GC3Denum, GC3Dint, GC3Denum, GC3Dint, GC3Dint, GC3Dsizei, GC3Dsizei, const void*)543 DELEGATE_TO_IMPL_9(compressedTexSubImage2D, GC3Denum, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Denum, GC3Dsizei, const void*)544 536 DELEGATE_TO_IMPL_8(copyTexImage2D, GC3Denum, GC3Dint, GC3Denum, GC3Dint, GC3Dint, GC3Dsizei, GC3Dsizei, GC3Dint) 545 537 DELEGATE_TO_IMPL_8(copyTexSubImage2D, GC3Denum, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dsizei, GC3Dsizei) … … 1106 1098 DELEGATE_TO_INTERNAL_1(compileShader, Platform3DObject) 1107 1099 1108 DELEGATE_TO_INTERNAL_8(compressedTexImage2D, GC3Denum, GC3Dint, GC3Denum, GC3Dint, GC3Dint, GC3Dsizei, GC3Dsizei, const void*)1109 DELEGATE_TO_INTERNAL_9(compressedTexSubImage2D, GC3Denum, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Denum, GC3Dsizei, const void*)1110 1100 DELEGATE_TO_INTERNAL_8(copyTexImage2D, GC3Denum, GC3Dint, GC3Denum, GC3Dint, GC3Dint, GC3Dsizei, GC3Dsizei, GC3Dint) 1111 1101 DELEGATE_TO_INTERNAL_8(copyTexSubImage2D, GC3Denum, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dsizei, GC3Dsizei) -
trunk/Source/WebKit/chromium/src/GraphicsContext3DPrivate.h
r100176 r100191 138 138 void compileShader(Platform3DObject); 139 139 140 void compressedTexImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, GC3Dsizei imageSize, const void* data);141 void compressedTexSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Dsizei imageSize, const void* data);142 140 void copyTexImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Dint border); 143 141 void copyTexSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height); -
trunk/Source/WebKit/chromium/tests/MockWebGraphicsContext3D.h
r100176 r100191 100 100 virtual void compileShader(WebGLId shader) { } 101 101 102 virtual void compressedTexImage2D(WGC3Denum target, WGC3Dint level, WGC3Denum internalformat, WGC3Dsizei width, WGC3Dsizei height, WGC3Dint border, WGC3Dsizei imageSize, const void* data) { }103 virtual void compressedTexSubImage2D(WGC3Denum target, WGC3Dint level, WGC3Dint xoffset, WGC3Dint yoffset, WGC3Dsizei width, WGC3Dsizei height, WGC3Denum format, WGC3Dsizei imageSize, const void* data) { }104 102 virtual void copyTexImage2D(WGC3Denum target, WGC3Dint level, WGC3Denum internalformat, WGC3Dint x, WGC3Dint y, WGC3Dsizei width, WGC3Dsizei height, WGC3Dint border) { } 105 103 virtual void copyTexSubImage2D(WGC3Denum target, WGC3Dint level, WGC3Dint xoffset, WGC3Dint yoffset, WGC3Dint x, WGC3Dint y, WGC3Dsizei width, WGC3Dsizei height) { }
Note: See TracChangeset
for help on using the changeset viewer.