Centralize NPOT support check for image, export it to isSupported

This commit is contained in:
Bart van Strien
2011-10-24 17:43:56 +02:00
parent a6eca47cef
commit d8b1d67a34
5 changed files with 14 additions and 2 deletions
+1
View File
@@ -154,6 +154,7 @@ namespace graphics
{
{ "canvas", Graphics::SUPPORT_CANVAS },
{ "pixeleffect", Graphics::SUPPORT_PIXELEFFECT },
{ "npot", Graphics::SUPPORT_NPOT },
};
StringMap<Graphics::Support, Graphics::SUPPORT_MAX_ENUM> Graphics::support(Graphics::supportEntries, sizeof(Graphics::supportEntries));
+1
View File
@@ -83,6 +83,7 @@ namespace graphics
{
SUPPORT_CANVAS = 1,
SUPPORT_PIXELEFFECT,
SUPPORT_NPOT,
SUPPORT_MAX_ENUM
};
+6 -1
View File
@@ -278,7 +278,7 @@ namespace opengl
bool Image::loadVolatile()
{
if (GLEE_ARB_texture_non_power_of_two)
if (hasNpot())
return loadVolatileNPOT();
else
return loadVolatilePOT();
@@ -387,6 +387,11 @@ namespace opengl
glPopMatrix();
}
bool Image::hasNpot()
{
return GLEE_ARB_texture_non_power_of_two;
}
} // opengl
} // graphics
} // love
+2 -1
View File
@@ -37,7 +37,6 @@ namespace graphics
{
namespace opengl
{
/**
* A drawable image based on OpenGL-textures. This class takes ImageData
* objects and create textures on the GPU for fast drawing.
@@ -138,6 +137,8 @@ namespace opengl
bool loadVolatile();
void unloadVolatile();
static bool hasNpot();
private:
void drawv(const Matrix & t, const vertex * v) const;
@@ -791,6 +791,10 @@ namespace opengl
if (!PixelEffect::isSupported())
supported = false;
break;
case Graphics::SUPPORT_NPOT:
if (!Image::hasNpot())
supported = false;
break;
default:
supported = false;
}