diff --git a/Userland/Libraries/LibGL/GLContext.cpp b/Userland/Libraries/LibGL/GLContext.cpp index a303e0d1d9d..33142e86e98 100644 --- a/Userland/Libraries/LibGL/GLContext.cpp +++ b/Userland/Libraries/LibGL/GLContext.cpp @@ -3089,7 +3089,7 @@ void GLContext::sync_device_texcoord_config() if (!context_coordinate_config.enabled) continue; - SoftGPU::TexCoordGenerationConfig* texcoord_generation_config; + GPU::TexCoordGenerationConfig* texcoord_generation_config; switch (capability) { case GL_TEXTURE_GEN_S: enabled_coordinates |= GPU::TexCoordGenerationCoordinate::S; diff --git a/Userland/Libraries/LibGPU/TexCoordGenerationConfig.h b/Userland/Libraries/LibGPU/TexCoordGenerationConfig.h new file mode 100644 index 00000000000..dbd8db63e6a --- /dev/null +++ b/Userland/Libraries/LibGPU/TexCoordGenerationConfig.h @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2022, Jelle Raaijmakers + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include +#include + +namespace GPU { + +struct TexCoordGenerationConfig { + GPU::TexCoordGenerationMode mode { GPU::TexCoordGenerationMode::EyeLinear }; + FloatVector4 coefficients {}; +}; + +} diff --git a/Userland/Libraries/LibSoftGPU/Device.h b/Userland/Libraries/LibSoftGPU/Device.h index 979681f83ea..310c89abd2c 100644 --- a/Userland/Libraries/LibSoftGPU/Device.h +++ b/Userland/Libraries/LibSoftGPU/Device.h @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -36,11 +37,6 @@ namespace SoftGPU { -struct TexCoordGenerationConfig { - GPU::TexCoordGenerationMode mode { GPU::TexCoordGenerationMode::EyeLinear }; - FloatVector4 coefficients {}; -}; - struct RasterizerOptions { bool shade_smooth { true }; bool enable_stencil_test { false }; @@ -75,7 +71,7 @@ struct RasterizerOptions { bool cull_back { true }; bool cull_front { false }; Array texcoord_generation_enabled_coordinates {}; - Array, NUM_SAMPLERS> texcoord_generation_config {}; + Array, NUM_SAMPLERS> texcoord_generation_config {}; Gfx::IntRect viewport; bool lighting_enabled { false }; bool color_material_enabled { false };