diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-05-31 14:12:46 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-05-31 14:12:46 +0000 |
| commit | 9aabfc789e410c2da9c34a38597338165398ce16 (patch) | |
| tree | dec8429a122704f0f90e0b5a3499f7e584fc108d /gyp | |
| parent | f123ba9e21a6e19b67d9c3fc0ac337725a2f1737 (diff) | |
Use a single GrDrawState in GrContext for direct and buffered drawing
Review URL: http://codereview.appspot.com/5933043
git-svn-id: http://skia.googlecode.com/svn/trunk@4091 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_conditions.gypi | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 985f1bdd54..ad4d81f06c 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -47,18 +47,19 @@ 'Release': { 'msvs_settings': { 'VCCLCompilerTool': { - 'DebugInformationFormat': '3', # programDatabase (/Zi) + 'DebugInformationFormat': '3', # programDatabase (/Zi) 'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb', - 'Optimization': '3', # full (/Ox) + 'Optimization': '3', # full (/Ox) 'WholeProgramOptimization': 'true', #/GL # Changing the floating point model requires rebaseling gm images - #'FloatingPointModel': '2', # fast (/fp:fast) - 'FavorSizeOrSpeed': '1', # speed (/Ot) + #'FloatingPointModel': '2', # fast (/fp:fast) + 'FavorSizeOrSpeed': '1', # speed (/Ot) 'PreprocessorDefinitions': ['NDEBUG'], - 'RuntimeLibrary': '2', # rtMultiThreadedDLL (/MD) + 'RuntimeLibrary': '2', # rtMultiThreadedDLL (/MD) 'ExceptionHandling': '0', - 'RuntimeTypeInfo': 'false', # /GR- - 'WarningLevel': '3', # level3 (/W3) + 'EnableEnhancedInstructionSet': '2',# /arch:SSE2 + 'RuntimeTypeInfo': 'false', # /GR- + 'WarningLevel': '3', # level3 (/W3) }, 'VCLinkerTool': { 'GenerateDebugInformation': 'true', # /DEBUG |