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

Don't allow calling Texture:generateMipmaps on depth/stencil textures

Browse Source
This commit is contained in:
Alex Szpakowski
2020-12-21 13:36:29 -04:00
parent 975cadf66b
commit a1861a8ff4
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/Texture.cpp
+6
View File
@@ -233,6 +233,9 @@ Texture::Texture(const Settings &settings, const Slices *slices)
if (mipmapsMode != MIPMAPS_NONE) if (mipmapsMode != MIPMAPS_NONE)
mipmapCount = getTotalMipmapCount(pixelWidth, pixelHeight, depth); mipmapCount = getTotalMipmapCount(pixelWidth, pixelHeight, depth);
if (mipmapsMode == MIPMAPS_AUTO && isPixelFormatDepthStencil(format))
throw love::Exception("Automatic mipmap generation cannot be used for depth/stencil textures.");
if (pixelWidth <= 0 || pixelHeight <= 0 || layers <= 0 || depth <= 0) if (pixelWidth <= 0 || pixelHeight <= 0 || layers <= 0 || depth <= 0)
throw love::Exception("Texture dimensions must be greater than 0."); throw love::Exception("Texture dimensions must be greater than 0.");
@@ -498,6 +501,9 @@ void Texture::generateMipmaps()
if (isPixelFormatCompressed(format)) if (isPixelFormatCompressed(format))
throw love::Exception("generateMipmaps cannot be called on a compressed Texture."); throw love::Exception("generateMipmaps cannot be called on a compressed Texture.");
if (isPixelFormatDepthStencil(format))
throw love::Exception("generateMipmaps cannot be called on a depth/stencil Texture.");
generateMipmapsInternal(); generateMipmapsInternal();
} }
src/modules/graphics/opengl/Graphics.cpp
+1 -4
View File
@@ -717,15 +717,12 @@ void Graphics::endPass()
} }
} }
// generateMipmaps can't be used for depth/stencil textures.
for (const auto &rt : rts.colors) for (const auto &rt : rts.colors)
{ {
if (rt.texture->getMipmapsMode() == Texture::MIPMAPS_AUTO && rt.mipmap == 0) if (rt.texture->getMipmapsMode() == Texture::MIPMAPS_AUTO && rt.mipmap == 0)
rt.texture->generateMipmaps(); rt.texture->generateMipmaps();
} }
int dsmipmap = rts.depthStencil.mipmap;
if (depthstencil != nullptr && depthstencil->getMipmapsMode() == Texture::MIPMAPS_AUTO && dsmipmap == 0)
depthstencil->generateMipmaps();
} }
void Graphics::clear(OptionalColorf c, OptionalInt stencil, OptionalDouble depth) void Graphics::clear(OptionalColorf c, OptionalInt stencil, OptionalDouble depth)