Changeset 27889 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_projmatrix.c

Timestamp:

Mar 31, 2010 12:57:09 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

59577

Message:

crOpenGL: more code for multiscreen support

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_projmatrix.c (modified) (7 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_projmatrix.c

@@ -47 +47 @@
     crStateLoadMatrixf( m );
 
-    if (matMode == GL_PROJECTION && mural->numExtents > 0) {
-        /* we're loading a matrix onto the projection stack -- better put the base 
-         * projection there first! */
-        crServerApplyBaseProjection(&(mural->extents[mural->curExtent].
-                                                                    baseProjection));
-    }
-    else if (matMode == GL_MODELVIEW && cr_server.viewOverride) {
+    if (matMode == GL_MODELVIEW && cr_server.viewOverride) {
         int eye = crServerGetCurrentEye();
         crServerApplyViewMatrix(&cr_server.viewMatrix[eye]);
@@ -70 +64 @@
     crStateLoadMatrixd( m );
 
-    if (matMode == GL_PROJECTION && mural->numExtents > 0) {
-        /* we're loading a matrix onto the projection stack -- better put the base 
-         * projection there first! */
-        crServerApplyBaseProjection(&(mural->extents[mural->curExtent].
-                                                                    baseProjection));
-    }
-    else if (matMode == GL_MODELVIEW && cr_server.viewOverride) {
+    if (matMode == GL_MODELVIEW && cr_server.viewOverride) {
         int eye = crServerGetCurrentEye();
         crServerApplyViewMatrix(&cr_server.viewMatrix[eye]);
@@ -128 +116 @@
     crStateLoadIdentity();
 
-    if (matMode == GL_PROJECTION && mural->numExtents > 0) {
-        /* we're loading a matrix onto the projection stack -- better put the base 
-         * projection there first! */
-        crServerApplyBaseProjection(&(mural->extents[mural->curExtent].
-                                                                    baseProjection));
-    }
-    else if (matMode == GL_MODELVIEW && cr_server.viewOverride) {
+    if (matMode == GL_MODELVIEW && cr_server.viewOverride) {
         int eye = crServerGetCurrentEye();
         crServerApplyViewMatrix(&cr_server.viewMatrix[eye]);
@@ -207 +189 @@
 crServerDispatchProgramLocalParameter4fARB(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
+#if 0
     if (target == GL_VERTEX_PROGRAM_ARB) {
         CRServerProgram *prog = LookupProgram(cr_server.currentProgram);
@@ -240 +223 @@
         }
     }
+#endif
 
     /* if we get here, pass the call through unchanged */
@@ -256 +240 @@
 crServerDispatchProgramParameter4fNV(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
+#if 0
     if (target == GL_VERTEX_PROGRAM_NV) {
         CRServerProgram *prog = LookupProgram(cr_server.currentProgram);
@@ -289 +274 @@
         }
     }
+#endif
 
     /* if we get here, pass the call through unchanged */