olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lightpreview: fix texture mips not being generated (#385) 

This was happening because allocateStorage allocates space for the texture and its mips up-front, the user of QOpenGLTexture is required
to determine the number of mips required for a texture beforehand.
allocateStorage was allocating space for mip 0 and no others, leading to no additional mips being generated.

This also adds explicit format and type to allocateStorage for only this instance, although it still remains optional.
This commit is contained in:
Josh Dowell 2023-09-14 06:18:51 +01:00 committed by GitHub
parent 20f7a83efa
commit 04044dd76d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lightpreview/glview.cpp
View File

@ -42,6 +42,13 @@ See file, 'COPYING', for details.
#include <common/prtfile.hh>
#include <light/light.hh>
// given a width and height, returns the number of mips required
// see https://registry.khronos.org/OpenGL/extensions/ARB/ARB_texture_non_power_of_two.txt
static int GetMipLevelsForDimensions(int w, int h)
{
return 1 + static_cast<int>(std::floor(std::log2(std::max(w, h))));
}
GLView::GLView(QWidget *parent)
: QOpenGLWidget(parent),
m_keysPressed(0),
@ -1289,19 +1296,20 @@ void GLView::renderBSP(const QString &file, const mbsp_t &bsp, const bspxentries
if (!qtexture) {
qtexture = std::make_shared<QOpenGLTexture>(QOpenGLTexture::Target2D);
qtexture->setSize(texture->width, texture->height);
qtexture->setFormat(QOpenGLTexture::TextureFormat::RGBA8_UNorm);
int mipLevels = GetMipLevelsForDimensions(texture->width, texture->height);
qtexture->allocateStorage();
qtexture->setFormat(QOpenGLTexture::TextureFormat::RGBA8_UNorm);
qtexture->setSize(texture->width, texture->height);
qtexture->setMipLevels(mipLevels);
qtexture->allocateStorage(QOpenGLTexture::RGBA, QOpenGLTexture::UInt8);
qtexture->setMinificationFilter(QOpenGLTexture::LinearMipMapLinear);
qtexture->setMagnificationFilter(m_filter);
qtexture->setMaximumAnisotropy(16);
qtexture->setData(
QOpenGLTexture::RGBA, QOpenGLTexture::UInt8, reinterpret_cast<const void *>(texture->pixels.data()));
qtexture->setMaximumAnisotropy(16);
qtexture->setAutoMipMapGenerationEnabled(true);
qtexture->setMagnificationFilter(m_filter);
qtexture->setMinificationFilter(QOpenGLTexture::LinearMipMapLinear);
}
const size_t dc_index_count = indexBuffer.size() - dc_first_index;