Commit 23dcabad by Geoff Lang

Enable the OpenGL/WGL backend on Windows.

BUG=angle:890 Change-Id: Ida58ecb9f3bcfd7ee9ae5c7cdbdff4aab9cca869 Reviewed-on: https://chromium-review.googlesource.com/249741Reviewed-by: 's avatarCooper Partin <coopp@microsoft.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent c588ac73
...@@ -153,6 +153,7 @@ angle_enable_gl = false ...@@ -153,6 +153,7 @@ angle_enable_gl = false
if (is_win) { if (is_win) {
angle_enable_d3d9 = true angle_enable_d3d9 = true
angle_enable_d3d11 = true angle_enable_d3d11 = true
angle_enable_gl = true
import("//build/config/win/visual_studio_version.gni") import("//build/config/win/visual_studio_version.gni")
copy("copy_compiler_dll") { copy("copy_compiler_dll") {
......
...@@ -26,6 +26,7 @@ def generateProjects(generation_dir, build_winphone): ...@@ -26,6 +26,7 @@ def generateProjects(generation_dir, build_winphone):
gyp_cmd += ' -D angle_build_winrt=1' gyp_cmd += ' -D angle_build_winrt=1'
gyp_cmd += ' -D angle_build_winphone=' + ('1' if build_winphone else '0') gyp_cmd += ' -D angle_build_winphone=' + ('1' if build_winphone else '0')
gyp_cmd += ' -D angle_enable_d3d9=0' gyp_cmd += ' -D angle_enable_d3d9=0'
gyp_cmd += ' -D angle_enable_gl=0'
gyp_cmd += ' -D angle_standalone=1' gyp_cmd += ' -D angle_standalone=1'
gyp_cmd += ' ' + os.path.join(script_dir, 'all.gyp') gyp_cmd += ' ' + os.path.join(script_dir, 'all.gyp')
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
[ [
['OS=="win"', ['OS=="win"',
{ {
'angle_enable_gl%': 1,
'angle_enable_d3d9%': 1, 'angle_enable_d3d9%': 1,
'angle_enable_d3d11%': 1, 'angle_enable_d3d11%': 1,
}], }],
......
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