1 2010-09-01 Zhenyao Mo <zmo@google.com>
3 Reviewed by Kenneth Russell.
5 Roll ANGLE under webkit to r402
6 https://bugs.webkit.org/show_bug.cgi?id=45004
8 * ANGLE.xcodeproj/project.pbxproj:
9 * include/GLES2/gl2ext.h:
10 * include/GLSLANG/ResourceLimits.h: Removed.
11 * include/GLSLANG/ShaderLang.h:
12 * src/compiler/BaseTypes.h:
17 * src/compiler/Initialize.cpp:
20 * src/compiler/Initialize.h:
21 * src/compiler/InitializeDll.cpp:
26 * src/compiler/InitializeDll.h:
27 * src/compiler/InitializeParseContext.h:
28 * src/compiler/Intermediate.cpp:
30 (TIntermediate::addBinaryMath):
31 (TIntermediate::setAggregateOperator):
32 (TIntermediate::addComma):
33 (TIntermediate::postProcess):
34 (TIntermBinary::promote):
36 * src/compiler/OutputGLSL.cpp:
37 (TOutputGLSL::writeFunctionParameters):
38 (TOutputGLSL::visitUnary):
39 (TOutputGLSL::visitBranch):
40 * src/compiler/OutputHLSL.cpp:
41 (sh::OutputHLSL::header):
42 (sh::OutputHLSL::visitBinary):
43 (sh::OutputHLSL::visitAggregate):
44 (sh::OutputHLSL::handleExcessiveLoop):
45 (sh::OutputHLSL::addConstructor):
46 * src/compiler/ParseHelper.cpp:
47 (TParseContext::constructorErrorCheck):
48 (TParseContext::samplerErrorCheck):
49 (TParseContext::paramErrorCheck):
50 (TParseContext::findFunction):
51 (TParseContext::executeInitializer):
52 (TParseContext::addConstructor):
53 (TParseContext::addConstStruct):
54 (FreeParseContextIndex):
55 (GetGlobalParseContext):
56 * src/compiler/PoolAlloc.h:
57 (TPoolAllocator::tHeader::tHeader):
58 (pool_allocator::allocate):
59 (pool_allocator::deallocate):
60 * src/compiler/ShaderLang.cpp:
63 (ShInitBuiltInResource):
64 * src/compiler/SymbolTable.cpp:
65 (TType::getStructSize):
66 * src/compiler/SymbolTable.h:
67 (TVariable::setQualifier):
68 * src/compiler/Types.h:
70 (TType::getBasicType):
71 (TType::setBasicType):
72 (TType::getPrecision):
73 (TType::setPrecision):
74 (TType::getQualifier):
75 (TType::setQualifier):
76 (TType::getNominalSize):
77 (TType::setNominalSize):
81 (TType::getArraySize):
82 (TType::setArraySize):
83 (TType::getMaxArraySize):
84 (TType::setMaxArraySize):
85 (TType::clearArrayness):
86 (TType::setArrayInformationType):
87 (TType::getArrayInformationType):
94 (TType::getFieldName):
95 (TType::setFieldName):
96 (TType::getBasicString):
97 (TType::getPrecisionString):
98 (TType::getQualifierString):
99 * src/compiler/glslang.l:
100 * src/compiler/glslang.y:
101 * src/compiler/intermediate.h:
102 (TIntermNode::getLine):
103 (TIntermNode::setLine):
104 (TIntermTyped::getAsTyped):
105 (TIntermTyped::setType):
106 (TIntermTyped::getType):
107 (TIntermTyped::getTypePointer):
108 (TIntermTyped::getBasicType):
109 (TIntermTyped::getQualifier):
110 (TIntermTyped::getPrecision):
111 (TIntermTyped::getNominalSize):
112 (TIntermTyped::isMatrix):
113 (TIntermTyped::isArray):
114 (TIntermTyped::isVector):
115 (TIntermTyped::isScalar):
116 (TIntermTyped::getBasicString):
117 (TIntermTyped::getQualifierString):
118 (TIntermSymbol::getId):
119 (TIntermSymbol::getSymbol):
120 (TIntermOperator::setOp):
121 (TIntermBinary::setLeft):
122 (TIntermBinary::setRight):
123 (TIntermBinary::getLeft):
124 (TIntermBinary::getRight):
125 (TIntermUnary::setOperand):
126 (TIntermUnary::getOperand):
127 (TIntermAggregate::getAsAggregate):
128 (TIntermAggregate::getSequence):
129 (TIntermAggregate::setName):
130 (TIntermAggregate::getName):
131 (TIntermAggregate::setUserDefined):
132 (TIntermAggregate::isUserDefined):
133 (TIntermAggregate::getQualifier):
134 (TIntermAggregate::setOptimize):
135 (TIntermAggregate::setDebug):
136 (TIntermSelection::getCondition):
137 (TIntermSelection::getTrueBlock):
138 (TIntermSelection::getFalseBlock):
139 (TIntermSelection::getAsSelectionNode):
140 * src/compiler/parseConst.cpp:
141 (TConstTraverser::TConstTraverser):
142 * src/compiler/preprocessor/atom.c:
144 * src/compiler/preprocessor/atom.h:
145 * src/compiler/preprocessor/compile.h:
146 * src/compiler/preprocessor/cpp.c:
147 * src/compiler/preprocessor/cpp.h:
148 * src/compiler/preprocessor/cppstruct.c:
149 * src/compiler/preprocessor/memory.c:
150 * src/compiler/preprocessor/memory.h:
151 * src/compiler/preprocessor/parser.h:
152 * src/compiler/preprocessor/preprocess.h:
153 * src/compiler/preprocessor/scanner.c:
154 * src/compiler/preprocessor/scanner.h:
155 * src/compiler/preprocessor/slglobals.h:
156 * src/compiler/preprocessor/symbols.c:
158 * src/compiler/preprocessor/symbols.h:
159 * src/compiler/preprocessor/tokens.c:
161 * src/compiler/preprocessor/tokens.h:
162 * src/libEGL/Display.cpp:
163 (egl::Display::Display):
164 (egl::Display::initialize):
165 (egl::Display::terminate):
166 (egl::Display::createDevice):
167 (egl::Display::createWindowSurface):
168 (egl::Display::createContext):
169 (egl::Display::getMultiSampleSupport):
170 (egl::Display::getCompressedTextureSupport):
171 * src/libEGL/Display.h:
172 * src/libEGL/Surface.cpp:
173 (egl::Surface::Surface):
174 (egl::Surface::resetSwapChain):
175 (egl::Surface::getWindowHandle):
176 (egl::Surface::writeRecordableFlipState):
177 (egl::Surface::applyFlipState):
178 (egl::Surface::releaseRecordedState):
179 (egl::Surface::checkForWindowResize):
180 (egl::Surface::swap):
181 * src/libEGL/Surface.h:
182 * src/libEGL/libEGL.cpp:
183 * src/libEGL/libEGL.vcproj:
184 * src/libGLESv2/Blit.cpp:
185 (gl::Blit::setVertexShader):
186 (gl::Blit::setPixelShader):
187 (gl::Blit::setFormatConvertShaders):
188 * src/libGLESv2/Buffer.cpp:
189 (gl::Buffer::Buffer):
190 * src/libGLESv2/Buffer.h:
191 * src/libGLESv2/Context.cpp:
192 (gl::Context::Context):
193 (gl::Context::~Context):
194 (gl::Context::makeCurrent):
195 (gl::Context::markAllStateDirty):
196 (gl::Context::getReadFramebufferHandle):
197 (gl::Context::getDrawFramebufferHandle):
198 (gl::Context::getRenderbufferHandle):
199 (gl::Context::getArrayBufferHandle):
200 (gl::Context::setVertexAttribState):
201 (gl::Context::createBuffer):
202 (gl::Context::createProgram):
203 (gl::Context::createShader):
204 (gl::Context::createTexture):
205 (gl::Context::createRenderbuffer):
206 (gl::Context::deleteBuffer):
207 (gl::Context::deleteShader):
208 (gl::Context::deleteProgram):
209 (gl::Context::deleteTexture):
210 (gl::Context::deleteRenderbuffer):
211 (gl::Context::getBuffer):
212 (gl::Context::getShader):
213 (gl::Context::getProgram):
214 (gl::Context::getTexture):
215 (gl::Context::getRenderbuffer):
216 (gl::Context::getReadFramebuffer):
217 (gl::Context::getDrawFramebuffer):
218 (gl::Context::bindArrayBuffer):
219 (gl::Context::bindElementArrayBuffer):
220 (gl::Context::bindTexture2D):
221 (gl::Context::bindTextureCubeMap):
222 (gl::Context::bindReadFramebuffer):
223 (gl::Context::bindDrawFramebuffer):
224 (gl::Context::bindRenderbuffer):
225 (gl::Context::useProgram):
226 (gl::Context::setFramebufferZero):
227 (gl::Context::setRenderbufferStorage):
228 (gl::Context::getFramebuffer):
229 (gl::Context::getArrayBuffer):
230 (gl::Context::getElementArrayBuffer):
231 (gl::Context::getCurrentProgram):
232 (gl::Context::getTexture2D):
233 (gl::Context::getTextureCubeMap):
234 (gl::Context::getSamplerTexture):
235 (gl::Context::getFloatv):
236 (gl::Context::getIntegerv):
237 (gl::Context::getQueryParameterInfo):
238 (gl::Context::applyRenderTarget):
239 (gl::Context::applyState):
240 (gl::Context::applyIndexBuffer):
241 (gl::Context::readPixels):
242 (gl::Context::clear):
243 (gl::Context::finish):
244 (gl::Context::flush):
245 (gl::Context::supportsShaderModel3):
246 (gl::Context::getMaxSupportedSamples):
247 (gl::Context::getNearestSupportedSamples):
248 (gl::Context::supportsCompressedTextures):
249 (gl::Context::detachBuffer):
250 (gl::Context::detachTexture):
251 (gl::Context::detachFramebuffer):
252 (gl::Context::detachRenderbuffer):
253 (gl::Context::getIncompleteTexture):
254 (gl::Context::initExtensionString):
255 (gl::Context::blitFramebuffer):
256 * src/libGLESv2/Context.h:
257 (gl::AttributeState::AttributeState):
258 * src/libGLESv2/Framebuffer.cpp:
259 (gl::Framebuffer::Framebuffer):
260 (gl::Framebuffer::~Framebuffer):
261 (gl::Framebuffer::lookupRenderbuffer):
262 (gl::Framebuffer::setColorbuffer):
263 (gl::Framebuffer::setDepthbuffer):
264 (gl::Framebuffer::setStencilbuffer):
265 (gl::Framebuffer::detachTexture):
266 (gl::Framebuffer::detachRenderbuffer):
267 (gl::Framebuffer::getRenderTargetSerial):
268 (gl::Framebuffer::getRenderTarget):
269 (gl::Framebuffer::getDepthStencil):
270 (gl::Framebuffer::getDepthbufferSerial):
271 (gl::Framebuffer::getStencilbufferSerial):
272 (gl::Framebuffer::getColorbuffer):
273 (gl::Framebuffer::getDepthbuffer):
274 (gl::Framebuffer::getStencilbuffer):
275 (gl::Framebuffer::getColorbufferHandle):
276 (gl::Framebuffer::getDepthbufferHandle):
277 (gl::Framebuffer::getStencilbufferHandle):
278 (gl::Framebuffer::hasStencil):
279 (gl::Framebuffer::isMultisample):
280 (gl::Framebuffer::completeness):
281 (gl::DefaultFramebuffer::DefaultFramebuffer):
282 (gl::Framebuffer::getSamples):
283 (gl::DefaultFramebuffer::completeness):
284 * src/libGLESv2/Framebuffer.h:
285 * src/libGLESv2/Program.cpp:
286 (gl::Program::Program):
287 (gl::Program::~Program):
288 (gl::Program::attachShader):
289 (gl::Program::detachShader):
290 (gl::Program::linkVaryings):
292 (gl::Program::unlink):
293 (gl::Program::release):
294 (gl::Program::addRef):
295 (gl::Program::getRefCount):
296 (gl::Program::getDxViewportLocation):
297 * src/libGLESv2/Program.h:
298 * src/libGLESv2/RefCountObject.cpp: Added.
299 (gl::RefCountObject::RefCountObject):
300 (gl::RefCountObject::~RefCountObject):
301 (gl::RefCountObject::addRef):
302 (gl::RefCountObject::release):
303 (gl::RefCountObjectBindingPointer::set):
304 * src/libGLESv2/RefCountObject.h: Added.
305 (gl::RefCountObject::id):
306 (gl::RefCountObjectBindingPointer::RefCountObjectBindingPointer):
307 (gl::RefCountObjectBindingPointer::~RefCountObjectBindingPointer):
308 (gl::RefCountObjectBindingPointer::get):
309 (gl::RefCountObjectBindingPointer::id):
310 (gl::RefCountObjectBindingPointer::operator ! ):
311 (gl::BindingPointer::set):
312 (gl::BindingPointer::get):
313 (gl::BindingPointer::operator -> ):
314 * src/libGLESv2/Renderbuffer.cpp:
315 (gl::Renderbuffer::Renderbuffer):
316 (gl::Renderbuffer::~Renderbuffer):
317 (gl::Renderbuffer::isColorbuffer):
318 (gl::Renderbuffer::isDepthbuffer):
319 (gl::Renderbuffer::isStencilbuffer):
320 (gl::Renderbuffer::getRenderTarget):
321 (gl::Renderbuffer::getDepthStencil):
322 (gl::Renderbuffer::getWidth):
323 (gl::Renderbuffer::getHeight):
324 (gl::Renderbuffer::getFormat):
325 (gl::Renderbuffer::getD3DFormat):
326 (gl::Renderbuffer::getSerial):
327 (gl::Renderbuffer::setStorage):
328 (gl::RenderbufferStorage::RenderbufferStorage):
329 (gl::RenderbufferStorage::~RenderbufferStorage):
330 (gl::RenderbufferStorage::isColorbuffer):
331 (gl::RenderbufferStorage::isDepthbuffer):
332 (gl::RenderbufferStorage::isStencilbuffer):
333 (gl::RenderbufferStorage::getRenderTarget):
334 (gl::RenderbufferStorage::getDepthStencil):
335 (gl::RenderbufferStorage::getWidth):
336 (gl::RenderbufferStorage::getHeight):
337 (gl::RenderbufferStorage::setSize):
338 (gl::RenderbufferStorage::getFormat):
339 (gl::RenderbufferStorage::getD3DFormat):
340 (gl::RenderbufferStorage::getSamples):
341 (gl::RenderbufferStorage::getSerial):
342 (gl::RenderbufferStorage::issueSerial):
343 (gl::Colorbuffer::Colorbuffer):
344 (gl::Colorbuffer::isColorbuffer):
345 (gl::Colorbuffer::getRedSize):
346 (gl::Colorbuffer::getGreenSize):
347 (gl::Colorbuffer::getBlueSize):
348 (gl::Colorbuffer::getAlphaSize):
349 (gl::DepthStencilbuffer::DepthStencilbuffer):
350 (gl::DepthStencilbuffer::~DepthStencilbuffer):
351 (gl::DepthStencilbuffer::isDepthbuffer):
352 (gl::DepthStencilbuffer::isStencilbuffer):
353 (gl::DepthStencilbuffer::getDepthSize):
354 (gl::DepthStencilbuffer::getStencilSize):
355 (gl::DepthStencilbuffer::getDepthStencil):
356 (gl::Depthbuffer::Depthbuffer):
357 (gl::Depthbuffer::~Depthbuffer):
358 (gl::Depthbuffer::isDepthbuffer):
359 (gl::Depthbuffer::isStencilbuffer):
360 (gl::Stencilbuffer::Stencilbuffer):
361 (gl::Stencilbuffer::~Stencilbuffer):
362 (gl::Stencilbuffer::isDepthbuffer):
363 (gl::Stencilbuffer::isStencilbuffer):
364 * src/libGLESv2/Renderbuffer.h:
365 (gl::Renderbuffer::getStorage):
366 * src/libGLESv2/ResourceManager.cpp: Added.
367 (gl::ResourceManager::ResourceManager):
368 (gl::ResourceManager::~ResourceManager):
369 (gl::ResourceManager::addRef):
370 (gl::ResourceManager::release):
371 (gl::ResourceManager::createBuffer):
372 (gl::ResourceManager::createShader):
373 (gl::ResourceManager::createProgram):
374 (gl::ResourceManager::createTexture):
375 (gl::ResourceManager::createRenderbuffer):
376 (gl::ResourceManager::deleteBuffer):
377 (gl::ResourceManager::deleteShader):
378 (gl::ResourceManager::deleteProgram):
379 (gl::ResourceManager::deleteTexture):
380 (gl::ResourceManager::deleteRenderbuffer):
381 (gl::ResourceManager::getBuffer):
382 (gl::ResourceManager::getShader):
383 (gl::ResourceManager::getTexture):
384 (gl::ResourceManager::getProgram):
385 (gl::ResourceManager::getRenderbuffer):
386 (gl::ResourceManager::setRenderbuffer):
387 (gl::ResourceManager::checkBufferAllocation):
388 (gl::ResourceManager::checkTextureAllocation):
389 (gl::ResourceManager::checkRenderbufferAllocation):
390 * src/libGLESv2/ResourceManager.h: Added.
391 * src/libGLESv2/Shader.cpp:
392 (gl::Shader::Shader):
393 (gl::Shader::addRef):
394 (gl::Shader::release):
395 (gl::Shader::getRefCount):
396 (gl::Shader::parseVaryings):
397 (gl::VertexShader::VertexShader):
398 (gl::FragmentShader::FragmentShader):
399 * src/libGLESv2/Shader.h:
400 * src/libGLESv2/Texture.cpp:
401 (gl::Texture::Image::Image):
402 (gl::Texture::Texture):
403 (gl::Texture::getBlitter):
404 (gl::Texture::selectFormat):
405 (gl::Texture::loadImageData):
406 (gl::Texture::loadAlphaImageData):
407 (gl::Texture::loadLuminanceImageData):
408 (gl::Texture::loadLuminanceAlphaImageData):
409 (gl::Texture::loadRGBUByteImageData):
410 (gl::Texture::loadRGB565ImageData):
411 (gl::Texture::loadRGBAUByteImageData):
412 (gl::Texture::loadRGBA4444ImageData):
413 (gl::Texture::loadRGBA5551ImageData):
414 (gl::Texture::loadBGRAImageData):
415 (gl::Texture::createSurface):
416 (gl::Texture::setImage):
417 (gl::Texture::setCompressedImage):
418 (gl::Texture::subImage):
419 (gl::Texture::subImageCompressed):
420 (gl::Texture2D::Texture2D):
421 (gl::Texture2D::getFormat):
422 (gl::Texture2D::setCompressedImage):
423 (gl::Texture2D::subImage):
424 (gl::Texture2D::subImageCompressed):
425 (gl::Texture2D::copyImage):
426 (gl::Texture2D::copySubImage):
427 (gl::Texture2D::isCompressed):
428 (gl::Texture2D::getColorbuffer):
429 (gl::TextureCubeMap::TextureCubeMap):
430 (gl::TextureCubeMap::getFormat):
431 (gl::TextureCubeMap::setCompressedImage):
432 (gl::TextureCubeMap::subImage):
433 (gl::TextureCubeMap::subImageCompressed):
434 (gl::TextureCubeMap::isCompressed):
435 (gl::TextureCubeMap::copyImage):
436 (gl::TextureCubeMap::copySubImage):
437 (gl::TextureCubeMap::getColorbuffer):
438 (gl::Texture::TextureColorbufferProxy::addRef):
439 (gl::Texture::TextureColorbufferProxy::release):
440 (gl::Texture::TextureColorbufferProxy::getWidth):
441 (gl::Texture::TextureColorbufferProxy::getHeight):
442 (gl::Texture::TextureColorbufferProxy::getFormat):
443 * src/libGLESv2/Texture.h:
444 * src/libGLESv2/libGLESv2.cpp:
445 * src/libGLESv2/libGLESv2.def:
446 * src/libGLESv2/libGLESv2.vcproj:
447 * src/libGLESv2/main.h:
448 * src/libGLESv2/utilities.cpp:
449 (gl::ComputeCompressedPitch):
450 (gl::ComputeCompressedSize):
452 (gl::ComputePixelSize):
453 (gl::CheckTextureFormatType):
454 (es2dx::ConvertRenderbufferFormat):
455 (es2dx::GetSamplesFromMultisampleType):
456 (es2dx::GetMultisampleTypeFromSamples):
457 * src/libGLESv2/utilities.h:
459 2010-08-17 Chris Marrin <cmarrin@apple.com>
463 Moved previous link error fix to Base.xcconfig.
465 * ANGLE.xcodeproj/project.pbxproj:
466 * Configurations/Base.xcconfig:
468 2010-08-17 Chris Marrin <cmarrin@apple.com>
472 Got rid of link errors in WebCore.
474 Changed GCC_INLINES_ARE_PRIVATE_EXTERN to YES and
475 GCC_SYMBOLS_PRIVATE_EXTERN to NO to match WebCore
478 * ANGLE.xcodeproj/project.pbxproj:
480 2010-08-04 Kenneth Russell <kbr@google.com>
482 Reviewed by Dimitri Glazkov.
485 https://bugs.webkit.org/show_bug.cgi?id=43500
487 Updated ANGLE to r352 (July 26, 2010). Built WebKit to test.
489 * include/GLSLANG/ShaderLang.h:
490 * src/compiler/Initialize.cpp:
491 (BuiltInFunctionsCommon):
492 (BuiltInFunctionsVertex):
493 (BuiltInFunctionsFragment):
495 (DefaultPrecisionVertex):
496 (DefaultPrecisionFragment):
498 (TBuiltIns::initialize):
500 * src/compiler/Initialize.h:
501 (TBuiltIns::getBuiltInStrings):
502 * src/compiler/OutputGLSL.cpp:
503 (TOutputGLSL::visitSelection):
504 * src/compiler/ShHandle.h:
505 (TCompiler::getLanguage):
506 (TCompiler::getSpec):
507 (TCompiler::getSymbolTable):
508 (TCompiler::getInfoSink):
509 * src/compiler/ShaderLang.cpp:
510 (InitializeSymbolTable):
511 (GenerateBuiltInSymbolTable):
513 (ShConstructCompiler):
516 * src/compiler/SymbolTable.h:
517 (TSymbolTable::atBuiltInLevel):
518 (TSymbolTable::atGlobalLevel):
519 (TSymbolTable::push):
520 (TSymbolTable::getGlobalLevel):
521 (TSymbolTable::currentLevel):
522 * src/libGLESv2/Shader.cpp:
523 (gl::Shader::Shader):
524 (gl::Shader::compileToHLSL):
526 2010-08-03 Mark Rowe <mrowe@apple.com>
528 Rubber-stamped by Adele Peterson.
530 Remove some unnecessary files from the ANGLE tree.
532 * src/compiler/tools/COPYING.bison: Removed.
533 * src/compiler/tools/COPYING.flex: Removed.
534 * src/compiler/tools/README: Removed.
535 * src/compiler/tools/bison.hairy: Removed.
536 * src/compiler/tools/bison.simple: Removed.
538 2010-08-03 Mark Rowe <mrowe@apple.com>
540 Rubber-stamped by Adele Peterson.
542 Clean up the ANGLE Xcode project.
544 Main changes include:
545 • Adding a Production configuration.
546 • Modifying the library name from libangle.a to libANGLE.a.
547 • Installing the headers in a subdirectory of /usr/local/include to avoid polluting the top-level directory.
548 • Generating derived sources in to the built products directory so they're saved along with the symroot.
549 • Switching to using .xcconfig files for maximum cleanliness.
551 * ANGLE.xcodeproj/project.pbxproj:
552 * Configurations/ANGLE.xcconfig: Added.
553 * Configurations/Base.xcconfig: Added.
554 * Configurations/DebugRelease.xcconfig: Added.
556 2010-08-02 Paul Sawaya <psawaya@apple.com>
558 Reviewed by Adele Peterson.
560 Add ANGLE library to WebKit. From the repository (http://angleproject.googlecode.com) as of July 22.
561 https://bugs.webkit.org/show_bug.cgi?id=42789