Changeset 78105 in vbox for trunk/src/VBox/GuestHost/OpenGL

Timestamp:

Apr 10, 2019 8:01:12 PM (6 years ago)

Author:

vboxsync

Message:

GuestHost/OpenGL,HostServices/SharedOpenGL: Updates bugref:9407

Location:

trunk/src/VBox/GuestHost/OpenGL/state_tracker

Files:

• state_evaluators.c (modified) (4 diffs)
• state_teximage.c (modified) (2 diffs)

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

@@ -360 +360 @@
         }
 
+    switch (target) {
+        case GL_MAP1_VERTEX_3:
+        case GL_MAP1_VERTEX_4:
+        case GL_MAP1_INDEX:
+        case GL_MAP1_COLOR_4:
+        case GL_MAP1_NORMAL:
+        case GL_MAP1_TEXTURE_COORD_1:
+        case GL_MAP1_TEXTURE_COORD_2:
+        case GL_MAP1_TEXTURE_COORD_3:
+        case GL_MAP1_TEXTURE_COORD_4:
+            break;
+        default:
+            crStateError(__LINE__, __FILE__, GL_INVALID_ENUM, "glMap1d(bad target)");
+            return;
+    }
+
         i = target - GL_MAP1_COLOR_4;
 
@@ -378 +394 @@
                 crStateError(__LINE__, __FILE__, GL_INVALID_OPERATION,
                                                                  "glMap1d(current texture unit must be zero)");
-                return;
-        }
-
-        switch (target) {
-        case GL_MAP1_VERTEX_3:
-        case GL_MAP1_VERTEX_4:
-        case GL_MAP1_INDEX:
-        case GL_MAP1_COLOR_4:
-        case GL_MAP1_NORMAL:
-        case GL_MAP1_TEXTURE_COORD_1:
-        case GL_MAP1_TEXTURE_COORD_2:
-        case GL_MAP1_TEXTURE_COORD_3:
-        case GL_MAP1_TEXTURE_COORD_4:
-                break;
-        default:
-                crStateError(__LINE__, __FILE__, GL_INVALID_ENUM, "glMap1d(bad target)");
                 return;
         }
@@ -474 +474 @@
         }
 
-        if (g->extensions.NV_vertex_program) {
+    switch (target) {
+        case GL_MAP2_VERTEX_3:
+        case GL_MAP2_VERTEX_4:
+        case GL_MAP2_INDEX:
+        case GL_MAP2_COLOR_4:
+        case GL_MAP2_NORMAL:
+        case GL_MAP2_TEXTURE_COORD_1:
+        case GL_MAP2_TEXTURE_COORD_2:
+        case GL_MAP2_TEXTURE_COORD_3:
+        case GL_MAP2_TEXTURE_COORD_4:
+            break;
+        default:
+            crStateError(__LINE__, __FILE__, GL_INVALID_ENUM, "glMap2d()");
+            return;
+    }
+
+    if (g->extensions.NV_vertex_program) {
 /* XXX FIXME */
                 i = target - GL_MAP2_COLOR_4;
@@ -508 +524 @@
         }
 #endif
-
-        switch (target) {
-        case GL_MAP2_VERTEX_3:
-        case GL_MAP2_VERTEX_4:
-        case GL_MAP2_INDEX:
-        case GL_MAP2_COLOR_4:
-        case GL_MAP2_NORMAL:
-        case GL_MAP2_TEXTURE_COORD_1:
-        case GL_MAP2_TEXTURE_COORD_2:
-        case GL_MAP2_TEXTURE_COORD_3:
-        case GL_MAP2_TEXTURE_COORD_4:
-                break;
-        default:
-                crStateError(__LINE__, __FILE__, GL_INVALID_ENUM, "glMap2d()");
-                return;
-        }
 
         /* make copy of the control points */

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

@@ -218 +218 @@
     CRTextureState *t = &(g->texture);
     CRTextureUnit *unit = t->unit + t->curTextureUnit;
+    
+    if (level < 0 || level > MaxTextureLevel(g, texTarget)) {
+        crWarning("Wrong texture level=%d", level);
+        *obj = NULL;
+        *img = NULL;
+        return;
+    }
+
+    if (level < 0 || level >= CR_MAX_MIPMAP_LEVELS)
+    {
+        crWarning("unexpected level 0x%x", level);
+        *obj = NULL;
+        *img = NULL;
+    }
 
     switch (texTarget) {
@@ -691 +705 @@
     CRTextureLevel *tl = NULL;
     (void)x; (void)y;
+
+    if (level < 0 || level > MaxTextureLevel(g, target)) {
+        crStateError(__LINE__, __FILE__, GL_INVALID_VALUE,
+                     "crStateCopyTexImage2D: invalid level: %d", level);
+        return;
+    }
     
     crStateGetTextureObjectAndImage(g, target, level, &tobj, &tl);