From 9c8a1980f7b81a78100034852c59777c2cc4d83d Mon Sep 17 00:00:00 2001
From: "sky@chromium.org"
<sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 24 May 2011 23:08:58 +0000
Subject: Prototype compositor to render views to a texture using d3d 10. This
is just a prototype for us to play with. There are plenty of issues to
resolve before its made real, but I wanted to check something in for others
to play with rather than keeping it all local. To get it to compile you need
to set the GYP_DEFINE to views_compositor.
BUG=none
TEST=none
R=ben@chromium.org,apatrick@chromium.org
Review URL: http://codereview.chromium.org/7067029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86516 0039d316-1c4b-4281-b951-d872f2087c98
---
build/common.gypi | 10 ++++++++++
1 file changed, 10 insertions(+)
(limited to 'build')
diff --git a/build/common.gypi b/build/common.gypi
index d173104..fbfd20b 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -23,10 +23,14 @@
# Disable touch support by default.
'touchui%': 0,
+
+ # Whether the compositor is enabled on views.
+ 'views_compositor%': 0,
},
# Copy conditionally-set variables out one scope.
'chromeos%': '<(chromeos)',
'touchui%': '<(touchui)',
+ 'views_compositor%': '<(views_compositor)',
# Compute the architecture that we're building on.
'conditions': [
@@ -55,6 +59,7 @@
'touchui%': '<(touchui)',
'host_arch%': '<(host_arch)',
'toolkit_views%': '<(toolkit_views)',
+ 'views_compositor%': '<(views_compositor)',
# We used to provide a variable for changing how libraries were built.
# This variable remains until we can clean up all the users.
@@ -200,6 +205,7 @@
'host_arch%': '<(host_arch)',
'library%': 'static_library',
'toolkit_views%': '<(toolkit_views)',
+ 'views_compositor%': '<(views_compositor)',
'os_posix%': '<(os_posix)',
'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
'use_x11%': '<(use_x11)',
@@ -628,6 +634,10 @@
['toolkit_views==1', {
'defines': ['TOOLKIT_VIEWS=1'],
}],
+ ['views_compositor==1', {
+ # TODO(sky): nuke COMPOSITOR_2 when we remove it from views.
+ 'defines': ['VIEWS_COMPOSITOR=1', 'COMPOSITOR_2=1'],
+ }],
['chromeos==1', {
'defines': ['OS_CHROMEOS=1'],
}],
--
cgit v1.1