summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-12-18Merge from Chromium at DEPS revision 240154HEADmastermainTorne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: If62909d7c4061d6f5c5ea72115270326b92a45db
2013-12-10am da1db041: (-s ours) Merge remote-tracking branch \'origin/kitkat-dev\'Baligh Uddin
* commit 'da1db04101b57a1bad4b2f98f8898a0cf01f56e6': Initial empty repository
2013-12-05am 5e667cc0: (-s ours) merge in KQS81MEd Heyl
* commit '5e667cc092b51bf91ee9f6562dc824a2c753d1e6':
2013-12-05am ff4bf538: (-s ours) Minimise logging/tracing in release builds.Torne (Richard Coles)
* commit 'ff4bf538535b9774e3b6d7a466bdcabd0ce9ee17': Minimise logging/tracing in release builds.
2013-12-05am 0a1e1b93: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.31Torne (Richard Coles)
* commit '0a1e1b933202b54d7ee7d2cc5a9ea8f8cd310554': Update makefiles after merge of Chromium at 30.0.1599.31
2013-12-05am 479d1590: (-s ours) Add generated makefiles for printing.Selim Gurun
* commit '479d159055d563e29690d671f942c64b5f34a1d5': Add generated makefiles for printing.
2013-12-05Update makefiles after merge of Chromium at 238989Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I30a80ffa76c92e8f970bb7158b4de98c1c4af16d
2013-12-04Update makefiles after merge of Chromium at 238573Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Iee38ba3fe26fb64103535778990218ad842cd783
2013-12-02Update makefiles after merge of Chromium at 238197Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I9409996cdf6a92a311569d7828cc224bbdedeb82
2013-12-02Update makefiles after merge of Chromium at 238097Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I4eb5fd40df456da2f078266558df46e4ed5ceb92
2013-11-28Merge from Chromium at DEPS revision 237746Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I833f5a91dcd06d119b577f09bbee05cb45ccd615
2013-11-28Merge third_party/angle_dx11 from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/angle.git at af640efbfdbe80909016fc623bb65f010a2e551f This commit was generated by merge_from_chromium.py. Change-Id: I45af795ac7ab674108b79ea2d867643e3dde1f1f
2013-11-27Fix device removed handling for systems which do notJamie Madill
immediately allow recreating a new device. On Intel systems there's a cool-down period when you must wait before recreating the device. BUG=313210 Change-Id: I22cdf41eecf0eae5058b59e1b0863173d604d606
2013-11-27Ensure stream source frequency for stream 0 is set to 1 in swapRectJamie Madill
for D3D9. This prevents D3D errors which we could see when using the Debug runtime. BUG=321834 Change-Id: I1496366117c7642199a941fbccf94dee04c78d8b
2013-11-26Merge third_party/angle_dx11 from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/angle.git at 3bc1f246ff86182ceb05dc2d7c55f7c2ab44fd46 This commit was generated by merge_from_chromium.py. Change-Id: I78ff13fbdf53ff3ecb0ab1a9acb29fc042e8562e
2013-11-22Bump version.hShannon Woods
Change-Id: I06de40485fcfba0435c6fbec5112eebf67f590d6
2013-11-22Fix enum names that were not updated in the tests.Geoff Lang
Change-Id: Id1bb71d997e710028759a9e9a2e0b24e35f92fc4
2013-11-22Update gclient configuation for DEPS and git repository.Geoff Lang
Change-Id: I49845a0a4e660027dd817b7a783163c1aa5d04d7
2013-11-22Add a build step to copy the D3DCompiler_46 DLL from the Windows SDK folder ↵Jamie Madill
to the build products path. BUG=315387 R=zmo@chromium.org,shannonwoods@chromium.org Change-Id: If9a149a6f780e78451c11008b0f7bfd4dd39b582
2013-11-22Use 64-bit safe constant union indexes.Nicolas Capens
BUG=angle:450 Change-Id: If7be5f72e1037d92256edf45e1cfc7fedbf0b4bd
2013-11-22Rename the Diagnostics enum values to have a PP_ prefixEhsan Akhgari
This will make it possible to build angle in unified mode for Mozilla. Change-Id: Iba4b971392b8abae8b5ff8f96e9172582f43de90
2013-11-22Proper handling of D3D9Ex device removed.Jamie Madill
BUG=313210 Change-Id: I6b7e34466e89e7854c8797cbdcffc4a24c2c32f5
2013-11-22Add #include guards to ForLoopUnroll.hEhsan Akhgari
Change-Id: Ied066feb2b8954dc7f0398704cd3429780549989
2013-11-14Update makefiles after merge of Chromium at 235157Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I9a15533e8e8da02831b0208253c2c83e261eabae
2013-11-14Update makefiles after merge of Chromium at 235046Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I45647cb8fbd47ce64aa22f3ce85b487fb9e458f7
2013-11-13Merge third_party/angle_dx11 from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/angle.git at a60e0805721f62c28a55faf2df74472cc5fc91fc This commit was generated by merge_from_chromium.py. Change-Id: I7b037bfe94654b9a86ae33dbc543ce8ab6bf472f
2013-11-12Update makefiles after merge of Chromium at 234542Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I9e167b13a0f67dcfb22c5d00bcc86775f16fb9c3
2013-11-08Update makefiles after merge of Chromium at 233893Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Idf4d0cf7881a99342bc3d4e18eeb481ab3f7e0ae
2013-11-08Update makefiles after merge of Chromium at 233887Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I9b22569aa3e7e8689eaf2d4f4a36c27378ceae21
2013-11-07Update makefiles after merge of Chromium at 233627Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I6cb78294096e15ca78d603e7f0cf4fe7ff8da9c1
2013-11-07Fix issues with the conditional discard workarounds to do with assignments.Jamie Madill
The old modifiesState method really checked if an operator was an assignment, so restored that behaviour and use the new side effects detection only for the new code. ANGLEBUG=486 BUG= R=nicolascapens@chromium.org, zmo@chromium.org Review URL: https://codereview.appspot.com/22130043
2013-11-07Update makefiles after merge of Chromium at 233612Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I033065b2889350df548577de149471cf6ec8fb72
2013-11-06Merge from Chromium at DEPS revision 232870Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ifeb056ca7583771ebee7fc1a1b77742f83169cd5
2013-11-05Merge third_party/angle_dx11 from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/angle.git at 9c318342233f68b915d39c8f1f181b9ef545c4db This commit was generated by merge_from_chromium.py. Change-Id: I362f70d6dcdf0f8446efef9b0d27f8db770433d5
2013-11-04Disable optimizations for shaders with conditional discard in D3D9, and only ↵Jamie Madill
use expanded short-circuiting conditionals for expressions with potential side-effects. Conservatively assume aggreate and selection operators have side effects for now. BUG= ANGLEBUG=486 R=geofflang@chromium.org, kbr@chromium.org, nicolas@transgaming.com, shannonwoods@chromium.org Review URL: https://codereview.appspot.com/14441075
2013-11-01Merge remote-tracking branch 'origin/kitkat-dev'idea133Baligh Uddin
2013-11-01Fix build on QNX.Jamie Madill
InfoSink.h needs stdlib.h for abs(int) and free() in the global namespace. ExpressionParser needs malloc.h, because bison needs malloc and free in the global namespace, but "#include <cassert>" will put it only in the std:: namespace on QNX. BUG=500 R=geofflang@chromium.org, jmadill@chromium.org, shannonwoods@chromium.org, zmo@chromium.org Review URL: https://codereview.appspot.com/19330044
2013-11-01Update makefiles after merge of Chromium at 232403Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I88ab7170ec8a80ec9df4bf17e5234146518ba893
2013-10-31Don't apply textures that are currently bound to the framebuffer.Geoff Lang
BUG=496 Review URL=https://codereview.appspot.com/18690043/
2013-10-31Initial empty repositoryBaligh Uddin
2013-10-31Fixed a bug where the vertex data manager was not caching the currentGeoff Lang
value attributes properly. ANGLEBUG=489 Review URL: https://codereview.appspot.com/18400043
2013-10-31Merge from Chromium at DEPS revision 232015Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I7b289e3f0f59b9e4bb88efef42759f358df3d55b
2013-10-30Fix build on QNX.Jamie Madill
InfoSink.h needs stdlib.h for abs(int) and free() in the global namespace. ExpressionParser needs malloc.h, because bison needs malloc and free in the global namespace, but "#include <cassert>" will put it only in the std:: namespace on QNX. BUG=500 R=geofflang@chromium.org, shannonwoods@chromium.org Review URL: https://codereview.appspot.com/19330044
2013-10-30Update makefiles after merge of Chromium at 231906Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I78e9e80179d71565b34b6acf199b75c9d82893f7
2013-10-30Merge third_party/angle_dx11 from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/angle.git at 0f0edf94bfe1fc28979b0d12747a900164bb966a This commit was generated by merge_from_chromium.py. Change-Id: I2dd203dd27e681527e9715adf07f179927cf7bf0
2013-10-30Update makefiles after merge of Chromium at 231849Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ied01a0f35ff8fdb457f637e2a0229670a28232bd
2013-10-30Re-enable hazard warnings for setting render targets that are currently ↵Jamie Madill
bound as SRVs. We can manually unset applied textures in SetRenderTargets. This should fix the spurious warnings while still showing a warning on error cases. BUG= R=geofflang@chromium.org, shannonwoods@chromium.org Review URL: https://codereview.appspot.com/15880044
2013-10-29Disable automatically resizing swapchain if window is iconifiedJohn Bauman
The size of the window is changed if the window is iconified, but that change should be ignored. BUG= R=shannonwoods@chromium.org Review URL: https://codereview.appspot.com/19460043
2013-10-23Do not allow context sharing between egl Displays.Jamie Madill
This is an explicit error according to the EGL specification. ANGLEBUG=487 BUG= Test=WebGL CTS R=geofflang@chromium.org, shannonwoods@chromium.org Review URL: https://codereview.appspot.com/15690047
2013-10-22Merge from Chromium at DEPS revision 230120Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ie751694b8a80ba4e30c332a2d9e04df973946c0f