Граф коммитов

44 Коммитов

Автор SHA1 Сообщение Дата
Austin Kinross fa69721060 Add *.VC.opendb to the .gitignore
These are new temporary files used by VS 2015 Update 1

Equivalent Chromium CR: https://codereview.chromium.org/1413153015

Change-Id: I7a73b3d45107cf2a81b604953482aed9f2c971f8
Reviewed-on: https://chromium-review.googlesource.com/314881
Tested-by: Austin Kinross <aukinros@microsoft.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
2015-11-30 22:34:09 +00:00
Jamie Madill 2fdd3da939 Add clang-format integration for 'git cl format'.
This will allow us to eventually make a presubmit script for ANGLE,
and also will help new contributors who aren't as familiar with
the style guide.

One outstanding issue is the lack of proper breaking before array
initializers. We don't use arrays all over the place, but this
will likely require a patch for clang.

BUG=angleproject:762

Change-Id: I4702b1fcdfa10b7682b07316be59ec67bcf84943
Reviewed-on: https://chromium-review.googlesource.com/285901
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
2015-07-20 18:47:58 +00:00
Jamie Madill 86bc3a6630 dEQP: Move the DEPS dirs to mirror Chromium.
This avoid us needing to replicate gyp variables in both Chromium's
and ANGLE's common.gypi files.

BUG=angleproject:998

Change-Id: Iba1938fd37eb4bee28ae7daad31bf85a2d3bd692
Reviewed-on: https://chromium-review.googlesource.com/282145
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@google.com>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
2015-06-26 15:25:05 +00:00
Geoff Lang 029c78cd0e Ignore visual studio profiler and nsight files.
Change-Id: I01cb029300760341262fb27cafc32d4366d161c0
Reviewed-on: https://chromium-review.googlesource.com/265005
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
2015-04-09 21:36:08 +00:00
Jamie Madill 3cd438d107 Add dEQP tests.
We integrate dEQP as a console application and a shared library which
runs all of the test logic. Using a shared library lets us compile
dEQP with all the specific compiler options it needs, without
conflicting with the compile settings in ANGLE proper.

Currently we only support Windows D3D11, ES 2 and 3. We can add
other targets in the future.

We also have a few bugs preventing us from running the test suite in
full. We run into infinite loop problems in some shader tests, and
have crashes or UNIMPLEMENTED in others.

BUG=angleproject:901

Change-Id: Ib6fe66041a6fe547eb2cba497c52de7fd080d667
Reviewed-on: https://chromium-review.googlesource.com/238084
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Olli Etuaho <oetuaho@nvidia.com>
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
2015-03-24 15:24:02 +00:00
Jamie Madill 559a2e8cdc Move the ANGLE tests project to src/
*re-re-land with fix for Chrome's angle tests*

BUG=angleproject:945

Change-Id: I3c64e2edc776c299791440f65f22450855eb6dfa
Reviewed-on: https://chromium-review.googlesource.com/260448
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
2015-03-16 21:38:50 +00:00
Jamie Madill 96e3f556d6 Revert "Move the ANGLE tests project to src/"
Still causing build issues on Chrome.

This reverts commit 64a3b2a92f.

Change-Id: I8d40fe3dfd0a877343357153a02b8ef66d571c64
Reviewed-on: https://chromium-review.googlesource.com/260425
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
2015-03-16 21:24:56 +00:00
Jamie Madill 64a3b2a92f Move the ANGLE tests project to src/
*re-land with fix for Chromium build*

BUG=angleproject:945

Change-Id: I82bff1760e681987fb26e479734aa62fb845898a
Reviewed-on: https://chromium-review.googlesource.com/260362
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
2015-03-16 21:02:51 +00:00
Jamie Madill 5491fe6667 Revert "Move the ANGLE tests project to src/"
Causing build break in Chromium.

This reverts commit 71c2d85c4a.

Change-Id: Iedf001c1f4c60a759f69009610fbce978d193d17
Reviewed-on: https://chromium-review.googlesource.com/260370
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
2015-03-16 17:59:48 +00:00
Jamie Madill 71c2d85c4a Move the ANGLE tests project to src/
BUG=angleproject:945

Change-Id: I2eb44ac43f65b916ddd838d39e6aae62580d7fa0
Reviewed-on: https://chromium-review.googlesource.com/258903
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>
2015-03-16 17:34:40 +00:00
Jamie Madill 9ddd5150bc Embed rapidjson sources.
This makes integration with Chrome much easier: Chrome won't
have to pull sources from github or an internal mirror, and
it won't duplicate the base json library.

This should also fix warnings about missing headers with
building Chromium gyp with the ninja msvs generator.

BUG=459058

Change-Id: Ie97cfde9b848a9099da696e027887bcc07b55e08
Reviewed-on: https://chromium-review.googlesource.com/252073
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
2015-02-24 17:58:36 +00:00
Geoff Lang 5312b5d8bb Remove pre-generated projects.
BUG=angle:829

Change-Id: I220ffb0929cf20f2834e7e0ea163105b45a9e03b
Reviewed-on: https://chromium-review.googlesource.com/229065
Tested-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
2014-11-19 19:10:38 +00:00
Cooper Partin 88d3b8cb73 Added IInspectable EGLNativeWindowType and ICoreWindow support
Change-Id: I6dd7fef72a73572d4a3deda7ce36a11da3a75c81
Reviewed-on: https://chromium-review.googlesource.com/224366
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
2014-10-20 18:39:45 +00:00
Jamie Madill e020bed5a7 Revert "Added IInspectable EGLNativeWindowType and ICoreWindow support"
Causing regressions in the build: http://build.chromium.org/p/chromium.gpu.fyi/builders/GPU%20Mac%20Builder/builds/20182

This reverts commit 756aebfc7a.

Change-Id: I2f4bdb5aeb429c9bbc5e655a1761704f33737841
Reviewed-on: https://chromium-review.googlesource.com/224221
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
2014-10-20 16:18:16 +00:00
Cooper Partin 756aebfc7a Added IInspectable EGLNativeWindowType and ICoreWindow support
Change-Id: I34e443b1e194800460e441ac6cee42cf68430564
Reviewed-on: https://chromium-review.googlesource.com/224302
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
2014-10-20 15:58:08 +00:00
Shannon Woods 8858cf0a92 Revert "Added IInspectable EGLNativeWindowType and ICoreWindow support" due to build failures on Chromium FYI bots.
This reverts commit 406a3be91c.

Change-Id: Ica2abd2e557a4fd9852d85b7fc018e3d272b6edf
Reviewed-on: https://chromium-review.googlesource.com/224051
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Shannon Woods <shannonwoods@chromium.org>
2014-10-17 20:53:49 +00:00
Cooper Partin 406a3be91c Added IInspectable EGLNativeWindowType and ICoreWindow support
Change-Id: I9ad82b7819bcca1c05e7aa60dc2baec4a7bc403c
Reviewed-on: https://chromium-review.googlesource.com/222360
Tested-by: Cooper Partin <coopp@microsoft.com>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
2014-10-17 20:05:34 +00:00
Jamie Madill 1cfaaf8a3b Add a util project to share between samples and tests.
This code shares the Window and EGL logic between the two
projects.

BUG=angle:730

Change-Id: I8940371226a8f7b02579c332f51679c4a5d0e2a5
Reviewed-on: https://chromium-review.googlesource.com/212799
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
2014-08-21 20:41:09 +00:00
Geoff Lang 592dbb8e8f Remove the gclient file, it should be generated now.
BUG=angle:713

Change-Id: Icd3e9c5212baf4c1dc781df6fef68c078b054e1a
Reviewed-on: https://chromium-review.googlesource.com/210883
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
2014-08-20 17:48:34 +00:00
Vladimir Vukicevic 24d8d675cd Fix register packing for structs in d3d9.
Fixes WebGL test misc/shader-with-array-of-structs-uniform

BUG=angle:656

Change-Id: If79a19db4d40bab9110422f7876de32e7f85e506
Reviewed-on: https://chromium-review.googlesource.com/200620
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Nicolas Capens <nicolascapens@chromium.org>
2014-05-28 14:32:05 +00:00
Jamie Madill fc2521e16b Fix build on Windows 8.1 SDK.
The Windows 8.1 SDK includes a new DLL compiler DLL, and is useful
to test against, so we should fix the few deprecated functions and
warnings.

BUG=angle:649

Change-Id: I28bcf49564f3f7d7403d939d61dd78d3972281ba
Reviewed-on: https://chromium-review.googlesource.com/199341
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
2014-05-21 14:06:45 +00:00
Jamie Madill e78603b585 Fix standalone Linux build.
We can include Makefiles in the ignore list, and need a few extra
flags to fix the GCC build on Linux.

BUG=angle:563

Change-Id: Iacd386359f0c0d9bb87ddc544dd8b4da2cb8fee0
Reviewed-on: https://chromium-review.googlesource.com/186902
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/186989
2014-02-20 14:17:23 +00:00
Jamie Madill 0aa84f6338 Merge 'Tie program binary version to commit hash.'
Port changes from master branch with commit hash embedding
to the development branch.

BUG=angle:529
Change-Id: I307bf44103913aaaeb875a2e3ade1fab77838c48
Reviewed-on: https://chromium-review.googlesource.com/186390
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
2014-02-14 15:02:13 +00:00
Geoff Lang a50232fd52 Added a utility application to generate c headers from dds textures.
Change-Id: Idb4c2ca318c84433f2b06bd4f0c66045f43e56de
Reviewed-on: https://chromium-review.googlesource.com/182191
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
2014-01-15 20:16:18 +00:00
Jamie Madill 049108df24 Include the current commit as part of the build process.
BUG=angle:529
Change-Id: I6d1d227b495e9bae6e017c88642679210c6d2355
Reviewed-on: https://chromium-review.googlesource.com/177233
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Commit-Queue: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Shannon Woods <shannonwoods@chromium.org>
2013-12-02 21:29:52 +00:00
Jamie Madill a895c6f012 Fix errors in the gyp projects when we build with ninja.
Ninja does not like having targets named 'all', and the
post-build step had some ninja-incompatible variables.

BUG=angle:529

Change-Id: Ia2bf701c997ec072b18bcbd62f7d05a2e40a1578
Reviewed-on: https://chromium-review.googlesource.com/178072
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Commit-Queue: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Shannon Woods <shannonwoods@chromium.org>
2013-11-28 14:41:31 +00:00
Jamie Madill 91db708c4e Add a step to the gyp projects which can run a python script after
a build of ANGLE is complete.

We can use this hook to do things like copy DLLs to user-configured
output folders.

Signed-off-by: Shannon Woods
Signed-off-by: Geoff Lang
ANGLEBUG=503

Change-Id: Iecf86b8c211b2a9933894c631c32107c8fda096a
2013-11-13 20:17:02 -05:00
Geoff Lang 251f57a036 Ignore output from new Visual Studio projects.
TRAC #24020
2013-10-22 14:34:31 -04:00
Geoff Lang 2b8f6fb49e Public project generation script is now a python script and generates projects into the projects directory.
TRAC #24020

Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods
2013-10-22 14:30:10 -04:00
Geoff Lang b236212e5a Updated the gyp build system for the ninja generator to work.
TRAC #24018

Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods
2013-10-18 17:05:57 -04:00
Geoff Lang 61af78d1a2 Add a project update script.
TRAC #24017

Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods
2013-10-17 14:13:53 -04:00
Geoff Lang 0049e43d65 Fixed the DEPS folder and added a .gclient file so gclient sync will now work. 2013-10-17 09:37:05 -04:00
Alok Priyadarshi 0d7e7d49a2 Ignore files generated by GYP.
R=shannonwoods@chromium.org

Review URL: https://codereview.appspot.com/12865044
2013-09-10 18:15:10 -04:00
Jamie Madill 53950a2905 Delete a "rej" file that was accidentally committed.
This was a relic from a preliminary lexer 64-bit compliance patch.

TRAC #23158

Authored-by: Jamie Madill
2013-07-19 18:04:55 -04:00
Jamie Madill 23ee2382d5 Ignore .orig files, which result from merge conflicts.
TRAC #23158

Signed-off-by: Nicolas Capens
Authored-by: Jamie Madill
2013-07-19 18:04:51 -04:00
shannon.woods@transgaming.com 0b7f7cfb3c Add .opensdf files to .gitignore.
TRAC #22410

Signed-off-by: Geoff Lang
Signed-off-by: Daniel Koch
Author: Jamie Madill

git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1770 736b8ea6-26fd-11df-bfd4-992fa37f6226
2013-01-25 21:53:45 +00:00
shannon.woods@transgaming.com 338ffa8272 Add ipch folders and debug.txt to .gitignore.
TRAC #22441

Signed-off-by: Geoff Lang
Signed-off-by: Daniel Koch
Author: Jamie Madill

git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1756 736b8ea6-26fd-11df-bfd4-992fa37f6226
2013-01-25 21:51:51 +00:00
daniel@transgaming.com 0d3b36deca .gitignore: Add *.target.mk, generated when building as part of ChromiumOS
BUG=None
TEST=Build Chromium and ChromiumOS from source, and run "repo status",
    with and without this change.

Contributed by Josh Triplett <josh.triplett@intel.com>

git-svn-id: https://angleproject.googlecode.com/svn/trunk@1316 736b8ea6-26fd-11df-bfd4-992fa37f6226
2012-10-17 20:58:50 +00:00
daniel@transgaming.com c60c15c095 Add filter files for VS2010 Solution browser
Trac #21647

git-svn-id: https://angleproject.googlecode.com/svn/trunk@1300 736b8ea6-26fd-11df-bfd4-992fa37f6226
2012-10-17 18:15:14 +00:00
daniel@transgaming.com e9b408bfc1 Add auto converted .vxcproj files for VC++ 2010 Express
Trac #21647
Signed-off-by: Shannon Woods
Signed-off-by: Nicolas Capens

git-svn-id: https://angleproject.googlecode.com/svn/trunk@1295 736b8ea6-26fd-11df-bfd4-992fa37f6226
2012-10-17 18:11:40 +00:00
daniel@transgaming.com a628c9ffcb Update .gitignore file
git-svn-id: https://angleproject.googlecode.com/svn/trunk@512 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-12-17 03:51:57 +00:00
daniel@transgaming.com 5e89073150 Update .gitignore
Use better wildcards to hide files we don't commit

git-svn-id: https://angleproject.googlecode.com/svn/trunk@79 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-03-28 19:36:18 +00:00
daniel@transgaming.com 4da3d93531 update .gitignore file for new file locations
Trac #11406
Signed-off-by: Nicolas Capens

git-svn-id: https://angleproject.googlecode.com/svn/trunk@47 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-03-17 13:13:32 +00:00
daniel@transgaming.com 4f39fd9956 Initial import from TransGaming
git-svn-id: https://angleproject.googlecode.com/svn/trunk@2 736b8ea6-26fd-11df-bfd4-992fa37f6226
2010-03-08 20:26:45 +00:00