зеркало из https://github.com/mozilla/moz-skia.git
Enable 64-bit builds on Windows
Encountered compile errors passing 64-bit size_t to SkIntToScalar and needed to make adjustments to gm/gradients.cpp and bench/PicturePlaybackBench.cpp. Verified on my local Linux, Mac, and Windows machines. As of this change, the skia_arch_width gyp define actually forces a 32/64-bit build on Linux, Mac, and Windows. Review URL: https://codereview.appspot.com/6460112 git-svn-id: http://skia.googlecode.com/svn/trunk@5195 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
Родитель
b73e0f9b69
Коммит
b7961193a3
|
@ -119,7 +119,7 @@ protected:
|
||||||
if (fDrawPosH)
|
if (fDrawPosH)
|
||||||
pos[i].set(x + advX, y);
|
pos[i].set(x + advX, y);
|
||||||
else
|
else
|
||||||
pos[i].set(x + advX, y + SkIntToScalar(i));
|
pos[i].set(x + advX, y + i);
|
||||||
advX += adv[i];
|
advX += adv[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -169,9 +169,9 @@ protected:
|
||||||
// apply an increasing y perspective as we move to the right
|
// apply an increasing y perspective as we move to the right
|
||||||
SkMatrix perspective;
|
SkMatrix perspective;
|
||||||
perspective.setIdentity();
|
perspective.setIdentity();
|
||||||
perspective.setPerspY(SkScalarDiv(SkIntToScalar(i+1),
|
perspective.setPerspY(SkScalarDiv(SkIntToScalar((unsigned) i+1),
|
||||||
SkIntToScalar(500)));
|
SkIntToScalar(500)));
|
||||||
perspective.setSkewX(SkScalarDiv(SkIntToScalar(i+1),
|
perspective.setSkewX(SkScalarDiv(SkIntToScalar((unsigned) i+1),
|
||||||
SkIntToScalar(10)));
|
SkIntToScalar(10)));
|
||||||
shader->setLocalMatrix(perspective);
|
shader->setLocalMatrix(perspective);
|
||||||
|
|
||||||
|
|
|
@ -85,6 +85,14 @@
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
'conditions' : [
|
||||||
|
['skia_arch_width == 64', {
|
||||||
|
'msvs_configuration_platform': 'x64'
|
||||||
|
}],
|
||||||
|
['skia_arch_width == 32', {
|
||||||
|
'msvs_configuration_platform': 'Win32',
|
||||||
|
}],
|
||||||
|
],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче