Upgrade from ES2 to ES3 and from WebGL1 to WebGL2

Upgrade from ES2 to ES3 and from WebGL1 to WebGL2. This change is needed in the long term for better rendering features such as: - Transform feedback for GPU based particle simulations. - Instanced rendering. - MSAA FBO. Issue #55
ensisoft · Sep 30, 2023 · ec4d932 · ec4d932
1 parent e1aee55
commit ec4d932
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 11 deletions.
diff --git a/editor/gui/gfxwidget.cpp b/editor/gui/gfxwidget.cpp
@@ -411,7 +411,7 @@ void GfxWindow::doInit()
         }
         virtual Version GetVersion() const override
         {
-            return Version::OpenGL_ES2;
+            return Version::OpenGL_ES3;
         }
     private:
         QOpenGLContext* mContext = nullptr;

diff --git a/editor/gui/host.cpp b/editor/gui/host.cpp
@@ -208,7 +208,7 @@ void Main(int argc, char* argv[])
     // whether the destination color buffer has alpha channel or 
     // not should be irrelevant. 
     QSurfaceFormat format;
-    format.setVersion(2, 0);
+    format.setVersion(3, 0);
     format.setProfile(QSurfaceFormat::CoreProfile);
     format.setRenderableType(QSurfaceFormat::OpenGLES);
     format.setDepthBufferSize(24);

diff --git a/editor/gui/main.cpp b/editor/gui/main.cpp
@@ -465,7 +465,7 @@ int Main(int argc, char* argv[])
     // whether the destination color buffer has alpha channel or
     // not should be irrelevant.
     QSurfaceFormat format;
-    format.setVersion(2, 0);
+    format.setVersion(3, 0);
     format.setProfile(QSurfaceFormat::CoreProfile);
     format.setRenderableType(QSurfaceFormat::OpenGLES);
     format.setDepthBufferSize(24);

diff --git a/editor/gui/playwindow.cpp b/editor/gui/playwindow.cpp
@@ -214,7 +214,7 @@ class PlayWindow::WindowContext : public dev::Context
     }
     virtual Version GetVersion() const override
     {
-        return Version::OpenGL_ES2;
+        return Version::OpenGL_ES3;
     }
     void SetSurface(QWindow* surface)
     { mSurface = surface; }

diff --git a/emscripten/CMakeLists.txt b/emscripten/CMakeLists.txt
@@ -150,6 +150,8 @@ target_link_options(GameEngine PRIVATE -sALLOW_MEMORY_GROWTH)
 target_link_options(GameEngine PRIVATE -lidbfs.js)
 target_link_options(GameEngine PRIVATE -sEXPORTED_FUNCTIONS=_main,_gui_set_flag)
 target_link_options(GameEngine PRIVATE -sEXPORTED_RUNTIME_METHODS=ccall)
+target_link_options(GameEngine PRIVATE -sUSE_WEBGL2)
+target_link_options(GameEngine PRIVATE -sFULL_ES3)
 
 # uncomment this in order to enable threading
 #target_link_options(GameEngine PRIVATE -pthread)

diff --git a/emscripten/main.cpp b/emscripten/main.cpp
@@ -114,7 +114,7 @@ class WebGLContext : public dev::Context
         attrs.depth                        = true;
         attrs.stencil                      = true;
         attrs.antialias                    = antialias;
-        attrs.majorVersion                 = 1; // WebGL 1.0 is based on OpenGL ES 2.0
+        attrs.majorVersion                 = 2; // WebGL 2.0 is based on OpenGL ES 3.0
         attrs.minorVersion                 = 0;
         attrs.preserveDrawingBuffer        = false;
         attrs.failIfMajorPerformanceCaveat = true;
@@ -161,7 +161,7 @@ class WebGLContext : public dev::Context
     }
     virtual Version GetVersion() const override
     {
-        return Version::WebGL_1;
+        return Version::WebGL_2;
     }
 private:
     EMSCRIPTEN_WEBGL_CONTEXT_HANDLE mContext = 0;

diff --git a/engine/main/main.cpp b/engine/main/main.cpp
@@ -199,8 +199,7 @@ class WindowContext : public dev::Context
     WindowContext(const wdk::Config::Attributes& attrs, bool debug)
     {
         mConfig  = std::make_unique<wdk::Config>(attrs);
-        mContext = std::make_unique<wdk::Context>(*mConfig, 2, 0, debug,
-            wdk::Context::Type::OpenGL_ES);
+        mContext = std::make_unique<wdk::Context>(*mConfig, 3, 0, debug, wdk::Context::Type::OpenGL_ES);
         mVisualID = mConfig->GetVisualID();
         mDebug = debug;
     }
@@ -218,7 +217,7 @@ class WindowContext : public dev::Context
     }
     virtual Version GetVersion() const override
     {
-        return Version::OpenGL_ES2;
+        return Version::OpenGL_ES3;
     }
     virtual bool IsDebug() const override
     {

diff --git a/tools/test/3d/main.cpp b/tools/test/3d/main.cpp
@@ -617,7 +617,7 @@ int main(int argc, char* argv[])
             attrs.sampling        = wdk::Config::Multisampling::MSAA4;
             attrs.srgb_buffer     = true;
             mConfig   = std::make_unique<wdk::Config>(attrs);
-            mContext  = std::make_unique<wdk::Context>(*mConfig, 2, 0,  false /*debug*/, wdk::Context::Type::OpenGL_ES);
+            mContext  = std::make_unique<wdk::Context>(*mConfig, 3, 0,  false /*debug*/, wdk::Context::Type::OpenGL_ES);
             mVisualID = mConfig->GetVisualID();
         }
         virtual void Display() override
@@ -634,7 +634,7 @@ int main(int argc, char* argv[])
         }
         virtual Version GetVersion() const override
         {
-            return Version::OpenGL_ES2;
+            return Version::OpenGL_ES3;
         }
         virtual bool IsDebug() const override
         {