Changeset 20147 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

May 29, 2009 11:21:57 AM (16 years ago)

Author:

vboxsync

Message:

crOpenGL: some opengl 2.0 parts

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• Makefile.kmk (modified) (1 diff)
• crserverlib/server_dispatch.py (modified) (3 diffs)
• crserverlib/server_get.py (modified) (2 diffs)
• crserverlib/server_getshaders.c (added)
• crserverlib/server_special (modified) (1 diff)

trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk

@@ -126 +126 @@
         crserverlib/server_winpos.c \
         crserverlib/server_writeback.c \
+        crserverlib/server_getshaders.c \
         $(VBOX_PATH_CROGL_GENFILES)/server_dispatch.c \
         $(VBOX_PATH_CROGL_GENFILES)/server_retval.c \

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_dispatch.py

@@ -25 +25 @@
 
 
-def GetTestWrapper(func_name):
-    """Return a C preprocessor token to test in order to wrap code.
-    This handles extensions.
-    Example: GetTestWrapper("glActiveTextureARB") = "CR_multitexture"
-    Example: GetTestWrapper("glBegin") = ""
-    """
-    cat = apiutil.Category(func_name)
-    if (cat == "1.0" or
-        cat == "1.1" or
-        cat == "1.2" or
-        cat == "Chromium" or
-        cat == "GL_chromium"):
-        return ''
-    elif cat[0] =='1':
-        # i.e. OpenGL 1.3 or 1.4 or 1.5
-        return "OPENGL_VERSION_" + string.replace(cat, ".", "_")
-    else:
-        assert cat != ''
-        return string.replace(cat, "GL_", "")
-
-
-
 for func_name in apiutil.AllSpecials( sys.argv[1]+"/../state_tracker/state" ):
     params = apiutil.Parameters(func_name)
@@ -53 +31 @@
         continue
 
-    wrap = GetTestWrapper(func_name)
+    wrap = apiutil.GetCategoryWrapper(func_name)
     if wrap:
         print '#if defined(CR_%s)' % wrap
@@ -140 +118 @@
         apiutil.FindSpecial( sys.argv[1]+"/../state_tracker/state", func_name )):
 
-        wrap = GetTestWrapper(func_name)
+        wrap = apiutil.GetCategoryWrapper(func_name)
         if wrap:
             print '#if defined(CR_%s)' % wrap

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_get.py

@@ -70 +70 @@
     'GetQueryObjectivARB' : 1,
     'GetQueryObjectuivARB' : 1,
-    'GetQueryivARB' : 1
+    'GetQueryivARB' : 1,
+    'GetProgramiv' : 1,
+    'GetShaderiv' : 1
 }
 
@@ -85 +87 @@
     'GetProgramEnvParameterfvARB',
     'GetProgramivARB',
-    'AreProgramsResidentNV'
+    'AreProgramsResidentNV',
+    'GetProgramiv',
+    'GetShaderiv'
 ];
 

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_special

@@ -181 +181 @@
 WindowPos3sARB
 WindowPos3svARB
+GetActiveAttrib
+GetActiveUniform
+GetAttachedShaders
+GetShaderInfoLog
+GetProgramInfoLog
+GetShaderSource
+GetUniformfv
+GetUniformiv