diff options
| -rw-r--r-- | pts-core/functions/pts-functions_system_graphics.php | 45 | ||||
| -rw-r--r-- | pts-core/modules/graphics_override.php | 6 | ||||
| -rw-r--r-- | pts-core/objects/pts_module_interface.php | 2 | ||||
| -rw-r--r-- | pts-core/pts-gui.php | 8 | ||||
| -rw-r--r-- | pts-core/pts-run-benchmark.php | 28 |
5 files changed, 76 insertions, 13 deletions
diff --git a/pts-core/functions/pts-functions_system_graphics.php b/pts-core/functions/pts-functions_system_graphics.php index 0a4030c..e9c31d3 100644 --- a/pts-core/functions/pts-functions_system_graphics.php +++ b/pts-core/functions/pts-functions_system_graphics.php @@ -80,6 +80,27 @@ function graphics_antialiasing_level() break; } } + else + { + $ati_fsaa = read_amd_pcsdb("OpenGL,AntiAliasSamples"); + + if(!empty($ati_fsaa)) + { + switch($ati_fsaa) + { + case "0x00000002": + $aa_level = 2; + break; + case "0x00000004": + $aa_level = 4; + break; + case "0x00000008": + $aa_level = 8; + break; + } + } + } + return $aa_level; } function graphics_anisotropic_level() @@ -106,6 +127,30 @@ function graphics_anisotropic_level() break; } } + else + { + $ati_af = read_amd_pcsdb("OpenGL,AnisoDegree"); + + if(!empty($ati_af)) + { + switch($ati_af) + { + case "0x00000002": + $af_level = 2; + break; + case "0x00000004": + $af_level = 4; + break; + case "0x00000008": + $af_level = 8; + break; + case "0x00000010": + $af_level = 16; + break; + } + } + } + return $af_level; } function set_nvidia_extension($attribute, $value) diff --git a/pts-core/modules/graphics_override.php b/pts-core/modules/graphics_override.php index f8588d3..833d763 100644 --- a/pts-core/modules/graphics_override.php +++ b/pts-core/modules/graphics_override.php @@ -28,6 +28,8 @@ class graphics_override extends pts_module_interface const module_description = "This module allows you to override some graphics rendering settings for the ATI and NVIDIA drivers while running the Phoronix Test Suite."; const module_author = "Michael Larabel"; + public static $module_store_vars = array("FORCE_AA", "FORCE_AF"); + static $graphics_driver = FALSE; static $preset_aa = FALSE; static $preset_af = FALSE; @@ -37,7 +39,7 @@ class graphics_override extends pts_module_interface static $supported_aa_levels = array(0, 2, 4, 8, 16); static $supported_af_levels = array(0, 2, 4, 8, 16); - public static function __startup() + public static function __pre_run_process() { $opengl_driver = opengl_version(); @@ -155,7 +157,7 @@ class graphics_override extends pts_module_interface } } } - public static function __shutdown() + public static function __post_run_process() { if(self::$graphics_driver == FALSE) return; // Not using a supported graphics driver diff --git a/pts-core/objects/pts_module_interface.php b/pts-core/objects/pts_module_interface.php index 7d3b096..3b1964a 100644 --- a/pts-core/objects/pts_module_interface.php +++ b/pts-core/objects/pts_module_interface.php @@ -28,6 +28,8 @@ class pts_module_interface const module_description = "A description of the module."; const module_author = "Module Creator"; + public static $module_store_vars = array(); + public static function module_info() { diff --git a/pts-core/pts-gui.php b/pts-core/pts-gui.php index 118076d..687aa66 100644 --- a/pts-core/pts-gui.php +++ b/pts-core/pts-gui.php @@ -11,6 +11,14 @@ $glade->signal_autoconnect(); $window = $glade->get_widget("pts_main_window"); $window->connect_simple("destroy", array("Gtk", "main_quit")); +$test_suite_list = new GtkListStore(64); +$test_suite_list->append(array("Test 1")); +$test_suite_list->append(array("Test 2")); + +$glade->get_widget("run_tests_treeview")->set_model($test_suite_list); + + + $window->show(); Gtk::main(); diff --git a/pts-core/pts-run-benchmark.php b/pts-core/pts-run-benchmark.php index 7d58ec4..8f8d85a 100644 --- a/pts-core/pts-run-benchmark.php +++ b/pts-core/pts-run-benchmark.php @@ -266,7 +266,7 @@ if($TO_RUN_TYPE == "BENCHMARK") $xml_parser = new tandem_XmlReader(file_get_contents(XML_PROFILE_DIR . $TO_RUN . ".xml")); $test_description = $xml_parser->getXMLValue(P_TEST_DESCRIPTION); $test_version = $xml_parser->getXMLValue(P_TEST_PTSVERSION); - $test_type = $xml_parser->getXMLValue(P_TEST_SOFTWARE_TYPE); + $test_type = $xml_parser->getXMLValue(P_TEST_HARDWARE_TYPE); $test_maintainer = $xml_parser->getXMLValue(P_TEST_MAINTAINER); unset($xml_parser); } @@ -318,7 +318,7 @@ else //pts_beep(2); define("PTS_TESTING_DONE", 1); -pts_module_process("__post_run_process"); + if($SAVE_RESULTS) { $check_processes = array( @@ -330,15 +330,6 @@ if($SAVE_RESULTS) $test_notes = pts_process_running_string($check_processes); - if($test_type == "Graphics" || $test_type == "System") - { - $aa_level = graphics_antialiasing_level(); - $af_level = graphics_anisotropic_level(); - - if(!empty($aa_level) && !empty($af_level)) - $test_notes .= " \nAntialiasing: $aa_level Anisotropic Filtering: $af_level."; - } - // Power Saving Technologies? $cpu_savings = pts_processor_power_savings_enabled(); if(!empty($cpu_savings)) @@ -356,6 +347,17 @@ if($SAVE_RESULTS) if(!empty($virtualized)) $test_notes .= " \n" . $virtualized; + if($test_type == "Graphics" || $test_type == "System") + { + $aa_level = graphics_antialiasing_level(); + $af_level = graphics_anisotropic_level(); + + if(!empty($aa_level) && !empty($af_level)) + $test_notes .= " \nAntialiasing: $aa_level Anisotropic Filtering: $af_level."; + } + + pts_module_process("__post_run_process"); + $id = pts_request_new_id(); $RESULTS->setXslBinding("pts-results-viewer.xsl"); $RESULTS->addXmlObject(P_RESULTS_SYSTEM_HARDWARE, $id, pts_hw_string()); @@ -408,5 +410,9 @@ if($SAVE_RESULTS) echo "\n"; } } +else +{ + pts_module_process("__post_run_process"); +} ?> |