summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Larabel <michael@phx-laptop.(none)>2008-05-31 23:14:52 -0400
committerMichael Larabel <michael@phx-laptop.(none)>2008-05-31 23:14:52 -0400
commit6a3683427ec79f6e613922eaed64d08ff930264c (patch)
tree1dde2e96eddd9ed872842dfb350d1ebd4beb474b
parentfbae4c8e760143191c376bb1414def673dce1556 (diff)
downloadphoronix-test-suite-upstream-6a3683427ec79f6e613922eaed64d08ff930264c.tar.gz
phoronix-test-suite-upstream-6a3683427ec79f6e613922eaed64d08ff930264c.tar.xz
phoronix-test-suite-upstream-6a3683427ec79f6e613922eaed64d08ff930264c.zip
A few more small fixes to PTS
-rw-r--r--CHANGE-LOG1
-rw-r--r--documentation/credits.html1
-rw-r--r--pts-core/functions/pts-functions_system_graphics.php18
-rw-r--r--pts-core/pts-run-benchmark.php3
4 files changed, 12 insertions, 11 deletions
diff --git a/CHANGE-LOG b/CHANGE-LOG
index 88fec85..5d785c8 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -15,6 +15,7 @@ Phoronix Test Suite
- Add hmmer test profile
- Add detection if system is running within a virtualized environment (QEMU or VMware) and report to test notes area.
- Fix padding around commas with dependency parsing, don't require a space with the delimiter and parse out extra spaces if present
+- Miscellaneous fixes and other improvements
Phoronix Test Suite 0.9.0
May 28, 2008
diff --git a/documentation/credits.html b/documentation/credits.html
index 09ccb93..8e7719e 100644
--- a/documentation/credits.html
+++ b/documentation/credits.html
@@ -21,6 +21,7 @@
<p>- Pekka Panula</p>
<p>- Stefan Doesinger</p>
<p>- Jörg Schirottke</p>
+<p>- Stéphane Teletchéa</p>
<p>- Laminar Research / Ben Supnik</p>
<p>- Peter Kraus</p>
<!-- END OF PTS AREA -->
diff --git a/pts-core/functions/pts-functions_system_graphics.php b/pts-core/functions/pts-functions_system_graphics.php
index afb66ea..5994d76 100644
--- a/pts-core/functions/pts-functions_system_graphics.php
+++ b/pts-core/functions/pts-functions_system_graphics.php
@@ -82,29 +82,29 @@ function graphics_antialiasing_level()
}
function graphics_anisotropic_level()
{
- $aa_level = "";
+ $af_level = "";
- $nvidia_fsaa = read_nvidia_extension("LogAniso");
+ $nvidia_af = read_nvidia_extension("LogAniso");
- if(!empty($nvidia_fsaa))
+ if(!empty($nvidia_af))
{
- switch($nvidia_fsaa)
+ switch($nvidia_af)
{
case 1:
- $aa_level = "2x";
+ $af_level = "2x";
break;
case 2:
- $aa_level = "4x";
+ $af_level = "4x";
break;
case 3:
- $aa_level = "8x";
+ $af_level = "8x";
break;
case 4:
- $aa_level = "16x";
+ $af_level = "16x";
break;
}
}
- return $aa_level;
+ return $af_level;
}
function xrandr_screen_resolution()
{
diff --git a/pts-core/pts-run-benchmark.php b/pts-core/pts-run-benchmark.php
index 60dd915..9e65951 100644
--- a/pts-core/pts-run-benchmark.php
+++ b/pts-core/pts-run-benchmark.php
@@ -322,7 +322,7 @@ if($SAVE_RESULTS)
$test_notes = pts_process_running_string($check_processes);
- if(defined("TEST_GRAPHICS"))
+ if($test_type == "Graphics" || $test_type == "System")
{
$aa_level = graphics_antialiasing_level();
$af_level = graphics_anisotropic_level();
@@ -397,7 +397,6 @@ if($SAVE_RESULTS)
else
echo "\nResults Failed To Upload.\n";
}
-
echo "\n";
}
pts_monitor_update(); // Update sensors, etc