diff --git a/src/modules/graphics/Image.h b/src/modules/graphics/Image.h index 0d4f1139c..4341e6308 100644 --- a/src/modules/graphics/Image.h +++ b/src/modules/graphics/Image.h @@ -57,7 +57,6 @@ public: void replacePixels(love::image::ImageDataBase *d, int slice, int mipmap, int x, int y, bool reloadmipmaps); void replacePixels(const void *data, size_t size, int slice, int mipmap, const Rect &rect, bool reloadmipmaps); - bool isFormatLinear() const; MipmapsType getMipmapsType() const; static bool getConstant(const char *in, SettingType &out); diff --git a/src/modules/graphics/wrap_Image.cpp b/src/modules/graphics/wrap_Image.cpp index 1d7da4773..db04b5b42 100644 --- a/src/modules/graphics/wrap_Image.cpp +++ b/src/modules/graphics/wrap_Image.cpp @@ -31,20 +31,6 @@ Image *luax_checkimage(lua_State *L, int idx) return luax_checktype(L, idx); } -int w_Image_isFormatLinear(lua_State *L) -{ - Image *i = luax_checkimage(L, 1); - luax_pushboolean(L, i->isFormatLinear()); - return 1; -} - -int w_Image_isCompressed(lua_State *L) -{ - Image *i = luax_checkimage(L, 1); - luax_pushboolean(L, i->isCompressed()); - return 1; -} - int w_Image_replacePixels(lua_State *L) { Image *i = luax_checkimage(L, 1); @@ -76,8 +62,6 @@ int w_Image_replacePixels(lua_State *L) static const luaL_Reg w_Image_functions[] = { - { "isFormatLinear", w_Image_isFormatLinear }, - { "isCompressed", w_Image_isCompressed }, { "replacePixels", w_Image_replacePixels }, { 0, 0 } }; diff --git a/src/modules/graphics/wrap_Texture.cpp b/src/modules/graphics/wrap_Texture.cpp index 9189a3101..51fb438ae 100644 --- a/src/modules/graphics/wrap_Texture.cpp +++ b/src/modules/graphics/wrap_Texture.cpp @@ -129,6 +129,20 @@ int w_Texture_getDPIScale(lua_State *L) return 1; } +int w_Texture_isFormatLinear(lua_State *L) +{ + Texture *t = luax_checktexture(L, 1); + luax_pushboolean(L, t->isFormatLinear()); + return 1; +} + +int w_Texture_isCompressed(lua_State *L) +{ + Texture *t = luax_checktexture(L, 1); + luax_pushboolean(L, t->isCompressed()); + return 1; +} + int w_Texture_setFilter(lua_State *L) { Texture *t = luax_checktexture(L, 1); @@ -314,6 +328,8 @@ const luaL_Reg w_Texture_functions[] = { "getPixelHeight", w_Texture_getPixelHeight }, { "getPixelDimensions", w_Texture_getPixelDimensions }, { "getDPIScale", w_Texture_getDPIScale }, + { "isFormatLinear", w_Texture_isFormatLinear }, + { "isCompressed", w_Texture_isCompressed }, { "setFilter", w_Texture_setFilter }, { "getFilter", w_Texture_getFilter }, { "setMipmapFilter", w_Texture_setMipmapFilter },