diff options
author | Idan Horowitz <idan.horowitz@gmail.com> | 2022-04-01 20:58:27 +0300 |
---|---|---|
committer | Linus Groh <mail@linusgroh.de> | 2022-04-01 21:24:45 +0100 |
commit | 086969277e74d8ba065bf8145d3aeb0dec0bfee5 (patch) | |
tree | 02b3699a66735ef806d9b46353491f18f8e4e7b4 /Userland/Libraries/LibGL | |
parent | 0376c127f6e98e03607700d0b3f5154b7014b2f8 (diff) | |
download | serenity-086969277e74d8ba065bf8145d3aeb0dec0bfee5.zip |
Everywhere: Run clang-format
Diffstat (limited to 'Userland/Libraries/LibGL')
-rw-r--r-- | Userland/Libraries/LibGL/GL/gl.h | 50 | ||||
-rw-r--r-- | Userland/Libraries/LibGL/GLColor.cpp | 6 | ||||
-rw-r--r-- | Userland/Libraries/LibGL/GLContext.cpp | 41 | ||||
-rw-r--r-- | Userland/Libraries/LibGL/GLContext.h | 16 | ||||
-rw-r--r-- | Userland/Libraries/LibGL/GLDraw.cpp | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibGL/GLTexture.cpp | 10 | ||||
-rw-r--r-- | Userland/Libraries/LibGL/GLVert.cpp | 26 | ||||
-rw-r--r-- | Userland/Libraries/LibGL/GLVertexArrays.cpp | 8 |
8 files changed, 79 insertions, 80 deletions
diff --git a/Userland/Libraries/LibGL/GL/gl.h b/Userland/Libraries/LibGL/GL/gl.h index ce37953258..696ae07cce 100644 --- a/Userland/Libraries/LibGL/GL/gl.h +++ b/Userland/Libraries/LibGL/GL/gl.h @@ -484,26 +484,26 @@ GLAPI void glClearStencil(GLint s); GLAPI void glColor3d(GLdouble r, GLdouble g, GLdouble b); GLAPI void glColor3dv(GLdouble const* v); GLAPI void glColor3f(GLfloat r, GLfloat g, GLfloat b); -GLAPI void glColor3fv(const GLfloat* v); +GLAPI void glColor3fv(GLfloat const* v); GLAPI void glColor3ub(GLubyte r, GLubyte g, GLubyte b); GLAPI void glColor3ubv(GLubyte const* v); GLAPI void glColor4b(GLbyte r, GLbyte g, GLbyte b, GLbyte a); GLAPI void glColor4dv(GLdouble const* v); GLAPI void glColor4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a); -GLAPI void glColor4fv(const GLfloat* v); +GLAPI void glColor4fv(GLfloat const* v); GLAPI void glColor4ub(GLubyte r, GLubyte g, GLubyte b, GLubyte a); -GLAPI void glColor4ubv(const GLubyte* v); +GLAPI void glColor4ubv(GLubyte const* v); GLAPI void glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); GLAPI void glColorMaterial(GLenum face, GLenum mode); -GLAPI void glDeleteTextures(GLsizei n, const GLuint* textures); +GLAPI void glDeleteTextures(GLsizei n, GLuint const* textures); GLAPI void glEnd(); GLAPI void glFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble nearVal, GLdouble farVal); GLAPI void glGenTextures(GLsizei n, GLuint* textures); GLAPI GLenum glGetError(); GLAPI GLubyte* glGetString(GLenum name); GLAPI void glLoadIdentity(); -GLAPI void glLoadMatrixd(const GLdouble* matrix); -GLAPI void glLoadMatrixf(const GLfloat* matrix); +GLAPI void glLoadMatrixd(GLdouble const* matrix); +GLAPI void glLoadMatrixf(GLfloat const* matrix); GLAPI void glMatrixMode(GLenum mode); GLAPI void glOrtho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble nearVal, GLdouble farVal); GLAPI void glPushMatrix(); @@ -517,29 +517,29 @@ GLAPI void glScalef(GLfloat x, GLfloat y, GLfloat z); GLAPI void glTranslated(GLdouble x, GLdouble y, GLdouble z); GLAPI void glTranslatef(GLfloat x, GLfloat y, GLfloat z); GLAPI void glVertex2d(GLdouble x, GLdouble y); -GLAPI void glVertex2dv(const GLdouble* v); +GLAPI void glVertex2dv(GLdouble const* v); GLAPI void glVertex2f(GLfloat x, GLfloat y); -GLAPI void glVertex2fv(const GLfloat* v); +GLAPI void glVertex2fv(GLfloat const* v); GLAPI void glVertex2i(GLint x, GLint y); -GLAPI void glVertex2iv(const GLint* v); +GLAPI void glVertex2iv(GLint const* v); GLAPI void glVertex2s(GLshort x, GLshort y); -GLAPI void glVertex2sv(const GLshort* v); +GLAPI void glVertex2sv(GLshort const* v); GLAPI void glVertex3d(GLdouble x, GLdouble y, GLdouble z); -GLAPI void glVertex3dv(const GLdouble* v); +GLAPI void glVertex3dv(GLdouble const* v); GLAPI void glVertex3f(GLfloat x, GLfloat y, GLfloat z); -GLAPI void glVertex3fv(const GLfloat* v); +GLAPI void glVertex3fv(GLfloat const* v); GLAPI void glVertex3i(GLint x, GLint y, GLint z); -GLAPI void glVertex3iv(const GLint* v); +GLAPI void glVertex3iv(GLint const* v); GLAPI void glVertex3s(GLshort x, GLshort y, GLshort z); -GLAPI void glVertex3sv(const GLshort* v); +GLAPI void glVertex3sv(GLshort const* v); GLAPI void glVertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void glVertex4dv(const GLdouble* v); +GLAPI void glVertex4dv(GLdouble const* v); GLAPI void glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void glVertex4fv(const GLfloat* v); +GLAPI void glVertex4fv(GLfloat const* v); GLAPI void glVertex4i(GLint x, GLint y, GLint z, GLint w); -GLAPI void glVertex4iv(const GLint* v); +GLAPI void glVertex4iv(GLint const* v); GLAPI void glVertex4s(GLshort x, GLshort y, GLshort z, GLshort w); -GLAPI void glVertex4sv(const GLshort* v); +GLAPI void glVertex4sv(GLshort const* v); GLAPI void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); GLAPI void glEnable(GLenum cap); GLAPI void glDisable(GLenum cap); @@ -566,7 +566,7 @@ GLAPI void glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum GLAPI void glTexImage1D(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, GLvoid const* data); GLAPI void glTexImage2D(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, GLvoid const* data); GLAPI void glTexImage3D(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, GLvoid const* data); -GLAPI void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid* data); +GLAPI void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid const* data); GLAPI void glTexCoord1f(GLfloat s); GLAPI void glTexCoord1fv(GLfloat const* v); GLAPI void glTexCoord2d(GLdouble s, GLdouble t); @@ -577,7 +577,7 @@ GLAPI void glTexCoord2i(GLint s, GLint t); GLAPI void glTexCoord3f(GLfloat s, GLfloat t, GLfloat r); GLAPI void glTexCoord3fv(GLfloat const* v); GLAPI void glTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q); -GLAPI void glTexCoord4fv(const GLfloat* v); +GLAPI void glTexCoord4fv(GLfloat const* v); GLAPI void glMultiTexCoord2fARB(GLenum target, GLfloat s, GLfloat t); GLAPI void glMultiTexCoord2f(GLenum target, GLfloat s, GLfloat t); GLAPI void glTexParameteri(GLenum target, GLenum pname, GLint param); @@ -602,12 +602,12 @@ GLAPI void glDisableClientState(GLenum cap); GLAPI void glClientActiveTextureARB(GLenum target); GLAPI void glClientActiveTexture(GLenum target); -GLAPI void glVertexPointer(GLint size, GLenum type, GLsizei stride, const void* pointer); -GLAPI void glColorPointer(GLint size, GLenum type, GLsizei stride, const void* pointer); -GLAPI void glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const void* pointer); +GLAPI void glVertexPointer(GLint size, GLenum type, GLsizei stride, void const* pointer); +GLAPI void glColorPointer(GLint size, GLenum type, GLsizei stride, void const* pointer); +GLAPI void glTexCoordPointer(GLint size, GLenum type, GLsizei stride, void const* pointer); GLAPI void glDrawArrays(GLenum mode, GLint first, GLsizei count); -GLAPI void glDrawElements(GLenum mode, GLsizei count, GLenum type, const void* indices); -GLAPI void glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const void* data); +GLAPI void glDrawElements(GLenum mode, GLsizei count, GLenum type, void const* indices); +GLAPI void glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, void const* data); GLAPI void glDepthRange(GLdouble nearVal, GLdouble farVal); GLAPI void glDepthFunc(GLenum func); GLAPI void glPolygonMode(GLenum face, GLenum mode); diff --git a/Userland/Libraries/LibGL/GLColor.cpp b/Userland/Libraries/LibGL/GLColor.cpp index a3b50c3fc1..4eb277c919 100644 --- a/Userland/Libraries/LibGL/GLColor.cpp +++ b/Userland/Libraries/LibGL/GLColor.cpp @@ -26,7 +26,7 @@ void glColor3f(GLfloat r, GLfloat g, GLfloat b) g_gl_context->gl_color(r, g, b, 1.0); } -void glColor3fv(const GLfloat* v) +void glColor3fv(GLfloat const* v) { g_gl_context->gl_color(v[0], v[1], v[2], 1.0); } @@ -60,7 +60,7 @@ void glColor4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a) g_gl_context->gl_color(r, g, b, a); } -void glColor4fv(const GLfloat* v) +void glColor4fv(GLfloat const* v) { g_gl_context->gl_color(v[0], v[1], v[2], v[3]); } @@ -70,7 +70,7 @@ void glColor4ub(GLubyte r, GLubyte g, GLubyte b, GLubyte a) g_gl_context->gl_color(r / 255.0, g / 255.0, b / 255.0, a / 255.0); } -void glColor4ubv(const GLubyte* v) +void glColor4ubv(GLubyte const* v) { g_gl_context->gl_color(v[0] / 255.0, v[1] / 255.0, v[2] / 255.0, v[3] / 255.0); } diff --git a/Userland/Libraries/LibGL/GLContext.cpp b/Userland/Libraries/LibGL/GLContext.cpp index 0c0246f25d..f57c6f99b5 100644 --- a/Userland/Libraries/LibGL/GLContext.cpp +++ b/Userland/Libraries/LibGL/GLContext.cpp @@ -471,7 +471,7 @@ void GLContext::gl_load_identity() *m_current_matrix = FloatMatrix4x4::identity(); } -void GLContext::gl_load_matrix(const FloatMatrix4x4& matrix) +void GLContext::gl_load_matrix(FloatMatrix4x4 const& matrix) { APPEND_TO_CALL_LIST_WITH_ARG_AND_RETURN_IF_NEEDED(gl_load_matrix, matrix); RETURN_WITH_ERROR_IF(m_in_draw_state, GL_INVALID_OPERATION); @@ -859,7 +859,7 @@ void GLContext::gl_gen_textures(GLsizei n, GLuint* textures) } } -void GLContext::gl_delete_textures(GLsizei n, const GLuint* textures) +void GLContext::gl_delete_textures(GLsizei n, GLuint const* textures) { RETURN_WITH_ERROR_IF(n < 0, GL_INVALID_VALUE); RETURN_WITH_ERROR_IF(m_in_draw_state, GL_INVALID_OPERATION); @@ -1070,8 +1070,7 @@ void GLContext::invoke_list(size_t list_index) for (auto& entry : listing.entries) { entry.function.visit([&](auto& function) { entry.arguments.visit([&](auto& arguments) { - auto apply = [&]<typename... Args>(Args && ... args) - { + auto apply = [&]<typename... Args>(Args&&... args) { if constexpr (requires { (this->*function)(forward<Args>(args)...); }) (this->*function)(forward<Args>(args)...); }; @@ -1987,7 +1986,7 @@ void GLContext::gl_client_active_texture(GLenum target) m_client_active_texture = target - GL_TEXTURE0; } -void GLContext::gl_vertex_pointer(GLint size, GLenum type, GLsizei stride, const void* pointer) +void GLContext::gl_vertex_pointer(GLint size, GLenum type, GLsizei stride, void const* pointer) { RETURN_WITH_ERROR_IF(m_in_draw_state, GL_INVALID_OPERATION); RETURN_WITH_ERROR_IF(!(size == 2 || size == 3 || size == 4), GL_INVALID_VALUE); @@ -1997,7 +1996,7 @@ void GLContext::gl_vertex_pointer(GLint size, GLenum type, GLsizei stride, const m_client_vertex_pointer = { .size = size, .type = type, .stride = stride, .pointer = pointer }; } -void GLContext::gl_color_pointer(GLint size, GLenum type, GLsizei stride, const void* pointer) +void GLContext::gl_color_pointer(GLint size, GLenum type, GLsizei stride, void const* pointer) { RETURN_WITH_ERROR_IF(m_in_draw_state, GL_INVALID_OPERATION); RETURN_WITH_ERROR_IF(!(size == 3 || size == 4), GL_INVALID_VALUE); @@ -2015,7 +2014,7 @@ void GLContext::gl_color_pointer(GLint size, GLenum type, GLsizei stride, const m_client_color_pointer = { .size = size, .type = type, .stride = stride, .pointer = pointer }; } -void GLContext::gl_tex_coord_pointer(GLint size, GLenum type, GLsizei stride, const void* pointer) +void GLContext::gl_tex_coord_pointer(GLint size, GLenum type, GLsizei stride, void const* pointer) { RETURN_WITH_ERROR_IF(m_in_draw_state, GL_INVALID_OPERATION); RETURN_WITH_ERROR_IF(!(size == 1 || size == 2 || size == 3 || size == 4), GL_INVALID_VALUE); @@ -2117,7 +2116,7 @@ void GLContext::gl_draw_arrays(GLenum mode, GLint first, GLsizei count) gl_end(); } -void GLContext::gl_draw_elements(GLenum mode, GLsizei count, GLenum type, const void* indices) +void GLContext::gl_draw_elements(GLenum mode, GLsizei count, GLenum type, void const* indices) { APPEND_TO_CALL_LIST_AND_RETURN_IF_NEEDED(gl_draw_elements, mode, count, type, indices); RETURN_WITH_ERROR_IF(m_in_draw_state, GL_INVALID_OPERATION); @@ -2147,13 +2146,13 @@ void GLContext::gl_draw_elements(GLenum mode, GLsizei count, GLenum type, const int i = 0; switch (type) { case GL_UNSIGNED_BYTE: - i = reinterpret_cast<const GLubyte*>(indices)[index]; + i = reinterpret_cast<GLubyte const*>(indices)[index]; break; case GL_UNSIGNED_SHORT: - i = reinterpret_cast<const GLushort*>(indices)[index]; + i = reinterpret_cast<GLushort const*>(indices)[index]; break; case GL_UNSIGNED_INT: - i = reinterpret_cast<const GLuint*>(indices)[index]; + i = reinterpret_cast<GLuint const*>(indices)[index]; break; } @@ -2184,7 +2183,7 @@ void GLContext::gl_draw_elements(GLenum mode, GLsizei count, GLenum type, const gl_end(); } -void GLContext::gl_draw_pixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const void* data) +void GLContext::gl_draw_pixels(GLsizei width, GLsizei height, GLenum format, GLenum type, void const* data) { APPEND_TO_CALL_LIST_AND_RETURN_IF_NEEDED(gl_draw_pixels, width, height, format, type, data); @@ -2335,7 +2334,7 @@ void GLContext::gl_depth_func(GLenum func) // General helper function to read arbitrary vertex attribute data into a float array void GLContext::read_from_vertex_attribute_pointer(VertexAttribPointer const& attrib, int index, float* elements) { - auto byte_ptr = reinterpret_cast<const char*>(attrib.pointer); + auto byte_ptr = reinterpret_cast<char const*>(attrib.pointer); auto normalize = attrib.normalize; size_t stride = attrib.stride; @@ -2345,7 +2344,7 @@ void GLContext::read_from_vertex_attribute_pointer(VertexAttribPointer const& at stride = sizeof(GLbyte) * attrib.size; for (int i = 0; i < attrib.size; i++) { - elements[i] = *(reinterpret_cast<const GLbyte*>(byte_ptr + stride * index) + i); + elements[i] = *(reinterpret_cast<GLbyte const*>(byte_ptr + stride * index) + i); if (normalize) elements[i] /= 0x80; } @@ -2356,7 +2355,7 @@ void GLContext::read_from_vertex_attribute_pointer(VertexAttribPointer const& at stride = sizeof(GLubyte) * attrib.size; for (int i = 0; i < attrib.size; i++) { - elements[i] = *(reinterpret_cast<const GLubyte*>(byte_ptr + stride * index) + i); + elements[i] = *(reinterpret_cast<GLubyte const*>(byte_ptr + stride * index) + i); if (normalize) elements[i] /= 0xff; } @@ -2367,7 +2366,7 @@ void GLContext::read_from_vertex_attribute_pointer(VertexAttribPointer const& at stride = sizeof(GLshort) * attrib.size; for (int i = 0; i < attrib.size; i++) { - elements[i] = *(reinterpret_cast<const GLshort*>(byte_ptr + stride * index) + i); + elements[i] = *(reinterpret_cast<GLshort const*>(byte_ptr + stride * index) + i); if (normalize) elements[i] /= 0x8000; } @@ -2378,7 +2377,7 @@ void GLContext::read_from_vertex_attribute_pointer(VertexAttribPointer const& at stride = sizeof(GLushort) * attrib.size; for (int i = 0; i < attrib.size; i++) { - elements[i] = *(reinterpret_cast<const GLushort*>(byte_ptr + stride * index) + i); + elements[i] = *(reinterpret_cast<GLushort const*>(byte_ptr + stride * index) + i); if (normalize) elements[i] /= 0xffff; } @@ -2389,7 +2388,7 @@ void GLContext::read_from_vertex_attribute_pointer(VertexAttribPointer const& at stride = sizeof(GLint) * attrib.size; for (int i = 0; i < attrib.size; i++) { - elements[i] = *(reinterpret_cast<const GLint*>(byte_ptr + stride * index) + i); + elements[i] = *(reinterpret_cast<GLint const*>(byte_ptr + stride * index) + i); if (normalize) elements[i] /= 0x80000000; } @@ -2400,7 +2399,7 @@ void GLContext::read_from_vertex_attribute_pointer(VertexAttribPointer const& at stride = sizeof(GLuint) * attrib.size; for (int i = 0; i < attrib.size; i++) { - elements[i] = *(reinterpret_cast<const GLuint*>(byte_ptr + stride * index) + i); + elements[i] = *(reinterpret_cast<GLuint const*>(byte_ptr + stride * index) + i); if (normalize) elements[i] /= 0xffffffff; } @@ -2411,7 +2410,7 @@ void GLContext::read_from_vertex_attribute_pointer(VertexAttribPointer const& at stride = sizeof(GLfloat) * attrib.size; for (int i = 0; i < attrib.size; i++) - elements[i] = *(reinterpret_cast<const GLfloat*>(byte_ptr + stride * index) + i); + elements[i] = *(reinterpret_cast<GLfloat const*>(byte_ptr + stride * index) + i); break; } case GL_DOUBLE: { @@ -2419,7 +2418,7 @@ void GLContext::read_from_vertex_attribute_pointer(VertexAttribPointer const& at stride = sizeof(GLdouble) * attrib.size; for (int i = 0; i < attrib.size; i++) - elements[i] = static_cast<float>(*(reinterpret_cast<const GLdouble*>(byte_ptr + stride * index) + i)); + elements[i] = static_cast<float>(*(reinterpret_cast<GLdouble const*>(byte_ptr + stride * index) + i)); break; } } diff --git a/Userland/Libraries/LibGL/GLContext.h b/Userland/Libraries/LibGL/GLContext.h index c4704973fb..394ee8216e 100644 --- a/Userland/Libraries/LibGL/GLContext.h +++ b/Userland/Libraries/LibGL/GLContext.h @@ -57,14 +57,14 @@ public: void gl_clear_depth(GLdouble depth); void gl_clear_stencil(GLint s); void gl_color(GLdouble r, GLdouble g, GLdouble b, GLdouble a); - void gl_delete_textures(GLsizei n, const GLuint* textures); + void gl_delete_textures(GLsizei n, GLuint const* textures); void gl_end(); void gl_frustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble near_val, GLdouble far_val); void gl_gen_textures(GLsizei n, GLuint* textures); GLenum gl_get_error(); GLubyte* gl_get_string(GLenum name); void gl_load_identity(); - void gl_load_matrix(const FloatMatrix4x4& matrix); + void gl_load_matrix(FloatMatrix4x4 const& matrix); void gl_matrix_mode(GLenum mode); void gl_ortho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble near_val, GLdouble far_val); void gl_push_matrix(); @@ -110,12 +110,12 @@ public: void gl_enable_client_state(GLenum cap); void gl_disable_client_state(GLenum cap); void gl_client_active_texture(GLenum target); - void gl_vertex_pointer(GLint size, GLenum type, GLsizei stride, const void* pointer); - void gl_color_pointer(GLint size, GLenum type, GLsizei stride, const void* pointer); - void gl_tex_coord_pointer(GLint size, GLenum type, GLsizei stride, const void* pointer); + void gl_vertex_pointer(GLint size, GLenum type, GLsizei stride, void const* pointer); + void gl_color_pointer(GLint size, GLenum type, GLsizei stride, void const* pointer); + void gl_tex_coord_pointer(GLint size, GLenum type, GLsizei stride, void const* pointer); void gl_draw_arrays(GLenum mode, GLint first, GLsizei count); - void gl_draw_elements(GLenum mode, GLsizei count, GLenum type, const void* indices); - void gl_draw_pixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const void* data); + void gl_draw_elements(GLenum mode, GLsizei count, GLenum type, void const* indices); + void gl_draw_pixels(GLsizei width, GLsizei height, GLenum format, GLenum type, void const* data); void gl_color_mask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); void gl_get_booleanv(GLenum pname, GLboolean* data); void gl_get_doublev(GLenum pname, GLdouble* params); @@ -419,7 +419,7 @@ private: GLenum type { GL_FLOAT }; bool normalize { true }; GLsizei stride { 0 }; - const void* pointer { 0 }; + void const* pointer { 0 }; }; static void read_from_vertex_attribute_pointer(VertexAttribPointer const&, int index, float* elements); diff --git a/Userland/Libraries/LibGL/GLDraw.cpp b/Userland/Libraries/LibGL/GLDraw.cpp index f484dc49d2..9d16e42f44 100644 --- a/Userland/Libraries/LibGL/GLDraw.cpp +++ b/Userland/Libraries/LibGL/GLDraw.cpp @@ -15,7 +15,7 @@ void glBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLflo g_gl_context->gl_bitmap(width, height, xorig, yorig, xmove, ymove, bitmap); } -void glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const void* data) +void glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, void const* data) { g_gl_context->gl_draw_pixels(width, height, format, type, data); } diff --git a/Userland/Libraries/LibGL/GLTexture.cpp b/Userland/Libraries/LibGL/GLTexture.cpp index 73c8d1af46..adf43b416f 100644 --- a/Userland/Libraries/LibGL/GLTexture.cpp +++ b/Userland/Libraries/LibGL/GLTexture.cpp @@ -15,29 +15,29 @@ void glGenTextures(GLsizei n, GLuint* textures) g_gl_context->gl_gen_textures(n, textures); } -void glDeleteTextures(GLsizei n, const GLuint* textures) +void glDeleteTextures(GLsizei n, GLuint const* textures) { g_gl_context->gl_delete_textures(n, textures); } -void glTexImage1D(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid* data) +void glTexImage1D(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, GLvoid const* data) { dbgln("glTexImage1D({:#x}, {}, {:#x}, {}, {}, {:#x}, {:#x}, {:p}): unimplemented", target, level, internalFormat, width, border, format, type, data); TODO(); } -void glTexImage2D(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* data) +void glTexImage2D(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, GLvoid const* data) { g_gl_context->gl_tex_image_2d(target, level, internalFormat, width, height, border, format, type, data); } -void glTexImage3D(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* data) +void glTexImage3D(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, GLvoid const* data) { dbgln("glTexImage3D({:#x}, {}, {:#x}, {}, {}, {}, {}, {:#x}, {:#x}, {:p}): unimplemented", target, level, internalFormat, width, height, depth, border, format, type, data); TODO(); } -void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid* data) +void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid const* data) { g_gl_context->gl_tex_sub_image_2d(target, level, xoffset, yoffset, width, height, format, type, data); } diff --git a/Userland/Libraries/LibGL/GLVert.cpp b/Userland/Libraries/LibGL/GLVert.cpp index a0a40e9082..1005a7f875 100644 --- a/Userland/Libraries/LibGL/GLVert.cpp +++ b/Userland/Libraries/LibGL/GLVert.cpp @@ -25,7 +25,7 @@ void glVertex2d(GLdouble x, GLdouble y) g_gl_context->gl_vertex(x, y, 0.0, 1.0); } -void glVertex2dv(const GLdouble* v) +void glVertex2dv(GLdouble const* v) { g_gl_context->gl_vertex(v[0], v[1], 0.0, 1.0); } @@ -35,7 +35,7 @@ void glVertex2f(GLfloat x, GLfloat y) g_gl_context->gl_vertex(x, y, 0.0, 1.0); } -void glVertex2fv(const GLfloat* v) +void glVertex2fv(GLfloat const* v) { g_gl_context->gl_vertex(v[0], v[1], 0.0, 1.0); } @@ -45,7 +45,7 @@ void glVertex2i(GLint x, GLint y) g_gl_context->gl_vertex(x, y, 0.0, 1.0); } -void glVertex2iv(const GLint* v) +void glVertex2iv(GLint const* v) { g_gl_context->gl_vertex(v[0], v[1], 0.0, 1.0); } @@ -55,7 +55,7 @@ void glVertex2s(GLshort x, GLshort y) g_gl_context->gl_vertex(x, y, 0.0, 1.0); } -void glVertex2sv(const GLshort* v) +void glVertex2sv(GLshort const* v) { g_gl_context->gl_vertex(v[0], v[1], 0.0, 1.0); } @@ -65,7 +65,7 @@ void glVertex3d(GLdouble x, GLdouble y, GLdouble z) g_gl_context->gl_vertex(x, y, z, 1.0); } -void glVertex3dv(const GLdouble* v) +void glVertex3dv(GLdouble const* v) { g_gl_context->gl_vertex(v[0], v[1], v[2], 1.0); } @@ -75,7 +75,7 @@ void glVertex3f(GLfloat x, GLfloat y, GLfloat z) g_gl_context->gl_vertex(x, y, z, 1.0); } -void glVertex3fv(const GLfloat* v) +void glVertex3fv(GLfloat const* v) { g_gl_context->gl_vertex(v[0], v[1], v[2], 1.0); } @@ -85,7 +85,7 @@ void glVertex3i(GLint x, GLint y, GLint z) g_gl_context->gl_vertex(x, y, z, 1.0); } -void glVertex3iv(const GLint* v) +void glVertex3iv(GLint const* v) { g_gl_context->gl_vertex(v[0], v[1], v[2], 1.0); } @@ -95,7 +95,7 @@ void glVertex3s(GLshort x, GLshort y, GLshort z) g_gl_context->gl_vertex(x, y, z, 1.0); } -void glVertex3sv(const GLshort* v) +void glVertex3sv(GLshort const* v) { g_gl_context->gl_vertex(v[0], v[1], v[2], 1.0); } @@ -105,7 +105,7 @@ void glVertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w) g_gl_context->gl_vertex(x, y, z, w); } -void glVertex4dv(const GLdouble* v) +void glVertex4dv(GLdouble const* v) { g_gl_context->gl_vertex(v[0], v[1], v[2], v[3]); } @@ -115,7 +115,7 @@ void glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) g_gl_context->gl_vertex(x, y, z, w); } -void glVertex4fv(const GLfloat* v) +void glVertex4fv(GLfloat const* v) { g_gl_context->gl_vertex(v[0], v[1], v[2], v[3]); } @@ -125,7 +125,7 @@ void glVertex4i(GLint x, GLint y, GLint z, GLint w) g_gl_context->gl_vertex(x, y, z, w); } -void glVertex4iv(const GLint* v) +void glVertex4iv(GLint const* v) { g_gl_context->gl_vertex(v[0], v[1], v[2], v[3]); } @@ -135,7 +135,7 @@ void glVertex4s(GLshort x, GLshort y, GLshort z, GLshort w) g_gl_context->gl_vertex(x, y, z, w); } -void glVertex4sv(const GLshort* v) +void glVertex4sv(GLshort const* v) { g_gl_context->gl_vertex(v[0], v[1], v[2], v[3]); } @@ -190,7 +190,7 @@ void glTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q) g_gl_context->gl_tex_coord(s, t, r, q); } -void glTexCoord4fv(const GLfloat* v) +void glTexCoord4fv(GLfloat const* v) { g_gl_context->gl_tex_coord(v[0], v[1], v[2], v[3]); } diff --git a/Userland/Libraries/LibGL/GLVertexArrays.cpp b/Userland/Libraries/LibGL/GLVertexArrays.cpp index 46a3a8d2a9..3dea1ade54 100644 --- a/Userland/Libraries/LibGL/GLVertexArrays.cpp +++ b/Userland/Libraries/LibGL/GLVertexArrays.cpp @@ -9,17 +9,17 @@ extern GL::GLContext* g_gl_context; -void glVertexPointer(GLint size, GLenum type, GLsizei stride, const void* pointer) +void glVertexPointer(GLint size, GLenum type, GLsizei stride, void const* pointer) { g_gl_context->gl_vertex_pointer(size, type, stride, pointer); } -void glColorPointer(GLint size, GLenum type, GLsizei stride, const void* pointer) +void glColorPointer(GLint size, GLenum type, GLsizei stride, void const* pointer) { g_gl_context->gl_color_pointer(size, type, stride, pointer); } -void glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const void* pointer) +void glTexCoordPointer(GLint size, GLenum type, GLsizei stride, void const* pointer) { g_gl_context->gl_tex_coord_pointer(size, type, stride, pointer); } @@ -29,7 +29,7 @@ void glDrawArrays(GLenum mode, GLint first, GLsizei count) g_gl_context->gl_draw_arrays(mode, first, count); } -void glDrawElements(GLenum mode, GLsizei count, GLenum type, const void* indices) +void glDrawElements(GLenum mode, GLsizei count, GLenum type, void const* indices) { g_gl_context->gl_draw_elements(mode, count, type, indices); } |