Previous 199869 Revisions Next

r17982 Tuesday 18th September, 2012 at 04:11:19 UTC by Aaron Giles
Fix MSVC compilation.
[src/mame/audio]micro3d.c
[src/mame/includes]megadriv.h
[src/mame/machine]megavdp.c
[src/osd/windows]d3d8intf.c d3d9intf.c d3dhlsl.c d3dhlsl.h d3dintf.h drawd3d.c

trunk/src/mame/audio/micro3d.c
r17981r17982
5656
5757   float            gain;
5858   UINT32            noise_shift;
59   UINT8            noise_state;
59   UINT8            noise_value;
6060   UINT8            noise_subcount;
6161
6262   filter_state      noise_filters[4];
r17981r17982
247247      for (step = 2000000 / (2000000/8); step >= state->noise_subcount; step -= state->noise_subcount)
248248      {
249249         state->noise_shift = (state->noise_shift << 1) | (((state->noise_shift >> 13) ^ (state->noise_shift >> 16)) & 1);
250         state->noise_state = (state->noise_shift >> 16) & 1;
250         state->noise_value = (state->noise_shift >> 16) & 1;
251251         state->noise_subcount = 2000000 / MM5837_CLOCK;
252252      }
253253      state->noise_subcount -= step;
254      input = (float)state->noise_state - 0.5;
254      input = (float)state->noise_value - 0.5;
255255      white = input;
256256
257257      /* Pink noise filtering */
trunk/src/mame/machine/megavdp.c
r17981r17982
473473
474474UINT16 (*vdp_get_word_from_68k_mem)(running_machine &machine, UINT32 source, address_space& space68k);
475475
476UINT16 vdp_get_word_from_68k_mem_default(running_machine &machine, UINT32 source, address_space * space68k)
476UINT16 vdp_get_word_from_68k_mem_default(running_machine &machine, UINT32 source, address_space & space68k)
477477{
478478   // should we limit the valid areas here?
479479   // how does this behave with the segacd etc?
r17981r17982
495495         source -= 2;
496496      }
497497
498      return space68k->read_word(source);
498      return space68k.read_word(source);
499499   }
500500   else if (( source >= 0xe00000 ) && ( source <= 0xffffff ))
501501   {
502      return space68k->read_word(source);
502      return space68k.read_word(source);
503503   }
504504   else
505505   {
trunk/src/mame/includes/megadriv.h
r17981r17982
483483extern DECLARE_READ16_HANDLER( jcart_ctrl_r );
484484
485485/* machine/megavdp.c */
486extern UINT16 (*vdp_get_word_from_68k_mem)(running_machine &machine, UINT32 source, address_space* space);
487extern UINT16 vdp_get_word_from_68k_mem_default(running_machine &machine, UINT32 source, address_space* space);
486extern UINT16 (*vdp_get_word_from_68k_mem)(running_machine &machine, UINT32 source, address_space& space);
487extern UINT16 vdp_get_word_from_68k_mem_default(running_machine &machine, UINT32 source, address_space& space);
488488extern int megadriv_framerate;
489489extern int megadrive_total_scanlines;
490490extern int megadrive_vblank_flag;
trunk/src/osd/windows/d3dintf.h
r17981r17982
7474//  TYPE DEFINITIONS
7575//============================================================
7676
77struct d3d;
77struct d3d_base;
7878struct d3d_device;
7979struct d3d_surface;
8080struct d3d_texture;
r17981r17982
154154
155155struct d3d_interface
156156{
157   HRESULT  (*check_device_format)(d3d *d3dptr, UINT adapter, D3DDEVTYPE devtype, D3DFORMAT adapterformat, DWORD usage, D3DRESOURCETYPE restype, D3DFORMAT format);
158   HRESULT  (*check_device_type)(d3d *d3dptr, UINT adapter, D3DDEVTYPE devtype, D3DFORMAT format, D3DFORMAT backformat, BOOL windowed);
159   HRESULT  (*create_device)(d3d *d3dptr, UINT adapter, D3DDEVTYPE devtype, HWND focus, DWORD behavior, d3d_present_parameters *params, d3d_device **dev);
160   HRESULT  (*enum_adapter_modes)(d3d *d3dptr, UINT adapter, D3DFORMAT format, UINT index, D3DDISPLAYMODE *mode);
161   UINT     (*get_adapter_count)(d3d *d3dptr);
162   HRESULT  (*get_adapter_display_mode)(d3d *d3dptr, UINT adapter, D3DDISPLAYMODE *mode);
163   HRESULT  (*get_adapter_identifier)(d3d *d3dptr, UINT adapter, DWORD flags, d3d_adapter_identifier *identifier);
164   UINT     (*get_adapter_mode_count)(d3d *d3dptr, UINT adapter, D3DFORMAT format);
165   HMONITOR (*get_adapter_monitor)(d3d *d3dptr, UINT adapter);
166   HRESULT  (*get_caps_dword)(d3d *d3dptr, UINT adapter, D3DDEVTYPE devtype, d3d_caps_index which, DWORD *value);
167   ULONG    (*release)(d3d *d3dptr);
157   HRESULT  (*check_device_format)(d3d_base *d3dptr, UINT adapter, D3DDEVTYPE devtype, D3DFORMAT adapterformat, DWORD usage, D3DRESOURCETYPE restype, D3DFORMAT format);
158   HRESULT  (*check_device_type)(d3d_base *d3dptr, UINT adapter, D3DDEVTYPE devtype, D3DFORMAT format, D3DFORMAT backformat, BOOL windowed);
159   HRESULT  (*create_device)(d3d_base *d3dptr, UINT adapter, D3DDEVTYPE devtype, HWND focus, DWORD behavior, d3d_present_parameters *params, d3d_device **dev);
160   HRESULT  (*enum_adapter_modes)(d3d_base *d3dptr, UINT adapter, D3DFORMAT format, UINT index, D3DDISPLAYMODE *mode);
161   UINT     (*get_adapter_count)(d3d_base *d3dptr);
162   HRESULT  (*get_adapter_display_mode)(d3d_base *d3dptr, UINT adapter, D3DDISPLAYMODE *mode);
163   HRESULT  (*get_adapter_identifier)(d3d_base *d3dptr, UINT adapter, DWORD flags, d3d_adapter_identifier *identifier);
164   UINT     (*get_adapter_mode_count)(d3d_base *d3dptr, UINT adapter, D3DFORMAT format);
165   HMONITOR (*get_adapter_monitor)(d3d_base *d3dptr, UINT adapter);
166   HRESULT  (*get_caps_dword)(d3d_base *d3dptr, UINT adapter, D3DDEVTYPE devtype, d3d_caps_index which, DWORD *value);
167   ULONG    (*release)(d3d_base *d3dptr);
168168};
169169
170170
r17981r17982
262262//  Core D3D object
263263//============================================================
264264
265struct d3d
265struct d3d_base
266266{
267267   // internal objects
268268   int                     version;
r17981r17982
285285//============================================================
286286
287287#if DIRECT3D_VERSION < 0x0900
288d3d *drawd3d8_init(void);
288d3d_base *drawd3d8_init(void);
289289#endif
290d3d *drawd3d9_init(void);
290d3d_base *drawd3d9_init(void);
291291
292292
293293#endif
trunk/src/osd/windows/d3dhlsl.h
r17981r17982
104104   hlsl_info();
105105   ~hlsl_info();
106106
107   void init(d3d *d3dintf, win_window_info *window);
107   void init(d3d_base *d3dintf, win_window_info *window);
108108   void init_fsfx_quad(void *vertbuf);
109109
110110   bool enabled() { return master_enable; }
r17981r17982
143143
144144   bool               screen_encountered[9];      // whether a given screen was encountered this frame
145145
146   d3d *                   d3dintf;               // D3D interface
146   d3d_base *              d3dintf;               // D3D interface
147147   win_window_info *       window;                  // D3D window info
148148
149149   bool               master_enable;            // overall enable flag
trunk/src/osd/windows/d3d8intf.c
r17981r17982
6767//  PROTOTYPES
6868//============================================================
6969
70static void set_interfaces(d3d *d3dptr);
70static void set_interfaces(d3d_base *d3dptr);
7171
7272
7373
r17981r17982
102102//  drawd3d8_init
103103//============================================================
104104
105d3d *drawd3d8_init(void)
105d3d_base *drawd3d8_init(void)
106106{
107107   direct3dcreate8_ptr direct3dcreate8;
108108   HINSTANCE dllhandle;
109109   IDirect3D8 *d3d8;
110   d3d *d3dptr;
110   d3d_base *d3dptr;
111111
112112   // dynamically grab the create function from d3d8.dll
113113   dllhandle = LoadLibrary(TEXT("d3d8.dll"));
r17981r17982
138138   }
139139
140140   // allocate an object to hold our data
141   d3dptr = global_alloc(d3d);
141   d3dptr = global_alloc(d3d_base);
142142   d3dptr->version = 8;
143143   d3dptr->d3dobj = d3d8;
144144   d3dptr->dllhandle = dllhandle;
r17981r17982
155155//  Direct3D interfaces
156156//============================================================
157157
158static HRESULT d3d_check_device_format(d3d *d3dptr, UINT adapter, D3DDEVTYPE devtype, D3DFORMAT adapterformat, DWORD usage, D3DRESOURCETYPE restype, D3DFORMAT format)
158static HRESULT d3d_check_device_format(d3d_base *d3dptr, UINT adapter, D3DDEVTYPE devtype, D3DFORMAT adapterformat, DWORD usage, D3DRESOURCETYPE restype, D3DFORMAT format)
159159{
160160   IDirect3D8 *d3d8 = (IDirect3D8 *)d3dptr->d3dobj;
161161   return IDirect3D8_CheckDeviceFormat(d3d8, adapter, devtype, adapterformat, usage, restype, format);
162162}
163163
164164
165static HRESULT d3d_check_device_type(d3d *d3dptr, UINT adapter, D3DDEVTYPE devtype, D3DFORMAT format, D3DFORMAT backformat, BOOL windowed)
165static HRESULT d3d_check_device_type(d3d_base *d3dptr, UINT adapter, D3DDEVTYPE devtype, D3DFORMAT format, D3DFORMAT backformat, BOOL windowed)
166166{
167167   IDirect3D8 *d3d8 = (IDirect3D8 *)d3dptr->d3dobj;
168168   return IDirect3D8_CheckDeviceType(d3d8, adapter, devtype, format, backformat, windowed);
169169}
170170
171171
172static HRESULT d3d_create_device(d3d *d3dptr, UINT adapter, D3DDEVTYPE devtype, HWND focus, DWORD behavior, d3d_present_parameters *params, d3d_device **dev)
172static HRESULT d3d_create_device(d3d_base *d3dptr, UINT adapter, D3DDEVTYPE devtype, HWND focus, DWORD behavior, d3d_present_parameters *params, d3d_device **dev)
173173{
174174   IDirect3D8 *d3d8 = (IDirect3D8 *)d3dptr->d3dobj;
175175   D3DPRESENT_PARAMETERS d3d8params;
r17981r17982
178178}
179179
180180
181static HRESULT d3d_enum_adapter_modes(d3d *d3dptr, UINT adapter, D3DFORMAT format, UINT index, D3DDISPLAYMODE *mode)
181static HRESULT d3d_enum_adapter_modes(d3d_base *d3dptr, UINT adapter, D3DFORMAT format, UINT index, D3DDISPLAYMODE *mode)
182182{
183183   IDirect3D8 *d3d8 = (IDirect3D8 *)d3dptr->d3dobj;
184184   return IDirect3D8_EnumAdapterModes(d3d8, adapter, index, mode);
185185}
186186
187187
188static UINT d3d_get_adapter_count(d3d *d3dptr)
188static UINT d3d_get_adapter_count(d3d_base *d3dptr)
189189{
190190   IDirect3D8 *d3d8 = (IDirect3D8 *)d3dptr->d3dobj;
191191   return IDirect3D8_GetAdapterCount(d3d8);
192192}
193193
194194
195static HRESULT d3d_get_adapter_display_mode(d3d *d3dptr, UINT adapter, D3DDISPLAYMODE *mode)
195static HRESULT d3d_get_adapter_display_mode(d3d_base *d3dptr, UINT adapter, D3DDISPLAYMODE *mode)
196196{
197197   IDirect3D8 *d3d8 = (IDirect3D8 *)d3dptr->d3dobj;
198198   return IDirect3D8_GetAdapterDisplayMode(d3d8, adapter, mode);
199199}
200200
201201
202static HRESULT d3d_get_adapter_identifier(d3d *d3dptr, UINT adapter, DWORD flags, d3d_adapter_identifier *identifier)
202static HRESULT d3d_get_adapter_identifier(d3d_base *d3dptr, UINT adapter, DWORD flags, d3d_adapter_identifier *identifier)
203203{
204204   IDirect3D8 *d3d8 = (IDirect3D8 *)d3dptr->d3dobj;
205205   D3DADAPTER_IDENTIFIER8 id;
r17981r17982
217217}
218218
219219
220static UINT d3d_get_adapter_mode_count(d3d *d3dptr, UINT adapter, D3DFORMAT format)
220static UINT d3d_get_adapter_mode_count(d3d_base *d3dptr, UINT adapter, D3DFORMAT format)
221221{
222222   IDirect3D8 *d3d8 = (IDirect3D8 *)d3dptr->d3dobj;
223223   return IDirect3D8_GetAdapterModeCount(d3d8, adapter);
224224}
225225
226226
227static HMONITOR d3d_get_adapter_monitor(d3d *d3dptr, UINT adapter)
227static HMONITOR d3d_get_adapter_monitor(d3d_base *d3dptr, UINT adapter)
228228{
229229   IDirect3D8 *d3d8 = (IDirect3D8 *)d3dptr->d3dobj;
230230   return IDirect3D8_GetAdapterMonitor(d3d8, adapter);
231231}
232232
233233
234static HRESULT d3d_get_caps_dword(d3d *d3dptr, UINT adapter, D3DDEVTYPE devtype, d3d_caps_index which, DWORD *value)
234static HRESULT d3d_get_caps_dword(d3d_base *d3dptr, UINT adapter, D3DDEVTYPE devtype, d3d_caps_index which, DWORD *value)
235235{
236236   IDirect3D8 *d3d8 = (IDirect3D8 *)d3dptr->d3dobj;
237237   D3DCAPS8 caps;
r17981r17982
257257}
258258
259259
260static ULONG d3d_release(d3d *d3dptr)
260static ULONG d3d_release(d3d_base *d3dptr)
261261{
262262   IDirect3D8 *d3d8 = (IDirect3D8 *)d3dptr->d3dobj;
263263   ULONG result = IDirect3D8_Release(d3d8);
r17981r17982
696696//  set_interfaces
697697//============================================================
698698
699static void set_interfaces(d3d *d3dptr)
699static void set_interfaces(d3d_base *d3dptr)
700700{
701701   d3dptr->d3d = d3d8_interface;
702702   d3dptr->device = d3d8_device_interface;
trunk/src/osd/windows/d3d9intf.c
r17981r17982
6969//  PROTOTYPES
7070//============================================================
7171
72static void set_interfaces(d3d *d3dptr);
72static void set_interfaces(d3d_base *d3dptr);
7373
7474//============================================================
7575//  INLINES
r17981r17982
100100//  drawd3d9_init
101101//============================================================
102102
103d3d *drawd3d9_init(void)
103d3d_base *drawd3d9_init(void)
104104{
105105   direct3dcreate9_ptr direct3dcreate9;
106106   HINSTANCE dllhandle;
107107   IDirect3D9 *d3d9;
108   d3d *d3dptr;
108   d3d_base *d3dptr;
109109   bool post_available = true;
110110
111111   // dynamically grab the create function from d3d9.dll
r17981r17982
165165   }
166166
167167   // allocate an object to hold our data
168   d3dptr = global_alloc(d3d);
168   d3dptr = global_alloc(d3d_base);
169169   d3dptr->version = 9;
170170   d3dptr->d3dobj = d3d9;
171171   d3dptr->dllhandle = dllhandle;
r17981r17982
182182//  Direct3D interfaces
183183//============================================================
184184
185static HRESULT d3d_check_device_format(d3d *d3dptr, UINT adapter, D3DDEVTYPE devtype, D3DFORMAT adapterformat, DWORD usage, D3DRESOURCETYPE restype, D3DFORMAT format)
185static HRESULT d3d_check_device_format(d3d_base *d3dptr, UINT adapter, D3DDEVTYPE devtype, D3DFORMAT adapterformat, DWORD usage, D3DRESOURCETYPE restype, D3DFORMAT format)
186186{
187187   IDirect3D9 *d3d9 = (IDirect3D9 *)d3dptr->d3dobj;
188188   return IDirect3D9_CheckDeviceFormat(d3d9, adapter, devtype, adapterformat, usage, restype, format);
189189}
190190
191191
192static HRESULT d3d_check_device_type(d3d *d3dptr, UINT adapter, D3DDEVTYPE devtype, D3DFORMAT format, D3DFORMAT backformat, BOOL windowed)
192static HRESULT d3d_check_device_type(d3d_base *d3dptr, UINT adapter, D3DDEVTYPE devtype, D3DFORMAT format, D3DFORMAT backformat, BOOL windowed)
193193{
194194   IDirect3D9 *d3d9 = (IDirect3D9 *)d3dptr->d3dobj;
195195   return IDirect3D9_CheckDeviceType(d3d9, adapter, devtype, format, backformat, windowed);
196196}
197197
198static HRESULT d3d_create_device(d3d *d3dptr, UINT adapter, D3DDEVTYPE devtype, HWND focus, DWORD behavior, d3d_present_parameters *params, d3d_device **dev)
198static HRESULT d3d_create_device(d3d_base *d3dptr, UINT adapter, D3DDEVTYPE devtype, HWND focus, DWORD behavior, d3d_present_parameters *params, d3d_device **dev)
199199{
200200   IDirect3D9 *d3d9 = (IDirect3D9 *)d3dptr->d3dobj;
201201   D3DPRESENT_PARAMETERS d3d9params;
r17981r17982
203203   return IDirect3D9_CreateDevice(d3d9, adapter, devtype, focus, behavior, &d3d9params, (IDirect3DDevice9 **)dev);
204204}
205205
206static HRESULT d3d_enum_adapter_modes(d3d *d3dptr, UINT adapter, D3DFORMAT format, UINT index, D3DDISPLAYMODE *mode)
206static HRESULT d3d_enum_adapter_modes(d3d_base *d3dptr, UINT adapter, D3DFORMAT format, UINT index, D3DDISPLAYMODE *mode)
207207{
208208   IDirect3D9 *d3d9 = (IDirect3D9 *)d3dptr->d3dobj;
209209   return IDirect3D9_EnumAdapterModes(d3d9, adapter, format, index, mode);
210210}
211211
212212
213static UINT d3d_get_adapter_count(d3d *d3dptr)
213static UINT d3d_get_adapter_count(d3d_base *d3dptr)
214214{
215215   IDirect3D9 *d3d9 = (IDirect3D9 *)d3dptr->d3dobj;
216216   return IDirect3D9_GetAdapterCount(d3d9);
217217}
218218
219219
220static HRESULT d3d_get_adapter_display_mode(d3d *d3dptr, UINT adapter, D3DDISPLAYMODE *mode)
220static HRESULT d3d_get_adapter_display_mode(d3d_base *d3dptr, UINT adapter, D3DDISPLAYMODE *mode)
221221{
222222   IDirect3D9 *d3d9 = (IDirect3D9 *)d3dptr->d3dobj;
223223   return IDirect3D9_GetAdapterDisplayMode(d3d9, adapter, mode);
224224}
225225
226226
227static HRESULT d3d_get_adapter_identifier(d3d *d3dptr, UINT adapter, DWORD flags, d3d_adapter_identifier *identifier)
227static HRESULT d3d_get_adapter_identifier(d3d_base *d3dptr, UINT adapter, DWORD flags, d3d_adapter_identifier *identifier)
228228{
229229   IDirect3D9 *d3d9 = (IDirect3D9 *)d3dptr->d3dobj;
230230   D3DADAPTER_IDENTIFIER9 id;
r17981r17982
242242}
243243
244244
245static UINT d3d_get_adapter_mode_count(d3d *d3dptr, UINT adapter, D3DFORMAT format)
245static UINT d3d_get_adapter_mode_count(d3d_base *d3dptr, UINT adapter, D3DFORMAT format)
246246{
247247   IDirect3D9 *d3d9 = (IDirect3D9 *)d3dptr->d3dobj;
248248   return IDirect3D9_GetAdapterModeCount(d3d9, adapter, format);
249249}
250250
251251
252static HMONITOR d3d_get_adapter_monitor(d3d *d3dptr, UINT adapter)
252static HMONITOR d3d_get_adapter_monitor(d3d_base *d3dptr, UINT adapter)
253253{
254254   IDirect3D9 *d3d9 = (IDirect3D9 *)d3dptr->d3dobj;
255255   return IDirect3D9_GetAdapterMonitor(d3d9, adapter);
256256}
257257
258258
259static HRESULT d3d_get_caps_dword(d3d *d3dptr, UINT adapter, D3DDEVTYPE devtype, d3d_caps_index which, DWORD *value)
259static HRESULT d3d_get_caps_dword(d3d_base *d3dptr, UINT adapter, D3DDEVTYPE devtype, d3d_caps_index which, DWORD *value)
260260{
261261   IDirect3D9 *d3d9 = (IDirect3D9 *)d3dptr->d3dobj;
262262   D3DCAPS9 caps;
r17981r17982
282282}
283283
284284
285static ULONG d3d_release(d3d *d3dptr)
285static ULONG d3d_release(d3d_base *d3dptr)
286286{
287287   IDirect3D9 *d3d9 = (IDirect3D9 *)d3dptr->d3dobj;
288288   ULONG result = IDirect3D9_Release(d3d9);
r17981r17982
789789//  set_interfaces
790790//============================================================
791791
792static void set_interfaces(d3d *d3dptr)
792static void set_interfaces(d3d_base *d3dptr)
793793{
794794   d3dptr->d3d = d3d9_interface;
795795   d3dptr->device = d3d9_device_interface;
trunk/src/osd/windows/drawd3d.c
r17981r17982
113113//  GLOBALS
114114//============================================================
115115
116static d3d *            d3dintf; // FIX ME
116static d3d_base *            d3dintf; // FIX ME
117117
118118static const line_aa_step line_aa_1step[] =
119119{
trunk/src/osd/windows/d3dhlsl.c
r17981r17982
615615//  hlsl_info::init
616616//============================================================
617617
618void hlsl_info::init(d3d *d3dintf, win_window_info *window)
618void hlsl_info::init(d3d_base *d3dintf, win_window_info *window)
619619{
620620   if (!d3dintf->post_fx_available)
621621      return;

Previous 199869 Revisions Next

© 1997-2024 The MAME Team