Commit 9534a8f7 by Geoff Lang

Fix more links and incorrect newlines in markdown files.

Change-Id: I3c96b0408d80be0f47c968566301637f49fe98c6 Reviewed-on: https://chromium-review.googlesource.com/285224Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 4ad5108d
...@@ -68,6 +68,7 @@ solutions = [ ...@@ -68,6 +68,7 @@ solutions = [
You then have full control over your ANGLE workspace and are responsible for running all git commands (pull, rebase, etc.) for managing your branches. You then have full control over your ANGLE workspace and are responsible for running all git commands (pull, rebase, etc.) for managing your branches.
If you decide you need to go back to the DEPS version of ANGLE: If you decide you need to go back to the DEPS version of ANGLE:
* Comment out the `src/third_party/angle` line in your `custom_deps`. * Comment out the `src/third_party/angle` line in your `custom_deps`.
* Go into your ANGLE workspace and switch back to the master branch (ensure there are no modified or new files). * Go into your ANGLE workspace and switch back to the master branch (ensure there are no modified or new files).
* `gclient sync` your Chromium workspace. * `gclient sync` your Chromium workspace.
...@@ -24,6 +24,7 @@ Set the following environment variables as needed: ...@@ -24,6 +24,7 @@ Set the following environment variables as needed:
* `GYP_MSVS_VERSION` to `2013` (or `2013e` for Express editions of MSVS) * `GYP_MSVS_VERSION` to `2013` (or `2013e` for Express editions of MSVS)
Download the ANGLE source by running the following commands: Download the ANGLE source by running the following commands:
``` ```
mkdir angle mkdir angle
cd angle cd angle
...@@ -31,10 +32,11 @@ gclient config --name . --unmanaged https://chromium.googlesource.com/angle/angl ...@@ -31,10 +32,11 @@ gclient config --name . --unmanaged https://chromium.googlesource.com/angle/angl
gclient sync gclient sync
git checkout master git checkout master
``` ```
Gyp will generate the main VS2013 solution file as build/ANGLE.sln. If you update ANGLE, or make a change to the projects, they can be regenerated by executing `gclient runhooks`. Gyp will generate the main VS2013 solution file as build/ANGLE.sln. If you update ANGLE, or make a change to the projects, they can be regenerated by executing `gclient runhooks`.
### Building ANGLE ### Building ANGLE
1. Open one of the ANGLE Visual Studio solution files (see [DevSetup.md#Development-setup-Getting-the-source](Getting the source)). 1. Open one of the ANGLE Visual Studio solution files (see [Getting the source](DevSetup.md#Development-setup-Getting-the-source)).
2. Select Build -> Configuration Manager 2. Select Build -> Configuration Manager
3. In the "Active solution configuration:" drop down, select the desired configuration (eg. Release), and close the Configuration Manager. 3. In the "Active solution configuration:" drop down, select the desired configuration (eg. Release), and close the Configuration Manager.
4. Select Build -> Build Solution. 4. Select Build -> Build Solution.
...@@ -59,12 +61,12 @@ By default, ANGLE will use a D3D11 renderer. To change the default: ...@@ -59,12 +61,12 @@ By default, ANGLE will use a D3D11 renderer. To change the default:
* Right-click your project in the _Solution Explorer_, and select _Properties_. * Right-click your project in the _Solution Explorer_, and select _Properties_.
* Under the _Configuration Properties_ branch, click _C/C++_. * Under the _Configuration Properties_ branch, click _C/C++_.
* Add the relative path to the Khronos EGL and GLES2 header files to _Additional Include Directories_. * Add the relative path to the Khronos EGL and GLES2 header files to _Additional Include Directories_.
2. Configure your build environment to have access to `libEGL.lib` and `libGLESv2.lib` found in the build output directory (see [DevSteup.md#Building-ANGLE](Building ANGLE)). 2. Configure your build environment to have access to `libEGL.lib` and `libGLESv2.lib` found in the build output directory (see [Building ANGLE](DevSteup.md#Building-ANGLE)).
* For Visual C++ * For Visual C++
* Right-click your project in the _Solution Explorer_, and select _Properties_. * Right-click your project in the _Solution Explorer_, and select _Properties_.
* Under the _Configuration Properties_ branch, open the _Linker_ branch and click _Input_. * Under the _Configuration Properties_ branch, open the _Linker_ branch and click _Input_.
* Add the relative paths to both the `libEGL.lib` file and `libGLESv2.lib` file to _Additional Dependencies_, separated by a semicolon. * Add the relative paths to both the `libEGL.lib` file and `libGLESv2.lib` file to _Additional Dependencies_, separated by a semicolon.
3. Copy `libEGL.dll` and `libGLESv2.dll` from the build output directory (see [DevSteup.md#Building-ANGLE](Building ANGLE)) into your application folder. 3. Copy `libEGL.dll` and `libGLESv2.dll` from the build output directory (see [Building ANGLE](DevSteup.md#Building-ANGLE)) into your application folder.
4. Code your application to the Khronos [OpenGL ES 2.0](http://www.khronos.org/registry/gles/) and [EGL 1.4](http://www.khronos.org/registry/egl/) APIs. 4. Code your application to the Khronos [OpenGL ES 2.0](http://www.khronos.org/registry/gles/) and [EGL 1.4](http://www.khronos.org/registry/egl/) APIs.
## GLSL ES to GLSL Translator ## GLSL ES to GLSL Translator
......
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