Changeset 78875 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/unpacker

Timestamp:

May 30, 2019 11:39:41 AM (6 years ago)

Author:

vboxsync

Message:

HostServices/SharedOpenGL/unpacker/unpack_texture.cpp: Fix crUnpackTexSubImage3D(), crUnpackTexSubImage2D() and crUnpackTexSubImage1D and calculate the proper texture size for crUnpackTexImage3DEXT() and crUnpackTexImage3D()

File:

• trunk/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_texture.cpp (modified) (5 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_texture.cpp

@@ -38 +38 @@
     else
     {
-        size_t cbImg = crImageSize(format, type, width, height);
+        size_t cbImg = crTextureSize(format, type, width, height, depth);
         if (RT_UNLIKELY(cbImg == 0))
         {
@@ -77 +77 @@
     else
     {
-        size_t cbImg = crImageSize(format, type, width, height);
+        size_t cbImg = crTextureSize(format, type, width, height, depth);
         if (RT_UNLIKELY(cbImg == 0))
         {
@@ -322 +322 @@
     else
     {
-        size_t cbImg = crImageSize(format, type, width, height);
-        if (RT_UNLIKELY(cbImg == 0))
+        /*
+         * Specifying a sub texture with zero width, height or depth is not an
+         * error but has no effect.
+         * See: https://www.khronos.org/registry/OpenGL-Refpages/gl2.1/xhtml/glTexSubImage3D.xml
+         */
+        size_t cbImg = crTextureSize(format, type, width, height, depth);
+        if (RT_UNLIKELY(   cbImg == 0
+                        && width != 0
+                        && height != 0
+                        && depth != 0))
         {
             pState->rcUnpack = VERR_INVALID_PARAMETER;
@@ -366 +374 @@
     else
     {
+        /*
+         * Specifying a sub texture with zero width, height or depth is not an
+         * error but has no effect.
+         * See: https://www.khronos.org/registry/OpenGL-Refpages/gl2.1/xhtml/glTexSubImage2D.xml
+         */
         size_t cbImg = crImageSize(format, type, width, height);
-        if (RT_UNLIKELY(cbImg == 0))
+        if (RT_UNLIKELY(   cbImg == 0
+                        && width != 0
+                        && height != 0))
         {
             pState->rcUnpack = VERR_INVALID_PARAMETER;
@@ -404 +419 @@
     else
     {
+        /*
+         * Specifying a sub texture with zero width, height or depth is not an
+         * error but has no effect.
+         * See: https://www.khronos.org/registry/OpenGL-Refpages/gl2.1/xhtml/glTexSubImage1D.xml
+         */
         size_t cbImg = crImageSize(format, type, width, 1);
-        if (RT_UNLIKELY(cbImg == 0))
+        if (RT_UNLIKELY(   cbImg == 0
+                        && width != 0))
         {
             pState->rcUnpack = VERR_INVALID_PARAMETER;