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

32 Коммитов

Автор SHA1 Сообщение Дата
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