LibWeb: Move WebGL error variable to WebGLRenderingContextBase

Implementations in both WebGL1 and WebGL2 were the same and most
probably will stay the same.

Author: cqundefine

Libraries/LibWeb/WebGL/WebGL2RenderingContext.cpp

@@ -109,15 +109,6 @@ void WebGL2RenderingContext::needs_to_present()
     m_canvas_element->paintable()->set_needs_display();
 }
 
-void WebGL2RenderingContext::set_error(GLenum error)
-{
-    auto context_error = glGetError();
-    if (context_error != GL_NO_ERROR)
-        m_error = context_error;
-    else
-        m_error = error;
-}
-
 bool WebGL2RenderingContext::is_context_lost() const
 {
     dbgln_if(WEBGL_CONTEXT_DEBUG, "WebGLRenderingContext::is_context_lost()");

Libraries/LibWeb/WebGL/WebGL2RenderingContext.h

@@ -82,8 +82,6 @@ class WebGL2RenderingContext final : public Bindings::PlatformObject
     // - clear, drawArrays, or drawElements has been called while the drawing buffer is the currently bound framebuffer
     bool m_should_present { true };
 
-    GLenum m_error { 0 };
-
     Vector<WebIDL::UnsignedLong> m_enabled_compressed_texture_formats;
 
     // Extensions
@@ -94,8 +92,6 @@ class WebGL2RenderingContext final : public Bindings::PlatformObject
     GC::Ptr<Extensions::EXTTextureNorm16> m_ext_texture_norm16;
     GC::Ptr<Extensions::WebGLCompressedTextureS3tc> m_webgl_compressed_texture_s3tc_extension;
     GC::Ptr<Extensions::WebGLCompressedTextureS3tcSrgb> m_webgl_compressed_texture_s3tc_srgb_extension;
-
-    virtual void set_error(GLenum error) override;
 };
 
 }

Libraries/LibWeb/WebGL/WebGLRenderingContext.cpp

@@ -127,15 +127,6 @@ void WebGLRenderingContext::needs_to_present()
     m_canvas_element->paintable()->set_needs_display();
 }
 
-void WebGLRenderingContext::set_error(GLenum error)
-{
-    auto context_error = glGetError();
-    if (context_error != GL_NO_ERROR)
-        m_error = context_error;
-    else
-        m_error = error;
-}
-
 bool WebGLRenderingContext::is_context_lost() const
 {
     dbgln_if(WEBGL_CONTEXT_DEBUG, "WebGLRenderingContext::is_context_lost()");

Libraries/LibWeb/WebGL/WebGLRenderingContext.h

@@ -81,8 +81,6 @@ class WebGLRenderingContext final : public Bindings::PlatformObject
     // - clear, drawArrays, or drawElements has been called while the drawing buffer is the currently bound framebuffer
     bool m_should_present { true };
 
-    GLenum m_error { 0 };
-
     Vector<WebIDL::UnsignedLong> m_enabled_compressed_texture_formats;
 
     // Extensions
@@ -94,8 +92,6 @@ class WebGLRenderingContext final : public Bindings::PlatformObject
     GC::Ptr<Extensions::WebGLCompressedTextureS3tc> m_webgl_compressed_texture_s3tc_extension;
     GC::Ptr<Extensions::WebGLCompressedTextureS3tcSrgb> m_webgl_compressed_texture_s3tc_srgb_extension;
     GC::Ptr<Extensions::WebGLDrawBuffers> m_webgl_draw_buffers_extension;
-
-    virtual void set_error(GLenum error) override;
 };
 
 void fire_webgl_context_event(HTML::HTMLCanvasElement& canvas_element, FlyString const& type);

Libraries/LibWeb/WebGL/WebGLRenderingContextBase.cpp

@@ -195,4 +195,13 @@ Optional<WebGLRenderingContextBase::ConvertedTexture> WebGLRenderingContextBase:
     };
 }
 
+void WebGLRenderingContextBase::set_error(GLenum error)
+{
+    auto context_error = glGetError();
+    if (context_error != GL_NO_ERROR)
+        m_error = context_error;
+    else
+        m_error = error;
+}
+
 }

Libraries/LibWeb/WebGL/WebGLRenderingContextBase.h

@@ -138,6 +138,8 @@ class WebGLRenderingContextBase {
         return result;
     }
 
+    void set_error(GLenum error);
+
     // UNPACK_FLIP_Y_WEBGL of type boolean
     //      If set, then during any subsequent calls to texImage2D or texSubImage2D, the source data is flipped along
     //      the vertical axis, so that conceptually the last row is the first one transferred. The initial value is false.
@@ -149,6 +151,9 @@ class WebGLRenderingContextBase {
     //      if present, is multiplied into the color channels during the data transfer. The initial value is false.
     //      Any non-zero value is interpreted as true.
     bool m_unpack_premultiply_alpha { false };
+
+private:
+    GLenum m_error { 0 };
 };
 
 }

Libraries/LibWeb/WebGL/WebGLRenderingContextImpl.h

@@ -28,7 +28,7 @@ class WebGLRenderingContextImpl : public WebGLRenderingContextBase {
 
     virtual void present() = 0;
     virtual void needs_to_present() = 0;
-    virtual void set_error(GLenum) = 0;
+
     void active_texture(WebIDL::UnsignedLong texture);
     void attach_shader(GC::Root<WebGLProgram> program, GC::Root<WebGLShader> shader);
     void bind_attrib_location(GC::Root<WebGLProgram> program, WebIDL::UnsignedLong index, String name);