eessppeelllloo/splash
1
0
Fork 0
mirror of https://gitlab.com/splashmapper/splash.git synced 2026-06-16 12:33:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Warp doing its rendering in sRGB instead of RGB16

Browse Source
This commit is contained in:
Emmanuel Durand
2022-03-24 08:18:30 -04:00
committed by Emmanuel Durand
parent 694c17c06b
commit fca0976c22
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/graphics/texture_image.cpp
+9 -12
View File
@@ -163,56 +163,53 @@ void Texture_Image::reset(int width, int height, const std::string& pixelFormat,
// Fill texture parameters
_spec.width = width;
_spec.height = height;
auto realPixelFormat = pixelFormat;
if (realPixelFormat.empty())
realPixelFormat = "RGBA";
_pixelFormat = realPixelFormat;
_pixelFormat = pixelFormat.empty() ? "RGBA" : pixelFormat;
_multisample = multisample;
_cubemap = multisample == 0 ? cubemap : false;
if (realPixelFormat == "RGBA")
if (_pixelFormat == "RGBA")
{
_spec = ImageBufferSpec(width, height, 4, 32, ImageBufferSpec::Type::UINT8, "RGBA");
_texInternalFormat = GL_RGBA8;
_texFormat = GL_RGBA;
_texType = GL_UNSIGNED_INT_8_8_8_8_REV;
}
else if (realPixelFormat == "sRGBA")
else if (_pixelFormat == "sRGBA")
{
_spec = ImageBufferSpec(width, height, 4, 32, ImageBufferSpec::Type::UINT8, "RGBA");
_texInternalFormat = GL_SRGB8_ALPHA8;
_texFormat = GL_RGBA;
_texType = GL_UNSIGNED_INT_8_8_8_8_REV;
}
else if (realPixelFormat == "RGBA16")
else if (_pixelFormat == "RGBA16")
{
_spec = ImageBufferSpec(width, height, 4, 64, ImageBufferSpec::Type::UINT8, "RGBA");
_texInternalFormat = GL_RGBA16;
_texFormat = GL_RGBA;
_texType = GL_UNSIGNED_INT_8_8_8_8_REV;
}
else if (realPixelFormat == "RGB")
else if (_pixelFormat == "RGB")
{
_spec = ImageBufferSpec(width, height, 3, 24, ImageBufferSpec::Type::UINT8, "RGB");
_texInternalFormat = GL_RGBA8;
_texFormat = GL_RGB;
_texType = GL_UNSIGNED_BYTE;
}
else if (realPixelFormat == "R16")
else if (_pixelFormat == "R16")
{
_spec = ImageBufferSpec(width, height, 1, 16, ImageBufferSpec::Type::UINT16, "R");
_texInternalFormat = GL_R16;
_texFormat = GL_RED;
_texType = GL_UNSIGNED_SHORT;
}
else if (realPixelFormat == "YUYV" || realPixelFormat == "UYVY")
else if (_pixelFormat == "YUYV" || _pixelFormat == "UYVY")
{
_spec = ImageBufferSpec(width, height, 3, 16, ImageBufferSpec::Type::UINT8, realPixelFormat);
_spec = ImageBufferSpec(width, height, 3, 16, ImageBufferSpec::Type::UINT8, _pixelFormat);
_texInternalFormat = GL_RGBA8;
_texFormat = GL_RGBA;
_texType = GL_UNSIGNED_INT_8_8_8_8_REV;
}
else if (realPixelFormat == "D")
else if (_pixelFormat == "D")
{
_spec = ImageBufferSpec(width, height, 1, 24, ImageBufferSpec::Type::UINT16, "R");
_texInternalFormat = GL_DEPTH_COMPONENT24;
src/graphics/warp.cpp
+1 -3
View File
@@ -148,7 +148,6 @@ void Warp::render()
}
_fbo->bindDraw();
glEnable(GL_FRAMEBUFFER_SRGB);
glViewport(0, 0, _spec.width, _spec.height);
glClearColor(0.0, 0.0, 0.0, 0.0);
@@ -190,7 +189,6 @@ void Warp::render()
}
}
glDisable(GL_FRAMEBUFFER_SRGB);
_fbo->unbindDraw();
auto colorTexture = _fbo->getColorTexture();
@@ -256,7 +254,7 @@ void Warp::loadDefaultModels()
void Warp::setupFBO()
{
_fbo = std::make_unique<Framebuffer>(_root);
_fbo->setsRGB(true);
_fbo->setSixteenBpc(true);
// Setup the virtual screen
_screen = std::make_shared<Object>(_root);