VirtualBox

Ignore:
Timestamp:
Jun 16, 2009 9:20:54 AM (16 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
48670
Message:

crOpenGL: update wine to 1.1.23

Location:
trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/mscvpdb.h

    r16477 r20612  
    1919 * License along with this library; if not, write to the Free Software
    2020 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
    21  */
    22 
    23 /*
    24  * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
    25  * other than GPL or LGPL is available it will apply instead, Sun elects to use only
    26  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
    27  * a choice of LGPL license versions is made available with the language indicating
    28  * that LGPLv2 or any later version may be used, or where a choice of which version
    29  * of the LGPL is applied is otherwise unspecified.
    3021 */
    3122

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/rpcfc.h

    r16410 r20612  
    22 * RPC format chars, as found by studying MIDL output.
    33 * Some, but not all, usage of these are explained on MSDN.
     4 */
     5
     6/*
     7 * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
     8 * other than GPL or LGPL is available it will apply instead, Sun elects to use only
     9 * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
     10 * a choice of LGPL license versions is made available with the language indicating
     11 * that LGPLv2 or any later version may be used, or where a choice of which version
     12 * of the LGPL is applied is otherwise unspecified.
    413 */
    514

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wgl.h

    r19678 r20612  
    8888#define WGL_GENERIC_ACCELERATION_ARB            0x2026
    8989#define WGL_FULL_ACCELERATION_ARB               0x2027
     90
     91#define WGL_SWAP_EXCHANGE_ARB           0x2028
     92#define WGL_SWAP_COPY_ARB                       0x2029
     93#define WGL_SWAP_UNDEFINED_ARB          0x202A
    9094
    9195#define WGL_PBUFFER_WIDTH_ARB                   0x2034

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wined3d.h

    r19678 r20612  
    1 /*** Autogenerated by WIDL 1.1.21 from ../../include/wine/wined3d.idl - Do not edit ***/
     1/*** Autogenerated by WIDL 1.1.23 from ../../include/wine/wined3d.idl - Do not edit ***/
    22
    33#include <rpc.h>
    … …  
    872872    SURFACE_GDI = 2
    873873} WINED3DSURFTYPE;
     874enum wined3d_sysval_semantic {
     875    WINED3D_SV_DEPTH = 0xffffffff,
     876    WINED3D_SV_TARGET0 = 0,
     877    WINED3D_SV_TARGET1 = 1,
     878    WINED3D_SV_TARGET2 = 2,
     879    WINED3D_SV_TARGET3 = 3,
     880    WINED3D_SV_TARGET4 = 4,
     881    WINED3D_SV_TARGET5 = 5,
     882    WINED3D_SV_TARGET6 = 6,
     883    WINED3D_SV_TARGET7 = 7
     884};
     885
    874886#define WINED3DCOLORWRITEENABLE_RED (1 << 0)
    875887
    … …  
    25822594};
    25832595
     2596struct wined3d_shader_signature_element {
     2597    const char *semantic_name;
     2598    UINT semantic_idx;
     2599    enum wined3d_sysval_semantic sysval_semantic;
     2600    DWORD component_type;
     2601    UINT register_idx;
     2602    DWORD mask;
     2603};
     2604
     2605struct wined3d_shader_signature {
     2606    UINT element_count;
     2607    struct wined3d_shader_signature_element *elements;
     2608    char *string_data;
     2609};
     2610
    25842611#ifndef __IWineD3DResource_FWD_DEFINED__
    25852612#define __IWineD3DResource_FWD_DEFINED__
    … …  
    48314858        ) = 0;
    48324859
    4833     virtual void STDMETHODCALLTYPE ApplyStateChanges(
    4834         const DWORD texture_states[18],
    4835         const DWORD sampler_states[14]) = 0;
    4836 
    48374860};
    48384861#else
    … …  
    49324955    BOOL (STDMETHODCALLTYPE *IsCondNP2)(
    49334956        IWineD3DBaseTexture* This);
    4934 
    4935     void (STDMETHODCALLTYPE *ApplyStateChanges)(
    4936         IWineD3DBaseTexture* This,
    4937         const DWORD texture_states[18],
    4938         const DWORD sampler_states[14]);
    49394957
    49404958    END_INTERFACE
    … …  
    49734991#define IWineD3DBaseTexture_GetTextureDimensions(This) (This)->lpVtbl->GetTextureDimensions(This)
    49744992#define IWineD3DBaseTexture_IsCondNP2(This) (This)->lpVtbl->IsCondNP2(This)
    4975 #define IWineD3DBaseTexture_ApplyStateChanges(This,texture_states,sampler_states) (This)->lpVtbl->ApplyStateChanges(This,texture_states,sampler_states)
    49764993#endif
    49774994
    … …  
    50555072    IWineD3DBaseTexture* This);
    50565073void __RPC_STUB IWineD3DBaseTexture_IsCondNP2_Stub(
    5057     IRpcStubBuffer* This,
    5058     IRpcChannelBuffer* pRpcChannelBuffer,
    5059     PRPC_MESSAGE pRpcMessage,
    5060     DWORD* pdwStubPhase);
    5061 void STDMETHODCALLTYPE IWineD3DBaseTexture_ApplyStateChanges_Proxy(
    5062     IWineD3DBaseTexture* This,
    5063     const DWORD texture_states[18],
    5064     const DWORD sampler_states[14]);
    5065 void __RPC_STUB IWineD3DBaseTexture_ApplyStateChanges_Stub(
    50665074    IRpcStubBuffer* This,
    50675075    IRpcChannelBuffer* pRpcChannelBuffer,
    … …  
    52015209    BOOL (STDMETHODCALLTYPE *IsCondNP2)(
    52025210        IWineD3DTexture* This);
    5203 
    5204     void (STDMETHODCALLTYPE *ApplyStateChanges)(
    5205         IWineD3DTexture* This,
    5206         const DWORD texture_states[18],
    5207         const DWORD sampler_states[14]);
    52085211
    52095212    /*** IWineD3DTexture methods ***/
    … …  
    52725275#define IWineD3DTexture_GetTextureDimensions(This) (This)->lpVtbl->GetTextureDimensions(This)
    52735276#define IWineD3DTexture_IsCondNP2(This) (This)->lpVtbl->IsCondNP2(This)
    5274 #define IWineD3DTexture_ApplyStateChanges(This,texture_states,sampler_states) (This)->lpVtbl->ApplyStateChanges(This,texture_states,sampler_states)
    52755277/*** IWineD3DTexture methods ***/
    52765278#define IWineD3DTexture_Destroy(This,destroy_surface_callback) (This)->lpVtbl->Destroy(This,destroy_surface_callback)
    … …  
    54745476    BOOL (STDMETHODCALLTYPE *IsCondNP2)(
    54755477        IWineD3DCubeTexture* This);
    5476 
    5477     void (STDMETHODCALLTYPE *ApplyStateChanges)(
    5478         IWineD3DCubeTexture* This,
    5479         const DWORD texture_states[18],
    5480         const DWORD sampler_states[14]);
    54815478
    54825479    /*** IWineD3DCubeTexture methods ***/
    … …  
    55495546#define IWineD3DCubeTexture_GetTextureDimensions(This) (This)->lpVtbl->GetTextureDimensions(This)
    55505547#define IWineD3DCubeTexture_IsCondNP2(This) (This)->lpVtbl->IsCondNP2(This)
    5551 #define IWineD3DCubeTexture_ApplyStateChanges(This,texture_states,sampler_states) (This)->lpVtbl->ApplyStateChanges(This,texture_states,sampler_states)
    55525548/*** IWineD3DCubeTexture methods ***/
    55535549#define IWineD3DCubeTexture_Destroy(This,destroy_surface_callback) (This)->lpVtbl->Destroy(This,destroy_surface_callback)
    … …  
    57515747    BOOL (STDMETHODCALLTYPE *IsCondNP2)(
    57525748        IWineD3DVolumeTexture* This);
    5753 
    5754     void (STDMETHODCALLTYPE *ApplyStateChanges)(
    5755         IWineD3DVolumeTexture* This,
    5756         const DWORD texture_states[18],
    5757         const DWORD sampler_states[14]);
    57585749
    57595750    /*** IWineD3DVolumeTexture methods ***/
    … …  
    58225813#define IWineD3DVolumeTexture_GetTextureDimensions(This) (This)->lpVtbl->GetTextureDimensions(This)
    58235814#define IWineD3DVolumeTexture_IsCondNP2(This) (This)->lpVtbl->IsCondNP2(This)
    5824 #define IWineD3DVolumeTexture_ApplyStateChanges(This,texture_states,sampler_states) (This)->lpVtbl->ApplyStateChanges(This,texture_states,sampler_states)
    58255815/*** IWineD3DVolumeTexture methods ***/
    58265816#define IWineD3DVolumeTexture_Destroy(This,destroy_volume_callback) (This)->lpVtbl->Destroy(This,destroy_volume_callback)
    … …  
    66276617{
    66286618    virtual HRESULT STDMETHODCALLTYPE SetFunction(
    6629         const DWORD *function) = 0;
     6619        const DWORD *function,
     6620        const struct wined3d_shader_signature *output_signature) = 0;
    66306621
    66316622};
    … …  
    66546645    HRESULT (STDMETHODCALLTYPE *SetFunction)(
    66556646        IWineD3DBaseShader* This,
    6656         const DWORD *function);
     6647        const DWORD *function,
     6648        const struct wined3d_shader_signature *output_signature);
    66576649
    66586650    END_INTERFACE
    … …  
    66706662#define IWineD3DBaseShader_GetParent(This,parent) (This)->lpVtbl->GetParent(This,parent)
    66716663/*** IWineD3DBaseShader methods ***/
    6672 #define IWineD3DBaseShader_SetFunction(This,function) (This)->lpVtbl->SetFunction(This,function)
     6664#define IWineD3DBaseShader_SetFunction(This,function,output_signature) (This)->lpVtbl->SetFunction(This,function,output_signature)
    66736665#endif
    66746666
    … …  
    66776669HRESULT STDMETHODCALLTYPE IWineD3DBaseShader_SetFunction_Proxy(
    66786670    IWineD3DBaseShader* This,
    6679     const DWORD *function);
     6671    const DWORD *function,
     6672    const struct wined3d_shader_signature *output_signature);
    66806673void __RPC_STUB IWineD3DBaseShader_SetFunction_Stub(
    66816674    IRpcStubBuffer* This,
    … …  
    67036696        UINT *data_size) = 0;
    67046697
    6705     virtual void STDMETHODCALLTYPE FakeSemantics(
    6706         IWineD3DVertexDeclaration *vertex_declaration) = 0;
    6707 
    67086698    virtual HRESULT STDMETHODCALLTYPE SetLocalConstantsF(
    67096699        UINT start_idx,
    … …  
    67366726    HRESULT (STDMETHODCALLTYPE *SetFunction)(
    67376727        IWineD3DVertexShader* This,
    6738         const DWORD *function);
     6728        const DWORD *function,
     6729        const struct wined3d_shader_signature *output_signature);
    67396730
    67406731    /*** IWineD3DVertexShader methods ***/
    … …  
    67476738        void *data,
    67486739        UINT *data_size);
    6749 
    6750     void (STDMETHODCALLTYPE *FakeSemantics)(
    6751         IWineD3DVertexShader* This,
    6752         IWineD3DVertexDeclaration *vertex_declaration);
    67536740
    67546741    HRESULT (STDMETHODCALLTYPE *SetLocalConstantsF)(
    … …  
    67726759#define IWineD3DVertexShader_GetParent(This,parent) (This)->lpVtbl->GetParent(This,parent)
    67736760/*** IWineD3DBaseShader methods ***/
    6774 #define IWineD3DVertexShader_SetFunction(This,function) (This)->lpVtbl->SetFunction(This,function)
     6761#define IWineD3DVertexShader_SetFunction(This,function,output_signature) (This)->lpVtbl->SetFunction(This,function,output_signature)
    67756762/*** IWineD3DVertexShader methods ***/
    67766763#define IWineD3DVertexShader_GetDevice(This,device) (This)->lpVtbl->GetDevice(This,device)
    67776764#define IWineD3DVertexShader_GetFunction(This,data,data_size) (This)->lpVtbl->GetFunction(This,data,data_size)
    6778 #define IWineD3DVertexShader_FakeSemantics(This,vertex_declaration) (This)->lpVtbl->FakeSemantics(This,vertex_declaration)
    67796765#define IWineD3DVertexShader_SetLocalConstantsF(This,start_idx,src_data,vector4f_count) (This)->lpVtbl->SetLocalConstantsF(This,start_idx,src_data,vector4f_count)
    67806766#endif
    … …  
    67956781    UINT *data_size);
    67966782void __RPC_STUB IWineD3DVertexShader_GetFunction_Stub(
    6797     IRpcStubBuffer* This,
    6798     IRpcChannelBuffer* pRpcChannelBuffer,
    6799     PRPC_MESSAGE pRpcMessage,
    6800     DWORD* pdwStubPhase);
    6801 void STDMETHODCALLTYPE IWineD3DVertexShader_FakeSemantics_Proxy(
    6802     IWineD3DVertexShader* This,
    6803     IWineD3DVertexDeclaration *vertex_declaration);
    6804 void __RPC_STUB IWineD3DVertexShader_FakeSemantics_Stub(
    68056783    IRpcStubBuffer* This,
    68066784    IRpcChannelBuffer* pRpcChannelBuffer,
    … …  
    68626840    HRESULT (STDMETHODCALLTYPE *SetFunction)(
    68636841        IWineD3DPixelShader* This,
    6864         const DWORD *function);
     6842        const DWORD *function,
     6843        const struct wined3d_shader_signature *output_signature);
    68656844
    68666845    /*** IWineD3DPixelShader methods ***/
    … …  
    68886867#define IWineD3DPixelShader_GetParent(This,parent) (This)->lpVtbl->GetParent(This,parent)
    68896868/*** IWineD3DBaseShader methods ***/
    6890 #define IWineD3DPixelShader_SetFunction(This,function) (This)->lpVtbl->SetFunction(This,function)
     6869#define IWineD3DPixelShader_SetFunction(This,function,output_signature) (This)->lpVtbl->SetFunction(This,function,output_signature)
    68916870/*** IWineD3DPixelShader methods ***/
    68926871#define IWineD3DPixelShader_GetDevice(This,device) (This)->lpVtbl->GetDevice(This,device)
    … …  
    70367015
    70377016    virtual HRESULT STDMETHODCALLTYPE CreateVertexShader(
    7038         IWineD3DVertexDeclaration *declaration,
    70397017        const DWORD *function,
     7018        const struct wined3d_shader_signature *output_signature,
    70407019        IWineD3DVertexShader **shader,
    70417020        IUnknown *parent) = 0;
    … …  
    70437022    virtual HRESULT STDMETHODCALLTYPE CreatePixelShader(
    70447023        const DWORD *function,
     7024        const struct wined3d_shader_signature *output_signature,
    70457025        IWineD3DPixelShader **shader,
    70467026        IUnknown *parent) = 0;
    … …  
    75047484        UINT swapchain_idx,
    75057485        IWineD3DSurface *dst_surface) = 0;
    7506 
    7507     virtual void STDMETHODCALLTYPE ResourceReleased(
    7508         IWineD3DResource *resource) = 0;
    75097486
    75107487    virtual HRESULT STDMETHODCALLTYPE EnumResources(
    … …  
    76607637    HRESULT (STDMETHODCALLTYPE *CreateVertexShader)(
    76617638        IWineD3DDevice* This,
    7662         IWineD3DVertexDeclaration *declaration,
    76637639        const DWORD *function,
     7640        const struct wined3d_shader_signature *output_signature,
    76647641        IWineD3DVertexShader **shader,
    76657642        IUnknown *parent);
    … …  
    76687645        IWineD3DDevice* This,
    76697646        const DWORD *function,
     7647        const struct wined3d_shader_signature *output_signature,
    76707648        IWineD3DPixelShader **shader,
    76717649        IUnknown *parent);
    … …  
    82328210        UINT swapchain_idx,
    82338211        IWineD3DSurface *dst_surface);
    8234 
    8235     void (STDMETHODCALLTYPE *ResourceReleased)(
    8236         IWineD3DDevice* This,
    8237         IWineD3DResource *resource);
    82388212
    82398213    HRESULT (STDMETHODCALLTYPE *EnumResources)(
    … …  
    82708244#define IWineD3DDevice_CreateVertexDeclaration(This,declaration,parent,elements,element_count) (This)->lpVtbl->CreateVertexDeclaration(This,declaration,parent,elements,element_count)
    82718245#define IWineD3DDevice_CreateVertexDeclarationFromFVF(This,declaration,parent,fvf) (This)->lpVtbl->CreateVertexDeclarationFromFVF(This,declaration,parent,fvf)
    8272 #define IWineD3DDevice_CreateVertexShader(This,declaration,function,shader,parent) (This)->lpVtbl->CreateVertexShader(This,declaration,function,shader,parent)
    8273 #define IWineD3DDevice_CreatePixelShader(This,function,shader,parent) (This)->lpVtbl->CreatePixelShader(This,function,shader,parent)
     8246#define IWineD3DDevice_CreateVertexShader(This,function,output_signature,shader,parent) (This)->lpVtbl->CreateVertexShader(This,function,output_signature,shader,parent)
     8247#define IWineD3DDevice_CreatePixelShader(This,function,output_signature,shader,parent) (This)->lpVtbl->CreatePixelShader(This,function,output_signature,shader,parent)
    82748248#define IWineD3DDevice_CreatePalette(This,flags,palette_entry,palette,parent) (This)->lpVtbl->CreatePalette(This,flags,palette_entry,palette,parent)
    82758249#define IWineD3DDevice_Init3D(This,present_parameters) (This)->lpVtbl->Init3D(This,present_parameters)
    … …  
    83858359#define IWineD3DDevice_UpdateSurface(This,src_surface,src_rect,dst_surface,dst_point) (This)->lpVtbl->UpdateSurface(This,src_surface,src_rect,dst_surface,dst_point)
    83868360#define IWineD3DDevice_GetFrontBufferData(This,swapchain_idx,dst_surface) (This)->lpVtbl->GetFrontBufferData(This,swapchain_idx,dst_surface)
    8387 #define IWineD3DDevice_ResourceReleased(This,resource) (This)->lpVtbl->ResourceReleased(This,resource)
    83888361#define IWineD3DDevice_EnumResources(This,callback,data) (This)->lpVtbl->EnumResources(This,callback,data)
    83898362#endif
    … …  
    85728545HRESULT STDMETHODCALLTYPE IWineD3DDevice_CreateVertexShader_Proxy(
    85738546    IWineD3DDevice* This,
    8574     IWineD3DVertexDeclaration *declaration,
    85758547    const DWORD *function,
     8548    const struct wined3d_shader_signature *output_signature,
    85768549    IWineD3DVertexShader **shader,
    85778550    IUnknown *parent);
    … …  
    85848557    IWineD3DDevice* This,
    85858558    const DWORD *function,
     8559    const struct wined3d_shader_signature *output_signature,
    85868560    IWineD3DPixelShader **shader,
    85878561    IUnknown *parent);
    … …  
    96059579    PRPC_MESSAGE pRpcMessage,
    96069580    DWORD* pdwStubPhase);
    9607 void STDMETHODCALLTYPE IWineD3DDevice_ResourceReleased_Proxy(
    9608     IWineD3DDevice* This,
    9609     IWineD3DResource *resource);
    9610 void __RPC_STUB IWineD3DDevice_ResourceReleased_Stub(
    9611     IRpcStubBuffer* This,
    9612     IRpcChannelBuffer* pRpcChannelBuffer,
    9613     PRPC_MESSAGE pRpcMessage,
    9614     DWORD* pdwStubPhase);
    96159581HRESULT STDMETHODCALLTYPE IWineD3DDevice_EnumResources_Proxy(
    96169582    IWineD3DDevice* This,

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wined3d.idl

    r19678 r20612  
    858858} WINED3DSURFTYPE;
    859859
     860enum wined3d_sysval_semantic
     861{
     862    WINED3D_SV_DEPTH = 0xffffffff,
     863    WINED3D_SV_TARGET0 = 0,
     864    WINED3D_SV_TARGET1 = 1,
     865    WINED3D_SV_TARGET2 = 2,
     866    WINED3D_SV_TARGET3 = 3,
     867    WINED3D_SV_TARGET4 = 4,
     868    WINED3D_SV_TARGET5 = 5,
     869    WINED3D_SV_TARGET6 = 6,
     870    WINED3D_SV_TARGET7 = 7,
     871};
     872
    860873const UINT WINED3DCOLORWRITEENABLE_RED                          = (1<<0);
    861874const UINT WINED3DCOLORWRITEENABLE_GREEN                        = (1<<1);
    … …  
    21272140};
    21282141
     2142struct wined3d_shader_signature_element
     2143{
     2144    const char *semantic_name;
     2145    UINT semantic_idx;
     2146    enum wined3d_sysval_semantic sysval_semantic;
     2147    DWORD component_type;
     2148    UINT register_idx;
     2149    DWORD mask;
     2150};
     2151
     2152struct wined3d_shader_signature
     2153{
     2154    UINT element_count;
     2155    struct wined3d_shader_signature_element *elements;
     2156    char *string_data;
     2157};
     2158
    21292159interface IWineD3DResource;
    21302160interface IWineD3DSurface;
    … …  
    25962626    BOOL IsCondNP2(
    25972627    );
    2598     void ApplyStateChanges(
    2599         const DWORD texture_states[WINED3D_HIGHEST_TEXTURE_STATE + 1],
    2600         const DWORD sampler_states[WINED3D_HIGHEST_SAMPLER_STATE + 1]
    2601     );
    26022628}
    26032629
    … …  
    28332859{
    28342860    HRESULT SetFunction(
    2835         [in] const DWORD *function
     2861        [in] const DWORD *function,
     2862        [in] const struct wined3d_shader_signature *output_signature
    28362863    );
    28372864}
    … …  
    28502877        [out] void *data,
    28512878        [in, out] UINT *data_size
    2852     );
    2853     void FakeSemantics(
    2854         [in] IWineD3DVertexDeclaration *vertex_declaration
    28552879    );
    28562880    HRESULT SetLocalConstantsF(
    … …  
    29943018    );
    29953019    HRESULT CreateVertexShader(
    2996         [in] IWineD3DVertexDeclaration *declaration,
    29973020        [in] const DWORD *function,
     3021        [in] const struct wined3d_shader_signature *output_signature,
    29983022        [out] IWineD3DVertexShader **shader,
    29993023        [in] IUnknown *parent
    … …  
    30013025    HRESULT CreatePixelShader(
    30023026        [in] const DWORD *function,
     3027        [in] const struct wined3d_shader_signature *output_signature,
    30033028        [out] IWineD3DPixelShader **shader,
    30043029        [in] IUnknown *parent
    … …  
    34533478        [in] IWineD3DSurface *dst_surface
    34543479    );
    3455     void ResourceReleased(
    3456         [in] IWineD3DResource *resource
    3457     );
    34583480    HRESULT EnumResources(
    34593481        [in] D3DCB_ENUMRESOURCES callback,
Note: See TracChangeset for help on using the changeset viewer.

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