Changeset 26407 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Feb 10, 2010 12:10:01 PM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: fix host gpu crashes when running realflight3d g4 demo in guest

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• include/state/cr_limits.h (modified) (2 diffs)
• state_tracker/state_buffer.c (modified) (2 diffs)
• state_tracker/state_client.c (modified) (3 diffs)

trunk/src/VBox/GuestHost/OpenGL/include/state/cr_limits.h

@@ -23 +23 @@
 
 
-#define CR_MAX_TEXTURE_UNITS            8
+#define CR_MAX_TEXTURE_UNITS            16
 #define CR_MAX_GENERAL_COMBINERS        8
 #define CR_MAX_TEXTURE_SIZE             8192
@@ -70 +70 @@
 #define CR_MAX_FRAGMENT_PROGRAM_INSTRUCTIONS       72
 #define CR_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMS       24
-#define CR_MAX_FRAGMENT_PROGRAM_ENV_PARAMS         24
+#define CR_MAX_FRAGMENT_PROGRAM_ENV_PARAMS         256
 #define CR_MAX_FRAGMENT_PROGRAM_TEMPS              16
 #define CR_MAX_FRAGMENT_PROGRAM_ATTRIBS            10

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_buffer.c

@@ -492 +492 @@
             if (g->framebufferobject.drawFB)
             {
-                crStateError(__LINE__, __FILE__, GL_INVALID_OPERATION, "glDrawBuffer invalud mode while fbo is active");
+                crStateError(__LINE__, __FILE__, GL_INVALID_OPERATION, "glDrawBuffer invalid mode while fbo is active");
                 return;
             }
@@ -501 +501 @@
                 if (!g->framebufferobject.drawFB)
                 {
-                    crStateError(__LINE__, __FILE__, GL_INVALID_OPERATION, "glDrawBuffer invalud mode while fbo is inactive");
+                    crStateError(__LINE__, __FILE__, GL_INVALID_OPERATION, "glDrawBuffer invalid mode while fbo is inactive");
                     return;
                 }

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_client.c

@@ -250 +250 @@
     for (i = 0; i < CR_MAX_VERTEX_ATTRIBS; i++) {
         c->array.a[i].enabled = GL_FALSE;
-        c->array.a[i].type = 0;
-        c->array.a[i].size = 0;
+        c->array.a[i].type = GL_FLOAT;
+        c->array.a[i].size = 4;
         c->array.a[i].stride = 0;
 #ifdef CR_ARB_vertex_buffer_object
@@ -1798 +1798 @@
         for (i = 0; (unsigned int)i < toCtx->limits.maxVertexProgramAttribs; i++) {
             if (from->array.a[i].enabled != to->array.a[i].enabled) {
-                able[to->array.a[i].enabled](GL_VERTEX_ATTRIB_ARRAY0_NV + i);
+                if (to->array.a[i].enabled)
+                    diff_api.EnableVertexAttribArrayARB(i);
+                else 
+                    diff_api.DisableVertexAttribArrayARB(i);
                 from->array.a[i].enabled = to->array.a[i].enabled;
             }
@@ -1982 +1985 @@
         for (i = 0; (unsigned int)i < toCtx->limits.maxVertexProgramAttribs; i++) {
             if (from->array.a[i].enabled != to->array.a[i].enabled) {
-                able[to->array.a[i].enabled](GL_VERTEX_ATTRIB_ARRAY0_NV + i);
+                if (to->array.a[i].enabled)
+                    diff_api.EnableVertexAttribArrayARB(i);
+                else 
+                    diff_api.DisableVertexAttribArrayARB(i);
                 FILLDIRTY(cb->enableClientState);
             }