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

Added support for DXT1/3/5 and BC5/7 compressed textures via love.image.CompressedData. Some internals are still iffy.

Browse Source 
- added a new CompressedData type to love.image
- added love.image.isCompressed(file or data)
- love.graphics.newImage automatically tests for compression when loading a file
- added love.graphics.isSupported strings for DXT, BC5, and BC7

Compressed textures meant to be used on the GPU offer huge performance gains when
- loading the texture from a file
- loading the texture from RAM to VRAM
- loading mipmaps
- rendering

--HG--
branch : image-CompressedData
This commit is contained in:
Alex Szpakowski
2013-04-04 19:09:18 -03:00
parent 7e658861d7
commit 5301026f3c
27 changed files with 1902 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/Graphics.cpp
+3
View File
@@ -163,6 +163,9 @@ StringMap<Graphics::Support, Graphics::SUPPORT_MAX_ENUM>::Entry Graphics::suppor
{ "npot", Graphics::SUPPORT_NPOT },
{ "subtractive", Graphics::SUPPORT_SUBTRACTIVE },
{ "mipmap", Graphics::SUPPORT_MIPMAP },
{ "dxt", Graphics::SUPPORT_DXT },
{ "bc5", Graphics::SUPPORT_BC5 },
{ "bc7", Graphics::SUPPORT_BC7 },
};
StringMap<Graphics::Support, Graphics::SUPPORT_MAX_ENUM> Graphics::support(Graphics::supportEntries, sizeof(Graphics::supportEntries));
src/modules/graphics/Graphics.h
+3
View File
@@ -92,6 +92,9 @@ public:
SUPPORT_NPOT,
SUPPORT_SUBTRACTIVE,
SUPPORT_MIPMAP,
SUPPORT_DXT,
SUPPORT_BC5,
SUPPORT_BC7,
SUPPORT_MAX_ENUM
};
src/modules/graphics/opengl/Graphics.cpp
+23
View File
@@ -373,6 +373,29 @@ Image *Graphics::newImage(love::image::ImageData *data)
return image;
}
Image *Graphics::newImage(love::image::CompressedData *cdata)
{
// Create the image.
Image *image = new Image(cdata);
bool success;
try
{
success = image->load();
}
catch(love::Exception &)
{
image->release();
throw;
}
if (!success)
{
image->release();
return 0;
}
return image;
}
Quad *Graphics::newQuad(float x, float y, float w, float h, float sw, float sh)
{
Quad::Viewport v;
src/modules/graphics/opengl/Graphics.h
+1 -1
View File
@@ -251,8 +251,8 @@ public:
/**
* Creates an Image object with padding and/or optimization.
**/
Image *newImage(love::filesystem::File *file);
Image *newImage(love::image::ImageData *data);
Image *newImage(love::image::CompressedData *cdata);
/**
* Creates a Quad object.
src/modules/graphics/opengl/Image.cpp
+209 -54
View File
@@ -39,43 +39,39 @@ Image::FilterMode Image::defaultMipmapFilter = Image::FILTER_NONE;
float Image::defaultMipmapSharpness = 0.0f;
Image::Image(love::image::ImageData *data)
: width((float)(data->getWidth()))
: cdata(0)
, width((float)(data->getWidth()))
, height((float)(data->getHeight()))
, texture(0)
, mipmapSharpness(defaultMipmapSharpness)
, mipmapsCreated(false)
, isCompressed(false)
{
data->retain();
this->data = data;
preload();
}
memset(vertices, 255, sizeof(vertex)*4);
vertices[0].x = 0;
vertices[0].y = 0;
vertices[1].x = 0;
vertices[1].y = height;
vertices[2].x = width;
vertices[2].y = height;
vertices[3].x = width;
vertices[3].y = 0;
vertices[0].s = 0;
vertices[0].t = 0;
vertices[1].s = 0;
vertices[1].t = 1;
vertices[2].s = 1;
vertices[2].t = 1;
vertices[3].s = 1;
vertices[3].t = 0;
filter = getDefaultFilter();
filter.mipmap = defaultMipmapFilter;
Image::Image(love::image::CompressedData *cdata)
: data(0)
, width((float)(cdata->getWidth(0)))
, height((float)(cdata->getHeight(0)))
, texture(0)
, mipmapSharpness(defaultMipmapSharpness)
, mipmapsCreated(false)
, isCompressed(true)
{
cdata->retain();
this->cdata = cdata;
preload();
}
Image::~Image()
{
if (data != 0)
data->release();
if (cdata != 0)
cdata->release();
unload();
}
@@ -155,18 +151,46 @@ void Image::checkMipmapsCreated()
if (mipmapsCreated || (filter.mipmap != FILTER_NEAREST && filter.mipmap != FILTER_LINEAR))
return;
if (!hasMipmapSupport())
if (!(isCompressed && cdata) && !hasMipmapSupport())
throw love::Exception("Mipmap filtering is not supported on this system.");
// Some old drivers claim support for NPOT textures, but fail when creating mipmaps.
// we can't detect which systems will do this, so we fail gracefully for all NPOT images.
int w = int(width), h = int(height);
if (w != next_p2(w) || h != next_p2(h))
if (!isCompressed && (w != next_p2(w) || h != next_p2(h)))
throw love::Exception("Cannot create mipmaps: image does not have power of two dimensions.");
bind();
if (hasNpot() && (GLEE_VERSION_3_0 || GLEE_ARB_framebuffer_object))
if (isCompressed && cdata && hasCompressedTextureSupport(cdata->getType()))
{
int numMipmaps = cdata->getNumMipmaps();
// We have to inform OpenGL if the image doesn't have all mipmap levels.
if (GLEE_VERSION_1_2 || GLEE_SGIS_texture_lod)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, numMipmaps - 1);
else if (cdata->getWidth(numMipmaps-1) > 1 || cdata->getHeight(numMipmaps-1) > 1)
{
// Telling OpenGL to ignore certain levels isn't always supported.
throw love::Exception("Cannot load mipmaps: "
"compressed image does not have all required levels.");
}
GLenum format = getCompressedFormat(cdata->getType());
for (int i = 1; i < numMipmaps; i++)
{
glCompressedTexImage2DARB(GL_TEXTURE_2D,
i,
format,
cdata->getWidth(i),
cdata->getHeight(i),
0,
GLsizei(cdata->getSize(i)),
cdata->getData(i));
}
}
else if (data && hasNpot() && (GLEE_VERSION_3_0 || GLEE_ARB_framebuffer_object))
{
// AMD/ATI drivers have several bugs when generating mipmaps,
// re-uploading the entire base image seems to be required.
@@ -184,7 +208,7 @@ void Image::checkMipmapsCreated()
glEnable(GL_TEXTURE_2D);
glGenerateMipmap(GL_TEXTURE_2D);
}
else
else if (data)
{
glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
glTexSubImage2D(GL_TEXTURE_2D,
@@ -197,6 +221,8 @@ void Image::checkMipmapsCreated()
GL_UNSIGNED_BYTE,
data->getData());
}
else
return;
mipmapsCreated = true;
}
@@ -255,6 +281,32 @@ void Image::bind() const
bindTexture(texture);
}
void Image::preload()
{
memset(vertices, 255, sizeof(vertex)*4);
vertices[0].x = 0;
vertices[0].y = 0;
vertices[1].x = 0;
vertices[1].y = height;
vertices[2].x = width;
vertices[2].y = height;
vertices[3].x = width;
vertices[3].y = 0;
vertices[0].s = 0;
vertices[0].t = 0;
vertices[1].s = 0;
vertices[1].t = 1;
vertices[2].s = 1;
vertices[2].t = 1;
vertices[3].s = 1;
vertices[3].t = 0;
filter = getDefaultFilter();
filter.mipmap = defaultMipmapFilter;
}
bool Image::load()
{
return loadVolatile();
@@ -267,6 +319,18 @@ void Image::unload()
bool Image::loadVolatile()
{
if (isCompressed && cdata && !hasCompressedTextureSupport(cdata->getType()))
{
const char *str;
if (image::CompressedData::getConstant(cdata->getType(), str))
{
throw love::Exception("Cannot create image: "
"%s compressed images are not supported on this system.", str);
}
else
throw love::Exception("cannot create image: format is not supported on this system.");
}
if (hasMipmapSharpnessSupport() && maxMipmapSharpness == 0.0f)
glGetFloatv(GL_MAX_TEXTURE_LOD_BIAS, &maxMipmapSharpness);
@@ -296,25 +360,47 @@ bool Image::loadVolatilePOT()
while (glGetError() != GL_NO_ERROR); // clear errors
glTexImage2D(GL_TEXTURE_2D,
0,
GL_RGBA8,
(GLsizei)p2width,
(GLsizei)p2height,
0,
GL_RGBA,
GL_UNSIGNED_BYTE,
0);
if (isCompressed && cdata)
{
if (s != 1.0f || t != 1.0f)
{
throw love::Exception("Cannot create image: "
"NPOT compressed images are not supported on this system.");
}
glTexSubImage2D(GL_TEXTURE_2D,
0,
0,
0,
(GLsizei)width,
(GLsizei)height,
GL_RGBA,
GL_UNSIGNED_BYTE,
data->getData());
GLenum format = getCompressedFormat(cdata->getType());
glCompressedTexImage2DARB(GL_TEXTURE_2D,
0,
format,
cdata->getWidth(0),
cdata->getHeight(0),
0,
GLsizei(cdata->getSize(0)),
cdata->getData(0));
}
else if (data)
{
glTexImage2D(GL_TEXTURE_2D,
0,
GL_RGBA8,
(GLsizei)p2width,
(GLsizei)p2height,
0,
GL_RGBA,
GL_UNSIGNED_BYTE,
0);
glTexSubImage2D(GL_TEXTURE_2D,
0,
0,
0,
(GLsizei)width,
(GLsizei)height,
GL_RGBA,
GL_UNSIGNED_BYTE,
data->getData());
}
if (glGetError() != GL_NO_ERROR)
throw love::Exception("Cannot create image: size may be too large for this system.");
@@ -337,15 +423,30 @@ bool Image::loadVolatileNPOT()
while (glGetError() != GL_NO_ERROR); // clear errors
glTexImage2D(GL_TEXTURE_2D,
0,
GL_RGBA8,
(GLsizei)width,
(GLsizei)height,
0,
GL_RGBA,
GL_UNSIGNED_BYTE,
data->getData());
if (isCompressed && cdata)
{
GLenum format = getCompressedFormat(cdata->getType());
glCompressedTexImage2DARB(GL_TEXTURE_2D,
0,
format,
cdata->getWidth(0),
cdata->getHeight(0),
0,
GLsizei(cdata->getSize(0)),
cdata->getData(0));
}
else if (data)
{
glTexImage2D(GL_TEXTURE_2D,
0,
GL_RGBA8,
(GLsizei)width,
(GLsizei)height,
0,
GL_RGBA,
GL_UNSIGNED_BYTE,
data->getData());
}
if (glGetError() != GL_NO_ERROR)
throw love::Exception("Cannot create image: size may be too large for this system.");
@@ -407,6 +508,29 @@ Image::FilterMode Image::getDefaultMipmapFilter()
return defaultMipmapFilter;
}
GLenum Image::getCompressedFormat(image::CompressedData::TextureType type) const
{
switch (type)
{
case image::CompressedData::TYPE_DXT1:
return GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
case image::CompressedData::TYPE_DXT3:
return GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
case image::CompressedData::TYPE_DXT5:
return GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
case image::CompressedData::TYPE_BC5s:
return GL_COMPRESSED_SIGNED_RG_RGTC2;
case image::CompressedData::TYPE_BC5u:
return GL_COMPRESSED_RG_RGTC2;
case image::CompressedData::TYPE_BC7:
return GL_COMPRESSED_RGBA_BPTC_UNORM_ARB;
case image::CompressedData::TYPE_BC7srgb:
return GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB;
default:
return GL_RGBA8;
}
}
bool Image::hasNpot()
{
return GLEE_VERSION_2_0 || GLEE_ARB_texture_non_power_of_two;
@@ -427,6 +551,37 @@ bool Image::hasMipmapSharpnessSupport()
return GLEE_VERSION_1_4 || GLEE_EXT_texture_lod_bias;
}
bool Image::hasCompressedTextureSupport()
{
return GLEE_VERSION_1_3 || GLEE_ARB_texture_compression;
}
bool Image::hasCompressedTextureSupport(image::CompressedData::TextureType type)
{
if (!hasCompressedTextureSupport())
return false;
switch (type)
{
case image::CompressedData::TYPE_DXT1:
case image::CompressedData::TYPE_DXT3:
case image::CompressedData::TYPE_DXT5:
return GLEE_EXT_texture_compression_s3tc;
case image::CompressedData::TYPE_BC5s:
case image::CompressedData::TYPE_BC5u:
return (GLEE_VERSION_3_0 || GLEE_ARB_texture_compression_rgtc);
case image::CompressedData::TYPE_BC7:
case image::CompressedData::TYPE_BC7srgb:
return (GLEE_VERSION_4_2 || GLEE_ARB_texture_compression_bptc);
default:
return false;
}
}
} // opengl
} // graphics
} // love
src/modules/graphics/opengl/Image.h
+21 -1
View File
@@ -26,6 +26,7 @@
#include "common/math.h"
#include "common/config.h"
#include "image/ImageData.h"
#include "image/CompressedData.h"
#include "graphics/Image.h"
// OpenGL
@@ -52,10 +53,17 @@ public:
* Creates a new Image. Not that anything is ready to use
* before load is called.
*
* @param file The file from which to load the image.
* @param data The data from which to load the image.
**/
Image(love::image::ImageData *data);
/**
* Creates a new Image with compressed image data.
*
* @param cdata The compressed data from which to load the image.
**/
Image(love::image::CompressedData *cdata);
/**
* Destructor. Deletes the hardware texture and other resources.
**/
@@ -126,6 +134,9 @@ public:
static bool hasMipmapSupport();
static bool hasMipmapSharpnessSupport();
static bool hasCompressedTextureSupport();
static bool hasCompressedTextureSupport(image::CompressedData::TextureType type);
private:
void drawv(const Matrix &t, const vertex *v) const;
@@ -138,6 +149,9 @@ private:
// The ImageData from which the texture is created.
love::image::ImageData *data;
// Or the Compressed Image Data from which the texture is created.
love::image::CompressedData *cdata;
// Width and height of the hardware texture.
float width, height;
@@ -153,12 +167,16 @@ private:
// True if mipmaps have been created for this Image.
bool mipmapsCreated;
bool isCompressed;
// The image's filter mode
Image::Filter filter;
// The image's wrap mode
Image::Wrap wrap;
void preload();
bool loadVolatilePOT();
bool loadVolatileNPOT();
@@ -169,6 +187,8 @@ private:
static FilterMode defaultMipmapFilter;
static float defaultMipmapSharpness;
GLenum getCompressedFormat(image::CompressedData::TextureType type) const;
}; // Image
} // opengl
src/modules/graphics/opengl/OpenGL.cpp
+8
View File
@@ -97,6 +97,14 @@ void initializeContext()
glUnmapBufferARB = (GLEEPFNGLUNMAPBUFFERARBPROC) glUnmapBuffer;
}
// Same deal for compressed textures.
if (GLEE_VERSION_1_3 && !GLEE_ARB_texture_compression)
{
glCompressedTexImage2DARB = (GLEEPFNGLCOMPRESSEDTEXIMAGE2DARBPROC) glCompressedTexImage2D;
glCompressedTexSubImage2DARB = (GLEEPFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) glCompressedTexSubImage2D;
glGetCompressedTexImageARB = (GLEEPFNGLGETCOMPRESSEDTEXIMAGEARBPROC) glGetCompressedTexImage;
}
if (GLEE_EXT_texture_filter_anisotropic)
glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &maxAnisotropy);
else
src/modules/graphics/opengl/wrap_Graphics.cpp
+40 -4
View File
@@ -269,21 +269,45 @@ int w_setInvertedStencil(lua_State *L)
int w_newImage(lua_State *L)
{
love::image::ImageData *data = 0;
love::image::CompressedData *cdata = 0;
// Convert to File, if necessary.
if (lua_isstring(L, 1))
luax_convobj(L, 1, "filesystem", "newFile");
// Convert to ImageData, if necessary.
// Convert to ImageData/CompressedData, if necessary.
if (luax_istype(L, 1, FILESYSTEM_FILE_T))
luax_convobj(L, 1, "image", "newImageData");
{
// Determine whether to convert to ImageData or CompressedData.
luax_getfunction(L, "image", "isCompressed");
lua_pushvalue(L, 1);
lua_call(L, 1, 1);
love::image::ImageData *data = luax_checktype<love::image::ImageData>(L, 1, "ImageData", IMAGE_IMAGE_DATA_T);
bool compressed = luax_toboolean(L, -1);
lua_pop(L, 1);
if (compressed)
luax_convobj(L, 1, "image", "newCompressedData");
else
luax_convobj(L, 1, "image", "newImageData");
}
if (luax_istype(L, 1, IMAGE_COMPRESSED_DATA_T))
cdata = luax_checktype<love::image::CompressedData>(L, 1, "CompressedData", IMAGE_COMPRESSED_DATA_T);
else
data = luax_checktype<love::image::ImageData>(L, 1, "ImageData", IMAGE_IMAGE_DATA_T);
// Create the image.
Image *image = 0;
try
{
image = instance->newImage(data);
if (cdata)
image = instance->newImage(cdata);
else if (data)
image = instance->newImage(data);
else
throw love::Exception("Error creating image.");
}
catch(love::Exception &e)
{
@@ -1110,6 +1134,18 @@ int w_isSupported(lua_State *L)
if (!Image::hasMipmapSupport())
supported = false;
break;
case Graphics::SUPPORT_DXT:
if (!Image::hasCompressedTextureSupport(image::CompressedData::TYPE_DXT5))
supported = false;
break;
case Graphics::SUPPORT_BC5:
if (!Image::hasCompressedTextureSupport(image::CompressedData::TYPE_BC5u))
supported = false;
break;
case Graphics::SUPPORT_BC7:
if (!Image::hasCompressedTextureSupport(image::CompressedData::TYPE_BC7))
supported = false;
break;
default:
supported = false;
}