Feature/wgpu native

.github/workflows/build_and_test.yml

@@ -141,7 +141,7 @@ jobs:
           CC: gcc
           CXX: g++
         run: |
-          sudo apt-get install ninja-build libspdlog-dev libglm-dev libgl1-mesa-dev libegl1-mesa-dev libtiff-dev libzstd-dev nasm
+          sudo apt-get install ninja-build libspdlog-dev libglm-dev libgl1-mesa-dev libegl1-mesa-dev mesa-vulkan-drivers libtiff-dev libzstd-dev nasm
       - name: linux build and test
         if: matrix.os == 'ubuntu-latest'
         env:

.gitignore

@@ -3,6 +3,7 @@ webclient/node_modules/
 webclient/es/
 
 build/
+out/
 renderlib/version.h
 docs/_build/
 GeneratedFiles/

CMakeLists.txt

@@ -119,6 +119,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 # THE COMMON CORE LIBRARIES
 # #####################
 add_subdirectory(renderlib)
+add_subdirectory(renderlib_wgpu)
 
 set(INSTALLDIR "${CMAKE_PROJECT_NAME}-install")
 

CMakeSettings.json

@@ -0,0 +1,16 @@
+{
+  "configurations": [
+    {
+      "name": "x64-Debug",
+      "generator": "Ninja",
+      "configurationType": "Debug",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
+      "cmakeCommandArgs": "-DVCPKG_TARGET_TRIPLET=x64-windows",
+      "buildCommandArgs": "",
+      "ctestCommandArgs": "",
+      "cmakeToolchain": "C:\\Users\\dmt\\source\\repos\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake"
+    }
+  ]
+}

README.md

@@ -30,6 +30,10 @@ Make sure you are in an environment where vsvarsall has been run, e.g. a "VS2022
 
 A convenient way to install Perl, NASM, and GNU Patch is with chocolatey.
 
+wgpu-native requires:
+Rust
+LLVM and clang
+
 ```
 choco install strawberryperl nasm patch
 ```
@@ -88,6 +92,8 @@ sudo make install
 
 ### For LINUX:
 
+Make sure you have Rust 1.59 or greater installed for the wgpu-native dependency.
+
 Install Qt 6.8.3 in your directory of choice and tell the build where to find it.
 In your favorite Python virtual environment:
 
@@ -100,10 +106,13 @@ aqt install-qt --outputdir ~/Qt linux desktop 6.8.3 -m qtwebsockets qtimageforma
 
 export Qt6_DIR=~/Qt/6.8.3/gcc_64
 
+sudo apt install libclang-dev # for rust / wgpu-native
 sudo apt install libtiff-dev
 sudo apt install libglm-dev
 sudo apt install libgl1-mesa-dev
 sudo apt install libegl1-mesa-dev
+sudo apt install libxkbcommon-dev
+sudo apt install mesa-vulkan-drivers
 sudo apt install libspdlog-dev
 sudo apt install nasm
 sudo apt install libxcb-xkb-dev

agave_app/CMakeLists.txt

@@ -75,6 +75,8 @@ target_sources(agaveapp PRIVATE
 	"${CMAKE_CURRENT_SOURCE_DIR}/TimelineDockWidget.h"
 	"${CMAKE_CURRENT_SOURCE_DIR}/ViewerState.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/ViewerState.h"
+	"${CMAKE_CURRENT_SOURCE_DIR}/wgpuView3D.cpp"
+	"${CMAKE_CURRENT_SOURCE_DIR}/wgpuView3D.h"
 	"${CMAKE_CURRENT_SOURCE_DIR}/ViewToolbar.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/ViewToolbar.h"
 )
@@ -98,6 +100,7 @@ endif(MSVC)
 
 target_link_libraries(agaveapp PRIVATE
 	renderlib
+	renderlib_wgpu
 	Qt::Widgets Qt::Core Qt::Gui Qt::Network Qt::OpenGL Qt::OpenGLWidgets Qt::WebSockets Qt::Xml Qt::Svg
 )
 

agave_app/StatisticsWidget.cpp

@@ -50,7 +50,9 @@ QStatisticsWidget::set(std::shared_ptr<CStatus> status)
     mStatusObject->removeObserver(&mStatusObserver);
   }
   mStatusObject = status;
-  mStatusObject->addObserver(&mStatusObserver);
+  if (mStatusObject) {
+    mStatusObject->addObserver(&mStatusObserver);
+  }
 }
 
 QSize

agave_app/agaveGui.cpp

@@ -111,7 +111,7 @@ agaveGui::agaveGui(QWidget* parent)
   connect(m_tabs, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)));
 
   // add the single gl view as a tab
-  m_glView = new GLView3D(&m_qcamera, &m_qrendersettings, &m_renderSettings, this);
+  m_glView = new WgpuCanvas(&m_qcamera, &m_qrendersettings, &m_renderSettings, this);
   QObject::connect(m_glView, SIGNAL(ChangedRenderer()), this, SLOT(OnUpdateRenderer()));
 
   m_glView->setObjectName("glcontainer");
@@ -725,7 +725,9 @@ agaveGui::onImageLoaded(std::shared_ptr<ImageXYZC> image,
   std::shared_ptr<CStatus> s = m_glView->getStatus();
   // set up the m_statisticsDockWidget as a CStatus  IStatusObserver
   m_statisticsDockWidget->setStatus(s);
-  s->onNewImage(filename, &m_appScene);
+  if (s) {
+    s->onNewImage(filename, &m_appScene);
+  }
 
   m_currentFilePath = loadSpec.filepath;
   agaveGui::prependToRecentFiles(QString::fromStdString(loadSpec.filepath));
@@ -853,7 +855,7 @@ agaveGui::openMesh(const QString& file)
 }
 
 void
-agaveGui::viewFocusChanged(GLView3D* newGlView)
+agaveGui::viewFocusChanged(WgpuCanvas* newGlView)
 {
   if (m_glView == newGlView)
     return;
@@ -870,14 +872,14 @@ agaveGui::viewFocusChanged(GLView3D* newGlView)
 void
 agaveGui::tabChanged(int index)
 {
-  GLView3D* current = 0;
+  WgpuCanvas* current = 0;
   if (index >= 0) {
     QWidget* w = m_tabs->currentWidget();
     if (w) {
       QLayout* layout = w->layout();
       // ASSUMES THAT THE GLVIEW IS THE SECOND WIDGET IN THE LAYOUT
       // TODO could use a QWidget wrapper class to get the glview out
-      current = static_cast<GLView3D*>(layout->itemAt(1)->widget());
+      current = static_cast<WgpuCanvas*>(layout->itemAt(1)->widget());
     }
   }
   viewFocusChanged(current);

agave_app/agaveGui.h

@@ -3,10 +3,10 @@
 #include "ui_agaveGui.h"
 
 #include "Camera.h"
-#include "GLView3D.h"
 #include "QRenderSettings.h"
 #include "ViewerState.h"
 #include "renderDialog.h"
+#include "wgpuView3D.h"
 
 #include "renderlib/AppScene.h"
 #include "renderlib/RenderSettings.h"
@@ -66,7 +66,7 @@ private slots:
   void view_frame();
   void view_toggleProjection();
   void showAxisHelper();
-  void viewFocusChanged(GLView3D* glView);
+  void viewFocusChanged(WgpuCanvas* glView);
   void tabChanged(int index);
   void openMeshDialog();
   void openMesh(const QString& file);
@@ -150,7 +150,7 @@ private slots:
   QStatisticsDockWidget* m_statisticsDockWidget;
 
   QTabWidget* m_tabs;
-  GLView3D* m_glView;
+  WgpuCanvas* m_glView;
   ViewToolbar* m_viewToolbar;
   QWidget* m_viewWithToolbar;
 

agave_app/loadDialog.h

@@ -60,7 +60,6 @@ private slots:
   // select any set of channels
   QListWidget* mChannels;
   Section* mChannelsSection;
-  QTreeWidget* mMetadataTree;
   QLabel* mVolumeLabel;
   QLabel* mMemoryEstimateLabel;
   // select region of interest in zyx

agave_app/main.cpp

@@ -5,6 +5,7 @@
 #include "renderlib/io/FileReader.h"
 #include "renderlib/renderlib.h"
 #include "renderlib/version.h"
+#include "renderlib_wgpu/renderlib_wgpu.h"
 #include "streamserver.h"
 
 #include <QApplication>
@@ -145,16 +146,24 @@ main(int argc, char* argv[])
   Logging::Init();
 
   QApplication::setAttribute(Qt::AA_UseDesktopOpenGL);
+  QApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
+  // TODO remove this for qt 6.6 and up?
   QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
   QApplication::setStyle("fusion");
+  // note that this is called before renderlib::initialize
+  QSurfaceFormat format = renderlib::getQSurfaceFormat();
+  QSurfaceFormat::setDefaultFormat(format);
+
   AgaveApplication a(argc, argv);
   a.setOrganizationName("Allen Institute for Cell Science");
   a.setOrganizationDomain("allencell.org");
   a.setApplicationName("AGAVE");
   a.setApplicationVersion(AICS_VERSION_STRING);
 
-  LOG_INFO << a.organizationName().toStdString() << " " << a.applicationName().toStdString() << " "
-           << a.applicationVersion().toStdString();
+  std::string orgname = a.organizationName().toStdString();
+  std::string appname = a.applicationName().toStdString();
+  std::string appversion = a.applicationVersion().toStdString();
+  LOG_INFO << orgname << " " << appname << " " << appversion;
 
   QCommandLineParser parser;
   parser.setApplicationDescription("Advanced GPU Accelerated Volume Explorer");
@@ -211,6 +220,10 @@ main(int argc, char* argv[])
     renderlib::cleanup();
     return 0;
   }
+  if (!renderlib_wgpu::initialize(isServer, listDevices, selectedGpu)) {
+    renderlib_wgpu::cleanup();
+    return 0;
+  }
 
   int result = 0;