Commit e0822cd9 authored by cmarrin@apple.com's avatar cmarrin@apple.com

Additional change to separate Accelerated Compositing test from 3D Rendering test

        https://bugs.webkit.org/show_bug.cgi?id=35610



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55481 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent ae4b74f0
2010-03-03 Chris Marrin <cmarrin@apple.com>
Reviewed by Simon Fraser.
Additional change to separate Accelerated Compositing test from 3D Rendering test
https://bugs.webkit.org/show_bug.cgi?id=35610
I am now using #if ENABLED(3D_RENDERING) to emit the 3DRendering string from
DRT or not. This allows these flags to set independently. I also improved
the code flow in run-webkit-tests a bit.
* DumpRenderTree/win/DumpRenderTree.cpp:
(main):
* Scripts/run-webkit-tests:
2010-03-03 Chris Marrin <cmarrin@apple.com>
Reviewed by Simon Fraser.
......
......@@ -1255,7 +1255,14 @@ int main(int argc, char* argv[])
if (printSupportedFeatures) {
BOOL acceleratedCompositingAvailable;
standardPreferences->acceleratedCompositingEnabled(&acceleratedCompositingAvailable);
printf("SupportedFeatures:%s\n", acceleratedCompositingAvailable ? "AcceleratedCompositing, 3DRendering" : "");
BOOL threeDRenderingAvailable =
#if ENABLE(3D_RENDERING)
true;
#else
false;
#endif
printf("SupportedFeatures:%s %s\n", acceleratedCompositingAvailable ? "AcceleratedCompositing" : "", threeDRenderingAvailable ? "3DRendering" : "");
return 0;
}
......
......@@ -462,21 +462,22 @@ if (isCygwin()) {
$supportedFeaturesResult = `$supportedFeaturesCommand 2>&1`;
}
# Check for acelerated compositing support
my $hasAcceleratedCompositing = 0;
my $has3DRendering = 0;
if (isCygwin()) {
if ($supportedFeaturesResult !~ /AcceleratedCompositing/) {
$ignoredDirectories{'compositing'} = 1;
}
} elsif (!checkWebCoreFeatureSupport("Accelerated Compositing", 0)) {
$hasAcceleratedCompositing = $supportedFeaturesResult =~ /AcceleratedCompositing/;
$has3DRendering = $supportedFeaturesResult =~ /3DRendering/;
} else {
$hasAcceleratedCompositing = checkWebCoreFeatureSupport("Accelerated Compositing", 0);
$has3DRendering = checkWebCoreFeatureSupport("3D Rendering", 0);
}
if (!$hasAcceleratedCompositing) {
$ignoredDirectories{'compositing'} = 1;
}
if (isCygwin()) {
if ($supportedFeaturesResult !~ /3DRendering/) {
$ignoredDirectories{'animations/3d'} = 1;
$ignoredDirectories{'transforms/3d'} = 1;
}
} elsif (!checkWebCoreFeatureSupport("3D Rendering", 0)) {
if (!$has3DRendering) {
$ignoredDirectories{'animations/3d'} = 1;
$ignoredDirectories{'transforms/3d'} = 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