nou/tenmon
1
0
Fork 1
Code Issues Pull Requests Projects Releases 33 Wiki Activity

Enable sRGB to gamma correct scaling

Browse Source
This commit is contained in:
Dušan Poizl
2022-10-16 11:05:15 +02:00
parent 2bc54ea0cc
commit 95c6fc5343
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imagescrollareagl.cpp
+6 -2
View File
@@ -24,8 +24,8 @@ const RawImageType rawImageTypes[] = {
{QOpenGLTexture::Red, QOpenGLTexture::R8_UNorm, QOpenGLTexture::UInt8, true}, {QOpenGLTexture::Red, QOpenGLTexture::R8_UNorm, QOpenGLTexture::UInt8, true},
{QOpenGLTexture::Red, QOpenGLTexture::R16_UNorm, QOpenGLTexture::UInt16, true}, {QOpenGLTexture::Red, QOpenGLTexture::R16_UNorm, QOpenGLTexture::UInt16, true},
{QOpenGLTexture::Red, QOpenGLTexture::R32F, QOpenGLTexture::Float32, true}, {QOpenGLTexture::Red, QOpenGLTexture::R32F, QOpenGLTexture::Float32, true},
{QOpenGLTexture::RGB, QOpenGLTexture::RGB8_UNorm, QOpenGLTexture::UInt8, false}, {QOpenGLTexture::RGB, QOpenGLTexture::SRGB8, QOpenGLTexture::UInt8, false},
{QOpenGLTexture::RGBA,QOpenGLTexture::RGB8_UNorm, QOpenGLTexture::UInt8, false}, {QOpenGLTexture::RGBA,QOpenGLTexture::SRGB8_Alpha8, QOpenGLTexture::UInt8, false},
{QOpenGLTexture::RGB, QOpenGLTexture::RGB16_UNorm, QOpenGLTexture::UInt16, false}, {QOpenGLTexture::RGB, QOpenGLTexture::RGB16_UNorm, QOpenGLTexture::UInt16, false},
{QOpenGLTexture::RGBA, QOpenGLTexture::RGB16_UNorm, QOpenGLTexture::UInt16, false}, {QOpenGLTexture::RGBA, QOpenGLTexture::RGB16_UNorm, QOpenGLTexture::UInt16, false},
{QOpenGLTexture::RGB, QOpenGLTexture::RGB32F, QOpenGLTexture::Float32, false} {QOpenGLTexture::RGB, QOpenGLTexture::RGB32F, QOpenGLTexture::Float32, false}
@@ -79,6 +79,7 @@ ImageWidget::ImageWidget(Database *database, QWidget *parent) : QOpenGLWidget(pa
}); });
setMouseTracking(true); setMouseTracking(true);
setTextureFormat(GL_SRGB8_ALPHA8);
} }
ImageWidget::~ImageWidget() ImageWidget::~ImageWidget()
@@ -110,6 +111,7 @@ void ImageWidget::setImage(std::shared_ptr<RawImage> image, int index)
m_image->setLevelOfDetailRange(m_superpixel ? 1 : 0, m_image->mipMaxLevel()); m_image->setLevelOfDetailRange(m_superpixel ? 1 : 0, m_image->mipMaxLevel());
m_image->generateMipMaps(); m_image->generateMipMaps();
m_bwImg = rawImageType.bw; m_bwImg = rawImageType.bw;
m_srgb = rawImageType.textureFormat == QOpenGLTexture::SRGB8 || rawImageType.textureFormat == QOpenGLTexture::SRGB8_Alpha8;
update(); update();
} }
@@ -288,6 +290,7 @@ void ImageWidget::paintGL()
} }
else else
{ {
if(m_srgb)f->glEnable(GL_FRAMEBUFFER_SRGB);
m_vao->bind(); m_vao->bind();
m_image->bind(0); m_image->bind(0);
m_program->bind(); m_program->bind();
@@ -298,6 +301,7 @@ void ImageWidget::paintGL()
m_program->setUniformValue("bw", m_bwImg); m_program->setUniformValue("bw", m_bwImg);
m_program->setUniformValue("invert", m_invert); m_program->setUniformValue("invert", m_invert);
f->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); f->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
if(m_srgb)f->glDisable(GL_FRAMEBUFFER_SRGB);
} }
} }
imagescrollareagl.h
+1
View File
@@ -57,6 +57,7 @@ class ImageWidget : public QOpenGLWidget
bool m_showThumbnails; bool m_showThumbnails;
bool m_selecting; bool m_selecting;
bool m_sizesDirty; bool m_sizesDirty;
bool m_srgb;
int m_thumbnailCount; int m_thumbnailCount;
QVector<ImageThumb> m_thumnails; QVector<ImageThumb> m_thumnails;
Database *m_database; Database *m_database;
main.cpp
+1
View File
@@ -15,6 +15,7 @@ int main(int argc, char *argv[])
format.setMinorVersion(3); format.setMinorVersion(3);
format.setOption(QSurfaceFormat::DebugContext); format.setOption(QSurfaceFormat::DebugContext);
format.setProfile(QSurfaceFormat::OpenGLContextProfile::CoreProfile); format.setProfile(QSurfaceFormat::OpenGLContextProfile::CoreProfile);
format.setColorSpace(QSurfaceFormat::sRGBColorSpace);
QSurfaceFormat::setDefaultFormat(format); QSurfaceFormat::setDefaultFormat(format);
QApplication a(argc, argv); QApplication a(argc, argv);