RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 17:07:34 +00:00
Code Issues Activity Actions

LibGL: Implement glPolygonMode

Browse source 
Currently just sets the renderer option for what polygon mode we
want the rasterizer to draw in. GLQuake only uses `GL_FRONT_AND_BACK`
with `GL_FILL` )which implies both back and front facing triangles
are to be filled completely by the rasterizer), so keeping this as
a small stub is perfectly fine for now.
This commit is contained in:
Jesse Buhagiar 2021-08-17 22:00:39 +10:00 • committed by Ali Mohammad Pur
parent f58e2350dc
commit 89eddb5bff
6 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Userland/Libraries/LibGL/GL/gl.h
View file

@ -170,6 +170,8 @@ extern "C" {
#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 #define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004
// Polygon modes // Polygon modes
#define GL_POINT 0x1B00
#define GL_LINE 0x1B01
#define GL_FILL 0x1B02 #define GL_FILL 0x1B02
// Pixel formats // Pixel formats
@ -371,6 +373,7 @@ GLAPI void glDrawArrays(GLenum mode, GLint first, GLsizei count);
GLAPI void glDrawElements(GLenum mode, GLsizei count, GLenum type, const void* indices); GLAPI void glDrawElements(GLenum mode, GLsizei count, GLenum type, const void* indices);
GLAPI void glDepthRange(GLdouble nearVal, GLdouble farVal); GLAPI void glDepthRange(GLdouble nearVal, GLdouble farVal);
GLAPI void glDepthFunc(GLenum func); GLAPI void glDepthFunc(GLenum func);
GLAPI void glPolygonMode(GLenum face, GLenum mode);
#ifdef __cplusplus #ifdef __cplusplus
} }

1
Userland/Libraries/LibGL/GLContext.h
View file

@ -76,6 +76,7 @@ public:
virtual void gl_get_integerv(GLenum pname, GLint* data) = 0; virtual void gl_get_integerv(GLenum pname, GLint* data) = 0;
virtual void gl_depth_range(GLdouble min, GLdouble max) = 0; virtual void gl_depth_range(GLdouble min, GLdouble max) = 0;
virtual void gl_depth_func(GLenum func) = 0; virtual void gl_depth_func(GLenum func) = 0;
virtual void gl_polygon_mode(GLenum face, GLenum mode) = 0;
virtual void present() = 0; virtual void present() = 0;
}; };

5
Userland/Libraries/LibGL/GLUtils.cpp
View file

@ -129,3 +129,8 @@ void glDepthFunc(GLenum func)
{ {
g_gl_context->gl_depth_func(func); g_gl_context->gl_depth_func(func);
} }
void glPolygonMode(GLenum face, GLenum mode)
{
g_gl_context->gl_polygon_mode(face, mode);
}

12
Userland/Libraries/LibGL/SoftwareGLContext.cpp
View file

@ -1733,6 +1733,18 @@ void SoftwareGLContext::gl_color_mask(GLboolean red, GLboolean green, GLboolean
m_rasterizer.set_options(options); m_rasterizer.set_options(options);
} }
void SoftwareGLContext::gl_polygon_mode(GLenum face, GLenum mode)
{
RETURN_WITH_ERROR_IF(!(face == GL_BACK || face == GL_FRONT || face == GL_FRONT_AND_BACK), GL_INVALID_ENUM);
RETURN_WITH_ERROR_IF(!(mode == GL_POINT || mode == GL_LINE || mode == GL_FILL), GL_INVALID_ENUM);
RETURN_WITH_ERROR_IF(m_in_draw_state, GL_INVALID_OPERATION);
auto options = m_rasterizer.options();
options.polygon_mode = mode;
m_rasterizer.set_options(options);
}
void SoftwareGLContext::present() void SoftwareGLContext::present()
{ {
m_rasterizer.blit_to(*m_frontbuffer); m_rasterizer.blit_to(*m_frontbuffer);

1
Userland/Libraries/LibGL/SoftwareGLContext.h
View file

@ -86,6 +86,7 @@ public:
virtual void gl_get_integerv(GLenum pname, GLint* data) override; virtual void gl_get_integerv(GLenum pname, GLint* data) override;
virtual void gl_depth_range(GLdouble min, GLdouble max) override; virtual void gl_depth_range(GLdouble min, GLdouble max) override;
virtual void gl_depth_func(GLenum func) override; virtual void gl_depth_func(GLenum func) override;
virtual void gl_polygon_mode(GLenum face, GLenum mode) override;
virtual void present() override; virtual void present() override;
private: private:

1
Userland/Libraries/LibGL/SoftwareRasterizer.h
View file

@ -32,6 +32,7 @@ struct RasterizerOptions {
float depth_min { 0 }; float depth_min { 0 };
float depth_max { 1 }; float depth_max { 1 };
GLenum depth_func { GL_LESS }; GLenum depth_func { GL_LESS };
GLenum polygon_mode { GL_FILL };
}; };
class SoftwareRasterizer final { class SoftwareRasterizer final {