May 2009 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Add a function around the handler table.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: e492dd858e9ef8edbae5fbe90ba63e1def6ddcd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e492dd858e9ef8edbae5fbe90… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 27 18:23:16 2009 +0200 wined3d: Add a function around the handler table. This reduces the number of methods in the shader backend(the instr modifiers can be handled in that wrapper) and it will help flow control emulation in the ARB backend. --- dlls/wined3d/arb_program_shader.c | 20 ++++++++++++++++++-- dlls/wined3d/baseshader.c | 24 +++--------------------- dlls/wined3d/glsl_shader.c | 20 ++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 40 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index dd74b25..a48925f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2666,8 +2666,25 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_TEXREG2RGB */ pshader_hw_texreg2rgb, }; +static void shader_arb_handle_instruction(const struct wined3d_shader_instruction *ins) { + SHADER_HANDLER hw_fct; + + /* Select handler */ + hw_fct = shader_arb_instruction_handler_table[ins->handler_idx]; + + /* Unhandled opcode */ + if (!hw_fct) + { + FIXME("Backend can't handle opcode %#x\n", ins->handler_idx); + return; + } + hw_fct(ins); + + shader_arb_add_instruction_modifiers(ins); +} + const shader_backend_t arb_program_shader_backend = { - shader_arb_instruction_handler_table, + shader_arb_handle_instruction, shader_arb_select, shader_arb_select_depth_blt, shader_arb_deselect_depth_blt, @@ -2681,7 +2698,6 @@ const shader_backend_t arb_program_shader_backend = { shader_arb_dirty_const, shader_arb_get_caps, shader_arb_color_fixup_supported, - shader_arb_add_instruction_modifiers, }; /* ARB_fragment_program fixed function pipeline replacement definitions */ diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 0380c33..431b9a2 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -986,7 +986,6 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; /* To access shader backend callbacks */ - const SHADER_HANDLER *handler_table = device->shader_backend->shader_instruction_handler_table; const struct wined3d_shader_frontend *fe = This->baseShader.frontend; void *fe_data = This->baseShader.frontend_data; struct wined3d_shader_src_param src_rel_addr[4]; @@ -997,7 +996,6 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, struct wined3d_shader_instruction ins; struct wined3d_shader_context ctx; const DWORD *pToken = pFunction; - SHADER_HANDLER hw_fct; DWORD i; /* Initialize current parsing state */ @@ -1046,17 +1044,6 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, continue; } - /* Select handler */ - hw_fct = handler_table[ins.handler_idx]; - - /* Unhandled opcode */ - if (!hw_fct) - { - FIXME("Backend can't handle opcode %#x\n", ins.handler_idx); - pToken += param_size; - continue; - } - /* Destination token */ if (ins.dst_count) fe->shader_read_dst_param(fe_data, &pToken, &dst_param, &dst_rel_addr); @@ -1070,10 +1057,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, } /* Call appropriate function for output target */ - hw_fct(&ins); - - /* Process instruction modifiers for GLSL apps ( _sat, etc. ) */ - device->shader_backend->shader_add_instruction_modifiers(&ins); + device->shader_backend->shader_handle_instruction(&ins); } } @@ -1271,7 +1255,7 @@ void shader_cleanup(IWineD3DBaseShader *iface) } } -static const SHADER_HANDLER shader_none_instruction_handler_table[WINED3DSIH_TABLE_SIZE] = {0}; +static void shader_none_handle_instruction(const struct wined3d_shader_instruction *ins) {} static void shader_none_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) {} static void shader_none_select_depth_blt(IWineD3DDevice *iface, enum tex_types tex_type) {} static void shader_none_deselect_depth_blt(IWineD3DDevice *iface) {} @@ -1283,7 +1267,6 @@ static void shader_none_destroy(IWineD3DBaseShader *iface) {} static HRESULT shader_none_alloc(IWineD3DDevice *iface) {return WINED3D_OK;} static void shader_none_free(IWineD3DDevice *iface) {} static BOOL shader_none_dirty_const(IWineD3DDevice *iface) {return FALSE;} -static void shader_none_add_instruction_modifiers(const struct wined3d_shader_instruction *ins) {} #define GLINFO_LOCATION (*gl_info) static void shader_none_get_caps(WINED3DDEVTYPE devtype, const WineD3D_GL_Info *gl_info, struct shader_caps *pCaps) @@ -1314,7 +1297,7 @@ static BOOL shader_none_color_fixup_supported(struct color_fixup_desc fixup) } const shader_backend_t none_shader_backend = { - shader_none_instruction_handler_table, + shader_none_handle_instruction, shader_none_select, shader_none_select_depth_blt, shader_none_deselect_depth_blt, @@ -1328,5 +1311,4 @@ const shader_backend_t none_shader_backend = { shader_none_dirty_const, shader_none_get_caps, shader_none_color_fixup_supported, - shader_none_add_instruction_modifiers, }; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0b20d33..08bcaa6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4656,8 +4656,25 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_TEXREG2RGB */ pshader_glsl_texreg2rgb, }; +static void shader_glsl_handle_instruction(const struct wined3d_shader_instruction *ins) { + SHADER_HANDLER hw_fct; + + /* Select handler */ + hw_fct = shader_glsl_instruction_handler_table[ins->handler_idx]; + + /* Unhandled opcode */ + if (!hw_fct) + { + FIXME("Backend can't handle opcode %#x\n", ins->handler_idx); + return; + } + hw_fct(ins); + + shader_glsl_add_instruction_modifiers(ins); +} + const shader_backend_t glsl_shader_backend = { - shader_glsl_instruction_handler_table, + shader_glsl_handle_instruction, shader_glsl_select, shader_glsl_select_depth_blt, shader_glsl_deselect_depth_blt, @@ -4671,5 +4688,4 @@ const shader_backend_t glsl_shader_backend = { shader_glsl_dirty_const, shader_glsl_get_caps, shader_glsl_color_fixup_supported, - shader_glsl_add_instruction_modifiers, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ce6fd40..1b4906a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -797,7 +797,7 @@ struct vs_compile_args { }; typedef struct { - const SHADER_HANDLER *shader_instruction_handler_table; + void (*shader_handle_instruction)(const struct wined3d_shader_instruction *); void (*shader_select)(IWineD3DDevice *iface, BOOL usePS, BOOL useVS); void (*shader_select_depth_blt)(IWineD3DDevice *iface, enum tex_types tex_type); void (*shader_deselect_depth_blt)(IWineD3DDevice *iface);

1 0

Stefan Dösinger : wined3d: Emulate if(bool) in ARB shaders.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: e70c80add9942bab844e6db8a3a4ddbca6576762 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e70c80add9942bab844e6db8a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 27 18:23:59 2009 +0200 wined3d: Emulate if(bool) in ARB shaders. --- dlls/wined3d/arb_program_shader.c | 203 ++++++++++++++++++++++++++++++++----- dlls/wined3d/baseshader.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 180 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e70c80add9942bab844e6…

1 0

Peter Hedlund : kernel32: Mask out obsolete flags in GlobalAlloc.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 7d47feaebe2986b426adc21f0dd81e8bd0e86b33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d47feaebe2986b426adc21f0… Author: Peter Hedlund <peter(a)peterandlinda.com> Date: Wed May 27 10:27:56 2009 -0700 kernel32: Mask out obsolete flags in GlobalAlloc. --- dlls/kernel32/heap.c | 3 ++ dlls/kernel32/tests/heap.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index c08fb51..c78c762 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -375,6 +375,9 @@ HGLOBAL WINAPI GlobalAlloc( pintern = HeapAlloc(GetProcessHeap(), 0, sizeof(GLOBAL32_INTERN)); if (pintern) { + /* Mask out obsolete flags */ + flags &= ~(GMEM_LOWER | GMEM_NOCOMPACT | GMEM_NOT_BANKED | GMEM_NOTIFY); + pintern->Magic = MAGIC_GLOBAL_USED; pintern->Flags = flags >> 8; pintern->LockCount = 0; diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 39517cc..19b4106 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -362,9 +362,58 @@ static void test_heap(void) GlobalFree(gbl); } +static void test_obsolete_flags(void) +{ + static struct { + UINT flags; + UINT globalflags; + } test_global_flags[] = { + {GMEM_FIXED | GMEM_NOTIFY, 0}, + {GMEM_FIXED | GMEM_DISCARDABLE, 0}, + {GMEM_MOVEABLE | GMEM_NOTIFY, 0}, + {GMEM_MOVEABLE | GMEM_DDESHARE, GMEM_DDESHARE}, + {GMEM_MOVEABLE | GMEM_NOT_BANKED, 0}, + {GMEM_MOVEABLE | GMEM_NODISCARD, 0}, + {GMEM_MOVEABLE | GMEM_DISCARDABLE, GMEM_DISCARDABLE}, + {GMEM_MOVEABLE | GMEM_DDESHARE | GMEM_DISCARDABLE | GMEM_LOWER | GMEM_NOCOMPACT | GMEM_NODISCARD | + GMEM_NOT_BANKED | GMEM_NOTIFY, GMEM_DDESHARE | GMEM_DISCARDABLE}, + }; + + unsigned int i; + HGLOBAL gbl; + UINT resultflags; + + UINT (WINAPI *pGlobalFlags)(HGLOBAL); + + pGlobalFlags = (void *) GetProcAddress(GetModuleHandleA("kernel32"), "GlobalFlags"); + + if (!pGlobalFlags) + { + win_skip("GlobalFlags is not available\n"); + return; + } + + for (i = 0; i < sizeof(test_global_flags)/sizeof(test_global_flags[0]); i++) + { + gbl = GlobalAlloc(test_global_flags[i].flags, 4); + ok(gbl != NULL, "GlobalAlloc failed\n"); + + SetLastError(MAGIC_DEAD); + resultflags = pGlobalFlags(gbl); + + ok( resultflags == test_global_flags[i].globalflags || + broken(resultflags == (test_global_flags[i].globalflags & ~GMEM_DDESHARE)), /* win9x */ + "%u: expected 0x%08x, but returned 0x%08x with %d\n", + i, test_global_flags[i].globalflags, resultflags, GetLastError() ); + + GlobalFree(gbl); + } +} + START_TEST(heap) { test_heap(); + test_obsolete_flags(); /* Test both short and very long blocks */ test_sized_HeapAlloc(1);

1 0

André Hentschel : winex11: Fix Ctrl+Tab translation.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: cc688148acef8d636bdaaa4e6ede264657364c36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc688148acef8d636bdaaa4e6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed May 27 19:55:23 2009 +0200 winex11: Fix Ctrl+Tab translation. --- dlls/user32/tests/input.c | 2 +- dlls/winex11.drv/keyboard.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 2ad3eae..00d344b 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1276,7 +1276,7 @@ static void test_ToUnicode(void) state[VK_LCONTROL] |= HIGHEST_BIT; ret = ToUnicode(VK_TAB, SC_TAB, state, wStr, 2, 0); - todo_wine ok(ret == 0, "ToUnicode for CTRL + Tab didn't return 0 (was %i)\n", ret); + ok(ret == 0, "ToUnicode for CTRL + Tab didn't return 0 (was %i)\n", ret); ret = ToUnicode(VK_RETURN, SC_RETURN, state, wStr, 2, 0); ok(ret == 1, "ToUnicode for CTRL + Return didn't return 1 (was %i)\n", ret); diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 80f8445..ad41c84 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2679,7 +2679,8 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState if (e.state & ControlMask) { if (((keysym>=33) && (keysym < 'A')) || - ((keysym > 'Z') && (keysym < 'a'))) + ((keysym > 'Z') && (keysym < 'a')) || + (keysym == XK_Tab)) { lpChar[0] = 0; ret = 0;

1 0

Louis Lenders : wined3d: Fix CheckDeviceMultiSampleType when queried with D3DMULTISAMPLE_NONE.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 06936f04c04869b611bd91b335a94fd9e2ae7157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06936f04c04869b611bd91b33… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed May 27 17:29:46 2009 +0000 wined3d: Fix CheckDeviceMultiSampleType when queried with D3DMULTISAMPLE_NONE. --- dlls/d3d9/tests/device.c | 4 ++-- dlls/wined3d/directx.c | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 22f4234..f1d3595 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -173,12 +173,12 @@ static void test_checkdevicemultisampletype(void) hr = IDirect3D9_CheckDeviceMultiSampleType(pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, TRUE, D3DMULTISAMPLE_NONE, &qualityLevels); ok(SUCCEEDED(hr), "CheckDeviceMultiSampleType failed with (%08x)\n", hr); - todo_wine ok(qualityLevels == 1,"qualitylevel is not 1 but %d\n",qualityLevels); + ok(qualityLevels == 1,"qualitylevel is not 1 but %d\n",qualityLevels); hr = IDirect3D9_CheckDeviceMultiSampleType(pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, FALSE, D3DMULTISAMPLE_NONE, &qualityLevels); ok(SUCCEEDED(hr), "CheckDeviceMultiSampleType failed with (%08x)\n", hr); - todo_wine ok(qualityLevels == 1,"qualitylevel is not 1 but %d\n",qualityLevels); + ok(qualityLevels == 1,"qualitylevel is not 1 but %d\n",qualityLevels); cleanup: if (pD3d) IUnknown_Release( pD3d ); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6bad91e..eb78782 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1915,7 +1915,10 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceMultiSampleType(IWineD3D *iface, U /* TODO: handle Windowed, add more quality levels */ - if (WINED3DMULTISAMPLE_NONE == MultiSampleType) return WINED3D_OK; + if (WINED3DMULTISAMPLE_NONE == MultiSampleType) { + if(pQualityLevels) *pQualityLevels = 1; + return WINED3D_OK; + } /* By default multisampling is disabled right now as it causes issues * on some Nvidia driver versions and it doesn't work well in combination

1 0

Stefan Dösinger : wined3d: Remove the forward declaration added in the last patch.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 732a9a15d59680e21897502e9afe2b3fefa6428b URL: http://source.winehq.org/git/wine.git/?a=commit;h=732a9a15d59680e21897502e9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 13:57:03 2009 +0200 wined3d: Remove the forward declaration added in the last patch. --- dlls/wined3d/arb_program_shader.c | 450 ++++++++++++++++++------------------- dlls/wined3d/glsl_shader.c | 358 +++++++++++++++--------------- 2 files changed, 401 insertions(+), 407 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=732a9a15d59680e218975…

1 0

Stefan Dösinger : wined3d: Make find_gl_vshader backend specific.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 8763f6eac549be7f458cb579e2308bf11fa958dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8763f6eac549be7f458cb579e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 14:10:56 2009 +0200 wined3d: Make find_gl_vshader backend specific. --- dlls/wined3d/arb_program_shader.c | 70 ++++++++++++++++++++++++++++++++---- dlls/wined3d/baseshader.c | 7 ---- dlls/wined3d/glsl_shader.c | 70 ++++++++++++++++++++++++++++++++----- dlls/wined3d/vertexshader.c | 65 ---------------------------------- dlls/wined3d/wined3d_private.h | 3 -- 5 files changed, 123 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8763f6eac549be7f458cb…

1 0

Stefan Dösinger : wined3d: Manage ps_compiled_shader in the backends.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 814dd42f256eaa2fe6caf2c78ffdff1f9af138bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=814dd42f256eaa2fe6caf2c78… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 21:05:59 2009 +0200 wined3d: Manage ps_compiled_shader in the backends. --- dlls/wined3d/arb_program_shader.c | 64 ++++++++++++++++++++----------- dlls/wined3d/glsl_shader.c | 76 +++++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 8 +--- 3 files changed, 94 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=814dd42f256eaa2fe6caf…

1 0

Henri Verbeet : d3d10core: Implement ID3D10Device::VSSetShader().
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 057513cf6696b461c89685737afd00f5bee831c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=057513cf6696b461c89685737… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 28 08:44:21 2009 +0200 d3d10core: Implement ID3D10Device::VSSetShader(). --- dlls/d3d10core/device.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index ce18eb7..15e0184 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -141,7 +141,12 @@ static void STDMETHODCALLTYPE d3d10_device_PSSetSamplers(ID3D10Device *iface, static void STDMETHODCALLTYPE d3d10_device_VSSetShader(ID3D10Device *iface, ID3D10VertexShader *shader) { - FIXME("iface %p, shader %p stub!\n", iface, shader); + struct d3d10_device *This = (struct d3d10_device *)iface; + struct d3d10_vertex_shader *vs = (struct d3d10_vertex_shader *)shader; + + TRACE("iface %p, shader %p\n", iface, shader); + + IWineD3DDevice_SetVertexShader(This->wined3d_device, vs ? vs->wined3d_shader : NULL); } static void STDMETHODCALLTYPE d3d10_device_DrawIndexed(ID3D10Device *iface,

1 0

Henri Verbeet : d3d10core: Don' t complain as much about setting a NULL geometry shader.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 71382b5cbbd2bbf8eedbe54e644113fc00f2cde2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71382b5cbbd2bbf8eedbe54e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 28 08:44:21 2009 +0200 d3d10core: Don't complain as much about setting a NULL geometry shader. Setting a NULL geometry shader doesn't hurt much, and it reduces console spam a bit. --- dlls/d3d10core/device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 15e0184..de07db7 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -236,7 +236,8 @@ static void STDMETHODCALLTYPE d3d10_device_GSSetConstantBuffers(ID3D10Device *if static void STDMETHODCALLTYPE d3d10_device_GSSetShader(ID3D10Device *iface, ID3D10GeometryShader *shader) { - FIXME("iface %p, shader %p stub!\n", iface, shader); + if (shader) FIXME("iface %p, shader %p stub!\n", iface, shader); + else WARN("iface %p, shader %p stub!\n", iface, shader); } static void STDMETHODCALLTYPE d3d10_device_IASetPrimitiveTopology(ID3D10Device *iface, D3D10_PRIMITIVE_TOPOLOGY topology)

1 0