Changeset 26407 in vbox

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

Files:

• Additions/common/crOpenGL/pack/packspu_pixel.c (modified) (6 diffs)
• Additions/common/crOpenGL/pack/packspu_special (modified) (1 diff)
• Additions/common/crOpenGL/pack/packspu_texture.c (modified) (1 diff)
• GuestHost/OpenGL/include/state/cr_limits.h (modified) (2 diffs)
• GuestHost/OpenGL/state_tracker/state_buffer.c (modified) (2 diffs)
• GuestHost/OpenGL/state_tracker/state_client.c (modified) (3 diffs)
• HostServices/SharedOpenGL/crserver/crservice.cpp (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server_simpleget.py (modified) (1 diff)

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_pixel.c

@@ -11 +11 @@
 #include "packspu_proto.h"
 
+static GLboolean packspu_CheckTexImageFormat(GLenum format)
+{
+    if (format!=GL_COLOR_INDEX
+        && format!=GL_RED
+        && format!=GL_GREEN
+        && format!=GL_BLUE
+        && format!=GL_ALPHA
+        && format!=GL_RGB
+        && format!=GL_BGR
+        && format!=GL_RGBA
+        && format!=GL_BGRA
+        && format!=GL_LUMINANCE
+        && format!=GL_LUMINANCE_ALPHA
+        && format!=GL_DEPTH_COMPONENT)
+    {
+        /*crWarning("crPackCheckTexImageFormat FAILED format 0x%x isn't valid", format);*/
+        return GL_FALSE;
+    }
+
+    return GL_TRUE;
+}
+
+static GLboolean packspu_CheckTexImageType(GLenum type)
+{
+    if (type!=GL_UNSIGNED_BYTE
+        && type!=GL_BYTE
+        && type!=GL_BITMAP
+        && type!=GL_UNSIGNED_SHORT
+        && type!=GL_SHORT
+        && type!=GL_UNSIGNED_INT
+        && type!=GL_INT
+        && type!=GL_FLOAT
+        && type!=GL_UNSIGNED_BYTE_3_3_2
+        && type!=GL_UNSIGNED_BYTE_2_3_3_REV
+        && type!=GL_UNSIGNED_SHORT_5_6_5
+        && type!=GL_UNSIGNED_SHORT_5_6_5_REV
+        && type!=GL_UNSIGNED_SHORT_4_4_4_4
+        && type!=GL_UNSIGNED_SHORT_4_4_4_4_REV
+        && type!=GL_UNSIGNED_SHORT_5_5_5_1
+        && type!=GL_UNSIGNED_SHORT_1_5_5_5_REV
+        && type!=GL_UNSIGNED_INT_8_8_8_8
+        && type!=GL_UNSIGNED_INT_8_8_8_8_REV
+        && type!=GL_UNSIGNED_INT_10_10_10_2
+        && type!=GL_UNSIGNED_INT_2_10_10_10_REV)
+    {
+        /*crWarning("crPackCheckTexImageType FAILED type 0x%x isn't valid", type);*/
+        return GL_FALSE;
+    }
+
+    return GL_TRUE;
+}
+
+static GLboolean packspu_CheckTexImageInternalFormat(GLint internalformat)
+{
+    if (internalformat!=1
+        && internalformat!=2
+        && internalformat!=3
+        && internalformat!=4
+        && internalformat!=GL_ALPHA
+        && internalformat!=GL_ALPHA4
+        && internalformat!=GL_ALPHA8
+        && internalformat!=GL_ALPHA12
+        && internalformat!=GL_ALPHA16
+        && internalformat!=GL_COMPRESSED_ALPHA
+        && internalformat!=GL_COMPRESSED_LUMINANCE
+        && internalformat!=GL_COMPRESSED_LUMINANCE_ALPHA
+        && internalformat!=GL_COMPRESSED_INTENSITY
+        && internalformat!=GL_COMPRESSED_RGB
+        && internalformat!=GL_COMPRESSED_RGBA
+        && internalformat!=GL_DEPTH_COMPONENT
+        && internalformat!=GL_DEPTH_COMPONENT16
+        && internalformat!=GL_DEPTH_COMPONENT24
+        && internalformat!=GL_DEPTH_COMPONENT32
+        && internalformat!=GL_LUMINANCE
+        && internalformat!=GL_LUMINANCE4
+        && internalformat!=GL_LUMINANCE8
+        && internalformat!=GL_LUMINANCE12
+        && internalformat!=GL_LUMINANCE16
+        && internalformat!=GL_LUMINANCE_ALPHA
+        && internalformat!=GL_LUMINANCE4_ALPHA4
+        && internalformat!=GL_LUMINANCE6_ALPHA2
+        && internalformat!=GL_LUMINANCE8_ALPHA8
+        && internalformat!=GL_LUMINANCE12_ALPHA4
+        && internalformat!=GL_LUMINANCE12_ALPHA12
+        && internalformat!=GL_LUMINANCE16_ALPHA16
+        && internalformat!=GL_INTENSITY
+        && internalformat!=GL_INTENSITY4
+        && internalformat!=GL_INTENSITY8
+        && internalformat!=GL_INTENSITY12
+        && internalformat!=GL_INTENSITY16
+        && internalformat!=GL_R3_G3_B2
+        && internalformat!=GL_RGB
+        && internalformat!=GL_RGB4
+        && internalformat!=GL_RGB5
+        && internalformat!=GL_RGB8
+        && internalformat!=GL_RGB10
+        && internalformat!=GL_RGB12
+        && internalformat!=GL_RGB16
+        && internalformat!=GL_RGBA
+        && internalformat!=GL_RGBA2
+        && internalformat!=GL_RGBA4
+        && internalformat!=GL_RGB5_A1
+        && internalformat!=GL_RGBA8
+        && internalformat!=GL_RGB10_A2
+        && internalformat!=GL_RGBA12
+        && internalformat!=GL_RGBA16
+        && internalformat!=GL_SLUMINANCE
+        && internalformat!=GL_SLUMINANCE8
+        && internalformat!=GL_SLUMINANCE_ALPHA
+        && internalformat!=GL_SLUMINANCE8_ALPHA8
+        && internalformat!=GL_SRGB
+        && internalformat!=GL_SRGB8
+        && internalformat!=GL_SRGB_ALPHA
+        && internalformat!=GL_SRGB8_ALPHA8
+#ifdef CR_EXT_texture_compression_s3tc
+        && internalformat!=GL_COMPRESSED_RGB_S3TC_DXT1_EXT
+        && internalformat!=GL_COMPRESSED_RGBA_S3TC_DXT1_EXT
+        && internalformat!=GL_COMPRESSED_RGBA_S3TC_DXT3_EXT
+        && internalformat!=GL_COMPRESSED_RGBA_S3TC_DXT5_EXT
+#endif
+        )
+    {
+        /*crWarning("crPackCheckTexImageInternalFormat FAILED internalformat 0x%x isn't valid", internalformat);*/
+        return GL_FALSE;
+    }
+
+    return GL_TRUE;
+}
+
+static GLboolean packspu_CheckTexImageParams(GLint internalformat, GLenum format, GLenum type)
+{
+    return packspu_CheckTexImageFormat(format)
+           && packspu_CheckTexImageType(type)
+           && packspu_CheckTexImageInternalFormat(internalformat);
+}
+
+static GLboolean packspu_CheckTexImageFormatType(GLenum format, GLenum type)
+{
+    return packspu_CheckTexImageFormat(format)
+           && packspu_CheckTexImageType(type);
+}
+
 void PACKSPU_APIENTRY packspu_PixelStoref( GLenum pname, GLfloat param )
 {
@@ -80 +222 @@
     GET_CONTEXT(ctx);
     CRClientState *clientState = &(ctx->clientState->client);
+
+    if (!packspu_CheckTexImageParams(internalformat, format, type))
+    {
+        if (pixels)
+        {
+            crWarning("packspu_TexImage1D invalid internalFormat(%x)/format(%x)/type(%x)", internalformat, format, type);
+            return;
+        }
+        internalformat = packspu_CheckTexImageInternalFormat(internalformat) ? internalformat:GL_RGBA;
+        format = packspu_CheckTexImageFormat(format) ? format:GL_RGBA;
+        type = packspu_CheckTexImageType(type) ? type:GL_UNSIGNED_BYTE;
+    }
+
     if (pack_spu.swap)
         crPackTexImage1DSWAP( target, level, internalformat, width, border, format, type, pixels, &(clientState->unpack) );
@@ -90 +245 @@
     GET_CONTEXT(ctx);
     CRClientState *clientState = &(ctx->clientState->client);
+
+    if (!packspu_CheckTexImageParams(internalformat, format, type))
+    {
+        if (pixels)
+        {
+            crWarning("packspu_TexImage2D invalid internalFormat(%x)/format(%x)/type(%x)", internalformat, format, type);
+            return;
+        }
+        internalformat = packspu_CheckTexImageInternalFormat(internalformat) ? internalformat:GL_RGBA;
+        format = packspu_CheckTexImageFormat(format) ? format:GL_RGBA;
+        type = packspu_CheckTexImageType(type) ? type:GL_UNSIGNED_BYTE;
+    }
+
     if (pack_spu.swap)
         crPackTexImage2DSWAP( target, level, internalformat, width, height, border, format, type, pixels, &(clientState->unpack) );
@@ -101 +269 @@
     GET_CONTEXT(ctx);
     CRClientState *clientState = &(ctx->clientState->client);
+
     if (pack_spu.swap)
         crPackTexImage3DEXTSWAP( target, level, internalformat, width, height, depth, border, format, type, pixels, &(clientState->unpack) );
@@ -124 +293 @@
     GET_CONTEXT(ctx);
     CRClientState *clientState = &(ctx->clientState->client);
+
+    if (!packspu_CheckTexImageFormatType(format, type))
+    {
+        crWarning("packspu_TexSubImage1D invalid format(%x)/type(%x)", format, type);
+        return;
+    }
+
     if (pack_spu.swap)
         crPackTexSubImage1DSWAP( target, level, xoffset, width, format, type, pixels, &(clientState->unpack) );
@@ -134 +310 @@
     GET_CONTEXT(ctx);
     CRClientState *clientState = &(ctx->clientState->client);
+
+    if (!packspu_CheckTexImageFormatType(format, type))
+    {
+        crWarning("packspu_TexSubImage2D invalid format(%x)/type(%x)", format, type);
+        return;
+    }
+
     if (pack_spu.swap)
         crPackTexSubImage2DSWAP( target, level, xoffset, yoffset, width, height, format, type, pixels, &(clientState->unpack) );

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_special

@@ -95 +95 @@
 CheckFramebufferStatusEXT
 BindTexture
+DeleteTextures

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_texture.c

@@ -37 +37 @@
     crPackBindTexture(target, texture);
 }
+
+void PACKSPU_APIENTRY packspu_DeleteTextures(GLsizei n, const GLuint * textures)
+{
+    crStateDeleteTextures(n, textures);
+    crPackDeleteTextures(n, textures);
+}

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);
             }

trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp

@@ -71 +71 @@
 
 static const char* gszVBoxOGLSSMMagic = "***OpenGL state data***";
-#define SHCROGL_SSM_VERSION 13
+#define SHCROGL_SSM_VERSION 14
 
 typedef struct

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

@@ -61 +61 @@
         CRASSERT(tablesize/sizeof(%s)==1);
         texid = (GLuint) *get_values;
-        *get_values = (%s) (texid - cr_server.curClient->number * 100000);
+        if (texid)
+        {
+            *get_values = (%s) (texid - cr_server.curClient->number * 100000);
+        }
     }
     else if (GL_CURRENT_PROGRAM==pname)