VirtualBox

Ignore:
Timestamp:
Apr 18, 2019 12:07:07 AM (6 years ago)
Author:
vboxsync
Message:

Merge first stage of the Chromium cleanup from the branch:

  • r129818 (Remove VBOX_WITH_CR_DISPLAY_LISTS and accompanying code as it was disabled since r108676 and was never brought back (see ​bugref:3456 and ​bugref:8485))
  • r129819 (HostServices/SharedOpenGL: Remove unused main entry point from upstream server process based implementation)
  • r129820 (HostServices/SharedOpenGL: Started eliminating all backends other than HGCM. They are not used and probably wouldn't work anymore anyway)
  • r129821 (HostServices/SharedOpenGL,GuestHost/OpenGLAdditions/common/crOpenGL: Kill crTimer* API as it is not used anywhere)
  • r129822 (HostServices/SharedOpenGL,GuestHost/OpenGLAdditions/common/crOpenGL: Kill most from cr_process.h apart from two used methods)
  • r129823 (HostServices/SharedOpenGL,GuestHost/OpenGLAdditions/common/crOpenGL: Kill crList* API as it is unused)
  • r129824 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Kill crHullInteriorBox API as it is unused)
  • r129825 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Kill crWarpPoint API as it is unused)
  • r129826 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Kill CrSa* API as it is unused and not even compiled in)
  • r129827 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Kill cr_bbox.h as it is unused)
  • r129828 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Remove a few crParseUrl() two uses)
  • r129829 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Remove last crParseURL() use)
  • r129830 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Remove crParseURL())
  • r129831 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Remove VBOX_WITH_COCOA_QT and related code when not set as it is the default for years now and we don't support anything else anymore)
  • r129832 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Remove unused cr_logo.h)
  • r129833 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Remove unused crut_api.h and crut_clientapi.h)
  • r129834 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Remove unused cr_dmx.h)
  • r129835 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Remove unused cr_perf.h)
  • r129836 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Remove cr_rand.h and friends as it is not actively used anywhere)
  • r129837 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Get rid of all the swapped versions in the packer SPU, we never change endianess from guest to host and don't need it)
  • r129838 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Remove more swapper versions in the packer related code)
  • r129839 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Remove more swapper versions in the packer related code)
  • r129840 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Remove unused pack_pica.c)
  • r129841 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Remove more swapper versions in the packer related code)
  • r129842 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Get rid of cr_endianess.h and friends)
  • r129843 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Get rid of unused lowercase.py)
  • r129844 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Get rid of unused cr_calllists.h and friends)
  • r129845 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Get rid of completely unused idpool.c, not even compiled in)
  • r129846 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Get rid of unused cr_debugopcodes.h and friends)
  • r129847 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Make the cr_mem.h API inline and get rid of the implementation in the util library)
  • r129848 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Get rid of SPUOptions and related code as it is of no use for us)
  • r129849 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Get rid of cr_environment.h and friends and convert usage to RTEnv* APIs)
  • r129850 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Get rid of unused renderspu_agl.c)
  • r129851 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Remove unused code in cr_htable.h)
  • r129853 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Introduce a state paremeter for the unpacker workers instead of reyling on global variables, work in progress)
  • r129854 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Let the caller of crUnpack set up the initial state. This allows to get rid of the global return_ptr and writeback_ptr as they get supplied in the unpacker state by the server)
  • r129855 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Get rid of the cr_lastDispatch and cr_unpackDispatch as they are of no use now)
  • r129856 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Get rid of the global cr_unpackData and cr_unpackDataEnd symbols by indtroducing another hack to make it possible for certail server dispatch callbacks to access the data buffer)
  • r129857 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: build fix for release builds)
  • r129858 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Make the pointer to the unpacker state non const (is required for the access verification))
  • r129859 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: First iteration of the buffer size validation to prevent out of bound read access + added todos for places where additional checks are needed)
  • r129860 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Working on remaining verification todos)
  • r129861 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Working on remaining verification todos)
  • r129871 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Working on remaining verification todos)
  • r129872 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Stop as soon as the unpacker encountered an error)
  • r129876 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Working on remaining verification todos)
  • r129880 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Working on remaining verification todos)
  • r129882 (HostServices/SharedOpenGL,GuestHost/OpenGL,Additions/common/crOpenGL: Fixed some offsets in unpack_texture.c, 3DMark03 renders correctly again)
  • r130013 (HostServices/SharedOpenGL: Convert files to C++ so we can use C99 featuers on Windows with cl.exe)
  • r130014 (HostServices/SharedOpenGL,GuestHost/OpenGL: WIndows build fixes)
  • r130015 (HostServices/SharedOpenGL,GuestHost/OpenGL: More Windows build fixes)
  • r130036 (Config.kmk: Fix linker error on Windows by temporarily disabling the use of VBoxGuestR3DllMinW2K)
  • r130094 (src/VBox/GuestHost/OpenGL: Revert inlining the allocation/free functions in R3 completely as it doesn't work on Windows if memory is allocated and freed across different DLLs which don't share a common CRT, causes crashes in RtlValidtaeHeap())
  • r130095 (src/VBox/GuestHost/OpenGL,src/VBox/Additions/common/crOpenGL/pack: Don't use floating point specifiers in packspu_GetString() to avoid R6002 errors (couldn't fully understand why they occur suddenly after the rework but this gets rid of it))
Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:mergeinfo

      •  

        old new  
        99/branches/VBox-5.1:112367,115992,116543,116550,116568,116573
        1010/branches/VBox-5.2:119536,120083,120099,120213,120221,120239,123597-123598,123600-123601,123755,124260,124263,124271,124273,124277-124279,124284-124286,124288-124290,125768,125779-125780,125812
         11/branches/aeichner/vbox-chromium-cleanup:129816,129818-129851,129853-129861,129871-129872,129876,129880,129882,130013-130015,130036,130094-130095
        1112/branches/andy/draganddrop:90781-91268
        1213/branches/andy/guestctrl20:78916,78930

  • trunk/src/VBox

    • Property svn:mergeinfo

      •  

        old new  
        99/branches/VBox-5.1/src/VBox:112367,116543,116550,116568,116573
        1010/branches/VBox-5.2/src/VBox:119536,120083,120099,120213,120221,120239,123597-123598,123600-123601,123755,124263,124273,124277-124279,124284-124286,124288-124290,125768,125779-125780,125812,127158-127159,127162-127167,127180
         11/branches/aeichner/vbox-chromium-cleanup/src/VBox:129818-129851,129853-129861,129871-129872,129876,129880,129882,130013-130015,130094-130095
        1112/branches/andy/draganddrop/src/VBox:90781-91268
        1213/branches/andy/guestctrl20/src/VBox:78916,78930

  • trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_client.c

    r69310 r78190  
    1515#if CR_ARB_vertex_buffer_object
    1616    GET_CONTEXT(ctx);
    17     if (ctx->clientState->extensions.ARB_vertex_buffer_object) {
    18         if (pack_spu.swap)
    19             crPackFogCoordPointerEXTSWAP( type, stride, pointer );
    20         else
    21             crPackFogCoordPointerEXT( type, stride, pointer );
     17   if (ctx->clientState->extensions.ARB_vertex_buffer_object) {
     18        crPackFogCoordPointerEXT( type, stride, pointer );
    2219    }
    2320#endif
    … …  
    3027    GET_CONTEXT(ctx);
    3128    if (ctx->clientState->extensions.ARB_vertex_buffer_object) {
    32         if (pack_spu.swap)
    33             crPackColorPointerSWAP( size, type, stride, pointer );
    34         else
    35             crPackColorPointer( size, type, stride, pointer );
     29        crPackColorPointer( size, type, stride, pointer );
    3630    }
    3731#endif
    … …  
    4438    GET_CONTEXT(ctx);
    4539    if (ctx->clientState->extensions.ARB_vertex_buffer_object) {
    46         if (pack_spu.swap)
    47             crPackSecondaryColorPointerEXTSWAP( size, type, stride, pointer );
    48         else
    49             crPackSecondaryColorPointerEXT( size, type, stride, pointer );
     40        crPackSecondaryColorPointerEXT( size, type, stride, pointer );
    5041    }
    5142#endif
    … …  
    5950    CRASSERT(ctx->clientState->extensions.ARB_vertex_buffer_object);
    6051    if (ctx->clientState->extensions.ARB_vertex_buffer_object) {
    61         if (pack_spu.swap)
    62             crPackVertexPointerSWAP( size, type, stride, pointer );
    63         else
    64             crPackVertexPointer( size, type, stride, pointer );
     52        crPackVertexPointer( size, type, stride, pointer );
    6553    }
    6654#endif
    … …  
    7361    GET_CONTEXT(ctx);
    7462    if (ctx->clientState->extensions.ARB_vertex_buffer_object) {
    75         if (pack_spu.swap)
    76             crPackTexCoordPointerSWAP( size, type, stride, pointer );
    77         else
    78             crPackTexCoordPointer( size, type, stride, pointer );
     63        crPackTexCoordPointer( size, type, stride, pointer );
    7964    }
    8065#endif
    … …  
    8772    GET_CONTEXT(ctx);
    8873    if (ctx->clientState->extensions.ARB_vertex_buffer_object) {
    89         if (pack_spu.swap)
    90             crPackNormalPointerSWAP( type, stride, pointer );
    91         else
    92             crPackNormalPointer( type, stride, pointer );
     74        crPackNormalPointer( type, stride, pointer );
    9375    }
    9476#endif
    … …  
    10183    GET_CONTEXT(ctx);
    10284    if (ctx->clientState->extensions.ARB_vertex_buffer_object) {
    103         if (pack_spu.swap)
    104             crPackEdgeFlagPointerSWAP( stride, pointer );
    105         else
    106             crPackEdgeFlagPointer( stride, pointer );
     85        crPackEdgeFlagPointer( stride, pointer );
    10786    }
    10887#endif
    … …  
    11594    GET_CONTEXT(ctx);
    11695    if (ctx->clientState->extensions.ARB_vertex_buffer_object) {
    117         if (pack_spu.swap)
    118             crPackVertexAttribPointerARBSWAP( index, size, type, normalized, stride, pointer );
    119         else
    120             crPackVertexAttribPointerARB( index, size, type, normalized, stride, pointer );
     96        crPackVertexAttribPointerARB( index, size, type, normalized, stride, pointer );
    12197    }
    12298#endif
    … …  
    129105    GET_CONTEXT(ctx);
    130106    if (ctx->clientState->extensions.ARB_vertex_buffer_object) {
    131         if (pack_spu.swap)
    132             crPackVertexAttribPointerNVSWAP( index, size, type, stride, pointer );
    133         else
    134             crPackVertexAttribPointerNV( index, size, type, stride, pointer );
     107        crPackVertexAttribPointerNV( index, size, type, stride, pointer );
    135108    }
    136109#endif
    … …  
    143116    GET_CONTEXT(ctx);
    144117    if (ctx->clientState->extensions.ARB_vertex_buffer_object) {
    145         if (pack_spu.swap)
    146             crPackIndexPointerSWAP( type, stride, pointer );
    147         else
    148             crPackIndexPointer( type, stride, pointer );
     118        crPackIndexPointer( type, stride, pointer );
    149119    }
    150120#endif
    … …  
    162132    GET_CONTEXT(ctx);
    163133    if (ctx->clientState->extensions.ARB_vertex_buffer_object) {
    164         if (pack_spu.swap)
    165             crPackInterleavedArraysSWAP( format, stride, pointer );
    166         else
    167             crPackInterleavedArrays( format, stride, pointer );
     134        crPackInterleavedArrays( format, stride, pointer );
    168135    }
    169136#endif
    … …  
    380347
    381348        /* Send the DrawArrays command over the wire */
    382         if (pack_spu.swap)
    383             crPackArrayElementSWAP( index );
    384         else
    385             crPackArrayElement( index );
     349        crPackArrayElement( index );
    386350
    387351        if (cZvaValues)
    … …  
    400364#endif
    401365
    402         if (pack_spu.swap)
    403             crPackExpandArrayElementSWAP( index, clientState, cZvaValues ? aAttrib : NULL );
    404         else
    405             crPackExpandArrayElement( index, clientState, cZvaValues ? aAttrib : NULL );
     366        crPackExpandArrayElement( index, clientState, cZvaValues ? aAttrib : NULL );
    406367
    407368#ifdef CR_FORCE_ZVA_SERVER_ARRAY
    … …  
    529490
    530491        /* Send the DrawArrays command over the wire */
    531         if (pack_spu.swap)
    532             crPackDrawElementsSWAP( mode, count, type, indices );
    533         else
    534             crPackDrawElements( mode, count, type, indices );
     492        crPackDrawElements( mode, count, type, indices );
    535493
    536494        if (cZvaValues)
    … …  
    549507#endif
    550508
    551         if (pack_spu.swap)
    552             crPackExpandDrawElementsSWAP( mode, count, type, indices, clientState, cZvaValues ? aAttrib : NULL );
    553         else
    554         {
    555             //packspu_Begin(mode);
    556             crPackExpandDrawElements( mode, count, type, indices, clientState, cZvaValues ? aAttrib : NULL );
    557             //packspu_End();
    558         }
     509        //packspu_Begin(mode);
     510        crPackExpandDrawElements( mode, count, type, indices, clientState, cZvaValues ? aAttrib : NULL );
     511        //packspu_End();
    559512
    560513#ifdef CR_FORCE_ZVA_SERVER_ARRAY
    … …  
    615568
    616569        /* Send the DrawRangeElements command over the wire */
    617         if (pack_spu.swap)
    618             crPackDrawRangeElementsSWAP( mode, start, end, count, type, indices );
    619         else
    620             crPackDrawRangeElements( mode, start, end, count, type, indices );
     570        crPackDrawRangeElements( mode, start, end, count, type, indices );
    621571
    622572        if (cZvaValues)
    … …  
    634584#endif
    635585
    636         if (pack_spu.swap)
    637             crPackExpandDrawRangeElementsSWAP( mode, start, end, count, type, indices, clientState, cZvaValues ? aAttrib : NULL );
    638         else
    639         {
    640             crPackExpandDrawRangeElements( mode, start, end, count, type, indices, clientState, cZvaValues ? aAttrib : NULL );
    641         }
     586        crPackExpandDrawRangeElements( mode, start, end, count, type, indices, clientState, cZvaValues ? aAttrib : NULL );
    642587
    643588#ifdef CR_FORCE_ZVA_SERVER_ARRAY
    … …  
    709654
    710655        /* Send the DrawArrays command over the wire */
    711         if (pack_spu.swap)
    712             crPackDrawArraysSWAP( mode, first, count );
    713         else
    714             crPackDrawArrays( mode, first, count );
     656        crPackDrawArrays( mode, first, count );
    715657
    716658        if (cZvaValues)
    … …  
    729671#endif
    730672
    731         if (pack_spu.swap)
    732             crPackExpandDrawArraysSWAP( mode, first, count, clientState, cZvaValues ? aAttrib : NULL );
    733         else
    734             crPackExpandDrawArrays( mode, first, count, clientState, cZvaValues ? aAttrib : NULL );
     673        crPackExpandDrawArrays( mode, first, count, clientState, cZvaValues ? aAttrib : NULL );
    735674
    736675#ifdef CR_FORCE_ZVA_SERVER_ARRAY
    … …  
    809748    {
    810749        crStateEnable(cap);
    811 
    812         if (pack_spu.swap)
    813             crPackEnableSWAP(cap);
    814         else
    815             crPackEnable(cap);
     750        crPackEnable(cap);
    816751    }
    817752    else
    … …  
    834769    {
    835770        crStateDisable(cap);
    836 
    837         if (pack_spu.swap)
    838             crPackDisableSWAP(cap);
    839         else
    840             crPackDisable(cap);
     771        crPackDisable(cap);
    841772    }
    842773    else
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