LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 11:00:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up love.graphics Image code for determining whether the image's pixel format is supported.

Browse Source
This commit is contained in:
Alex Szpakowski
2019-01-16 19:30:21 -04:00
parent 1bb50fccac
commit 74dcc41b38
6 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Graphics.cpp
+2 -2
View File
@@ -1398,9 +1398,9 @@ bool Graphics::isCanvasFormatSupported(PixelFormat format, bool readable) const
return Canvas::isFormatSupported(format, readable);
}
bool Graphics::isImageFormatSupported(PixelFormat format) const
bool Graphics::isImageFormatSupported(PixelFormat format, bool sRGB) const
{
return Image::isFormatSupported(format);
return Image::isFormatSupported(format, sRGB);
}
Shader::Language Graphics::getShaderLanguageTarget() const
src/modules/graphics/opengl/Graphics.h
+1 -1
View File
@@ -106,7 +106,7 @@ public:
bool isCanvasFormatSupported(PixelFormat format) const override;
bool isCanvasFormatSupported(PixelFormat format, bool readable) const override;
bool isImageFormatSupported(PixelFormat format) const override;
bool isImageFormatSupported(PixelFormat format, bool sRGB) const override;
Renderer getRenderer() const override;
RendererInfo getRendererInfo() const override;
src/modules/graphics/opengl/Image.cpp
+3 -22
View File
@@ -185,22 +185,8 @@ bool Image::loadVolatile()
OpenGL::TempDebugGroup debuggroup("Image load");
if (!OpenGL::isPixelFormatSupported(format, false, true, sRGB))
if (!isCompressed())
{
const char *str;
if (love::getConstant(format, str))
{
throw love::Exception("Cannot create image: "
"%s%s images are not supported on this system.", sRGB ? "sRGB " : "", str);
}
else
throw love::Exception("cannot create image: format is not supported on this system.");
}
else if (!isCompressed())
{
if (sRGB && !hasSRGBSupport())
throw love::Exception("sRGB images are not supported on this system.");
// GL_EXT_sRGB doesn't support glGenerateMipmap for sRGB textures.
if (sRGB && (GLAD_ES_VERSION_2_0 && GLAD_EXT_sRGB && !GLAD_ES_VERSION_3_0)
&& mipmapsType != MIPMAPS_DATA)
@@ -365,14 +351,9 @@ bool Image::setMipmapSharpness(float sharpness)
return true;
}
bool Image::isFormatSupported(PixelFormat pixelformat)
bool Image::isFormatSupported(PixelFormat pixelformat, bool sRGB)
{
return OpenGL::isPixelFormatSupported(pixelformat, false, true, false);
}
bool Image::hasSRGBSupport()
{
return GLAD_ES_VERSION_3_0 || GLAD_EXT_sRGB || GLAD_VERSION_2_1 || GLAD_EXT_texture_sRGB;
return OpenGL::isPixelFormatSupported(pixelformat, false, true, sRGB);
}
} // opengl
src/modules/graphics/opengl/Image.h
+1 -2
View File
@@ -54,8 +54,7 @@ public:
bool setMipmapSharpness(float sharpness) override;
static bool isFormatSupported(PixelFormat pixelformat);
static bool hasSRGBSupport();
static bool isFormatSupported(PixelFormat pixelformat, bool sRGB);
private: