diff options
Diffstat (limited to 'src/osd/windows/d3d9intf.c')
-rw-r--r-- | src/osd/windows/d3d9intf.c | 255 |
1 files changed, 130 insertions, 125 deletions
diff --git a/src/osd/windows/d3d9intf.c b/src/osd/windows/d3d9intf.c index dc15f8f4d29..3f0002b3d61 100644 --- a/src/osd/windows/d3d9intf.c +++ b/src/osd/windows/d3d9intf.c @@ -65,17 +65,20 @@ typedef HRESULT (WINAPI *direct3dx9_loadeffect_ptr)(LPDIRECT3DDEVICE9 pDevice, L static direct3dx9_loadeffect_ptr g_load_effect = NULL; +namespace d3d +{ + //============================================================ // PROTOTYPES //============================================================ -static void set_interfaces(d3d_base *d3dptr); +static void set_interfaces(base *d3dptr); //============================================================ // INLINES //============================================================ -INLINE void convert_present_params(const d3d_present_parameters *params, D3DPRESENT_PARAMETERS *d3d9params) +INLINE void convert_present_params(const present_parameters *params, D3DPRESENT_PARAMETERS *d3d9params) { memset(d3d9params, 0, sizeof(*d3d9params)); d3d9params->BackBufferWidth = params->BackBufferWidth; @@ -100,12 +103,12 @@ INLINE void convert_present_params(const d3d_present_parameters *params, D3DPRES // drawd3d9_init //============================================================ -d3d_base *drawd3d9_init(void) +base *drawd3d9_init(void) { direct3dcreate9_ptr direct3dcreate9; HINSTANCE dllhandle; IDirect3D9 *d3d9; - d3d_base *d3dptr; + base *d3dptr; bool post_available = true; // dynamically grab the create function from d3d9.dll @@ -165,7 +168,7 @@ d3d_base *drawd3d9_init(void) } // allocate an object to hold our data - d3dptr = global_alloc(d3d_base); + d3dptr = global_alloc(base); d3dptr->version = 9; d3dptr->d3dobj = d3d9; d3dptr->dllhandle = dllhandle; @@ -182,20 +185,20 @@ d3d_base *drawd3d9_init(void) // Direct3D interfaces //============================================================ -static HRESULT d3d_check_device_format(d3d_base *d3dptr, UINT adapter, D3DDEVTYPE devtype, D3DFORMAT adapterformat, DWORD usage, D3DRESOURCETYPE restype, D3DFORMAT format) +static HRESULT check_device_format(base *d3dptr, UINT adapter, D3DDEVTYPE devtype, D3DFORMAT adapterformat, DWORD usage, D3DRESOURCETYPE restype, D3DFORMAT format) { IDirect3D9 *d3d9 = (IDirect3D9 *)d3dptr->d3dobj; return IDirect3D9_CheckDeviceFormat(d3d9, adapter, devtype, adapterformat, usage, restype, format); } -static HRESULT d3d_check_device_type(d3d_base *d3dptr, UINT adapter, D3DDEVTYPE devtype, D3DFORMAT format, D3DFORMAT backformat, BOOL windowed) +static HRESULT check_device_type(base *d3dptr, UINT adapter, D3DDEVTYPE devtype, D3DFORMAT format, D3DFORMAT backformat, BOOL windowed) { IDirect3D9 *d3d9 = (IDirect3D9 *)d3dptr->d3dobj; return IDirect3D9_CheckDeviceType(d3d9, adapter, devtype, format, backformat, windowed); } -static HRESULT d3d_create_device(d3d_base *d3dptr, UINT adapter, D3DDEVTYPE devtype, HWND focus, DWORD behavior, d3d_present_parameters *params, d3d_device **dev) +static HRESULT create_device(base *d3dptr, UINT adapter, D3DDEVTYPE devtype, HWND focus, DWORD behavior, present_parameters *params, device **dev) { IDirect3D9 *d3d9 = (IDirect3D9 *)d3dptr->d3dobj; D3DPRESENT_PARAMETERS d3d9params; @@ -203,28 +206,28 @@ static HRESULT d3d_create_device(d3d_base *d3dptr, UINT adapter, D3DDEVTYPE devt return IDirect3D9_CreateDevice(d3d9, adapter, devtype, focus, behavior, &d3d9params, (IDirect3DDevice9 **)dev); } -static HRESULT d3d_enum_adapter_modes(d3d_base *d3dptr, UINT adapter, D3DFORMAT format, UINT index, D3DDISPLAYMODE *mode) +static HRESULT enum_adapter_modes(base *d3dptr, UINT adapter, D3DFORMAT format, UINT index, D3DDISPLAYMODE *mode) { IDirect3D9 *d3d9 = (IDirect3D9 *)d3dptr->d3dobj; return IDirect3D9_EnumAdapterModes(d3d9, adapter, format, index, mode); } -static UINT d3d_get_adapter_count(d3d_base *d3dptr) +static UINT get_adapter_count(base *d3dptr) { IDirect3D9 *d3d9 = (IDirect3D9 *)d3dptr->d3dobj; return IDirect3D9_GetAdapterCount(d3d9); } -static HRESULT d3d_get_adapter_display_mode(d3d_base *d3dptr, UINT adapter, D3DDISPLAYMODE *mode) +static HRESULT get_adapter_display_mode(base *d3dptr, UINT adapter, D3DDISPLAYMODE *mode) { IDirect3D9 *d3d9 = (IDirect3D9 *)d3dptr->d3dobj; return IDirect3D9_GetAdapterDisplayMode(d3d9, adapter, mode); } -static HRESULT d3d_get_adapter_identifier(d3d_base *d3dptr, UINT adapter, DWORD flags, d3d_adapter_identifier *identifier) +static HRESULT get_adapter_identifier(base *d3dptr, UINT adapter, DWORD flags, adapter_identifier *identifier) { IDirect3D9 *d3d9 = (IDirect3D9 *)d3dptr->d3dobj; D3DADAPTER_IDENTIFIER9 id; @@ -242,21 +245,21 @@ static HRESULT d3d_get_adapter_identifier(d3d_base *d3dptr, UINT adapter, DWORD } -static UINT d3d_get_adapter_mode_count(d3d_base *d3dptr, UINT adapter, D3DFORMAT format) +static UINT get_adapter_mode_count(base *d3dptr, UINT adapter, D3DFORMAT format) { IDirect3D9 *d3d9 = (IDirect3D9 *)d3dptr->d3dobj; return IDirect3D9_GetAdapterModeCount(d3d9, adapter, format); } -static HMONITOR d3d_get_adapter_monitor(d3d_base *d3dptr, UINT adapter) +static HMONITOR get_adapter_monitor(base *d3dptr, UINT adapter) { IDirect3D9 *d3d9 = (IDirect3D9 *)d3dptr->d3dobj; return IDirect3D9_GetAdapterMonitor(d3d9, adapter); } -static HRESULT d3d_get_caps_dword(d3d_base *d3dptr, UINT adapter, D3DDEVTYPE devtype, d3d_caps_index which, DWORD *value) +static HRESULT get_caps_dword(base *d3dptr, UINT adapter, D3DDEVTYPE devtype, caps_index which, DWORD *value) { IDirect3D9 *d3d9 = (IDirect3D9 *)d3dptr->d3dobj; D3DCAPS9 caps; @@ -282,7 +285,7 @@ static HRESULT d3d_get_caps_dword(d3d_base *d3dptr, UINT adapter, D3DDEVTYPE dev } -static ULONG d3d_release(d3d_base *d3dptr) +static ULONG release(base *d3dptr) { IDirect3D9 *d3d9 = (IDirect3D9 *)d3dptr->d3dobj; ULONG result = IDirect3D9_Release(d3d9); @@ -292,19 +295,19 @@ static ULONG d3d_release(d3d_base *d3dptr) } -static const d3d_interface d3d9_interface = +static const interface d3d9_interface = { - d3d_check_device_format, - d3d_check_device_type, - d3d_create_device, - d3d_enum_adapter_modes, - d3d_get_adapter_count, - d3d_get_adapter_display_mode, - d3d_get_adapter_identifier, - d3d_get_adapter_mode_count, - d3d_get_adapter_monitor, - d3d_get_caps_dword, - d3d_release + check_device_format, + check_device_type, + create_device, + enum_adapter_modes, + get_adapter_count, + get_adapter_display_mode, + get_adapter_identifier, + get_adapter_mode_count, + get_adapter_monitor, + get_caps_dword, + release }; @@ -313,27 +316,27 @@ static const d3d_interface d3d9_interface = // Direct3DDevice interfaces //============================================================ -static HRESULT d3d_device_begin_scene(d3d_device *dev) +static HRESULT device_begin_scene(device *dev) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; return IDirect3DDevice9_BeginScene(device); } -static HRESULT d3d_device_clear(d3d_device *dev, DWORD count, const D3DRECT *rects, DWORD flags, D3DCOLOR color, float z, DWORD stencil) +static HRESULT device_clear(device *dev, DWORD count, const D3DRECT *rects, DWORD flags, D3DCOLOR color, float z, DWORD stencil) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; return IDirect3DDevice9_Clear(device, count, rects, flags, color, z, stencil); } -static HRESULT d3d_device_create_offscreen_plain_surface(d3d_device *dev, UINT width, UINT height, D3DFORMAT format, D3DPOOL pool, d3d_surface **surface) +static HRESULT device_create_offscreen_plain_surface(device *dev, UINT width, UINT height, D3DFORMAT format, D3DPOOL pool, surface **surface) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; return IDirect3DDevice9_CreateOffscreenPlainSurface(device, width, height, format, pool, (IDirect3DSurface9 **)surface, NULL); } -static HRESULT d3d_device_create_effect(d3d_device *dev, const WCHAR *name, d3d_effect **effect) +static HRESULT device_create_effect(device *dev, const WCHAR *name, effect **effect) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; @@ -356,56 +359,56 @@ static HRESULT d3d_device_create_effect(d3d_device *dev, const WCHAR *name, d3d_ } -static HRESULT d3d_device_create_texture(d3d_device *dev, UINT width, UINT height, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool, d3d_texture **texture) +static HRESULT device_create_texture(device *dev, UINT width, UINT height, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool, texture **texture) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; return IDirect3DDevice9_CreateTexture(device, width, height, levels, usage, format, pool, (IDirect3DTexture9 **)texture, NULL); } -static HRESULT d3d_device_create_vertex_buffer(d3d_device *dev, UINT length, DWORD usage, DWORD fvf, D3DPOOL pool, d3d_vertex_buffer **buf) +static HRESULT device_create_vertex_buffer(device *dev, UINT length, DWORD usage, DWORD fvf, D3DPOOL pool, vertex_buffer **buf) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; return IDirect3DDevice9_CreateVertexBuffer(device, length, usage, fvf, pool, (IDirect3DVertexBuffer9 **)buf, NULL); } -static HRESULT d3d_device_draw_primitive(d3d_device *dev, D3DPRIMITIVETYPE type, UINT start, UINT count) +static HRESULT device_draw_primitive(device *dev, D3DPRIMITIVETYPE type, UINT start, UINT count) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; return IDirect3DDevice9_DrawPrimitive(device, type, start, count); } -static HRESULT d3d_device_end_scene(d3d_device *dev) +static HRESULT device_end_scene(device *dev) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; return IDirect3DDevice9_EndScene(device); } -static HRESULT d3d_device_get_raster_status(d3d_device *dev, D3DRASTER_STATUS *status) +static HRESULT device_get_raster_status(device *dev, D3DRASTER_STATUS *status) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; return IDirect3DDevice9_GetRasterStatus(device, 0, status); } -static HRESULT d3d_device_get_render_target(d3d_device *dev, DWORD index, d3d_surface **surface) +static HRESULT device_get_render_target(device *dev, DWORD index, surface **surface) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; return IDirect3DDevice9_GetRenderTarget(device, index, (IDirect3DSurface9 **)surface); } -static HRESULT d3d_device_get_render_target_data(d3d_device *dev, d3d_surface *rendertarget, d3d_surface *destsurface) +static HRESULT device_get_render_target_data(device *dev, surface *rendertarget, surface *destsurface) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; return IDirect3DDevice9_GetRenderTargetData(device, (IDirect3DSurface9 *)rendertarget, (IDirect3DSurface9 *)destsurface); } -static HRESULT d3d_device_present(d3d_device *dev, const RECT *source, const RECT *dest, HWND override, RGNDATA *dirty, DWORD flags) +static HRESULT device_present(device *dev, const RECT *source, const RECT *dest, HWND override, RGNDATA *dirty, DWORD flags) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; if (flags != 0) @@ -423,14 +426,14 @@ static HRESULT d3d_device_present(d3d_device *dev, const RECT *source, const REC } -static ULONG d3d_device_release(d3d_device *dev) +static ULONG device_release(device *dev) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; return IDirect3DDevice9_Release(device); } -static HRESULT d3d_device_reset(d3d_device *dev, d3d_present_parameters *params) +static HRESULT device_reset(device *dev, present_parameters *params) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; D3DPRESENT_PARAMETERS d3d9params; @@ -439,21 +442,21 @@ static HRESULT d3d_device_reset(d3d_device *dev, d3d_present_parameters *params) } -static void d3d_device_set_gamma_ramp(d3d_device *dev, DWORD flags, const D3DGAMMARAMP *ramp) +static void device_set_gamma_ramp(device *dev, DWORD flags, const D3DGAMMARAMP *ramp) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; IDirect3DDevice9_SetGammaRamp(device, 0, flags, ramp); } -static HRESULT d3d_device_set_render_state(d3d_device *dev, D3DRENDERSTATETYPE state, DWORD value) +static HRESULT device_set_render_state(device *dev, D3DRENDERSTATETYPE state, DWORD value) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; return IDirect3DDevice9_SetRenderState(device, state, value); } -static HRESULT d3d_device_set_render_target(d3d_device *dev, DWORD index, d3d_surface *surf) +static HRESULT device_set_render_target(device *dev, DWORD index, surface *surf) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; IDirect3DSurface9 *surface = (IDirect3DSurface9 *)surf; @@ -461,14 +464,14 @@ static HRESULT d3d_device_set_render_target(d3d_device *dev, DWORD index, d3d_su } -static HRESULT d3d_device_create_render_target(d3d_device *dev, UINT width, UINT height, D3DFORMAT format, d3d_surface **surface) +static HRESULT device_create_render_target(device *dev, UINT width, UINT height, D3DFORMAT format, surface **surface) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; return IDirect3DDevice9_CreateRenderTarget(device, width, height, format, D3DMULTISAMPLE_NONE, 0, false, (IDirect3DSurface9 **)surface, NULL); } -static HRESULT d3d_device_set_stream_source(d3d_device *dev, UINT number, d3d_vertex_buffer *vbuf, UINT stride) +static HRESULT device_set_stream_source(device *dev, UINT number, vertex_buffer *vbuf, UINT stride) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; IDirect3DVertexBuffer9 *vertexbuf = (IDirect3DVertexBuffer9 *)vbuf; @@ -476,7 +479,7 @@ static HRESULT d3d_device_set_stream_source(d3d_device *dev, UINT number, d3d_ve } -static HRESULT d3d_device_set_texture(d3d_device *dev, DWORD stage, d3d_texture *tex) +static HRESULT device_set_texture(device *dev, DWORD stage, texture *tex) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; IDirect3DBaseTexture9 *texture = (IDirect3DBaseTexture9 *)tex; @@ -484,7 +487,7 @@ static HRESULT d3d_device_set_texture(d3d_device *dev, DWORD stage, d3d_texture } -static HRESULT d3d_device_set_texture_stage_state(d3d_device *dev, DWORD stage, D3DTEXTURESTAGESTATETYPE state, DWORD value) +static HRESULT device_set_texture_stage_state(device *dev, DWORD stage, D3DTEXTURESTAGESTATETYPE state, DWORD value) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; @@ -515,14 +518,14 @@ static HRESULT d3d_device_set_texture_stage_state(d3d_device *dev, DWORD stage, } -static HRESULT d3d_device_set_vertex_format(d3d_device *dev, D3DFORMAT format) +static HRESULT device_set_vertex_format(device *dev, D3DFORMAT format) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; return IDirect3DDevice9_SetFVF(device, format); } -static HRESULT d3d_device_stretch_rect(d3d_device *dev, d3d_surface *source, const RECT *srcrect, d3d_surface *dest, const RECT *dstrect, D3DTEXTUREFILTERTYPE filter) +static HRESULT device_stretch_rect(device *dev, surface *source, const RECT *srcrect, surface *dest, const RECT *dstrect, D3DTEXTUREFILTERTYPE filter) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; IDirect3DSurface9 *ssurface = (IDirect3DSurface9 *)source; @@ -531,39 +534,39 @@ static HRESULT d3d_device_stretch_rect(d3d_device *dev, d3d_surface *source, con } -static HRESULT d3d_device_test_cooperative_level(d3d_device *dev) +static HRESULT device_test_cooperative_level(device *dev) { IDirect3DDevice9 *device = (IDirect3DDevice9 *)dev; return IDirect3DDevice9_TestCooperativeLevel(device); } -static const d3d_device_interface d3d9_device_interface = -{ - d3d_device_begin_scene, - d3d_device_clear, - d3d_device_create_offscreen_plain_surface, - d3d_device_create_effect, - d3d_device_create_texture, - d3d_device_create_vertex_buffer, - d3d_device_create_render_target, - d3d_device_draw_primitive, - d3d_device_end_scene, - d3d_device_get_raster_status, - d3d_device_get_render_target, - d3d_device_get_render_target_data, - d3d_device_present, - d3d_device_release, - d3d_device_reset, - d3d_device_set_gamma_ramp, - d3d_device_set_render_state, - d3d_device_set_render_target, - d3d_device_set_stream_source, - d3d_device_set_texture, - d3d_device_set_texture_stage_state, - d3d_device_set_vertex_format, - d3d_device_stretch_rect, - d3d_device_test_cooperative_level +static const device_interface d3d9_device_interface = +{ + device_begin_scene, + device_clear, + device_create_offscreen_plain_surface, + device_create_effect, + device_create_texture, + device_create_vertex_buffer, + device_create_render_target, + device_draw_primitive, + device_end_scene, + device_get_raster_status, + device_get_render_target, + device_get_render_target_data, + device_present, + device_release, + device_reset, + device_set_gamma_ramp, + device_set_render_state, + device_set_render_target, + device_set_stream_source, + device_set_texture, + device_set_texture_stage_state, + device_set_vertex_format, + device_stretch_rect, + device_test_cooperative_level }; @@ -572,32 +575,32 @@ static const d3d_device_interface d3d9_device_interface = // Direct3DSurface interfaces //============================================================ -static HRESULT d3d_surface_lock_rect(d3d_surface *surf, D3DLOCKED_RECT *locked, const RECT *rect, DWORD flags) +static HRESULT surface_lock_rect(surface *surf, D3DLOCKED_RECT *locked, const RECT *rect, DWORD flags) { IDirect3DSurface9 *surface = (IDirect3DSurface9 *)surf; return IDirect3DSurface9_LockRect(surface, locked, rect, flags); } -static ULONG d3d_surface_release(d3d_surface *surf) +static ULONG surface_release(surface *surf) { IDirect3DSurface9 *surface = (IDirect3DSurface9 *)surf; return IDirect3DSurface9_Release(surface); } -static HRESULT d3d_surface_unlock_rect(d3d_surface *surf) +static HRESULT surface_unlock_rect(surface *surf) { IDirect3DSurface9 *surface = (IDirect3DSurface9 *)surf; return IDirect3DSurface9_UnlockRect(surface); } -static const d3d_surface_interface d3d9_surface_interface = +static const surface_interface d3d9_surface_interface = { - d3d_surface_lock_rect, - d3d_surface_release, - d3d_surface_unlock_rect + surface_lock_rect, + surface_release, + surface_unlock_rect }; @@ -606,40 +609,40 @@ static const d3d_surface_interface d3d9_surface_interface = // Direct3DTexture interfaces //============================================================ -static HRESULT d3d_texture_get_surface_level(d3d_texture *tex, UINT level, d3d_surface **surface) +static HRESULT texture_get_surface_level(texture *tex, UINT level, surface **surface) { IDirect3DTexture9 *texture = (IDirect3DTexture9 *)tex; return IDirect3DTexture9_GetSurfaceLevel(texture, level, (IDirect3DSurface9 **)surface); } -static HRESULT d3d_texture_lock_rect(d3d_texture *tex, UINT level, D3DLOCKED_RECT *locked, const RECT *rect, DWORD flags) +static HRESULT texture_lock_rect(texture *tex, UINT level, D3DLOCKED_RECT *locked, const RECT *rect, DWORD flags) { IDirect3DTexture9 *texture = (IDirect3DTexture9 *)tex; return IDirect3DTexture9_LockRect(texture, level, locked, rect, flags); } -static ULONG d3d_texture_release(d3d_texture *tex) +static ULONG texture_release(texture *tex) { IDirect3DTexture9 *texture = (IDirect3DTexture9 *)tex; return IDirect3DTexture9_Release(texture); } -static HRESULT d3d_texture_unlock_rect(d3d_texture *tex, UINT level) +static HRESULT texture_unlock_rect(texture *tex, UINT level) { IDirect3DTexture9 *texture = (IDirect3DTexture9 *)tex; return IDirect3DTexture9_UnlockRect(texture, level); } -static const d3d_texture_interface d3d9_texture_interface = +static const texture_interface d3d9_texture_interface = { - d3d_texture_get_surface_level, - d3d_texture_lock_rect, - d3d_texture_release, - d3d_texture_unlock_rect + texture_get_surface_level, + texture_lock_rect, + texture_release, + texture_unlock_rect }; @@ -648,32 +651,32 @@ static const d3d_texture_interface d3d9_texture_interface = // Direct3DVertexBuffer interfaces //============================================================ -static HRESULT d3d_vertex_buffer_lock(d3d_vertex_buffer *vbuf, UINT offset, UINT size, VOID **data, DWORD flags) +static HRESULT vertex_buffer_lock(vertex_buffer *vbuf, UINT offset, UINT size, VOID **data, DWORD flags) { IDirect3DVertexBuffer9 *vertexbuf = (IDirect3DVertexBuffer9 *)vbuf; return IDirect3DVertexBuffer9_Lock(vertexbuf, offset, size, data, flags); } -static ULONG d3d_vertex_buffer_release(d3d_vertex_buffer *vbuf) +static ULONG vertex_buffer_release(vertex_buffer *vbuf) { IDirect3DVertexBuffer9 *vertexbuf = (IDirect3DVertexBuffer9 *)vbuf; return IDirect3DVertexBuffer9_Release(vertexbuf); } -static HRESULT d3d_vertex_buffer_unlock(d3d_vertex_buffer *vbuf) +static HRESULT vertex_buffer_unlock(vertex_buffer *vbuf) { IDirect3DVertexBuffer9 *vertexbuf = (IDirect3DVertexBuffer9 *)vbuf; return IDirect3DVertexBuffer9_Unlock(vertexbuf); } -static const d3d_vertex_buffer_interface d3d9_vertex_buffer_interface = +static const vertex_buffer_interface d3d9_vertex_buffer_interface = { - d3d_vertex_buffer_lock, - d3d_vertex_buffer_release, - d3d_vertex_buffer_unlock + vertex_buffer_lock, + vertex_buffer_release, + vertex_buffer_unlock }; @@ -682,42 +685,42 @@ static const d3d_vertex_buffer_interface d3d9_vertex_buffer_interface = // Direct3DEffect interfaces //============================================================ -static void d3d_effect_begin(d3d_effect *effect, UINT *passes, DWORD flags) +static void effect_begin(effect *effect, UINT *passes, DWORD flags) { ID3DXEffect *d3dfx = (ID3DXEffect*)effect; d3dfx->Begin(passes, flags); } -static void d3d_effect_end(d3d_effect *effect) +static void effect_end(effect *effect) { ID3DXEffect *d3dfx = (ID3DXEffect*)effect; d3dfx->End(); } -static void d3d_effect_begin_pass(d3d_effect *effect, UINT pass) +static void effect_begin_pass(effect *effect, UINT pass) { ID3DXEffect *d3dfx = (ID3DXEffect*)effect; d3dfx->BeginPass(pass); } -static void d3d_effect_end_pass(d3d_effect *effect) +static void effect_end_pass(effect *effect) { ID3DXEffect *d3dfx = (ID3DXEffect*)effect; d3dfx->EndPass(); } -static void d3d_effect_set_technique(d3d_effect *effect, const char *name) +static void effect_set_technique(effect *effect, const char *name) { ID3DXEffect *d3dfx = (ID3DXEffect*)effect; d3dfx->SetTechnique(name); } -static void d3d_effect_set_vector(d3d_effect *effect, const char *name, int count, float *vector) +static void effect_set_vector(effect *effect, const char *name, int count, float *vector) { static D3DXVECTOR4 out_vector; ID3DXEffect *d3dfx = (ID3DXEffect*)effect; @@ -733,54 +736,54 @@ static void d3d_effect_set_vector(d3d_effect *effect, const char *name, int coun } -static void d3d_effect_set_float(d3d_effect *effect, const char *name, float value) +static void effect_set_float(effect *effect, const char *name, float value) { ID3DXEffect *d3dfx = (ID3DXEffect*)effect; d3dfx->SetFloat(name, value); } -static void d3d_effect_set_int(d3d_effect *effect, const char *name, int value) +static void effect_set_int(effect *effect, const char *name, int value) { ID3DXEffect *d3dfx = (ID3DXEffect*)effect; d3dfx->SetInt(name, value); } -static void d3d_effect_set_matrix(d3d_effect *effect, const char *name, d3d_matrix *matrix) +static void effect_set_matrix(effect *effect, const char *name, matrix *matrix) { ID3DXEffect *d3dfx = (ID3DXEffect*)effect; d3dfx->SetMatrix(name, (D3DXMATRIX*)matrix); } -static void d3d_effect_set_texture(d3d_effect *effect, const char *name, d3d_texture *tex) +static void effect_set_texture(effect *effect, const char *name, texture *tex) { ID3DXEffect *d3dfx = (ID3DXEffect*)effect; d3dfx->SetTexture(name, (IDirect3DTexture9*)tex); } -static ULONG d3d_effect_release(d3d_effect *effect) +static ULONG effect_release(effect *effect) { ID3DXEffect *d3dfx = (ID3DXEffect*)effect; return d3dfx->Release(); } -static const d3d_effect_interface d3d9_effect_interface = +static const effect_interface d3d9_effect_interface = { - d3d_effect_begin, - d3d_effect_end, - d3d_effect_begin_pass, - d3d_effect_end_pass, - d3d_effect_set_technique, - d3d_effect_set_vector, - d3d_effect_set_float, - d3d_effect_set_int, - d3d_effect_set_matrix, - d3d_effect_set_texture, - d3d_effect_release + effect_begin, + effect_end, + effect_begin_pass, + effect_end_pass, + effect_set_technique, + effect_set_vector, + effect_set_float, + effect_set_int, + effect_set_matrix, + effect_set_texture, + effect_release }; @@ -789,7 +792,7 @@ static const d3d_effect_interface d3d9_effect_interface = // set_interfaces //============================================================ -static void set_interfaces(d3d_base *d3dptr) +static void set_interfaces(base *d3dptr) { d3dptr->d3d = d3d9_interface; d3dptr->device = d3d9_device_interface; @@ -798,3 +801,5 @@ static void set_interfaces(d3d_base *d3dptr) d3dptr->vertexbuf = d3d9_vertex_buffer_interface; d3dptr->effect = d3d9_effect_interface; } + +}; |