From: vincent@cubedesigners.com Date: Mon, 18 May 2020 17:23:37 +0000 (+0000) Subject: wip #3639 @4 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=b9856c9de97c858c6b8a50954ec4662c3ab14912;p=cubeextranet.git wip #3639 @4 --- diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php index 8f116fe83..e3d0e402f 100644 --- a/inc/ws/Controlleur/class.ws.services.php +++ b/inc/ws/Controlleur/class.ws.services.php @@ -1498,7 +1498,7 @@ class wsServices extends cubeFlashGateway { // First intention direct request $ugpu = urlencode($gpu); - $url = 'https://gfxbench.com/device.jsp?benchmark=gfx' . $gfxVersion . '&hwname=' . $ugpu . '&D=' . $ugpu . '&testgroup=graphics&var=median'; + $url = 'https://gfxbench.com/device.jsp?os=Windows&api=gl&benchmark=gfx' . $gfxVersion . '&D=' . $ugpu . '&testgroup=overall'; $f = self::_curlRequest($url); if (!stristr($f, '

No such device')) { diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php index 438bb93f1..7da4f5f40 100644 --- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php @@ -457,10 +457,11 @@ class wsHTML5Compiler public function writeGPUDatabase() { global $core; - $r = $core->con->select('SELECT gpu,score FROM gpu'); + $r = $core->con->select('SELECT gpu,rgpu,score FROM gpu'); $gpu = []; while ($r->fetch()) { $gpu[$r->gpu] = $r->score; + $gpu[$r->rgpu] = $r->score; } $this->config->gupsc = $gpu; $this->config->gupse = wsServices::gpuSeparators();