Add polyvox to shader tests and clean up test code

tests/shaders/src/main.cpp

@@ -20,6 +20,8 @@
 #include <QDir>
 #include <QGuiApplication>
 
+#include <GLHelpers.h>
+
 #include "../model/Skybox_vert.h"
 #include "../model/Skybox_frag.h"
 
@@ -112,85 +114,22 @@
 #include "paintStroke_vert.h"
 #include "paintStroke_frag.h"
 
-class RateCounter {
+#include "polyvox_vert.h"
-    std::vector<float> times;
+#include "polyvox_frag.h"
-    QElapsedTimer timer;
-public:
-    RateCounter() {
-        timer.start();
-    }
-
-    void reset() {
-        times.clear();
-    }
-
-    unsigned int count() const {
-        return times.size() - 1;
-    }
-
-    float elapsed() const {
-        if (times.size() < 1) {
-            return 0.0f;
-        }
-        float elapsed = *times.rbegin() - *times.begin();
-        return elapsed;
-    }
-
-    void increment() {
-        times.push_back(timer.elapsed() / 1000.0f);
-    }
-
-    float rate() const {
-        if (elapsed() == 0.0f) {
-            return 0.0f;
-        }
-        return (float) count() / elapsed();
-    }
-};
-
-
-const QString& getQmlDir() {
-    static QString dir;
-    if (dir.isEmpty()) {
-        QDir path(__FILE__);
-        path.cdUp();
-        dir = path.cleanPath(path.absoluteFilePath("../../../interface/resources/qml/")) + "/";
-        qDebug() << "Qml Path: " << dir;
-    }
-    return dir;
-}
 
 // Create a simple OpenGL window that renders text in various ways
 class QTestWindow : public QWindow {
     Q_OBJECT
-
     QOpenGLContext* _context{ nullptr };
-    QSize _size;
-    //TextRenderer* _textRenderer[4];
-    RateCounter fps;
 
 protected:
     void renderText();
 
-private:
-    void resizeWindow(const QSize& size) {
-        _size = size;
-    }
-
 public:
     QTestWindow() {
         setSurfaceType(QSurface::OpenGLSurface);
-
+        QSurfaceFormat format = getDefaultOpenGlSurfaceFormat();
-        QSurfaceFormat format;
-        // Qt Quick may need a depth and stencil buffer. Always make sure these are available.
-        format.setDepthBufferSize(16);
-        format.setStencilBufferSize(8);
-        format.setVersion(4, 1);
-        format.setProfile(QSurfaceFormat::OpenGLContextProfile::CoreProfile);
-        format.setOption(QSurfaceFormat::DebugContext);
-
         setFormat(format);
-
         _context = new QOpenGLContext;
         _context->setFormat(format);
         _context->create();
@@ -199,8 +138,6 @@ public:
         makeCurrent();
 
         gpu::Context::init<gpu::GLBackend>();
-
-
         {
             QOpenGLDebugLogger* logger = new QOpenGLDebugLogger(this);
             logger->initialize(); // initializes in the current context, i.e. ctx
@@ -208,25 +145,8 @@ public:
             connect(logger, &QOpenGLDebugLogger::messageLogged, this, [&](const QOpenGLDebugMessage & debugMessage) {
                 qDebug() << debugMessage;
             });
-            //        logger->startLogging(QOpenGLDebugLogger::SynchronousLogging);
         }
-        qDebug() << (const char*)glGetString(GL_VERSION);
-
-        //_textRenderer[0] = TextRenderer::getInstance(SANS_FONT_FAMILY, 12, false);
-        //_textRenderer[1] = TextRenderer::getInstance(SERIF_FONT_FAMILY, 12, false,
-        //    TextRenderer::SHADOW_EFFECT);
-        //_textRenderer[2] = TextRenderer::getInstance(MONO_FONT_FAMILY, 48, -1,
-        //    false, TextRenderer::OUTLINE_EFFECT);
-        //_textRenderer[3] = TextRenderer::getInstance(INCONSOLATA_FONT_FAMILY, 24);
-
-        glEnable(GL_BLEND);
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-        glClearColor(0.2f, 0.2f, 0.2f, 1);
-        glDisable(GL_DEPTH_TEST);
-
         makeCurrent();
-
-//        setFramePosition(QPoint(-1000, 0));
         resize(QSize(800, 600));
     }
 
@@ -237,18 +157,15 @@ public:
     void makeCurrent() {
         _context->makeCurrent(this);
     }
-
-protected:
-    void resizeEvent(QResizeEvent* ev) override {
-        resizeWindow(ev->size());
-    }
 };
 
 void testShaderBuild(const char* vs_src, const char * fs_src) {
     auto vs = gpu::ShaderPointer(gpu::Shader::createVertex(std::string(vs_src)));
     auto fs = gpu::ShaderPointer(gpu::Shader::createPixel(std::string(fs_src)));
     auto pr = gpu::ShaderPointer(gpu::Shader::createProgram(vs, fs));
-    gpu::Shader::makeProgram(*pr);
+    if (!gpu::Shader::makeProgram(*pr)) {
+        throw std::runtime_error("Failed to compile shader");
+    }
 }
 
 void QTestWindow::draw() {
@@ -257,8 +174,8 @@ void QTestWindow::draw() {
     }
 
     makeCurrent();
+    glClearColor(0.2f, 0.2f, 0.2f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-    glViewport(0, 0, _size.width() * devicePixelRatio(), _size.height() * devicePixelRatio());
 
     static std::once_flag once;
     std::call_once(once, [&]{
@@ -328,17 +245,10 @@ void QTestWindow::draw() {
         testShaderBuild(Skybox_vert, Skybox_frag);
         
         testShaderBuild(paintStroke_vert,paintStroke_frag);
+        testShaderBuild(polyvox_vert, polyvox_frag);
 
     });
-
     _context->swapBuffers(this);
-    glFinish();
-
-    fps.increment();
-    if (fps.elapsed() >= 2.0f) {
-        qDebug() << "FPS: " << fps.rate();
-        fps.reset();
-    }
 }
 
 void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message) {
@@ -352,7 +262,6 @@ void messageHandler(QtMsgType type, const QMessageLogContext& context, const QSt
     }
 }
 
-
 const char * LOG_FILTER_RULES = R"V0G0N(
 hifi.gpu=true
 )V0G0N";