Commit df429d6d authored by apatrick@chromium.org's avatar apatrick@chromium.org

Rolled ANGLE r537:r541.

r538 Applying patch from pkasting to svn:ignore files generated during the build process.
r539 Added version info resources.
r540 Fix issues with preprocessor on very malformed shaders
r541 Map D3D calls and HLSL shaders back to GLES2 calls and GLSL ES shaders in PIX. http://codereview.appspot.com/3945043

TEST=try
BUG=none

Review URL: http://codereview.chromium.org/6332016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72703 0039d316-1c4b-4281-b951-d872f2087c98
parent cdfc519a
...@@ -34,7 +34,7 @@ deps = { ...@@ -34,7 +34,7 @@ deps = {
(Var("googlecode_url") % "googletest") + "/trunk@492", (Var("googlecode_url") % "googletest") + "/trunk@492",
"src/third_party/angle": "src/third_party/angle":
(Var("googlecode_url") % "angleproject") + "/trunk@537", (Var("googlecode_url") % "angleproject") + "/trunk@541",
"src/third_party/WebKit": "src/third_party/WebKit":
"/trunk/deps/third_party/WebKit@71605", "/trunk/deps/third_party/WebKit@71605",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment