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

LibGL+LibGPU+LibSoftGPU: Move Vertex.h to LibGPU

Browse source
This commit is contained in:
Stephan Unverwerth 2022-03-27 15:43:51 +02:00 • committed by Andreas Kling
parent 5bf224708f
commit 5d2740217f
11 changed files with 37 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibGL/GLContext.cpp
View file

@ -577,7 +577,7 @@ void GLContext::gl_vertex(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
{
APPEND_TO_CALL_LIST_AND_RETURN_IF_NEEDED(gl_vertex, x, y, z, w);
SoftGPU::Vertex vertex;
GPU::Vertex vertex;
vertex.position = { static_cast<float>(x), static_cast<float>(y), static_cast<float>(z), static_cast<float>(w) };
vertex.color = m_current_vertex_color;

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

@ -19,13 +19,13 @@
#include <LibGL/Tex/TextureUnit.h>
#include <LibGPU/DeviceInfo.h>
#include <LibGPU/Light.h>
#include <LibGPU/Vertex.h>
#include <LibGfx/Bitmap.h>
#include <LibGfx/Matrix4x4.h>
#include <LibGfx/Rect.h>
#include <LibGfx/Vector3.h>
#include <LibSoftGPU/Clipper.h>
#include <LibSoftGPU/Device.h>
#include <LibSoftGPU/Vertex.h>
namespace GL {
@ -219,7 +219,7 @@ private:
Vector<FloatVector4> m_current_vertex_tex_coord;
FloatVector3 m_current_vertex_normal { 0.0f, 0.0f, 1.0f };
Vector<SoftGPU::Vertex> m_vertex_list;
Vector<GPU::Vertex> m_vertex_list;
GLenum m_error = GL_NO_ERROR;
bool m_in_draw_state = false;