LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-19 01:08:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibGL: Use buffers in vertex pointer functions and glDrawElements

Browse Source 
Many of these functions will treat the 'pointer' parameter as an offset
into a buffer if one is currently bound.

This makes it possible to run ClassiCube with OpenGL 1.5 support!
This commit is contained in:
cflip 2022-11-13 15:13:41 -07:00 committed by Andreas Kling
parent 59df2e62ee
commit b83181ef93
Notes: sideshowbarker 2024-07-17 04:03:25 +09:00 
Author: https://github.com/cflip
Commit: https://github.com/SerenityOS/serenity/commit/b83181ef93
Pull-request: https://github.com/SerenityOS/serenity/pull/16061
Reviewed-by: https://github.com/gmta ✅
1 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Userland/Libraries/LibGL/Vertex.cpp
View File

@ -117,7 +117,12 @@ void GLContext::gl_color_pointer(GLint size, GLenum type, GLsizei stride, void c
GL_INVALID_ENUM);
RETURN_WITH_ERROR_IF(stride < 0, GL_INVALID_VALUE);
m_client_color_pointer = { .size = size, .type = type, .normalize = true, .stride = stride, .pointer = pointer };
void const* data_pointer = pointer;
if (m_array_buffer) {
size_t data_offset = reinterpret_cast<size_t>(pointer);
data_pointer = m_array_buffer->offset_data(data_offset);
}
m_client_color_pointer = { .size = size, .type = type, .normalize = true, .stride = stride, .pointer = data_pointer };
}
void GLContext::gl_draw_arrays(GLenum mode, GLint first, GLsizei count)
@ -191,18 +196,24 @@ void GLContext::gl_draw_elements(GLenum mode, GLsizei count, GLenum type, void c
RETURN_WITH_ERROR_IF(count < 0, GL_INVALID_VALUE);
void const* index_data = indices;
if (m_element_array_buffer) {
size_t data_offset = reinterpret_cast<size_t>(indices);
index_data = m_element_array_buffer->offset_data(data_offset);
}
gl_begin(mode);
for (int index = 0; index < count; index++) {
int i = 0;
switch (type) {
case GL_UNSIGNED_BYTE:
i = reinterpret_cast<GLubyte const*>(indices)[index];
i = reinterpret_cast<GLubyte const*>(index_data)[index];
break;
case GL_UNSIGNED_SHORT:
i = reinterpret_cast<GLushort const*>(indices)[index];
i = reinterpret_cast<GLushort const*>(index_data)[index];
break;
case GL_UNSIGNED_INT:
i = reinterpret_cast<GLuint const*>(indices)[index];
i = reinterpret_cast<GLuint const*>(index_data)[index];
break;
}
@ -253,7 +264,12 @@ void GLContext::gl_normal_pointer(GLenum type, GLsizei stride, void const* point
GL_INVALID_ENUM);
RETURN_WITH_ERROR_IF(stride < 0, GL_INVALID_VALUE);
m_client_normal_pointer = { .size = 3, .type = type, .normalize = true, .stride = stride, .pointer = pointer };
void const* data_pointer = pointer;
if (m_array_buffer) {
size_t data_offset = reinterpret_cast<size_t>(pointer);
data_pointer = m_array_buffer->offset_data(data_offset);
}
m_client_normal_pointer = { .size = 3, .type = type, .normalize = true, .stride = stride, .pointer = data_pointer };
}
void GLContext::gl_tex_coord_pointer(GLint size, GLenum type, GLsizei stride, void const* pointer)
@ -264,7 +280,13 @@ void GLContext::gl_tex_coord_pointer(GLint size, GLenum type, GLsizei stride, vo
RETURN_WITH_ERROR_IF(stride < 0, GL_INVALID_VALUE);
auto& tex_coord_pointer = m_client_tex_coord_pointer[m_client_active_texture];
tex_coord_pointer = { .size = size, .type = type, .normalize = false, .stride = stride, .pointer = pointer };
void const* data_pointer = pointer;
if (m_array_buffer) {
size_t data_offset = reinterpret_cast<size_t>(pointer);
data_pointer = m_array_buffer->offset_data(data_offset);
}
tex_coord_pointer = { .size = size, .type = type, .normalize = false, .stride = stride, .pointer = data_pointer };
}
void GLContext::gl_vertex(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
@ -289,7 +311,12 @@ void GLContext::gl_vertex_pointer(GLint size, GLenum type, GLsizei stride, void
RETURN_WITH_ERROR_IF(!(type == GL_SHORT || type == GL_INT || type == GL_FLOAT || type == GL_DOUBLE), GL_INVALID_ENUM);
RETURN_WITH_ERROR_IF(stride < 0, GL_INVALID_VALUE);
m_client_vertex_pointer = { .size = size, .type = type, .normalize = false, .stride = stride, .pointer = pointer };
void const* data_pointer = pointer;
if (m_array_buffer) {
size_t data_offset = reinterpret_cast<size_t>(pointer);
data_pointer = m_array_buffer->offset_data(data_offset);
}
m_client_vertex_pointer = { .size = size, .type = type, .normalize = false, .stride = stride, .pointer = data_pointer };
}
}