Commit 21f76c20 by Shannon Woods

Add magic newlines to markdown files.

Change-Id: I225ecab48a7d3d0a04390c5535cf5b65709fd758 Reviewed-on: https://chromium-review.googlesource.com/311072Reviewed-by: 's avatarShannon Woods <shannonwoods@chromium.org> Tested-by: 's avatarShannon Woods <shannonwoods@chromium.org>
parent c5d2136a
...@@ -12,6 +12,7 @@ Chromium's dependency on third-party projects is tracked in [the Chromium ...@@ -12,6 +12,7 @@ Chromium's dependency on third-party projects is tracked in [the Chromium
repository's src/DEPS file] repository's src/DEPS file]
(http://src.chromium.org/viewvc/chrome/trunk/src/DEPS). To update the ANGLE (http://src.chromium.org/viewvc/chrome/trunk/src/DEPS). To update the ANGLE
dependency: dependency:
* Find the line in this file that defines "src/third\_party/angle" * Find the line in this file that defines "src/third\_party/angle"
for deps (**not** deps\_os) for deps (**not** deps\_os)
* Change the [git SHA-1 revision number] * Change the [git SHA-1 revision number]
...@@ -37,6 +38,7 @@ incorporate only these changes, and not everything that has been committed since ...@@ -37,6 +38,7 @@ incorporate only these changes, and not everything that has been committed since
the version on which Chrome depended at branch time. **Please note: Only ANGLE the version on which Chrome depended at branch time. **Please note: Only ANGLE
admins can create a new branch.** To create a branch of ANGLE for a branched admins can create a new branch.** To create a branch of ANGLE for a branched
Chrome release: Chrome release:
* Determine what the ANGLE dependency is for the Chrome release * Determine what the ANGLE dependency is for the Chrome release
by checking the DEPS file for that branch. by checking the DEPS file for that branch.
* Check out this commit as a new branch in your local repository. * Check out this commit as a new branch in your local repository.
......
...@@ -61,6 +61,7 @@ Items marked {DEV} indicate a deviation from the Google guidelines. Items marked ...@@ -61,6 +61,7 @@ Items marked {DEV} indicate a deviation from the Google guidelines. Items marked
Use the following guidelines, they do deviate somewhat from the Google Use the following guidelines, they do deviate somewhat from the Google
guidelines. guidelines.
* class and type names: start with capital letter and use CamelCase. * class and type names: start with capital letter and use CamelCase.
* {DEV} class member variables: use an **`m`** prefix instead of trailing * {DEV} class member variables: use an **`m`** prefix instead of trailing
underscore and use CamelCase. underscore and use CamelCase.
...@@ -78,6 +79,7 @@ use CamelCase (chosen for consistency) ...@@ -78,6 +79,7 @@ use CamelCase (chosen for consistency)
* {DO} read and follow Google's recommendations. * {DO} read and follow Google's recommendations.
* Each file **must** start with the following boilerplate notice: * Each file **must** start with the following boilerplate notice:
``` ```
// //
// Copyright (c) 2002-2011 The ANGLE Project Authors. All rights reserved. // Copyright (c) 2002-2011 The ANGLE Project Authors. All rights reserved.
...@@ -108,6 +110,7 @@ use CamelCase (chosen for consistency) ...@@ -108,6 +110,7 @@ use CamelCase (chosen for consistency)
line. line.
Examples: Examples:
``` ```
if (conditional) if (conditional)
{ {
...@@ -118,6 +121,7 @@ else ...@@ -118,6 +121,7 @@ else
otherstuff() otherstuff()
} }
``` ```
``` ```
switch (conditional) switch (conditional)
{ {
...@@ -131,6 +135,7 @@ switch (conditional) ...@@ -131,6 +135,7 @@ switch (conditional)
WTFBBQ(); WTFBBQ();
} }
``` ```
``` ```
class MyClass : public Foo class MyClass : public Foo
{ {
...@@ -141,6 +146,7 @@ class MyClass : public Foo ...@@ -141,6 +146,7 @@ class MyClass : public Foo
DISALLOW_COPY_AND_ASSIGN(MyClass); DISALLOW_COPY_AND_ASSIGN(MyClass);
}; };
``` ```
``` ```
char *c; char *c;
const string &str; const string &str;
......
...@@ -26,6 +26,7 @@ ANGLE. ...@@ -26,6 +26,7 @@ ANGLE.
## Shader Compiler ## Shader Compiler
We have also made a number of improvements in the shader compiler. We have also made a number of improvements in the shader compiler.
* We addressed a number of defects related to scoping differences between HLSL and * We addressed a number of defects related to scoping differences between HLSL and
GLSL and improved the scoping support in ANGLE's compiler front-end. We also GLSL and improved the scoping support in ANGLE's compiler front-end. We also
worked with The Khronos Group to get an ESSL spec bug fixed and several items worked with The Khronos Group to get an ESSL spec bug fixed and several items
...@@ -87,6 +88,7 @@ loaded and stored in the GL orientation, and the final rendered scene is flipped ...@@ -87,6 +88,7 @@ loaded and stored in the GL orientation, and the final rendered scene is flipped
when it is displayed to a window by eglSwapBuffers. This should be essentially when it is displayed to a window by eglSwapBuffers. This should be essentially
transparent to applications except that orientation of pbuffers will change.  In transparent to applications except that orientation of pbuffers will change.  In
addition to fixing the pbuffer orientation, this change: addition to fixing the pbuffer orientation, this change:
* eliminates * eliminates
dependent-texture look-ups in the shaders, caused by flipping the texture dependent-texture look-ups in the shaders, caused by flipping the texture
y-coordinates y-coordinates
......
...@@ -14,6 +14,7 @@ This merge doesn't signify completion of ES 3.0, as we have some features still ...@@ -14,6 +14,7 @@ This merge doesn't signify completion of ES 3.0, as we have some features still
left to implement there, but interested developers can explore the work in left to implement there, but interested developers can explore the work in
progress. A significant portion of 3.0 features have been implemented, progress. A significant portion of 3.0 features have been implemented,
including: including:
* 2D array textures, 3D textures * 2D array textures, 3D textures
* Expanded texture format support * Expanded texture format support
* Uniform Buffer Objects * Uniform Buffer Objects
......
...@@ -22,12 +22,14 @@ implementations compatible with OS X and Linux. ...@@ -22,12 +22,14 @@ implementations compatible with OS X and Linux.
Our ES 3.0 development branch was merged into mainline ANGLE in April 2014, but Our ES 3.0 development branch was merged into mainline ANGLE in April 2014, but
ES 3.0 support is not yet complete. The majority of API functionality has been ES 3.0 support is not yet complete. The majority of API functionality has been
implemented; features still pending include: implemented; features still pending include:
* ETC2/EAC support * ETC2/EAC support
* primitive restart index * primitive restart index
* drawRangeElements * drawRangeElements
* full GetProgramBinary support in core * full GetProgramBinary support in core
Additional work remains in the compiler, including: Additional work remains in the compiler, including:
* Array .length() * Array .length()
* inf/nan detection * inf/nan detection
* math utility functions, rounding * math utility functions, rounding
......
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