Ignore:
Timestamp:
Dec 29, 2002, 3:11:03 PM (23 years ago)
Author:
sandervl
Message:

Cleanup

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/ddraw/ddraw2d.cpp

    r9532 r9560  
    1 /* $Id: ddraw2d.cpp,v 1.4 2002-12-20 10:38:25 sandervl Exp $ */
     1/* $Id: ddraw2d.cpp,v 1.5 2002-12-29 14:11:01 sandervl Exp $ */
    22
    33/*
    … …  
    5656FOURCC DiveFOURCCs[MAX_DIVE_FOURCC] = {0};
    5757
     58extern IDirectDrawVtbl  DDrawV1Table;
     59extern IDirectDraw2Vtbl DDrawV2Table;
     60extern IDirectDraw4Vtbl DDrawV4Table;
     61extern IDirect3DVtbl    DDraw3DTable;
     62
    5863//******************************************************************************
    5964//Force DirectDraw to report only one fullscreen mode (useful for custom builds)
    … …  
    9297
    9398  // Setup table for 3d devices
    94   Vtbl3D.AddRef         = D3DAddRef;
    95   Vtbl3D.Release        = D3DRelease;
    96   Vtbl3D.QueryInterface = D3DQueryInterface;
    97   Vtbl3D.Initialize     = D3DInitialize;
    98   Vtbl3D.EnumDevices    = D3DEnumDevices;
    99   Vtbl3D.CreateLight    = D3DCreateLight;
    100   Vtbl3D.CreateMaterial = D3DCreateMaterial;
    101   Vtbl3D.CreateViewport = D3DCreateViewport;
    102   Vtbl3D.FindDevice     = D3DFindDevice;
    103 
    104   // Org Interface
    105   Vtbl.AddRef                 = DrawAddRef;
    106   Vtbl.Release                = DrawRelease;
    107   Vtbl.QueryInterface         = DrawQueryInterface;
    108   Vtbl.Compact                = DrawCompact;
    109   Vtbl.CreateClipper          = DrawCreateClipper;
    110   Vtbl.CreatePalette          = DrawCreatePalette;
    111   Vtbl.CreateSurface          = DrawCreateSurface;
    112   Vtbl.DuplicateSurface       = DrawDuplicateSurface;
    113   Vtbl.EnumDisplayModes       = DrawEnumDisplayModes;
    114   Vtbl.EnumSurfaces           = DrawEnumSurfaces;
    115   Vtbl.FlipToGDISurface       = DrawFlipToGDISurface;
    116   Vtbl.GetCaps                = DrawGetCaps;
    117   Vtbl.GetDisplayMode         = DrawGetDisplayMode;
    118   Vtbl.GetFourCCCodes         = DrawGetFourCCCodes;
    119   Vtbl.GetGDISurface          = DrawGetGDISurface;
    120   Vtbl.GetMonitorFrequency    = DrawGetMonitorFrequency;
    121   Vtbl.GetScanLine            = DrawGetScanLine;
    122   Vtbl.GetVerticalBlankStatus = DrawGetVerticalBlankStatus;
    123   Vtbl.Initialize             = DrawInitialize;
    124   Vtbl.RestoreDisplayMode     = DrawRestoreDisplayMode;
    125   Vtbl.SetCooperativeLevel    = DrawSetCooperativeLevel;
    126   Vtbl.SetDisplayMode         = DrawSetDisplayMode;
    127   Vtbl.WaitForVerticalBlank   = DrawWaitForVerticalBlank;
    128 
    129   // V2 Interface
    130 
    131   Vtbl2.AddRef                 = DrawAddRef;
    132   Vtbl2.Release                = DrawRelease;
    133   Vtbl2.QueryInterface         = DrawQueryInterface;
    134   Vtbl2.Compact                = DrawCompact;
    135   Vtbl2.CreateClipper          = DrawCreateClipper;
    136   Vtbl2.CreatePalette          = DrawCreatePalette;
    137   Vtbl2.CreateSurface          = DrawCreateSurface;
    138   Vtbl2.DuplicateSurface       = DrawDuplicateSurface;
    139   Vtbl2.EnumDisplayModes       = DrawEnumDisplayModes;
    140   Vtbl2.EnumSurfaces           = DrawEnumSurfaces;
    141   Vtbl2.FlipToGDISurface       = DrawFlipToGDISurface;
    142   Vtbl2.GetCaps                = DrawGetCaps;
    143   Vtbl2.GetDisplayMode         = DrawGetDisplayMode;
    144   Vtbl2.GetFourCCCodes         = DrawGetFourCCCodes;
    145   Vtbl2.GetGDISurface          = DrawGetGDISurface;
    146   Vtbl2.GetMonitorFrequency    = DrawGetMonitorFrequency;
    147   Vtbl2.GetScanLine            = DrawGetScanLine;
    148   Vtbl2.GetVerticalBlankStatus = DrawGetVerticalBlankStatus;
    149   Vtbl2.Initialize             = DrawInitialize;
    150   Vtbl2.RestoreDisplayMode     = DrawRestoreDisplayMode;
    151   Vtbl2.SetCooperativeLevel    = DrawSetCooperativeLevel;
    152   Vtbl2.SetDisplayMode         = DrawSetDisplayMode2;
    153   Vtbl2.WaitForVerticalBlank   = DrawWaitForVerticalBlank;
    154   Vtbl2.GetAvailableVidMem     = DrawGetAvailableVidMem;
    155 
    156   // New V4 interface
    157   Vtbl4.AddRef                 = DrawAddRef;   // todo change to a DrawAddRef4 as handling this has changed
    158   Vtbl4.Release                = DrawRelease;  // see above
    159   Vtbl4.QueryInterface         = DrawQueryInterface;
    160   Vtbl4.Compact                = DrawCompact;
    161   Vtbl4.CreateClipper          = DrawCreateClipper;
    162   Vtbl4.CreatePalette          = DrawCreatePalette;
    163   Vtbl4.CreateSurface          = DrawCreateSurface4;//
    164   Vtbl4.DuplicateSurface       = DrawDuplicateSurface4;//
    165   Vtbl4.EnumDisplayModes       = DrawEnumDisplayModes4;//
    166   Vtbl4.EnumSurfaces           = DrawEnumSurfaces4; //
    167   Vtbl4.FlipToGDISurface       = DrawFlipToGDISurface;
    168   Vtbl4.GetCaps                = DrawGetCaps;
    169   Vtbl4.GetDisplayMode         = DrawGetDisplayMode4;//
    170   Vtbl4.GetFourCCCodes         = DrawGetFourCCCodes;
    171   Vtbl4.GetGDISurface          = DrawGetGDISurface4;//
    172   Vtbl4.GetMonitorFrequency    = DrawGetMonitorFrequency;
    173   Vtbl4.GetScanLine            = DrawGetScanLine;
    174   Vtbl4.GetVerticalBlankStatus = DrawGetVerticalBlankStatus;
    175   Vtbl4.Initialize             = DrawInitialize;
    176   Vtbl4.RestoreDisplayMode     = DrawRestoreDisplayMode;
    177   Vtbl4.SetCooperativeLevel    = DrawSetCooperativeLevel;
    178   Vtbl4.SetDisplayMode         = DrawSetDisplayMode2;
    179   Vtbl4.WaitForVerticalBlank   = DrawWaitForVerticalBlank;
    180   Vtbl4.GetAvailableVidMem     = DrawGetAvailableVidMem4;
    181   Vtbl4.GetSurfaceFromDC       = DrawGetSurfaceFromDC;
    182   Vtbl4.RestoreAllSurfaces     = DrawRestoreAllSurfaces;
    183   Vtbl4.TestCooperativeLevel   = DrawTestCooperativeLevel;
    184   Vtbl4.GetDeviceIdentifier    = DrawGetDeviceIdentifier;
     99  Vtbl3D = DDraw3DTable;
     100
     101  // Copy Interface tables
     102  Vtbl  = DDrawV1Table;
     103  Vtbl2 = DDrawV2Table;
     104  Vtbl4 = DDrawV4Table;
     105
    185106
    186107  if(lpGUID && *lpGUID == IID_IDirect3D)
    … …  
    21662087}
    21672088//******************************************************************************
    2168 //******************************************************************************
    2169 
     2089// Setup table for 3d devices
     2090//******************************************************************************
     2091IDirect3DVtbl DDraw3DTable =
     2092{
     2093 D3DQueryInterface,
     2094 D3DAddRef,
     2095 D3DRelease,
     2096 D3DInitialize,
     2097 D3DEnumDevices,
     2098 D3DCreateLight,
     2099 D3DCreateMaterial,
     2100 D3DCreateViewport,
     2101 D3DFindDevice
     2102};
     2103//******************************************************************************
     2104// Org Interface
     2105//******************************************************************************
     2106IDirectDrawVtbl DDrawV1Table =
     2107{
     2108 DrawQueryInterface,
     2109 DrawAddRef,
     2110 DrawRelease,
     2111 DrawCompact,
     2112 DrawCreateClipper,
     2113 DrawCreatePalette,
     2114 DrawCreateSurface,
     2115 DrawDuplicateSurface,
     2116 DrawEnumDisplayModes,
     2117 DrawEnumSurfaces,
     2118 DrawFlipToGDISurface,
     2119 DrawGetCaps,
     2120 DrawGetDisplayMode,
     2121 DrawGetFourCCCodes,
     2122 DrawGetGDISurface,
     2123 DrawGetMonitorFrequency,
     2124 DrawGetScanLine,
     2125 DrawGetVerticalBlankStatus,
     2126 DrawInitialize,
     2127 DrawRestoreDisplayMode,
     2128 DrawSetCooperativeLevel,
     2129 DrawSetDisplayMode,
     2130 DrawWaitForVerticalBlank
     2131};
     2132//******************************************************************************
     2133// V2 Interface
     2134//******************************************************************************
     2135IDirectDraw2Vtbl DDrawV2Table =
     2136{
     2137 DrawQueryInterface,
     2138 DrawAddRef,
     2139 DrawRelease,
     2140 DrawCompact,
     2141 DrawCreateClipper,
     2142 DrawCreatePalette,
     2143 DrawCreateSurface,
     2144 DrawDuplicateSurface,
     2145 DrawEnumDisplayModes,
     2146 DrawEnumSurfaces,
     2147 DrawFlipToGDISurface,
     2148 DrawGetCaps,
     2149 DrawGetDisplayMode,
     2150 DrawGetFourCCCodes,
     2151 DrawGetGDISurface,
     2152 DrawGetMonitorFrequency,
     2153 DrawGetScanLine,
     2154 DrawGetVerticalBlankStatus,
     2155 DrawInitialize,
     2156 DrawRestoreDisplayMode,
     2157 DrawSetCooperativeLevel,
     2158 DrawSetDisplayMode2,
     2159 DrawWaitForVerticalBlank,
     2160 DrawGetAvailableVidMem
     2161};
     2162//******************************************************************************
     2163// New V4 interface
     2164//******************************************************************************
     2165IDirectDraw4Vtbl DDrawV4Table =
     2166{
     2167 DrawQueryInterface,
     2168 DrawAddRef,   // todo change to a DrawAddRef4 as handling this has change,
     2169 DrawRelease,  // see abov,
     2170 DrawCompact,
     2171 DrawCreateClipper,
     2172 DrawCreatePalette,
     2173 DrawCreateSurface4,
     2174 DrawDuplicateSurface4,
     2175 DrawEnumDisplayModes4,
     2176 DrawEnumSurfaces4,
     2177 DrawFlipToGDISurface,
     2178 DrawGetCaps,
     2179 DrawGetDisplayMode4,
     2180 DrawGetFourCCCodes,
     2181 DrawGetGDISurface4,
     2182 DrawGetMonitorFrequency,
     2183 DrawGetScanLine,
     2184 DrawGetVerticalBlankStatus,
     2185 DrawInitialize,
     2186 DrawRestoreDisplayMode,
     2187 DrawSetCooperativeLevel,
     2188 DrawSetDisplayMode2,
     2189 DrawWaitForVerticalBlank,
     2190 DrawGetAvailableVidMem4,
     2191 DrawGetSurfaceFromDC,
     2192 DrawRestoreAllSurfaces,
     2193 DrawTestCooperativeLevel,
     2194 DrawGetDeviceIdentifier,
     2195};
     2196//******************************************************************************
     2197//******************************************************************************
Note: See TracChangeset for help on using the changeset viewer.