summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authortwiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-21 23:08:32 +0000
committertwiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-21 23:08:32 +0000
commit8f1ab37a268834e9a71330401d90b4e3bbfd5604 (patch)
tree665226b867eac12a02eeecd6a2395996d873a38b /skia
parentc09f1a619592294610cc3a4f07cb83c16735fb9d (diff)
downloadchromium_src-8f1ab37a268834e9a71330401d90b4e3bbfd5604.zip
chromium_src-8f1ab37a268834e9a71330401d90b4e3bbfd5604.tar.gz
chromium_src-8f1ab37a268834e9a71330401d90b4e3bbfd5604.tar.bz2
Resubmit of reverted CL: http://codereview.chromium.org/6677105
Addition of GL-redirecting mechanism for the Skia/GPU back-end. During execution of the layout tests (DumpRenderTree), all GL-calls are invoked via Mesa. A GL re-direction mechanism was added to skia in revision (http://code.google.com/p/skia/source/detail?r=937) These changes populate the skia re-direction interface with the gl implementation currently in use in Chrome: The app\gfx\gl bindings. R=kbr, bsalomon Review URL: http://codereview.chromium.org/6708066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78941 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r--skia/skia.gyp8
1 files changed, 8 insertions, 0 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 81eb057..4482b8b 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -767,9 +767,16 @@
'include_dirs': [
'config/win',
],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ 'config/win',
+ ],
+ },
},],
['OS=="win" and component=="shared_library"', {
'defines': [
+ 'GR_DLL',
+ 'GR_IMPLEMENTATION=1',
'SKIA_DLL',
'SKIA_IMPLEMENTATION=1',
],
@@ -782,6 +789,7 @@
],
'direct_dependent_settings': {
'defines': [
+ 'GR_DLL',
'SKIA_DLL',
],
},