Browse Source

revert to previous names for a couple graphics enums

Sasha Szpakowski 10 months ago
parent
commit
e1494d4ad2
2 changed files with 4 additions and 4 deletions
  1. 2 2
      src/modules/graphics/Graphics.cpp
  2. 2 2
      testing/tests/graphics.lua

+ 2 - 2
src/modules/graphics/Graphics.cpp

@@ -2907,7 +2907,7 @@ STRINGMAP_CLASS_END(Graphics, Graphics::LineJoin, Graphics::LINE_JOIN_MAX_ENUM,
 
 
 STRINGMAP_CLASS_BEGIN(Graphics, Graphics::Feature, Graphics::FEATURE_MAX_ENUM, feature)
 STRINGMAP_CLASS_BEGIN(Graphics, Graphics::Feature, Graphics::FEATURE_MAX_ENUM, feature)
 {
 {
-	{ "multirendertargetformats", Graphics::FEATURE_MULTI_RENDER_TARGET_FORMATS },
+	{ "multicanvasformats",       Graphics::FEATURE_MULTI_RENDER_TARGET_FORMATS },
 	{ "clampzero",                Graphics::FEATURE_CLAMP_ZERO           },
 	{ "clampzero",                Graphics::FEATURE_CLAMP_ZERO           },
 	{ "clampone",                 Graphics::FEATURE_CLAMP_ONE            },
 	{ "clampone",                 Graphics::FEATURE_CLAMP_ONE            },
 	{ "lighten",                  Graphics::FEATURE_LIGHTEN              },
 	{ "lighten",                  Graphics::FEATURE_LIGHTEN              },
@@ -2935,7 +2935,7 @@ STRINGMAP_CLASS_BEGIN(Graphics, Graphics::SystemLimit, Graphics::LIMIT_MAX_ENUM,
 	{ "threadgroupsx",           Graphics::LIMIT_THREADGROUPS_X             },
 	{ "threadgroupsx",           Graphics::LIMIT_THREADGROUPS_X             },
 	{ "threadgroupsy",           Graphics::LIMIT_THREADGROUPS_Y             },
 	{ "threadgroupsy",           Graphics::LIMIT_THREADGROUPS_Y             },
 	{ "threadgroupsz",           Graphics::LIMIT_THREADGROUPS_Z             },
 	{ "threadgroupsz",           Graphics::LIMIT_THREADGROUPS_Z             },
-	{ "rendertargets",           Graphics::LIMIT_RENDER_TARGETS             },
+	{ "multicanvas",             Graphics::LIMIT_RENDER_TARGETS             },
 	{ "texturemsaa",             Graphics::LIMIT_TEXTURE_MSAA               },
 	{ "texturemsaa",             Graphics::LIMIT_TEXTURE_MSAA               },
 	{ "anisotropy",              Graphics::LIMIT_ANISOTROPY                 },
 	{ "anisotropy",              Graphics::LIMIT_ANISOTROPY                 },
 }
 }

+ 2 - 2
testing/tests/graphics.lua

@@ -2806,7 +2806,7 @@ love.test.graphics.getSupported = function(test)
   local gfs = {
   local gfs = {
     'clampzero', 'lighten', 'glsl3', 'instancing', 'fullnpot', 
     'clampzero', 'lighten', 'glsl3', 'instancing', 'fullnpot', 
     'pixelshaderhighp', 'shaderderivatives', 'indirectdraw',
     'pixelshaderhighp', 'shaderderivatives', 'indirectdraw',
-    'copytexturetobuffer', 'multirendertargetformats', 
+    'copytexturetobuffer', 'multicanvasformats', 
     'clampone', 'glsl4'
     'clampone', 'glsl4'
   }
   }
   local features = love.graphics.getSupported()
   local features = love.graphics.getSupported()
@@ -2823,7 +2823,7 @@ love.test.graphics.getSystemLimits = function(test)
   local glimits = {
   local glimits = {
     'texelbuffersize', 'shaderstoragebuffersize', 'threadgroupsx', 
     'texelbuffersize', 'shaderstoragebuffersize', 'threadgroupsx', 
     'threadgroupsy', 'pointsize', 'texturesize', 'texturelayers', 'volumetexturesize',
     'threadgroupsy', 'pointsize', 'texturesize', 'texturelayers', 'volumetexturesize',
-    'cubetexturesize', 'anisotropy', 'texturemsaa', 'rendertargets', 'threadgroupsz'
+    'cubetexturesize', 'anisotropy', 'texturemsaa', 'multicanvas', 'threadgroupsz'
   }
   }
   local limits = love.graphics.getSystemLimits()
   local limits = love.graphics.getSystemLimits()
   for g=1,#glimits do
   for g=1,#glimits do