VirtualBox

Changeset 78820 in vbox for trunk/src


Ignore:
Timestamp:
May 28, 2019 2:06:43 PM (6 years ago)
Author:
vboxsync
Message:

Revert r130914 again as it breaks Windows guests with the WDDM driver. Looks like there are two different formats used for the teximage command packet for Windows and the rest :\

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r78817 r78820  
    302302void crUnpackTexSubImage3D(PCrUnpackerState pState)
    303303{
    304     CHECK_BUFFER_SIZE_STATIC_LAST(pState, 40, int);
    305 
    306     GLenum target   = READ_DATA(pState,  0, GLenum);
    307     GLint level     = READ_DATA(pState,  4, GLint);
    308     GLint xoffset   = READ_DATA(pState,  8, GLint);
    309     GLint yoffset   = READ_DATA(pState, 12, GLint);
    310     GLint zoffset   = READ_DATA(pState, 16, GLint);
    311     GLsizei width   = READ_DATA(pState, 20, GLsizei);
    312     GLsizei height  = READ_DATA(pState, 24, GLsizei);
    313     GLsizei depth   = READ_DATA(pState, 28, GLsizei);
    314     GLenum format   = READ_DATA(pState, 32, GLenum);
    315     GLenum type     = READ_DATA(pState, 36, GLenum);
    316     int noimagedata = READ_DATA(pState, 40, int);
    317     GLvoid *pixels;
    318 
    319     CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, 44, GLint);
     304    CHECK_BUFFER_SIZE_STATIC_LAST(pState, sizeof(int) + 40, int);
     305
     306    GLenum target = READ_DATA(pState, sizeof( int ) + 0, GLenum );
     307    GLint level = READ_DATA(pState, sizeof( int ) + 4, GLint );
     308    GLint xoffset = READ_DATA(pState, sizeof( int ) + 8, GLint );
     309    GLint yoffset = READ_DATA(pState, sizeof( int ) + 12, GLint );
     310    GLint zoffset = READ_DATA(pState, sizeof( int ) + 16, GLint );
     311    GLsizei width = READ_DATA(pState, sizeof( int ) + 20, GLsizei );
     312    GLsizei height = READ_DATA(pState, sizeof( int ) + 24, GLsizei );
     313    GLsizei depth = READ_DATA(pState, sizeof( int ) + 28, GLsizei );
     314    GLenum format = READ_DATA(pState, sizeof( int ) + 32, GLenum );
     315    GLenum type = READ_DATA(pState, sizeof( int ) + 36, GLenum );
     316    int noimagedata = READ_DATA(pState, sizeof( int ) + 40, int );
     317    GLvoid *pixels;
     318
     319    CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, sizeof(int)+44, GLint);
    320320    if ( noimagedata )
    321         pixels = (void*) (uintptr_t) READ_DATA(pState, 44, GLint);
     321        pixels = (void*) (uintptr_t) READ_DATA(pState, sizeof(int)+44, GLint);
    322322    else
    323323    {
    … …  
    328328            return;
    329329        }
    330         pixels = DATA_POINTER(pState, 48, GLvoid );
     330        pixels = DATA_POINTER(pState, sizeof( int ) + 48, GLvoid );
    331331        CHECK_ARRAY_SIZE_FROM_PTR_UPDATE_LAST(pState, pixels, cbImg, GLubyte);
    332332    }
    … …  
    345345void crUnpackTexSubImage2D(PCrUnpackerState pState)
    346346{
    347     CHECK_BUFFER_SIZE_STATIC_LAST(pState, 32, int);
    348 
    349     GLenum target   = READ_DATA(pState,  0, GLenum);
    350     GLint level     = READ_DATA(pState,  4, GLint);
    351     GLint xoffset   = READ_DATA(pState,  8, GLint);
    352     GLint yoffset   = READ_DATA(pState, 12, GLint);
    353     GLsizei width   = READ_DATA(pState, 16, GLsizei);
    354     GLsizei height  = READ_DATA(pState, 20, GLsizei);
    355     GLenum format   = READ_DATA(pState, 24, GLenum);
    356     GLenum type     = READ_DATA(pState, 28, GLenum);
    357     int noimagedata = READ_DATA(pState, 32, int);
    358     GLvoid *pixels;
    359 
    360     CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, 36, GLint);
     347    CHECK_BUFFER_SIZE_STATIC_LAST(pState, sizeof(int) + 32, int);
     348
     349    GLenum target = READ_DATA(pState, sizeof( int ) + 0, GLenum );
     350    GLint level = READ_DATA(pState, sizeof( int ) + 4, GLint );
     351    GLint xoffset = READ_DATA(pState, sizeof( int ) + 8, GLint );
     352    GLint yoffset = READ_DATA(pState, sizeof( int ) + 12, GLint );
     353    GLsizei width = READ_DATA(pState, sizeof( int ) + 16, GLsizei );
     354    GLsizei height = READ_DATA(pState, sizeof( int ) + 20, GLsizei );
     355    GLenum format = READ_DATA(pState, sizeof( int ) + 24, GLenum );
     356    GLenum type = READ_DATA(pState, sizeof( int ) + 28, GLenum );
     357    int noimagedata = READ_DATA(pState, sizeof( int ) + 32, int );
     358    GLvoid *pixels;
     359
     360    CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, sizeof(int)+36, GLint);
    361361    if ( noimagedata )
    362362    {
    363         CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, 36, GLint);
    364         pixels = (void*) (uintptr_t) READ_DATA(pState, 36, GLint);
     363        CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, sizeof(int)+36, GLint);
     364        pixels = (void*) (uintptr_t) READ_DATA(pState, sizeof(int)+36, GLint);
    365365    }
    366366    else
    … …  
    372372            return;
    373373        }
    374         pixels = DATA_POINTER(pState, 40, GLvoid );
     374        pixels = DATA_POINTER(pState, sizeof( int ) + 40, GLvoid );
    375375        CHECK_ARRAY_SIZE_FROM_PTR_UPDATE_LAST(pState, pixels, cbImg, GLubyte);
    376376    }
    … …  
    388388void crUnpackTexSubImage1D(PCrUnpackerState pState)
    389389{
    390     CHECK_BUFFER_SIZE_STATIC_LAST(pState, 24, int);
    391 
    392     GLenum target   = READ_DATA(pState,  0, GLenum);
    393     GLint level     = READ_DATA(pState,  4, GLint);
    394     GLint xoffset   = READ_DATA(pState,  8, GLint);
    395     GLsizei width   = READ_DATA(pState, 12, GLsizei);
    396     GLenum format   = READ_DATA(pState, 16, GLenum);
    397     GLenum type     = READ_DATA(pState, 20, GLenum);
    398     int noimagedata = READ_DATA(pState, 24, int);
    399     GLvoid *pixels;
    400 
    401     CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, 28, GLint);
     390    CHECK_BUFFER_SIZE_STATIC_LAST(pState, sizeof(int) + 24, int);
     391
     392    GLenum target = READ_DATA(pState, sizeof( int ) + 0, GLenum );
     393    GLint level = READ_DATA(pState, sizeof( int ) + 4, GLint );
     394    GLint xoffset = READ_DATA(pState, sizeof( int ) + 8, GLint );
     395    GLsizei width = READ_DATA(pState, sizeof( int ) + 12, GLsizei );
     396    GLenum format = READ_DATA(pState, sizeof( int ) + 16, GLenum );
     397    GLenum type = READ_DATA(pState, sizeof( int ) + 20, GLenum );
     398    int noimagedata = READ_DATA(pState, sizeof( int ) + 24, int );
     399    GLvoid *pixels;
     400
     401    CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, sizeof(int)+28, GLint);
    402402    if ( noimagedata )
    403         pixels = (void*) (uintptr_t) READ_DATA(pState, 28, GLint);
     403        pixels = (void*) (uintptr_t) READ_DATA(pState, sizeof(int)+28, GLint);
    404404    else
    405405    {
    … …  
    410410            return;
    411411        }
    412         pixels = DATA_POINTER(pState, 32, GLvoid );
     412        pixels = DATA_POINTER(pState, sizeof( int ) + 32, GLvoid );
    413413        CHECK_ARRAY_SIZE_FROM_PTR_UPDATE_LAST(pState, pixels, cbImg, GLubyte);
    414414    }
    … …  
    527527void crUnpackExtendCompressedTexImage3DARB(PCrUnpackerState pState)
    528528{
    529     CHECK_BUFFER_SIZE_STATIC_LAST(pState, 4 + 32, int);
    530 
    531     GLenum  target         = READ_DATA(pState, 4 +  0, GLenum);
    532     GLint   level          = READ_DATA(pState, 4 +  4, GLint);
    533     GLenum  internalformat = READ_DATA(pState, 4 +  8, GLenum);
    534     GLsizei width          = READ_DATA(pState, 4 + 12, GLsizei);
    535     GLsizei height         = READ_DATA(pState, 4 + 16, GLsizei);
    536     GLsizei depth          = READ_DATA(pState, 4 + 20, GLsizei);
    537     GLint   border         = READ_DATA(pState, 4 + 24, GLint);
    538     GLsizei imagesize      = READ_DATA(pState, 4 + 28, GLsizei);
    539     int     noimagedata    = READ_DATA(pState, 4 + 32, int);
     529    CHECK_BUFFER_SIZE_STATIC_LAST(pState, 4 + sizeof(int) + 32, int);
     530
     531    GLenum  target         = READ_DATA(pState, 4 + sizeof(int) +  0, GLenum );
     532    GLint   level          = READ_DATA(pState, 4 + sizeof(int) +  4, GLint );
     533    GLenum  internalformat = READ_DATA(pState, 4 + sizeof(int) +  8, GLenum );
     534    GLsizei width          = READ_DATA(pState, 4 + sizeof(int) + 12, GLsizei );
     535    GLsizei height         = READ_DATA(pState, 4 + sizeof(int) + 16, GLsizei );
     536    GLsizei depth          = READ_DATA(pState, 4 + sizeof(int) + 20, GLsizei );
     537    GLint   border         = READ_DATA(pState, 4 + sizeof(int) + 24, GLint );
     538    GLsizei imagesize      = READ_DATA(pState, 4 + sizeof(int) + 28, GLsizei );
     539    int     noimagedata        = READ_DATA(pState, 4 + sizeof(int) + 32, int );
    540540    GLvoid  *pixels;
    541541
    542     CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, 4 + 36, GLint);
     542    CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, 4 + sizeof(int)+36, GLint);
    543543    if( noimagedata )
    544         pixels = (void*) (uintptr_t) READ_DATA(pState, 4 + 36, GLint);
    545     else
    546     {
    547         pixels = DATA_POINTER(pState, 4 + 40, GLvoid );
     544        pixels = (void*) (uintptr_t) READ_DATA(pState, 4+sizeof(int)+36, GLint);
     545    else
     546    {
     547        pixels = DATA_POINTER(pState, 4 + sizeof( int ) + 40, GLvoid );
    548548        CHECK_ARRAY_SIZE_FROM_PTR_UPDATE_LAST(pState, pixels, imagesize, GLubyte);
    549549    }
    … …  
    557557void crUnpackExtendCompressedTexImage2DARB(PCrUnpackerState pState)
    558558{
    559     CHECK_BUFFER_SIZE_STATIC_LAST(pState, 4 + 28, int);
    560 
    561     GLenum target =         READ_DATA(pState, 4 +  0, GLenum);
    562     GLint level =           READ_DATA(pState, 4 +  4, GLint);
    563     GLenum internalformat = READ_DATA(pState, 4 +  8, GLenum);
    564     GLsizei width =         READ_DATA(pState, 4 + 12, GLsizei);
    565     GLsizei height =        READ_DATA(pState, 4 + 16, GLsizei);
    566     GLint border =          READ_DATA(pState, 4 + 20, GLint);
    567     GLsizei imagesize =     READ_DATA(pState, 4 + 24, GLsizei);
    568     int noimagedata =       READ_DATA(pState, 4 + 28, int);
    569     GLvoid *pixels;
    570 
    571     CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, 4 + 32, GLint);
     559    CHECK_BUFFER_SIZE_STATIC_LAST(pState, 4 + sizeof(int) + 28, int);
     560
     561    GLenum target =         READ_DATA(pState, 4 + sizeof( int ) + 0, GLenum );
     562    GLint level =           READ_DATA(pState, 4 + sizeof( int ) + 4, GLint );
     563    GLenum internalformat = READ_DATA(pState, 4 + sizeof( int ) + 8, GLenum );
     564    GLsizei width =         READ_DATA(pState, 4 + sizeof( int ) + 12, GLsizei );
     565    GLsizei height =        READ_DATA(pState, 4 + sizeof( int ) + 16, GLsizei );
     566    GLint border =          READ_DATA(pState, 4 + sizeof( int ) + 20, GLint );
     567    GLsizei imagesize =     READ_DATA(pState, 4 + sizeof( int ) + 24, GLsizei );
     568    int noimagedata =           READ_DATA(pState, 4 + sizeof( int ) + 28, int );
     569    GLvoid *pixels;
     570
     571    CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, 4 + sizeof(int)+32, GLint);
    572572    if ( noimagedata )
    573         pixels = (void*) (uintptr_t) READ_DATA(pState, 4 + 32, GLint);
    574     else
    575     {
    576         pixels = DATA_POINTER(pState, 4 + 36, GLvoid );
     573        pixels = (void*) (uintptr_t) READ_DATA(pState, 4+sizeof(int)+32, GLint);
     574    else
     575    {
     576        pixels = DATA_POINTER(pState, 4 + sizeof( int ) + 36, GLvoid );
    577577        CHECK_ARRAY_SIZE_FROM_PTR_UPDATE_LAST(pState, pixels, imagesize, GLubyte);
    578578    }
    … …  
    586586void crUnpackExtendCompressedTexImage1DARB(PCrUnpackerState pState)
    587587{
    588     CHECK_BUFFER_SIZE_STATIC_LAST(pState, 4 + 24, int);
    589 
    590     GLenum  target         = READ_DATA(pState, 4 +  0, GLenum);
    591     GLint   level          = READ_DATA(pState, 4 +  4, GLint);
    592     GLenum  internalformat = READ_DATA(pState, 4 +  8, GLenum);
    593     GLsizei width          = READ_DATA(pState, 4 + 12, GLsizei);
    594     GLint   border         = READ_DATA(pState, 4 + 16, GLint);
    595     GLsizei imagesize      = READ_DATA(pState, 4 + 20, GLsizei);
    596     int     noimagedata    = READ_DATA(pState, 4 + 24, int);
     588    CHECK_BUFFER_SIZE_STATIC_LAST(pState, 4 + sizeof(int) + 24, int);
     589
     590    GLenum  target         = READ_DATA(pState, 4 + sizeof(int) +  0, GLenum );
     591    GLint   level          = READ_DATA(pState, 4 + sizeof(int) +  4, GLint );
     592    GLenum  internalformat = READ_DATA(pState, 4 + sizeof(int) +  8, GLenum );
     593    GLsizei width          = READ_DATA(pState, 4 + sizeof(int) + 12, GLsizei );
     594    GLint   border         = READ_DATA(pState, 4 + sizeof(int) + 16, GLint );
     595    GLsizei imagesize      = READ_DATA(pState, 4 + sizeof(int) + 20, GLsizei );
     596    int     noimagedata        = READ_DATA(pState, 4 + sizeof(int) + 24, int );
    597597    GLvoid  *pixels;
    598598
    599     CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, 4 + 28, GLint);
     599    CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, 4 + sizeof(int)+28, GLint);
    600600    if( noimagedata )
    601         pixels = (void*) (uintptr_t) READ_DATA(pState, 4 + 28, GLint);
    602     else
    603     {
    604         pixels = DATA_POINTER(pState, 4 + 32, GLvoid );
     601        pixels = (void*) (uintptr_t) READ_DATA(pState, 4+sizeof(int)+28, GLint);
     602    else
     603    {
     604        pixels = DATA_POINTER(pState, 4 + sizeof( int ) + 32, GLvoid );
    605605        CHECK_ARRAY_SIZE_FROM_PTR_UPDATE_LAST(pState, pixels, imagesize, GLubyte);
    606606    }
    … …  
    613613void crUnpackExtendCompressedTexSubImage3DARB(PCrUnpackerState pState)
    614614{
    615     CHECK_BUFFER_SIZE_STATIC_LAST(pState, 4 + 40, int);
    616 
    617     GLenum  target    = READ_DATA(pState, 4 + 0, GLenum );
    618     GLint   level     = READ_DATA(pState, 4 + 4, GLint );
    619     GLint   xoffset   = READ_DATA(pState, 4 + 8, GLint );
    620     GLint   yoffset   = READ_DATA(pState, 4 + 12, GLint );
    621     GLint   zoffset   = READ_DATA(pState, 4 + 16, GLint );
    622     GLsizei width     = READ_DATA(pState, 4 + 20, GLsizei );
    623     GLsizei height    = READ_DATA(pState, 4 + 24, GLsizei );
    624     GLsizei depth     = READ_DATA(pState, 4 + 28, GLsizei );
    625     GLenum  format    = READ_DATA(pState, 4 + 32, GLenum );
    626     GLsizei imagesize = READ_DATA(pState, 4 + 36, GLsizei );
    627     int     noimagedata   = READ_DATA(pState, 4 + 40, int );
     615    CHECK_BUFFER_SIZE_STATIC_LAST(pState, 4 + sizeof(int) + 40, int);
     616
     617    GLenum  target    = READ_DATA(pState, 4 + sizeof(int) + 0, GLenum );
     618    GLint   level     = READ_DATA(pState, 4 + sizeof(int) + 4, GLint );
     619    GLint   xoffset   = READ_DATA(pState, 4 + sizeof(int) + 8, GLint );
     620    GLint   yoffset   = READ_DATA(pState, 4 + sizeof(int) + 12, GLint );
     621    GLint   zoffset   = READ_DATA(pState, 4 + sizeof(int) + 16, GLint );
     622    GLsizei width     = READ_DATA(pState, 4 + sizeof(int) + 20, GLsizei );
     623    GLsizei height    = READ_DATA(pState, 4 + sizeof(int) + 24, GLsizei );
     624    GLsizei depth     = READ_DATA(pState, 4 + sizeof(int) + 28, GLsizei );
     625    GLenum  format    = READ_DATA(pState, 4 + sizeof(int) + 32, GLenum );
     626    GLsizei imagesize = READ_DATA(pState, 4 + sizeof(int) + 36, GLsizei );
     627    int     noimagedata   = READ_DATA(pState, 4 + sizeof(int) + 40, int );
    628628    GLvoid  *pixels;
    629629
    630     CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, 4 + 44, GLint);
     630    CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, 4 + sizeof(int)+44, GLint);
    631631    if( noimagedata )
    632         pixels = (void*) (uintptr_t) READ_DATA(pState, 4 + 44, GLint);
    633     else
    634     {
    635         pixels = DATA_POINTER(pState, 4 + 48, GLvoid );
     632        pixels = (void*) (uintptr_t) READ_DATA(pState, 4+sizeof(int)+44, GLint);
     633    else
     634    {
     635        pixels = DATA_POINTER(pState, 4 + sizeof( int ) + 48, GLvoid );
    636636        CHECK_ARRAY_SIZE_FROM_PTR_UPDATE_LAST(pState, pixels, imagesize, GLubyte);
    637637    }
    … …  
    646646void crUnpackExtendCompressedTexSubImage2DARB(PCrUnpackerState pState)
    647647{
    648     CHECK_BUFFER_SIZE_STATIC_LAST(pState, 4 + 32, int);
    649 
    650     GLenum  target      = READ_DATA(pState, 4 +  0, GLenum);
    651     GLint   level       = READ_DATA(pState, 4 +  4, GLint);
    652     GLint   xoffset     = READ_DATA(pState, 4 +  8, GLint);
    653     GLint   yoffset     = READ_DATA(pState, 4 + 12, GLint);
    654     GLsizei width       = READ_DATA(pState, 4 + 16, GLsizei);
    655     GLsizei height      = READ_DATA(pState, 4 + 20, GLsizei);
    656     GLenum  format      = READ_DATA(pState, 4 + 24, GLenum);
    657     GLsizei imagesize   = READ_DATA(pState, 4 + 28, GLsizei);
    658     int     noimagedata = READ_DATA(pState, 4 + 32, int);
     648    CHECK_BUFFER_SIZE_STATIC_LAST(pState, 4 + sizeof(int) + 32, int);
     649
     650    GLenum  target    = READ_DATA(pState, 4 + sizeof(int) +  0, GLenum );
     651    GLint   level     = READ_DATA(pState, 4 + sizeof(int) +  4, GLint );
     652    GLint   xoffset   = READ_DATA(pState, 4 + sizeof(int) +  8, GLint );
     653    GLint   yoffset   = READ_DATA(pState, 4 + sizeof(int) + 12, GLint );
     654    GLsizei width     = READ_DATA(pState, 4 + sizeof(int) + 16, GLsizei );
     655    GLsizei height    = READ_DATA(pState, 4 + sizeof(int) + 20, GLsizei );
     656    GLenum  format    = READ_DATA(pState, 4 + sizeof(int) + 24, GLenum );
     657    GLsizei imagesize = READ_DATA(pState, 4 + sizeof(int) + 28, GLsizei );
     658    int     noimagedata   = READ_DATA(pState, 4 + sizeof(int) + 32, int );
    659659    GLvoid  *pixels;
    660660
    661     CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, 4 + 36, GLint);
     661    CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, 4 + sizeof(int)+36, GLint);
    662662    if( noimagedata )
    663         pixels = (void*) (uintptr_t) READ_DATA(pState, 4 + 36, GLint);
    664     else
    665     {
    666         pixels = DATA_POINTER(pState, 4 + 40, GLvoid );
     663        pixels = (void*) (uintptr_t) READ_DATA(pState, 4+sizeof(int)+36, GLint);
     664    else
     665    {
     666        pixels = DATA_POINTER(pState, 4 + sizeof( int ) + 40, GLvoid );
    667667        CHECK_ARRAY_SIZE_FROM_PTR_UPDATE_LAST(pState, pixels, imagesize, GLubyte);
    668668    }
    … …  
    676676void crUnpackExtendCompressedTexSubImage1DARB(PCrUnpackerState pState)
    677677{
    678     CHECK_BUFFER_SIZE_STATIC_LAST(pState, 4 + 24, int);
    679 
    680     GLenum  target      = READ_DATA(pState, 4 +  0, GLenum);
    681     GLint   level       = READ_DATA(pState, 4 +  4, GLint);
    682     GLint   xoffset     = READ_DATA(pState, 4 +  8, GLint);
    683     GLsizei width       = READ_DATA(pState, 4 + 12, GLsizei);
    684     GLenum  format      = READ_DATA(pState, 4 + 16, GLenum);
    685     GLsizei imagesize   = READ_DATA(pState, 4 + 20, GLsizei);
    686     int     noimagedata = READ_DATA(pState, 4 + 24, int);
     678    CHECK_BUFFER_SIZE_STATIC_LAST(pState, 4 + sizeof(int) + 24, int);
     679
     680    GLenum  target    = READ_DATA(pState, 4 + sizeof(int) +  0, GLenum );
     681    GLint   level     = READ_DATA(pState, 4 + sizeof(int) +  4, GLint );
     682    GLint   xoffset   = READ_DATA(pState, 4 + sizeof(int) +  8, GLint );
     683    GLsizei width     = READ_DATA(pState, 4 + sizeof(int) + 12, GLsizei );
     684    GLenum  format    = READ_DATA(pState, 4 + sizeof(int) + 16, GLenum );
     685    GLsizei imagesize = READ_DATA(pState, 4 + sizeof(int) + 20, GLsizei );
     686    int     noimagedata   = READ_DATA(pState, 4 + sizeof(int) + 24, int );
    687687    GLvoid  *pixels;
    688688
    689     CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, 4 + 28, GLint);
     689    CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, 4 + sizeof(int)+28, GLint);
    690690    if( noimagedata )
    691         pixels = (void*) (uintptr_t) READ_DATA(pState, 4 + 28, GLint);
    692     else
    693     {
    694         pixels = DATA_POINTER(pState, 4 + 32, GLvoid );
     691        pixels = (void*) (uintptr_t) READ_DATA(pState, 4+sizeof(int)+28, GLint);
     692    else
     693    {
     694        pixels = DATA_POINTER(pState, 4 + sizeof( int ) + 32, GLvoid );
    695695        CHECK_ARRAY_SIZE_FROM_PTR_UPDATE_LAST(pState, pixels, imagesize, GLubyte);
    696696    }
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette