Index: /trunk/src/VBox/Additions/common/crOpenGL/windows_getprocaddress.py
===================================================================
--- /trunk/src/VBox/Additions/common/crOpenGL/windows_getprocaddress.py	(revision 43646)
+++ /trunk/src/VBox/Additions/common/crOpenGL/windows_getprocaddress.py	(revision 43647)
@@ -38,5 +38,5 @@
 
 
-keys = apiutil.GetAllFunctions(sys.argv[1]+"/APIspec.txt")
+keys = apiutil.GetAllFunctionsAndOmittedAliases(sys.argv[1]+"/APIspec.txt")
 for func_name in keys:
     if "Chromium" == apiutil.Category(func_name):
@@ -49,7 +49,14 @@
         pass #continue
 
+    # alias is the function we're aliasing
+    proc_name = func_name
+    if "omit" in apiutil.ChromiumProps(func_name):
+        alias = apiutil.Alias(func_name)
+        if alias:
+            proc_name = alias
+
     wrap = apiutil.GetCategoryWrapper(func_name)
     name = "gl" + func_name
-    address = "cr_gl" + func_name
+    address = "cr_gl" + proc_name
     if wrap:
         print '#ifdef CR_%s' % wrap
@@ -137,15 +144,4 @@
     if (!crStrcmp( name, "wglSwapIntervalEXT" )) return (CR_PROC) wglSwapIntervalEXT;
     
-    /* this is needed for VSG Open Inventor stuff.
-     * @todo: make all these auto-generated!!! */
-    if (!crStrcmp( name, "glBeginQuery" )) return (CR_PROC) cr_glBeginQueryARB;
-    if (!crStrcmp( name, "glDeleteQueries" )) return (CR_PROC) cr_glDeleteQueriesARB;
-    if (!crStrcmp( name, "glEndQuery" )) return (CR_PROC) cr_glEndQueryARB;
-    if (!crStrcmp( name, "glGenQueries" )) return (CR_PROC) cr_glGenQueriesARB;
-    if (!crStrcmp( name, "glGetQueryObjectiv" )) return (CR_PROC) cr_glGetQueryObjectivARB;
-    if (!crStrcmp( name, "glGetQueryObjectuiv" )) return (CR_PROC) cr_glGetQueryObjectuivARB;
-    if (!crStrcmp( name, "glGetQueryiv" )) return (CR_PROC) cr_glGetQueryivARB;
-    if (!crStrcmp( name, "glIsQuery" )) return (CR_PROC) cr_glIsQueryARB;
-
     crWarning("Returning GetProcAddress:NULL for %s", name);
     return NULL;
Index: /trunk/src/VBox/GuestHost/OpenGL/glapi_parser/apiutil.py
===================================================================
--- /trunk/src/VBox/GuestHost/OpenGL/glapi_parser/apiutil.py	(revision 43646)
+++ /trunk/src/VBox/GuestHost/OpenGL/glapi_parser/apiutil.py	(revision 43647)
@@ -224,4 +224,15 @@
 	return funcs
 	
+def GetAllFunctionsAndOmittedAliases(specFile = ""):
+	"""Return sorted list of all functions known to Chromium."""
+	d = GetFunctionDict(specFile)
+	funcs = []
+	for func in d.keys():
+		rec = d[func]
+		if (not "omit" in rec.chromium or
+			rec.alias != ''):
+			funcs.append(func)
+	funcs.sort()
+	return funcs
 
 def GetDispatchedFunctions(specFile = ""):