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

Set GL_UNPACK_ALIGNMENT

Browse Source
This commit is contained in:
Dušan Poizl
2024-08-25 17:55:47 +02:00
parent 0239aba165
commit 21b4e0934c
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imagescrollareagl.cpp
+1 -4
View File
@@ -144,9 +144,7 @@ void ImageWidget::setImage(std::shared_ptr<RawImage> image, int index)
m_image->allocateStorage(); m_image->allocateStorage();
m_image->setMinMagFilters(QOpenGLTexture::LinearMipMapLinear, QOpenGLTexture::Linear); m_image->setMinMagFilters(QOpenGLTexture::LinearMipMapLinear, QOpenGLTexture::Linear);
m_image->setWrapMode(QOpenGLTexture::ClampToEdge); m_image->setWrapMode(QOpenGLTexture::ClampToEdge);
//m_image->setBorderColor(0, 0, 0, 0);
m_image->setData(0, rawImageType.pixelFormat, rawImageType.dataType, (const void*)image->data()); m_image->setData(0, rawImageType.pixelFormat, rawImageType.dataType, (const void*)image->data());
//m_image->generateMipMaps();
m_image->bind(); m_image->bind();
f->glGenerateMipmap(GL_TEXTURE_2D); f->glGenerateMipmap(GL_TEXTURE_2D);
qDebug() << "setImage" << timer.elapsed(); qDebug() << "setImage" << timer.elapsed();
@@ -598,8 +596,7 @@ void ImageWidget::initializeGL()
m_thumbnailTexture = std::unique_ptr<QOpenGLTexture>(new QOpenGLTexture(QOpenGLTexture::Target2DArray)); m_thumbnailTexture = std::unique_ptr<QOpenGLTexture>(new QOpenGLTexture(QOpenGLTexture::Target2DArray));
m_transferOptions = std::unique_ptr<QOpenGLPixelTransferOptions>(new QOpenGLPixelTransferOptions); f->glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
m_transferOptions->setAlignment(1);
m_lut = std::make_unique<QOpenGLTexture>(QOpenGLTexture::Target3D); m_lut = std::make_unique<QOpenGLTexture>(QOpenGLTexture::Target3D);
m_lut->setSize(LUT_SIZE, LUT_SIZE, LUT_SIZE); m_lut->setSize(LUT_SIZE, LUT_SIZE, LUT_SIZE);
imagescrollareagl.h
-1
View File
@@ -40,7 +40,6 @@ class ImageWidget : public QOpenGLWidget
std::unique_ptr<QOpenGLTexture> m_image; std::unique_ptr<QOpenGLTexture> m_image;
std::unique_ptr<QOpenGLVertexArrayObject> m_vao; std::unique_ptr<QOpenGLVertexArrayObject> m_vao;
std::unique_ptr<QOpenGLVertexArrayObject> m_vaoThumb; std::unique_ptr<QOpenGLVertexArrayObject> m_vaoThumb;
std::unique_ptr<QOpenGLPixelTransferOptions> m_transferOptions;
std::unique_ptr<QOpenGLTexture> m_thumbnailTexture; std::unique_ptr<QOpenGLTexture> m_thumbnailTexture;
std::unique_ptr<QOpenGLTexture> m_lut; std::unique_ptr<QOpenGLTexture> m_lut;
GLuint m_debayerTex = 0; GLuint m_debayerTex = 0;