system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-09-16 06:30:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibGL: Verify Texture2D existence

Browse source 
The code currently guarantees that we always have a target texture.
This commit is contained in:
Jelle Raaijmakers 2022-09-04 16:50:07 +02:00 committed by Linus Groh
parent 72b4f95f71
commit 494024b70e
2 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Userland/Libraries/LibGL/Tex/Texture2D.cpp
View file

@ -13,9 +13,7 @@ namespace GL {
void Texture2D::download_texture_data(GLuint lod, GPU::ImageDataLayout output_layout, GLvoid* pixels)
{
if (device_image().is_null())
return;
VERIFY(!device_image().is_null());
device_image()->read_texels(0, lod, { 0, 0, 0 }, pixels, output_layout);
}
@ -42,8 +40,7 @@ void Texture2D::replace_sub_texture_data(GLuint lod, GPU::ImageDataLayout input_
// FIXME: We currently depend on the first glTexImage2D call to attach an image to mipmap level 0, which initializes the GPU image
// Ideally we would create separate GPU images for each level and merge them into a final image
// once used for rendering for the first time.
if (device_image().is_null())
return;
VERIFY(!device_image().is_null());
device_image()->write_texels(0, lod, output_offset, pixels, input_layout);
}

14
Userland/Libraries/LibGL/Texture.cpp
View file

@ -405,8 +405,7 @@ void GLContext::gl_tex_parameter(GLenum target, GLenum pname, GLfloat param)
// We assume GL_TEXTURE_2D (see above)
auto texture_2d = m_active_texture_unit->texture_2d_target_texture();
if (texture_2d.is_null())
return;
VERIFY(!texture_2d.is_null());
switch (pname) {
case GL_TEXTURE_MIN_FILTER:
@ -495,7 +494,8 @@ void GLContext::gl_tex_sub_image_2d(GLenum target, GLint level, GLint xoffset, G
// A 2D texture array must have been defined by a previous glTexImage2D operation
auto texture_2d = m_active_texture_unit->texture_2d_target_texture();
RETURN_WITH_ERROR_IF(texture_2d.is_null(), GL_INVALID_OPERATION);
VERIFY(!texture_2d.is_null());
RETURN_WITH_ERROR_IF(texture_2d->device_image().is_null(), GL_INVALID_OPERATION);
auto pixel_type_or_error = get_validated_pixel_type(target, texture_2d->internal_format(), format, type);
RETURN_WITH_ERROR_IF(pixel_type_or_error.is_error(), pixel_type_or_error.release_error().code());
@ -529,19 +529,13 @@ void GLContext::sync_device_sampler_config()
for (unsigned i = 0; i < m_texture_units.size(); ++i) {
auto const& texture_unit = m_texture_units[i];
if (!texture_unit.texture_2d_enabled())
continue;
GPU::SamplerConfig config;
auto texture_2d = texture_unit.texture_2d_target_texture();
if (texture_2d.is_null()) {
config.bound_image = nullptr;
m_rasterizer->set_sampler_config(i, config);
continue;
}
VERIFY(!texture_2d.is_null());
config.bound_image = texture_2d->device_image();
auto const& sampler = texture_2d->sampler();