wip #3639 @4

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 8f116fe8301be9c3ef47a9c0e44eb632e93c7f1f..e3d0e402fef285ea55bd1614ef6528be030f5b9d 100644 (file)
--- 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, '<p class="label1">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 438bb93f186f7ac38092cae36a131228835b1893..7da4f5f4068a54e0e3a48291667ac3402eb0e91e 100644 (file)
--- 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();