aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-05-27Merge WebView M40 build 1832189 into AOSP.HEADandroid-m-preview-2android-m-preview-1mastermainTorne (Richard Coles)
2015-02-03Merge from Chromium at DEPS revision 40.0.2214.107webview-m40_r4webview-m40_r3webview-m40_r2webview-m40_r1ub-webview-m40-releaseTorne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I9a0c54346a03a1dae0c4edfe75f40d45423aa79d
2015-02-03Merge third_party/angle from ↵Torne (Richard Coles)
https://chromium.googlesource.com/angle/angle.git at d77bd1632e4c3bbe326be4fb32fe6c53187cd5dd This commit was generated by merge_from_chromium.py. Change-Id: Ia1aa47601f2582964d7e65e4cc2750eda9f88200
2015-01-20Fix missing "!" in cube map render target serial check.Geoff Lang
BUG=angle:849 BUG=447419 Change-Id: I9e4cb31bdc82a1c556908571355387a9698c7528 Reviewed-on: https://chromium-review.googlesource.com/239230 Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/241875
2014-12-18Merge from Chromium at DEPS revision 40.0.2214.45Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ibc0b9d3009c7ddc09a3d73607cbd6534785fb040
2014-12-18Merge third_party/angle from ↵Torne (Richard Coles)
https://chromium.googlesource.com/angle/angle.git at 98c643d80776db7caa81170a0b45e318377c9f98 This commit was generated by merge_from_chromium.py. Change-Id: Ida5084e62921f6619f2e8014f32417972752ed65
2014-12-10Fix double delete with invariant varyings.Jamie Madill
The compiler would leave some TString variables lying around after the pool gets released, leading to a potential crash. BUG=angle:846 BUG=439202 Change-Id: I484ed9b14bba9bf653f6ed4001ae79f87791b0dd Reviewed-on: https://chromium-review.googlesource.com/232780 Tested-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Zhenyao Mo <zmo@chromium.org> Reviewed-by: Kenneth Russell <kbr@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/234381
2014-12-05Temporarily disable -Werror in Chromium.android-m-previewmaster-soongTorne (Richard Coles)
Temporarily disable the use of -Werror in the AOSP copy of Chromium so that the system-wide default warnings can be changed without breaking Chromium. We'll re-enable it once the warnings are settled and we've fixed any issues. Bug: 18632512 Change-Id: I0c3a0a4657461940d939b3341ee12deb00c19c86
2014-12-04Merge from Chromium at DEPS revision 40.0.2214.27Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: Ic16ae77d0bb100ad60b759255c75526a6c73a533
2014-12-04Merge third_party/angle from ↵Ben Murdoch
https://chromium.googlesource.com/angle/angle.git at 019fa9340e580e5836a9b9dc7cede4766cd090df This commit was generated by merge_from_chromium.py. Change-Id: Ifbca8a77aaac809cb2a44502a6e78dcdc092a04c
2014-11-25Fix memory leak with default Framebuffers.Jamie Madill
When the depth-stencil attachment had no depth or stencil bits, we would like a gl::Renderbuffer object. This was causing unbounded memory growth in Chrome, and could happen when you watched a lot of streaming video. The bug was originally reported and fixed by Austin Kinross in commit 44f4d74c0f07fa23. BUG=403471 Change-Id: I022f01a6d3159f766e65f65f023e6ce9baacbc8e Reviewed-on: https://chromium-review.googlesource.com/231235 Tested-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Hendrik Wagenaar <hendrikw@chromium.org> Tested-by: Hendrik Wagenaar <hendrikw@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>
2014-11-06Merge from Chromium at DEPS revision db3f05efe0f9Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ibee27a9aa4da32d838fb51bac5ca0d5a72097f9a
2014-11-05Update makefiles after merge of Chromium at 5a645aa13b82Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I8051b969ad6e4d592ca4f3fb1e7d8f8937db418d
2014-11-05Update makefiles after merge of Chromium at 2d0da5605d75Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Iac681f42e5c67c50919694a3cff603e2946afb54
2014-11-04Update makefiles after merge of Chromium at a99b7ad25d02Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I3c03d747e5b3daf7dac8aa7ee320cd85501998ad
2014-10-31Update makefiles after merge of Chromium at a41c404b1c7fAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I33266305be6d423826214ce83e5a77e10c6e9843
2014-10-31Update makefiles after merge of Chromium at b210e2d62956Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I2106423038490143b2e4e28862aea385c6327dee
2014-10-31Merge third_party/angle from ↵Android Chromium Automerger
https://chromium.googlesource.com/angle/angle.git at 4de44cb67e9e36966fb1993c0be35659a47182ef This commit was generated by merge_from_chromium.py. Change-Id: I13d38b00d8d2f043b6cde5c269116c51c3ce9c6d
2014-10-31Change ShaderLang APIs from c style to c++ style.Zhenyao Mo
BUG=angle:816 TEST=gpu_unittests,angle_unittests,webgl_conformance Change-Id: I0b46c11f6055a82511bb946a6dc491360835526e Reviewed-on: https://chromium-review.googlesource.com/226410 Reviewed-by: Zhenyao Mo <zmo@chromium.org> Tested-by: Zhenyao Mo <zmo@chromium.org>
2014-10-31Revert "Changes gl::RenderbufferStorage to rx::RenderbufferImpl"Shannon Woods
This reverts commit 9fc51d90176dcf4273cd6689968e1ca5d1c9fe16. Change-Id: I4134ebe5ef6b8f509f4cc5cc22a2d526ec43ef6d Reviewed-on: https://chromium-review.googlesource.com/226374 Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Tested-by: Shannon Woods <shannonwoods@chromium.org>
2014-10-31Fixed comments around choice of C runtime.Kenneth Russell
BUG=angle:733 Change-Id: Ia1add30d54c3a7d08effca6660f98c99cb3981c2 Reviewed-on: https://chromium-review.googlesource.com/226377 Tested-by: Kenneth Russell <kbr@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>
2014-10-30Fix angle_unittests failures.Zhenyao Mo
BUG=angle:815 TEST=angle_unittests Change-Id: I4d59f227b7c72f4f456d0a60d8507d097ef05dec Reviewed-on: https://chromium-review.googlesource.com/226463 Tested-by: Zhenyao Mo <zmo@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>
2014-10-30Changed feature macros to reduce accidental enabling/disablingBrandon Jones
Change-Id: Ieb1a0c55f412f2a1bb858522b2dfaa7a60aa7ddb Reviewed-on: https://chromium-review.googlesource.com/226304 Reviewed-by: Brandon Jones <bajones@chromium.org> Tested-by: Brandon Jones <bajones@chromium.org>
2014-10-30Merge third_party/angle from ↵Android Chromium Automerger
https://chromium.googlesource.com/angle/angle.git at ede18442c25632073202aa817272f9b5fbd24687 This commit was generated by merge_from_chromium.py. Change-Id: I7c92d8410a29ad486226d8390721629613a71a6a
2014-10-30Reject shaders of a version that the compiler doesn't support.Zhenyao Mo
For example, WebGL 1.0 compiler should not compile WebGL 2.0 shaders. BUG=angle: TEST=815 Change-Id: Iaec66fa5127426778aff6e3891e2c214048d7457 Reviewed-on: https://chromium-review.googlesource.com/226380 Tested-by: Zhenyao Mo <zmo@chromium.org> Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>
2014-10-30Changes gl::RenderbufferStorage to rx::RenderbufferImplShannon Woods
BUG=angle:782 Also eliminates Colorbuffer/DepthStencilBuffer and related friends and adds the RenderbufferD3D implementation of RenderbufferImpl. Change-Id: Ibe72c9589b3c238b952744e7cfd70d97ec898eb9 Reviewed-on: https://chromium-review.googlesource.com/222925 Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Shannon Woods <shannonwoods@chromium.org>
2014-10-30Updated Image9 to use gl::Errors for staging texture manipulation.Geoff Lang
BUG=angle:520 Change-Id: I527a2bcadbf1abb05bd461d35ddbd7e28d487639 Reviewed-on: https://chromium-review.googlesource.com/221396 Reviewed-by: Brandon Jones <bajones@chromium.org> Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>
2014-10-30Use D3D11 Debug Annotations when D3D9 is unavailableAustin Kinross
Change-Id: I37ac5fe7f0b2fe5e71bd7f0afca55e9894f3463c Reviewed-on: https://chromium-review.googlesource.com/224512 Tested-by: Austin Kinross <aukinros@microsoft.com> Reviewed-by: Geoff Lang <geofflang@chromium.org>
2014-10-29Remove ShGetVariableInfo() and related code.Zhenyao Mo
BUG=angle:775 TEST=chromium builds and runs fine Change-Id: Ic62d3a3c9a8f034880b77a96f7f1c6be2691985e Reviewed-on: https://chromium-review.googlesource.com/226004 Tested-by: Zhenyao Mo <zmo@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
2014-10-29Moving Uniform handling into ProgramD3D.Brandon Jones
Moves the last references to HLSLBlockEncoder out of ProgramBinary. Only one reference to ShaderD3D remains. BUG=angle:731 Change-Id: Ie23e24e09fbed4c8c5fab3bab814b7092a383c7f Reviewed-on: https://chromium-review.googlesource.com/220940 Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Brandon Jones <bajones@chromium.org>
2014-10-29Updated Image11 to use gl::Errors for staging texture manipulation.Geoff Lang
BUG=angle:520 Change-Id: I5792b139ddd69c2cabc3b901a7067438c1ee363b Reviewed-on: https://chromium-review.googlesource.com/221395 Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>
2014-10-29Updated mipmap generation to return Error objects.Geoff Lang
BUG=angle:520 Change-Id: Ic4e57148d031d6c452b3054efad98f6e730c7691 Reviewed-on: https://chromium-review.googlesource.com/221394 Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>
2014-10-28Fix an issue with separate invariant statement.Zhenyao Mo
Basically we end up with an extra "invariant xxx ;;" on GL backend. This is not handled correctly by Mac drivers and also out shader translator. BUG=angle:776 TEST=webgl conformance on mac/windows Change-Id: If32867efba64ab0d3e6e690155790b90d736439f Reviewed-on: https://chromium-review.googlesource.com/225780 Tested-by: Zhenyao Mo <zmo@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>
2014-10-28Add ANGLE_ENABLE_DEBUG_TRACE_TO_DEBUGGER, to output trace to debugger windowAustin Kinross
Change-Id: I7be71c41b0ec3a77f508c90c2de3331c9522a11b Reviewed-on: https://chromium-review.googlesource.com/223592 Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>
2014-10-28Rename ANGLE_ENABLE_TRACE -> ANGLE_ENABLE_DEBUG_TRACEAustin Kinross
Change-Id: Ib70c456c8d01161e370b9165ff4daa2f0f90c840 Reviewed-on: https://chromium-review.googlesource.com/223591 Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>
2014-10-28Rename ANGLE_ENABLE_PERF -> ANGLE_ENABLE_DEBUG_ANNOTATIONSAustin Kinross
Change-Id: I701cd5ee749797428171e9c58a46fce626b9a969 Reviewed-on: https://chromium-review.googlesource.com/223590 Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>
2014-10-28Fixed D3DDisassemble function dynamic GetProcAddress failure on WinRTCooper Partin
Change-Id: I32a345803c9183e0b9b77d529027711f8c8e1ad8 Reviewed-on: https://chromium-review.googlesource.com/225847 Tested-by: Cooper Partin <coopp@microsoft.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>
2014-10-28Fix build failure on WinRT due to missing Sleep definition.Geoff Lang
Change-Id: I9032484dde6e690fcd175d6d76192724e5bc0357 Reviewed-on: https://chromium-review.googlesource.com/225893 Reviewed-by: Cooper Partin <coopp@microsoft.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>
2014-10-28Only use the Windows 8.1 SDK for WinRT configurations.Geoff Lang
BUG=angle:772 BUG=395405 Change-Id: If26a0ec34e6bfd0e22d20803a0bb3ac2000a8e34 Reviewed-on: https://chromium-review.googlesource.com/225531 Reviewed-by: Cooper Partin <coopp@microsoft.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>
2014-10-28Fix precision tracking for built-in function return valuesOlli Etuaho
Previously, the type of the return value of all function calls was set to the type of the return value in the function signature. This did not carry precision information. This patch changes this so that the return value precision is set correctly for built-in functions. For single-argument math functions, it mostly depends on that addUnaryMath sets the type of the return value to be the same as the type of the operand. The type is replaced but the precision information from the operand type is retained when needed. For multi-argument math functions, precision is determined based on all the nodes in the aggregate after the type has been set. For texture functions, the precision is set according the sampler type as per ESSL 1.0 spec. For textureSize, the precision is always highp as per ESSL 3.0 spec. BUG=angle:787 Change-Id: I48448e3ffe38656b91177dee9b60dd07a03cd095 Reviewed-on: https://chromium-review.googlesource.com/224951 Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Nicolas Capens <capn@chromium.org> Tested-by: Olli Etuaho <oetuaho@nvidia.com>
2014-10-28Update makefiles after merge of Chromium at 82ca3b654cdaAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ia0ce8243e033ae873f1cc929df6d7254589c02e5
2014-10-27Fixed some configuration data not being added to 64-bit builds.Geoff Lang
The Debug and Release configurations are 32-bit only. The Debug_Base and Release_Base configurations should be used in these cases. In the future we should not rely on defines being placed in these configurations because if ANGLE is included in another project, they may not have the same configuration names and the defines will not be added. To combat this, always make sure that there are appropriate #ifdef's in the headers and don't add defines that would result in poor performance if they do not exist. BUG=angle:772 Change-Id: I2b26ffb934f8b3d5e6e556a1e87c1c5ee209c430 Reviewed-on: https://chromium-review.googlesource.com/225051 Tested-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>
2014-10-27Remove getData from BufferImpl.Jamie Madill
We only ever call this method inside the D3D Renderer, so we can downcast to BufferD3D and call getData on the D3D-specific type. Leave a FIXME for handling index range validation, which will need a CPU-side data cache. Change-Id: Iaf71bc8055869a8561777b6b36f67e376a1d0b81 Reviewed-on: https://chromium-review.googlesource.com/224654 Tested-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>
2014-10-27Support compressed textures with unpack buffers.Jamie Madill
BUG=angle:792 Change-Id: I32f32422232bd4cb04c8a70005cb51482224bf3e Reviewed-on: https://chromium-review.googlesource.com/224655 Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>
2014-10-27Merge from Chromium at DEPS revision 614f7b807940Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I739e5f1f44d400e041948db14ccea8a53e136f11
2014-10-27Fix ASSERT failure in XFB test.Jamie Madill
With the invariant handling changes, we're also exporting gl_Position and other builtin variables from the translator where we were not previously. This was causing an assert in the XFB code, where we would inadvertently assign a register to gl_Position, and trip up logic further in the varying handling logic. BUG=angle:808 Change-Id: I674902da75c572e969f9516033a85c7a7170d7d1 Reviewed-on: https://chromium-review.googlesource.com/225261 Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>
2014-10-24Add robust D3D11 SRV state tracking.Jamie Madill
This will ensure our currently set pixel and vertex SRVs match with the underlying D3D state, and reduce the need for resetting them as often. BUG=angle:756 BUG=417424 Change-Id: I42e9e25182b279871ac4cdf8da5e2ab62c8cf71f Reviewed-on: https://chromium-review.googlesource.com/225052 Tested-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Brandon Jones <bajones@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>
2014-10-24Defer the creation of textures in TextureStorage9 and use Error objects.Geoff Lang
BUG=angle:520 Change-Id: I5db70189d95babef14d48548054af4c7ff2bfc47 Reviewed-on: https://chromium-review.googlesource.com/219334 Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>
2014-10-24Defer the creation of textures in TextureStorage11.Geoff Lang
BUG=angle:520 Change-Id: If1c1f7519a84900f594701b6298b64ebf8798073 Reviewed-on: https://chromium-review.googlesource.com/219333 Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>
2014-10-24Remove build_angle.gyp.Jamie Madill
This file is a duplicate of angle.gyp, and we can remove it now that Chrome and Blink are finished with it. BUG=angle:460 Change-Id: Ida68c8343921ebe9a37b5bcd982e114c91febc3d Reviewed-on: https://chromium-review.googlesource.com/225053 Tested-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 09:32:48 +0000