ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-01-11 10:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[Convert] Workaround for broken names with spaces"

Browse source 
This reverts commit 1e78e62b90.
The relevant issue has been fixed upstream by Khronos.
This commit is contained in:
thefiddler 2014-06-20 09:27:04 +02:00
parent 7629d45907
commit 9659aad748
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Source/Converter/GLXmlParser.cs
View file

@ -61,7 +61,7 @@ namespace CHeaderToXML
var elements = new SortedDictionary<string, XElement>(); var elements = new SortedDictionary<string, XElement>();
foreach (var e in ParseEnums(input).Concat(ParseFunctions(input))) foreach (var e in ParseEnums(input).Concat(ParseFunctions(input)))
{ {
var name = e.Attribute("name").Value.Trim().Replace(" ", "_"); var name = e.Attribute("name").Value;
var version = (e.Attribute("version") ?? new XAttribute("version", String.Empty)).Value; var version = (e.Attribute("version") ?? new XAttribute("version", String.Empty)).Value;
var key = name + version; var key = name + version;
if (!elements.ContainsKey(key)) if (!elements.ContainsKey(key))
@ -131,7 +131,7 @@ namespace CHeaderToXML
enums.Add(api, new SortedDictionary<string, string>()); enums.Add(api, new SortedDictionary<string, string>());
enums[api].Add( enums[api].Add(
TrimName(e.Attribute("name").Value.Trim().Replace(" ", "_")), TrimName(e.Attribute("name").Value),
e.Attribute("value").Value); e.Attribute("value").Value);
} }
@ -146,7 +146,7 @@ namespace CHeaderToXML
.Concat(groups) .Concat(groups)
.OrderBy(f => TrimName(f.Attribute("name").Value))) .OrderBy(f => TrimName(f.Attribute("name").Value)))
{ {
var category = TrimName(feature.Attribute("name").Value.Trim().Replace(" ", "_")); var category = TrimName(feature.Attribute("name").Value);
var extension = feature.Name == "extension" ? category.Substring(0, category.IndexOf("_")) : "Core"; var extension = feature.Name == "extension" ? category.Substring(0, category.IndexOf("_")) : "Core";
var version = feature.Attribute("number") != null ? feature.Attribute("number").Value : null; var version = feature.Attribute("number") != null ? feature.Attribute("number").Value : null;
var apinames = GetApiNames(feature); var apinames = GetApiNames(feature);
@ -165,14 +165,14 @@ namespace CHeaderToXML
String.IsNullOrEmpty(version) ? null : new XAttribute("version", version))); String.IsNullOrEmpty(version) ? null : new XAttribute("version", version)));
var api = APIs[key]; var api = APIs[key];
var enum_name = TrimName(feature.Attribute("name").Value.Trim().Replace(" ", "_")); var enum_name = TrimName(feature.Attribute("name").Value);
var e = new XElement("enum", new XAttribute("name", enum_name)); var e = new XElement("enum", new XAttribute("name", enum_name));
foreach (var token in foreach (var token in
feature.Elements("enum") feature.Elements("enum")
.Concat(feature.Elements("require").Elements("enum"))) .Concat(feature.Elements("require").Elements("enum")))
{ {
var token_name = TrimName(token.Attribute("name").Value.Trim().Replace(" ", "_")); var token_name = TrimName(token.Attribute("name").Value);
var token_value = var token_value =
enums.ContainsKey(apiname) && enums[apiname].ContainsKey(token_name) ? enums[apiname][token_name] : enums.ContainsKey(apiname) && enums[apiname].ContainsKey(token_name) ? enums[apiname][token_name] :
enums["default"].ContainsKey(token_name) ? enums["default"][token_name] : enums["default"].ContainsKey(token_name) ? enums["default"][token_name] :
@ -198,15 +198,15 @@ namespace CHeaderToXML
foreach (var api in APIs.Values) foreach (var api in APIs.Values)
{ {
var apiname = api.Attribute("name").Value.Trim().Replace(" ", "_"); var apiname = api.Attribute("name").Value;
// Mark deprecated enums // Mark deprecated enums
foreach (var token in feature.Elements("remove").Elements("enum")) foreach (var token in feature.Elements("remove").Elements("enum"))
{ {
var token_name = TrimName(token.Attribute("name").Value.Trim().Replace(" ", "_")); var token_name = TrimName(token.Attribute("name").Value);
var deprecated = var deprecated =
api.Elements("enum").Elements("token") api.Elements("enum").Elements("token")
.FirstOrDefault(t => t.Attribute("name").Value.Trim().Replace(" ", "_") == token_name); .FirstOrDefault(t => t.Attribute("name").Value == token_name);
if (deprecated != null) if (deprecated != null)
{ {
@ -214,7 +214,7 @@ namespace CHeaderToXML
{ {
// These tokens do not exist in the glcore profile, remove them // These tokens do not exist in the glcore profile, remove them
api.Elements("enum").Elements("token") api.Elements("enum").Elements("token")
.First(t => t.Attribute("name").Value.Trim().Replace(" ", "_") == token_name) .First(t => t.Attribute("name").Value == token_name)
.Remove(); .Remove();
} }
else else
@ -256,7 +256,7 @@ namespace CHeaderToXML
// information about versioning, extension support and deprecation. // information about versioning, extension support and deprecation.
foreach (var feature in features.Concat(extensions)) foreach (var feature in features.Concat(extensions))
{ {
var category = TrimName(feature.Attribute("name").Value.Trim().Replace(" ", "_")); var category = TrimName(feature.Attribute("name").Value);
var apinames = GetApiNames(feature); var apinames = GetApiNames(feature);
var version = var version =
@ -283,7 +283,7 @@ namespace CHeaderToXML
foreach (var command in feature.Elements("require").Elements("command")) foreach (var command in feature.Elements("require").Elements("command"))
{ {
var cmd_name = TrimName(command.Attribute("name").Value.Trim().Replace(" ", "_")); var cmd_name = TrimName(command.Attribute("name").Value);
var cmd_extension = var cmd_extension =
ExtensionRegex.Match(cmd_name).Value ?? ExtensionRegex.Match(cmd_name).Value ??
(feature.Name == "extension" ? category.Substring(0, category.IndexOf("_")) : "Core"); (feature.Name == "extension" ? category.Substring(0, category.IndexOf("_")) : "Core");
@ -304,16 +304,16 @@ namespace CHeaderToXML
foreach (var api in APIs.Values) foreach (var api in APIs.Values)
{ {
i++; i++;
var apiname = api.Attribute("name").Value.Trim().Replace(" ", "_"); var apiname = api.Attribute("name").Value;
var cmd_version = version.Length > i ? version[i] : version[0]; var cmd_version = version.Length > i ? version[i] : version[0];
// Mark all deprecated functions as such // Mark all deprecated functions as such
foreach (var command in feature.Elements("remove").Elements("command")) foreach (var command in feature.Elements("remove").Elements("command"))
{ {
var deprecated_name = TrimName(command.Attribute("name").Value.Trim().Replace(" ", "_")); var deprecated_name = TrimName(command.Attribute("name").Value);
var deprecated = var deprecated =
api.Elements("function") api.Elements("function")
.FirstOrDefault(t => t.Attribute("name").Value.Trim().Replace(" ", "_") == deprecated_name); .FirstOrDefault(t => t.Attribute("name").Value == deprecated_name);
if (deprecated != null) if (deprecated != null)
{ {
@ -321,7 +321,7 @@ namespace CHeaderToXML
{ {
// These tokens do not exist in the glcore profile, remove them // These tokens do not exist in the glcore profile, remove them
api.Elements("function") api.Elements("function")
.First(t => t.Attribute("name").Value.Trim().Replace(" ", "_") == deprecated_name) .First(t => t.Attribute("name").Value == deprecated_name)
.Remove(); .Remove();
} }
else else
@ -431,7 +431,7 @@ namespace CHeaderToXML
// -> <param name="length" type="GLsizei" count="1" /> // -> <param name="length" type="GLsizei" count="1" />
var proto = e.Value; var proto = e.Value;
var name = e.Element("name").Value.Trim().Replace(" ", "_"); var name = e.Element("name").Value;
var group = e.Attribute("group"); var group = e.Attribute("group");
var ret = proto.Remove(proto.LastIndexOf(name)).Trim(); var ret = proto.Remove(proto.LastIndexOf(name)).Trim();