LibGL: Convert stencil front/back function and operation to `Array`s

2 files changed, 6 insertions, 8 deletions

diff --git a/Userland/Libraries/LibGL/SoftwareGLContext.cpp b/Userland/Libraries/LibGL/SoftwareGLContext.cpp
index e17af897ed..225ddc016c 100644
--- a/Userland/Libraries/LibGL/SoftwareGLContext.cpp
+++ b/Userland/Libraries/LibGL/SoftwareGLContext.cpp
@@ -2635,9 +2635,9 @@ void SoftwareGLContext::gl_stencil_func_separate(GLenum face, GLenum func, GLint
 
     StencilFunctionOptions new_options = { func, ref, mask };
     if (face == GL_FRONT || face == GL_FRONT_AND_BACK)
-        m_stencil_frontfacing_func = new_options;
+        m_stencil_function[Face::Front] = new_options;
     if (face == GL_BACK || face == GL_FRONT_AND_BACK)
-        m_stencil_backfacing_func = new_options;
+        m_stencil_function[Face::Back] = new_options;
 }
 
 void SoftwareGLContext::gl_stencil_op_separate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
@@ -2677,9 +2677,9 @@ void SoftwareGLContext::gl_stencil_op_separate(GLenum face, GLenum sfail, GLenum
 
     StencilOperationOptions new_options = { sfail, dpfail, dppass };
     if (face == GL_FRONT || face == GL_FRONT_AND_BACK)
-        m_stencil_frontfacing_op = new_options;
+        m_stencil_operation[Face::Front] = new_options;
     if (face == GL_BACK || face == GL_FRONT_AND_BACK)
-        m_stencil_backfacing_op = new_options;
+        m_stencil_operation[Face::Back] = new_options;
 }
 
 void SoftwareGLContext::gl_normal(GLfloat nx, GLfloat ny, GLfloat nz)
diff --git a/Userland/Libraries/LibGL/SoftwareGLContext.h b/Userland/Libraries/LibGL/SoftwareGLContext.h
index e2175e3ac5..5494642944 100644
--- a/Userland/Libraries/LibGL/SoftwareGLContext.h
+++ b/Userland/Libraries/LibGL/SoftwareGLContext.h
@@ -231,16 +231,14 @@ private:
         GLint reference_value { 0 };
         GLuint mask { NumericLimits<GLuint>::max() };
     };
-    StencilFunctionOptions m_stencil_backfacing_func;
-    StencilFunctionOptions m_stencil_frontfacing_func;
+    Array<StencilFunctionOptions, 2u> m_stencil_function;
 
     struct StencilOperationOptions {
         GLenum op_fail { GL_KEEP };
         GLenum op_depth_fail { GL_KEEP };
         GLenum op_pass { GL_KEEP };
     };
-    StencilOperationOptions m_stencil_backfacing_op;
-    StencilOperationOptions m_stencil_frontfacing_op;
+    Array<StencilOperationOptions, 2u> m_stencil_operation;
 
     GLenum m_current_read_buffer = GL_BACK;
     GLenum m_current_draw_buffer = GL_BACK;