Updated HallBench test scene

LuxCoreRender · Nov 18, 2020 · 543b678 · 543b678
1 parent b5b6a5b
commit 543b678
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/src/hardwaretree.cpp b/src/hardwaretree.cpp
@@ -268,9 +268,12 @@ HardwareTreeModel::HardwareTreeModel(MainWindow *w, const bool useCPU,
 		ss << "Compute Units: " << deviceDesc.units;
 		newNode->appendChild(new HardwareTreeItem(ss.str().c_str()));
 
-		ss.str("");
-		ss << "Clock: " << deviceDesc.clock << " MHz";
-		newNode->appendChild(new HardwareTreeItem(ss.str().c_str()));
+		// I don't really have this information for CUDA devices
+		if (!deviceDesc.isCUDA) {
+			ss.str("");
+			ss << "Clock: " << deviceDesc.clock << " MHz";
+			newNode->appendChild(new HardwareTreeItem(ss.str().c_str()));
+		}
 
 		ss.str("");
 		ss << "Preferred vector width: " << deviceDesc.nativeVectorWidthFloat;
@@ -280,13 +283,16 @@ HardwareTreeModel::HardwareTreeModel(MainWindow *w, const bool useCPU,
 		ss << "Max. Global Memory: " << (deviceDesc.globalMem / 1024) << " Kbytes";
 		newNode->appendChild(new HardwareTreeItem(ss.str().c_str()));
 
-		ss.str("");
-		ss << "Local Memory: " << (deviceDesc.localMem / 1024) << " Kbytes";
-		newNode->appendChild(new HardwareTreeItem(ss.str().c_str()));
+		// I don't really have this information for CUDA devices
+		if (!deviceDesc.isCUDA) {
+			ss.str("");
+			ss << "Local Memory: " << (deviceDesc.localMem / 1024) << " Kbytes";
+			newNode->appendChild(new HardwareTreeItem(ss.str().c_str()));
 
-		ss.str("");
-		ss << "Max. Constant Memory: " << (deviceDesc.constantMem / 1024) << " Kbytes";
-		newNode->appendChild(new HardwareTreeItem(ss.str().c_str()));
+			ss.str("");
+			ss << "Max. Constant Memory: " << (deviceDesc.constantMem / 1024) << " Kbytes";
+			newNode->appendChild(new HardwareTreeItem(ss.str().c_str()));
+		}
 
 		if (deviceDesc.isCUDA) {
 			HardwareTreeItem *useOptixNode = new HardwareTreeItem("Use Optix/RTX");

diff --git a/src/luxmarkapp.h b/src/luxmarkapp.h
@@ -42,7 +42,7 @@
 // List of supported scenes
 #define SCENE_WALLPAPER "scenes/wallpaper/render.cfg"
 #define SCENE_HALLBENCH "scenes/hallbench/render.cfg"
-#define SCENE_CANNELLE_ET_FROMAGE "scenes/CannelleEtFromage/render.cfg"
+#define SCENE_CANNELLE_ET_FROMAGE "scenes/cannelleetfromage/render.cfg"
 
 class LuxMarkApp : public QApplication {
 	Q_OBJECT

diff --git a/src/mainwindow.ui b/src/mainwindow.ui
@@ -175,9 +175,9 @@
     <property name="title">
      <string>&amp;Scene</string>
     </property>
-    <addaction name="action_WallPaper"/>
-    <addaction name="action_HallBench"/>
     <addaction name="action_CannelleEtFromage"/>
+    <addaction name="action_HallBench"/>
+    <addaction name="action_WallPaper"/>
    </widget>
    <addaction name="menu_File"/>
    <addaction name="menu_Mode"/>

diff --git a/src/resultdialog.cpp b/src/resultdialog.cpp
@@ -239,12 +239,12 @@ void ResultDialog::MD5ThreadImpl(ResultDialog *resultDialog) {
 		LM_LOG("Scene files MD5: [" << md5 << "]");
 
 		if (!strcmp(resultDialog->sceneName, SCENE_CANNELLE_ET_FROMAGE)) {
-			if (md5 == "8a1702d7bcdddac9a963e6eaa64d7070")
+			if (md5 == "7465c355dee9ccedecc541104eb73fc1")
 				emit resultDialog->sceneValidationLabelChanged("OK", true, true);
 			else
 				emit resultDialog->sceneValidationLabelChanged("Failed", true, false);
 		} else if (!strcmp(resultDialog->sceneName, SCENE_HALLBENCH)) {
-			if (md5 == "12dfdd54a35d3aca3538bbb15ce15bc7")
+			if (md5 == "04ec8cbef8aa1263b93f16416bfa5dcd")
 				emit resultDialog->sceneValidationLabelChanged("OK", true, true);
 			else
 				emit resultDialog->sceneValidationLabelChanged("Failed", true, false);