July 2011 - Wine-commits - list.winehq.org

Lucas Fialho Zawacki : dinput: SetActionMap constructing a dataformat for keyboard and mouse.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: b590090a4887a03c414cc21ff1a26c6d8db5c0a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b590090a4887a03c414cc21ff… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Sat Jul 2 01:06:54 2011 -0300 dinput: SetActionMap constructing a dataformat for keyboard and mouse. --- dlls/dinput/device.c | 3 -- dlls/dinput/device_private.h | 3 ++ dlls/dinput/keyboard.c | 73 ++++++++++++++++++++++++++++++++++++++- dlls/dinput/mouse.c | 77 ++++++++++++++++++++++++++++++++++++++++- dlls/dinput8/tests/device.c | 8 ++-- 5 files changed, 153 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b590090a4887a03c414cc…

1 0

Lucas Fialho Zawacki : dinput: SetActionMap and queue_event setting mapped data.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 39684c7e3ab64dcd1feba0300ec969027c5f8eb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39684c7e3ab64dcd1feba0300… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Sat Jul 2 01:07:15 2011 -0300 dinput: SetActionMap and queue_event setting mapped data. --- dlls/dinput/device.c | 19 +++++++++++++++++++ dlls/dinput/device_private.h | 7 +++++++ dlls/dinput/keyboard.c | 4 ++++ dlls/dinput/mouse.c | 6 +++++- dlls/dinput8/tests/device.c | 2 +- 5 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 16326b4..5d81227 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -604,6 +604,22 @@ void queue_event(LPDIRECTINPUTDEVICE8A iface, int inst_id, DWORD data, DWORD tim This->data_queue[This->queue_head].dwData = data; This->data_queue[This->queue_head].dwTimeStamp = time; This->data_queue[This->queue_head].dwSequence = seq; + + /* Set uAppData by means of action mapping */ + if (This->num_actions > 0) + { + int i; + for (i=0; i < This->num_actions; i++) + { + if (This->action_map[i].offset == ofs) + { + TRACE("Offset %d mapped to uAppData %lu\n", ofs, This->action_map[i].uAppData); + This->data_queue[This->queue_head].uAppData = This->action_map[i].uAppData; + break; + } + } + } + This->queue_head = next_pos; /* Send event if asked */ } @@ -783,6 +799,9 @@ ULONG WINAPI IDirectInputDevice2WImpl_Release(LPDIRECTINPUTDEVICE8W iface) HeapFree(GetProcessHeap(), 0, This->data_format.wine_df); release_DataFormat(&This->data_format); + /* Free action mapping */ + HeapFree(GetProcessHeap(), 0, This->action_map); + EnterCriticalSection( &This->dinput->crit ); list_remove( &This->entry ); LeaveCriticalSection( &This->dinput->crit ); diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 1bbc281..503698a 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -47,6 +47,12 @@ typedef struct LPDIDATAFORMAT user_df; /* user defined data format */ } DataFormat; +typedef struct +{ + unsigned int offset; + UINT_PTR uAppData; +} ActionMap; + /* Device implementation */ typedef struct IDirectInputDeviceImpl IDirectInputDeviceImpl; struct IDirectInputDeviceImpl @@ -74,6 +80,7 @@ struct IDirectInputDeviceImpl /* Action mapping */ int num_actions; /* number of actions mapped */ + ActionMap *action_map; /* array of mappings */ }; extern BOOL get_app_key(HKEY*, HKEY*) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 690a91d..3c93bcd 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -609,6 +609,8 @@ static HRESULT WINAPI SysKeyboardWImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, data_format.rgodf = (LPDIOBJECTDATAFORMAT)obj_df; data_format.dwNumObjs = num_actions; + This->base.action_map = HeapAlloc(GetProcessHeap(), 0, sizeof(ActionMap)*num_actions); + for (i = 0; i < lpdiaf->dwNumActions; i++) { if (IsEqualGUID(&This->base.guid, &lpdiaf->rgoAction[i].guidInstance)) @@ -616,6 +618,8 @@ static HRESULT WINAPI SysKeyboardWImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, int instance = DIDFT_GETINSTANCE(lpdiaf->rgoAction[i].dwObjID); memcpy(&obj_df[action], &c_dfDIKeyboard.rgodf[instance], c_dfDIKeyboard.dwObjSize); + This->base.action_map[action].uAppData = lpdiaf->rgoAction[i].uAppData; + This->base.action_map[action].offset = action; obj_df[action].dwOfs = action; action++; } diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 4783cf6..fb724d5 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -834,6 +834,7 @@ static HRESULT WINAPI SysMouseWImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, DIDATAFORMAT data_format; DIOBJECTDATAFORMAT *obj_df = NULL; int i, action = 0, num_actions = 0; + unsigned int offset = 0; if (This->base.acquired) return DIERR_ACQUIRED; @@ -856,15 +857,18 @@ static HRESULT WINAPI SysMouseWImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, data_format.rgodf = (LPDIOBJECTDATAFORMAT)obj_df; data_format.dwNumObjs = num_actions; + This->base.action_map = HeapAlloc(GetProcessHeap(), 0, sizeof(ActionMap)*num_actions); + for (i = 0; i < lpdiaf->dwNumActions; i++) { - unsigned int offset = 0; if (IsEqualGUID(&This->base.guid, &lpdiaf->rgoAction[i].guidInstance)) { int instance = DIDFT_GETINSTANCE(lpdiaf->rgoAction[i].dwObjID); memcpy(&obj_df[action], &c_dfDIMouse.rgodf[instance], c_dfDIMouse.dwObjSize); + This->base.action_map[action].uAppData = lpdiaf->rgoAction[i].uAppData; + This->base.action_map[action].offset = offset; obj_df[action].dwOfs = offset; offset += (obj_df[action].dwType & DIDFT_BUTTON) ? 1 : 4; diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 479ae34..84a499f 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -89,7 +89,7 @@ static void test_device_input( return; } - todo_wine ok (obj_data.uAppData == expected, "Retrieval of action failed uAppData=%lu expected=%d\n", obj_data.uAppData, expected); + ok (obj_data.uAppData == expected, "Retrieval of action failed uAppData=%lu expected=%d\n", obj_data.uAppData, expected); } static void test_build_action_map(

1 0

André Hentschel : imm32: Remove redundant check.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: ee44ff9597346bd9c8e6205ffd2d8009b62958f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee44ff9597346bd9c8e6205ff… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 3 19:32:05 2011 +0200 imm32: Remove redundant check. --- dlls/imm32/imm.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index fe394e3..a8392ff 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1889,7 +1889,6 @@ BOOL WINAPI ImmIsUIMessageA( (msg == WM_IME_NOTIFY) || (msg == WM_IME_COMPOSITIONFULL) || (msg == WM_IME_SELECT) || - (msg == WM_IME_SELECT) || (msg == 0x287 /* FIXME: WM_IME_SYSTEM */) || (msg == WM_MSIME_RECONVERTOPTIONS) || (msg == WM_MSIME_MOUSE) || @@ -1920,7 +1919,6 @@ BOOL WINAPI ImmIsUIMessageW( (msg == WM_IME_NOTIFY) || (msg == WM_IME_COMPOSITIONFULL) || (msg == WM_IME_SELECT) || - (msg == WM_IME_SELECT) || (msg == 0x287 /* FIXME: WM_IME_SYSTEM */) || (msg == WM_MSIME_RECONVERTOPTIONS) || (msg == WM_MSIME_MOUSE) ||

1 0

André Hentschel : wined3d: Remove dead code (clang).
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: a7c1b5f02ec48769b4f4334c67deb13635e4986a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7c1b5f02ec48769b4f4334c6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 3 21:06:07 2011 +0200 wined3d: Remove dead code (clang). --- dlls/wined3d/arb_program_shader.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e533018..0823c03 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3777,8 +3777,6 @@ static GLuint shader_arb_generate_pshader(struct wined3d_shader *shader, shader_addline(buffer, "PARAM np2fixup[%u] = { program.env[%u..%u] };\n", fixup->super.num_consts, fixup->offset, fixup->super.num_consts + fixup->offset - 1); } - - next_local += fixup->super.num_consts; } if (shader_priv->clipplane_emulation != ~0U && args->clip)

1 0

Jay Yang : explorer: Add navigation buttons to explorer.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 9544bcd10b4b7e0b97c16286ff2355c72ec777a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9544bcd10b4b7e0b97c16286f… Author: Jay Yang <jkelleyy(a)gmail.com> Date: Sun Jul 3 21:35:55 2011 -0400 explorer: Add navigation buttons to explorer. --- programs/explorer/explorer.c | 134 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 123 insertions(+), 11 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 0dc82cf..bcdfcff 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -31,12 +31,15 @@ #include <windows.h> #include <shobjidl.h> #include <shlobj.h> - +#include <commoncontrols.h> +#include <commctrl.h> WINE_DEFAULT_DEBUG_CHANNEL(explorer); #define EXPLORER_INFO_INDEX 0 +#define NAV_TOOLBAR_HEIGHT 30 + #define DEFAULT_WIDTH 640 #define DEFAULT_HEIGHT 480 @@ -54,16 +57,28 @@ typedef struct parametersTAG { typedef struct { IExplorerBrowser *browser; + HWND main_window; + INT rebar_height; } explorer_info; +enum +{ + BACK_BUTTON,FORWARD_BUTTON,UP_BUTTON +}; + static void make_explorer_window(IShellFolder* startFolder) { RECT explorerRect; - HWND window; + HWND rebar,nav_toolbar; FOLDERSETTINGS fs; explorer_info *info; HRESULT hres; WCHAR explorer_title[100]; + TBADDBITMAP bitmap_info; + TBBUTTON nav_buttons[3]; + int hist_offset,view_offset; + REBARBANDINFOW band_info; + memset(nav_buttons,0,sizeof(nav_buttons)); LoadStringW(explorer_hInstance,IDS_EXPLORER_TITLE,explorer_title, sizeof(explorer_title)/sizeof(WCHAR)); info = HeapAlloc(GetProcessHeap(),0,sizeof(explorer_info)); @@ -80,10 +95,12 @@ static void make_explorer_window(IShellFolder* startFolder) HeapFree(GetProcessHeap(),0,info); return; } + info->rebar_height=0; + info->main_window + = CreateWindowW(EXPLORER_CLASS,explorer_title,WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT,CW_USEDEFAULT,DEFAULT_WIDTH, + DEFAULT_HEIGHT,NULL,NULL,explorer_hInstance,NULL); - window = CreateWindowW(EXPLORER_CLASS,explorer_title,WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT,CW_USEDEFAULT,DEFAULT_WIDTH, - DEFAULT_HEIGHT,NULL,NULL,explorer_hInstance,NULL); fs.ViewMode = FVM_DETAILS; fs.fFlags = FWF_AUTOARRANGE; explorerRect.left = 0; @@ -91,20 +108,60 @@ static void make_explorer_window(IShellFolder* startFolder) explorerRect.right = DEFAULT_WIDTH; explorerRect.bottom = DEFAULT_HEIGHT; - IExplorerBrowser_Initialize(info->browser,window,&explorerRect,&fs); + IExplorerBrowser_Initialize(info->browser,info->main_window,&explorerRect,&fs); IExplorerBrowser_SetOptions(info->browser,EBO_SHOWFRAMES); - SetWindowLongPtrW(window,EXPLORER_INFO_INDEX,(LONG_PTR)info); + SetWindowLongPtrW(info->main_window,EXPLORER_INFO_INDEX,(LONG)info); + + /*setup navbar*/ + rebar = CreateWindowExW(WS_EX_TOOLWINDOW,REBARCLASSNAMEW,NULL, + WS_CHILD|WS_VISIBLE|RBS_VARHEIGHT|CCS_TOP|CCS_NODIVIDER, + 0,0,0,0,info->main_window,NULL,explorer_hInstance,NULL); + nav_toolbar + = CreateWindowExW(TBSTYLE_EX_MIXEDBUTTONS,TOOLBARCLASSNAMEW,NULL, + WS_CHILD|WS_VISIBLE|TBSTYLE_FLAT,0,0,0,0,rebar,NULL, + explorer_hInstance,NULL); + + bitmap_info.hInst = HINST_COMMCTRL; + bitmap_info.nID = IDB_HIST_LARGE_COLOR; + hist_offset= SendMessageW(nav_toolbar,TB_ADDBITMAP,0,(LPARAM)&bitmap_info); + bitmap_info.nID = IDB_VIEW_LARGE_COLOR; + view_offset= SendMessageW(nav_toolbar,TB_ADDBITMAP,0,(LPARAM)&bitmap_info); + + nav_buttons[0].iBitmap=hist_offset+HIST_BACK; + nav_buttons[0].idCommand=BACK_BUTTON; + nav_buttons[0].fsState=TBSTATE_ENABLED; + nav_buttons[0].fsStyle=BTNS_BUTTON|BTNS_AUTOSIZE; + nav_buttons[1].iBitmap=hist_offset+HIST_FORWARD; + nav_buttons[1].idCommand=FORWARD_BUTTON; + nav_buttons[1].fsState=TBSTATE_ENABLED; + nav_buttons[1].fsStyle=BTNS_BUTTON|BTNS_AUTOSIZE; + nav_buttons[2].iBitmap=view_offset+VIEW_PARENTFOLDER; + nav_buttons[2].idCommand=UP_BUTTON; + nav_buttons[2].fsState=TBSTATE_ENABLED; + nav_buttons[2].fsStyle=BTNS_BUTTON|BTNS_AUTOSIZE; + SendMessageW(nav_toolbar,TB_BUTTONSTRUCTSIZE,sizeof(TBBUTTON),0); + SendMessageW(nav_toolbar,TB_ADDBUTTONSW,sizeof(nav_buttons)/sizeof(TBBUTTON),(LPARAM)nav_buttons); + + band_info.cbSize = sizeof(band_info); + band_info.fMask = RBBIM_STYLE|RBBIM_CHILD|RBBIM_CHILDSIZE|RBBIM_SIZE; + band_info.hwndChild = nav_toolbar; + band_info.fStyle=RBBS_GRIPPERALWAYS|RBBS_CHILDEDGE; + band_info.cyChild=NAV_TOOLBAR_HEIGHT; + band_info.cx=0; + band_info.cyMinChild=NAV_TOOLBAR_HEIGHT; + band_info.cxMinChild=0; + SendMessageW(rebar,RB_INSERTBANDW,-1,(LPARAM)&band_info); IExplorerBrowser_BrowseToObject(info->browser,(IUnknown*)startFolder, SBSP_ABSOLUTE); - ShowWindow(window,SW_SHOWDEFAULT); - UpdateWindow(window); + ShowWindow(info->main_window,SW_SHOWDEFAULT); + UpdateWindow(info->main_window); } static void update_window_size(explorer_info *info, int height, int width) { RECT new_rect; new_rect.left = 0; - new_rect.top = 0; + new_rect.top = info->rebar_height; new_rect.right = width; new_rect.bottom = height; IExplorerBrowser_SetRect(info->browser,NULL,new_rect); @@ -116,12 +173,40 @@ static void do_exit(int code) ExitProcess(code); } +static LRESULT update_rebar_size(explorer_info* info,NMRBAUTOSIZE *size_info) +{ + RECT new_rect; + RECT window_rect; + info->rebar_height = size_info->rcTarget.bottom-size_info->rcTarget.top; + GetWindowRect(info->main_window,&window_rect); + new_rect.left = 0; + new_rect.top = info->rebar_height; + new_rect.right = window_rect.right-window_rect.left; + new_rect.bottom = window_rect.bottom-window_rect.top; + IExplorerBrowser_SetRect(info->browser,NULL,new_rect); + return 0; +} + +static LRESULT explorer_on_notify(explorer_info* info,NMHDR* notification) +{ + WINE_TRACE("code=%i\n",notification->code); + switch(notification->code) + { + case RBN_AUTOSIZE: + return update_rebar_size(info,(NMRBAUTOSIZE*)notification); + default: + break; + } + return 0; +} + static LRESULT CALLBACK explorer_wnd_proc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { explorer_info *info = (explorer_info*)GetWindowLongPtrW(hwnd,EXPLORER_INFO_INDEX); IExplorerBrowser *browser = NULL; + WINE_TRACE("(hwnd=%p,uMsg=%u,wParam=%lx,lParam=%lx)\n",hwnd,uMsg,wParam,lParam); if(info) browser = info->browser; switch(uMsg) @@ -133,6 +218,25 @@ static LRESULT CALLBACK explorer_wnd_proc(HWND hwnd, UINT uMsg, WPARAM wParam, L break; case WM_QUIT: do_exit(wParam); + case WM_NOTIFY: + return explorer_on_notify(info,(NMHDR*)lParam); + case WM_COMMAND: + if(HIWORD(wParam)==BN_CLICKED) + { + switch(LOWORD(wParam)) + { + case BACK_BUTTON: + IExplorerBrowser_BrowseToObject(browser,NULL,SBSP_NAVIGATEBACK); + break; + case FORWARD_BUTTON: + IExplorerBrowser_BrowseToObject(browser,NULL,SBSP_NAVIGATEFORWARD); + break; + case UP_BUTTON: + IExplorerBrowser_BrowseToObject(browser,NULL,SBSP_PARENT); + break; + } + } + break; case WM_SIZE: update_window_size(info,HIWORD(lParam),LOWORD(lParam)); break; @@ -153,7 +257,7 @@ static void register_explorer_window_class(void) window_class.hInstance = explorer_hInstance; window_class.hIcon = NULL; window_class.hCursor = NULL; - window_class.hbrBackground = NULL; + window_class.hbrBackground = (HBRUSH)COLOR_BACKGROUND; window_class.lpszMenuName = NULL; window_class.lpszClassName = EXPLORER_CLASS; window_class.hIconSm = NULL; @@ -309,6 +413,7 @@ int WINAPI wWinMain(HINSTANCE hinstance, HRESULT hres; MSG msg; IShellFolder *folder; + INITCOMMONCONTROLSEX init_info; memset(&parameters,0,sizeof(parameters)); explorer_hInstance = hinstance; @@ -319,6 +424,13 @@ int WINAPI wWinMain(HINSTANCE hinstance, WINE_ERR("Could not initialize COM\n"); ExitProcess(EXIT_FAILURE); } + init_info.dwSize = sizeof(INITCOMMONCONTROLSEX); + init_info.dwICC = ICC_BAR_CLASSES | ICC_COOL_CLASSES; + if(!InitCommonControlsEx(&init_info)) + { + WINE_ERR("Could not initialize Comctl\n"); + ExitProcess(EXIT_FAILURE); + } register_explorer_window_class(); folder = get_starting_shell_folder(&parameters); make_explorer_window(folder);

1 0

Henri Verbeet : wined3d: Get rid of some macros.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 8f6ae4ba38b4fd3cf268bf2de8b890f2c4ddfb1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6ae4ba38b4fd3cf268bf2de… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 3 22:27:19 2011 +0200 wined3d: Get rid of some macros. --- dlls/wined3d/directx.c | 90 +++++++++++++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 7 --- 2 files changed, 61 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f45ff04..b1dd957 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1398,14 +1398,35 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s return HW_VENDOR_NVIDIA; } +static UINT d3d_level_from_gl_info(const struct wined3d_gl_info *gl_info) +{ + UINT level = 0; + if (gl_info->supported[ARB_MULTITEXTURE]) + level = 6; + if (gl_info->supported[ARB_TEXTURE_COMPRESSION] + && gl_info->supported[ARB_TEXTURE_CUBE_MAP] + && gl_info->supported[ARB_TEXTURE_ENV_DOT3]) + level = 7; + if (level == 7 && gl_info->supported[ARB_MULTISAMPLE] + && gl_info->supported[ARB_TEXTURE_BORDER_CLAMP]) + level = 8; + if (level == 8 && gl_info->supported[ARB_FRAGMENT_PROGRAM] + && gl_info->supported[ARB_VERTEX_SHADER]) + level = 9; + if (level == 9 && gl_info->supported[EXT_GPU_SHADER4]) + level = 10; + + return level; +} static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl_info *gl_info, const char *gl_renderer) { + UINT d3d_level = d3d_level_from_gl_info(gl_info); unsigned int i; - if (WINE_D3D10_CAPABLE(gl_info)) + if (d3d_level >= 10) { static const struct { @@ -1480,7 +1501,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl /* Both the GeforceFX, 6xxx and 7xxx series support D3D9. The last two types have more * shader capabilities, so we use the shader capabilities to distinguish between FX and 6xxx/7xxx. */ - if (WINE_D3D9_CAPABLE(gl_info) && gl_info->supported[NV_VERTEX_PROGRAM3]) + if (d3d_level >= 9 && gl_info->supported[NV_VERTEX_PROGRAM3]) { static const struct { @@ -1514,7 +1535,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl return CARD_NVIDIA_GEFORCE_6200; /* Geforce 6100/6150/6200/7300/7400/7500 */ } - if (WINE_D3D9_CAPABLE(gl_info)) + if (d3d_level >= 9) { /* GeforceFX - highend */ if (strstr(gl_renderer, "5800") @@ -1538,7 +1559,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl return CARD_NVIDIA_GEFORCEFX_5200; /* GeforceFX 5100/5200/5250/5300/5500 */ } - if (WINE_D3D8_CAPABLE(gl_info)) + if (d3d_level >= 8) { if (strstr(gl_renderer, "GeForce4 Ti") || strstr(gl_renderer, "Quadro4")) { @@ -1548,7 +1569,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl return CARD_NVIDIA_GEFORCE3; /* Geforce3 standard/Ti200/Ti500, Quadro DCC */ } - if (WINE_D3D7_CAPABLE(gl_info)) + if (d3d_level >= 7) { if (strstr(gl_renderer, "GeForce4 MX")) { @@ -1579,11 +1600,13 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_info *gl_info, const char *gl_renderer) { + UINT d3d_level = d3d_level_from_gl_info(gl_info); + /* See http://developer.amd.com/drivers/pc_vendor_id/Pages/default.aspx * * Beware: renderer string do not match exact card model, * eg HD 4800 is returned for multiple cards, even for RV790 based ones. */ - if (WINE_D3D10_CAPABLE(gl_info)) + if (d3d_level >= 10) { unsigned int i; @@ -1648,7 +1671,7 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in return CARD_AMD_RADEON_HD3200; } - if (WINE_D3D8_CAPABLE(gl_info)) + if (d3d_level >= 9) { /* Radeon R5xx */ if (strstr(gl_renderer, "X1600") @@ -1687,15 +1710,11 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in return CARD_AMD_RADEON_9500; /* Radeon 9500/9550/9600/9700/9800/X300/X550/X600 */ } - if (WINE_D3D8_CAPABLE(gl_info)) - { + if (d3d_level >= 8) return CARD_AMD_RADEON_8500; /* Radeon 8500/9000/9100/9200/9300 */ - } - if (WINE_D3D7_CAPABLE(gl_info)) - { + if (d3d_level >= 7) return CARD_AMD_RADEON_7200; /* Radeon 7000/7100/7200/7500 */ - } return CARD_AMD_RAGE_128PRO; } @@ -1728,6 +1747,7 @@ static enum wined3d_pci_device select_card_intel(const struct wined3d_gl_info *g static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info *gl_info, const char *gl_renderer) { + UINT d3d_level; unsigned int i; /* See http://developer.amd.com/drivers/pc_vendor_id/Pages/default.aspx @@ -1817,7 +1837,8 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info } } - if (WINE_D3D9_CAPABLE(gl_info)) + d3d_level = d3d_level_from_gl_info(gl_info); + if (d3d_level >= 9) { static const struct { @@ -1853,15 +1874,11 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info } } - if (WINE_D3D8_CAPABLE(gl_info)) - { + if (d3d_level >= 8) return CARD_AMD_RADEON_8500; /* Radeon 8500/9000/9100/9200/9300 */ - } - if (WINE_D3D7_CAPABLE(gl_info)) - { + if (d3d_level >= 7) return CARD_AMD_RADEON_7200; /* Radeon 7000/7100/7200/7500 */ - } return CARD_AMD_RAGE_128PRO; } @@ -1869,6 +1886,8 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_info *gl_info, const char *gl_renderer) { + UINT d3d_level; + if (strstr(gl_renderer, "Gallium")) { unsigned int i; @@ -1944,10 +1963,16 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i } FIXME_(d3d_caps)("Unknown renderer %s.\n", debugstr_a(gl_renderer)); - if (WINE_D3D9_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCEFX_5600; - if (WINE_D3D8_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCE3; - if (WINE_D3D7_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCE; - if (WINE_D3D6_CAPABLE(gl_info)) return CARD_NVIDIA_RIVA_TNT; + + d3d_level = d3d_level_from_gl_info(gl_info); + if (d3d_level >= 9) + return CARD_NVIDIA_GEFORCEFX_5600; + if (d3d_level >= 8) + return CARD_NVIDIA_GEFORCE3; + if (d3d_level >= 7) + return CARD_NVIDIA_GEFORCE; + if (d3d_level >= 6) + return CARD_NVIDIA_RIVA_TNT; return CARD_NVIDIA_RIVA_128; } @@ -1977,6 +2002,8 @@ static const struct vendor_card_selection vendor_card_select_table[] = static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info *gl_info, const char *gl_renderer, enum wined3d_gl_vendor *gl_vendor, enum wined3d_pci_vendor *card_vendor) { + UINT d3d_level; + /* Above is a list of Nvidia and ATI GPUs. Both vendors have dozens of * different GPUs with roughly the same features. In most cases GPUs from a * certain family differ in clockspeeds, the amount of video memory and the @@ -2050,10 +2077,15 @@ static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info * * for Nvidia was because the hardware and drivers they make are of good quality. This makes * them a good generic choice. */ *card_vendor = HW_VENDOR_NVIDIA; - if (WINE_D3D9_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCEFX_5600; - if (WINE_D3D8_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCE3; - if (WINE_D3D7_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCE; - if (WINE_D3D6_CAPABLE(gl_info)) return CARD_NVIDIA_RIVA_TNT; + d3d_level = d3d_level_from_gl_info(gl_info); + if (d3d_level >= 9) + return CARD_NVIDIA_GEFORCEFX_5600; + if (d3d_level >= 8) + return CARD_NVIDIA_GEFORCE3; + if (d3d_level >= 7) + return CARD_NVIDIA_GEFORCE; + if (d3d_level >= 6) + return CARD_NVIDIA_RIVA_TNT; return CARD_NVIDIA_RIVA_128; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e8fddb7..32b50d2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1245,13 +1245,6 @@ void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) DEC void context_set_tls_idx(DWORD idx) DECLSPEC_HIDDEN; void context_surface_update(struct wined3d_context *context, const struct wined3d_surface *surface) DECLSPEC_HIDDEN; -/* Macros for doing basic GPU detection based on opengl capabilities */ -#define WINE_D3D6_CAPABLE(gl_info) (gl_info->supported[ARB_MULTITEXTURE]) -#define WINE_D3D7_CAPABLE(gl_info) (gl_info->supported[ARB_TEXTURE_COMPRESSION] && gl_info->supported[ARB_TEXTURE_CUBE_MAP] && gl_info->supported[ARB_TEXTURE_ENV_DOT3]) -#define WINE_D3D8_CAPABLE(gl_info) WINE_D3D7_CAPABLE(gl_info) && (gl_info->supported[ARB_MULTISAMPLE] && gl_info->supported[ARB_TEXTURE_BORDER_CLAMP]) -#define WINE_D3D9_CAPABLE(gl_info) WINE_D3D8_CAPABLE(gl_info) && (gl_info->supported[ARB_FRAGMENT_PROGRAM] && gl_info->supported[ARB_VERTEX_SHADER]) -#define WINE_D3D10_CAPABLE(gl_info) WINE_D3D9_CAPABLE(gl_info) && (gl_info->supported[EXT_GPU_SHADER4]) - /***************************************************************************** * Internal representation of a light */

1 0

Henri Verbeet : wined3d: Move some enums to directx.c.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 0c716b77e576ab8e9da10a3c59eefd0c57b02d50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c716b77e576ab8e9da10a3c5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 3 22:27:20 2011 +0200 wined3d: Move some enums to directx.c. --- dlls/wined3d/directx.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 39 --------------------------------------- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b1dd957..ce4a058 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -32,6 +32,44 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_caps); #define WINE_DEFAULT_VIDMEM (64 * 1024 * 1024) +/* The driver names reflect the lowest GPU supported + * by a certain driver, so DRIVER_AMD_R300 supports + * R3xx, R4xx and R5xx GPUs. */ +enum wined3d_display_driver +{ + DRIVER_AMD_RAGE_128PRO, + DRIVER_AMD_R100, + DRIVER_AMD_R300, + DRIVER_AMD_R600, + DRIVER_INTEL_GMA800, + DRIVER_INTEL_GMA900, + DRIVER_INTEL_GMA950, + DRIVER_INTEL_GMA3000, + DRIVER_NVIDIA_TNT, + DRIVER_NVIDIA_GEFORCE2MX, + DRIVER_NVIDIA_GEFORCEFX, + DRIVER_NVIDIA_GEFORCE6, + DRIVER_UNKNOWN +}; + +enum wined3d_driver_model +{ + DRIVER_MODEL_WIN9X, + DRIVER_MODEL_NT40, + DRIVER_MODEL_NT5X, + DRIVER_MODEL_NT6X +}; + +enum wined3d_gl_vendor +{ + GL_VENDOR_UNKNOWN, + GL_VENDOR_APPLE, + GL_VENDOR_FGLRX, + GL_VENDOR_INTEL, + GL_VENDOR_MESA, + GL_VENDOR_NVIDIA, +}; + /* The d3d device ID */ static const GUID IID_D3DDEVICE_D3DUID = { 0xaeb2cdd4, 0x6e41, 0x43ea, { 0x94,0x1c,0x83,0x61,0xcc,0x76,0x07,0x81 } }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 32b50d2..79b6f27 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1279,45 +1279,6 @@ struct wined3d_pixel_format int numSamples; }; -/* The driver names reflect the lowest GPU supported - * by a certain driver, so DRIVER_AMD_R300 supports - * R3xx, R4xx and R5xx GPUs. */ -enum wined3d_display_driver -{ - DRIVER_AMD_RAGE_128PRO, - DRIVER_AMD_R100, - DRIVER_AMD_R300, - DRIVER_AMD_R600, - DRIVER_INTEL_GMA800, - DRIVER_INTEL_GMA900, - DRIVER_INTEL_GMA950, - DRIVER_INTEL_GMA3000, - DRIVER_NVIDIA_TNT, - DRIVER_NVIDIA_GEFORCE2MX, - DRIVER_NVIDIA_GEFORCEFX, - DRIVER_NVIDIA_GEFORCE6, - DRIVER_UNKNOWN -}; - -enum wined3d_driver_model -{ - DRIVER_MODEL_WIN9X, - DRIVER_MODEL_NT40, - DRIVER_MODEL_NT5X, - DRIVER_MODEL_NT6X -}; - -enum wined3d_gl_vendor -{ - GL_VENDOR_UNKNOWN, - GL_VENDOR_APPLE, - GL_VENDOR_FGLRX, - GL_VENDOR_INTEL, - GL_VENDOR_MESA, - GL_VENDOR_NVIDIA, -}; - - enum wined3d_pci_vendor { HW_VENDOR_SOFTWARE = 0x0000,

1 0

Henri Verbeet : wined3d: Get rid of some IWineD3D* references.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: b1664a2c85d326b39a2c2816c61836c1de189410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1664a2c85d326b39a2c2816c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 3 22:27:21 2011 +0200 wined3d: Get rid of some IWineD3D* references. --- dlls/wined3d/buffer.c | 13 ++++++------- dlls/wined3d/clipper.c | 3 +-- dlls/wined3d/device.c | 6 ++---- dlls/wined3d/directx.c | 6 ------ dlls/wined3d/query.c | 2 -- dlls/wined3d/resource.c | 2 -- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/swapchain.c | 7 +++---- 8 files changed, 14 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index ea94c7e..fa14f3a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -119,7 +119,7 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, const struc { GLenum error, gl_usage; - TRACE("Creating an OpenGL vertex buffer object for IWineD3DVertexBuffer %p Usage(%s)\n", + TRACE("Creating an OpenGL vertex buffer object for wined3d_buffer %p with usage %s.\n", This, debug_d3dusage(This->resource.usage)); ENTER_GL(); @@ -131,12 +131,11 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, const struc */ while (glGetError() != GL_NO_ERROR); - /* Basically the FVF parameter passed to CreateVertexBuffer is no good - * It is the FVF set with IWineD3DDevice::SetFVF or the Vertex Declaration set with - * IWineD3DDevice::SetVertexDeclaration that decides how the vertices in the buffer - * look like. This means that on each DrawPrimitive call the vertex buffer has to be verified - * to check if the rhw and color values are in the correct format. - */ + /* Basically the FVF parameter passed to CreateVertexBuffer is no good. + * The vertex declaration from the device determines how the data in the + * buffer is interpreted. This means that on each draw call the buffer has + * to be verified to check if the rhw and color values are in the correct + * format. */ GL_EXTCALL(glGenBuffersARB(1, &This->buffer_object)); error = glGetError(); diff --git a/dlls/wined3d/clipper.c b/dlls/wined3d/clipper.c index e5131d7..0829cde 100644 --- a/dlls/wined3d/clipper.c +++ b/dlls/wined3d/clipper.c @@ -1,5 +1,4 @@ -/* IWineD3DClipper implementation - * +/* * Copyright 2000 (c) Marcus Meissner * Copyright 2000 (c) TransGaming Technologies Inc. * Copyright 2006 (c) Stefan Dösinger diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 180fd49..f3fceac 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1,6 +1,4 @@ /* - * IWineD3DDevice implementation - * * Copyright 2002 Lionel Ulmer * Copyright 2002-2005 Jason Edmeades * Copyright 2003-2004 Raphael Junqueira @@ -4377,7 +4375,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, hr = wined3d_device_update_surface(device, src_surface, NULL, dst_surface, NULL); if (FAILED(hr)) { - WARN("IWineD3DDevice_UpdateSurface failed, hr %#x.\n", hr); + WARN("Failed to update surface, hr %#x.\n", hr); return hr; } } @@ -4396,7 +4394,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, hr = wined3d_device_update_surface(device, src_surface, NULL, dst_surface, NULL); if (FAILED(hr)) { - WARN("IWineD3DDevice_UpdateSurface failed, hr %#x.\n", hr); + WARN("Failed to update surface, hr %#x.\n", hr); return hr; } } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ce4a058..504cb2c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1,6 +1,4 @@ /* - * IWineD3D implementation - * * Copyright 2002-2004 Jason Edmeades * Copyright 2003-2004 Raphael Junqueira * Copyright 2004 Christian Costa @@ -412,10 +410,6 @@ ULONG CDECL wined3d_decref(struct wined3d *wined3d) return refcount; } -/********************************************************** - * IWineD3D parts follows - **********************************************************/ - /* GL locking is done by the caller */ static inline BOOL test_arb_vs_offset_limit(const struct wined3d_gl_info *gl_info) { diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index ca4426f..2deb337 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1,6 +1,4 @@ /* - * IWineD3DQuery implementation - * * Copyright 2005 Oliver Stieber * Copyright 2007-2008 Stefan Dösinger for CodeWeavers * Copyright 2009-2010 Henri Verbeet for CodeWeavers. diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 699a61b..4dbe46e 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -1,6 +1,4 @@ /* - * IWineD3DResource Implementation - * * Copyright 2002-2004 Jason Edmeades * Copyright 2003-2004 Raphael Junqueira * Copyright 2004 Christian Costa diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 114be69..5fb667d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5281,8 +5281,8 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa * This path will only be entered for d3d7 and ddraw apps, because d3d8/9 offer no way to blit TO the front buffer */ - /* Check rects - IWineD3DDevice_Present doesn't handle them */ - while(1) + /* Check rects - wined3d_swapchain_present() doesn't handle them. */ + for (;;) { TRACE("Looking if a Present can be done...\n"); /* Source Rectangle must be full surface */ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index a64c0db..2242f66 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -351,9 +351,8 @@ static void swapchain_blit(struct wined3d_swapchain *swapchain, ENTER_GL(); context_bind_fbo(context2, GL_FRAMEBUFFER, NULL); - /* Set up the texture. The surface is not in a IWineD3D*Texture container, - * so there are no d3d texture settings to dirtify - */ + /* Set up the texture. The surface is not in a wined3d_texture + * container, so there are no D3D texture settings to dirtify. */ device->blitter->set_shader(device->blit_priv, context2->gl_info, backbuffer); glTexParameteri(backbuffer->texture_target, GL_TEXTURE_MIN_FILTER, gl_filter); glTexParameteri(backbuffer->texture_target, GL_TEXTURE_MAG_FILTER, gl_filter); @@ -693,7 +692,7 @@ void x11_copy_to_screen(struct wined3d_swapchain *swapchain, const RECT *rect) if (front->clipper) { RECT xrc; - HWND hwnd = ((IWineD3DClipperImpl *)front->clipper)->hWnd; + HWND hwnd = front->clipper->hWnd; if (hwnd && GetClientRect(hwnd,&xrc)) { OffsetRect(&xrc, offset.x, offset.y);

1 0

Henri Verbeet : wined3d: Get rid of the tex_op_args typedef.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 82d74d563a750c8c640de9cae5c626e3c1fe24a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d74d563a750c8c640de9cae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 3 22:27:22 2011 +0200 wined3d: Get rid of the tex_op_args typedef. --- dlls/wined3d/nvidia_texture_shader.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index f20fc7a..624d630 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -70,11 +70,12 @@ static void nvts_activate_dimensions(const struct wined3d_state *state, DWORD st } } -typedef struct { +struct tex_op_args +{ GLenum input[3]; GLenum mapping[3]; GLenum component_usage[3]; -} tex_op_args; +}; static GLenum d3dta_to_combiner_input(DWORD d3dta, DWORD stage, INT texture_idx) { switch (d3dta) { @@ -134,7 +135,7 @@ static void get_src_and_opr_nvrc(DWORD stage, DWORD arg, BOOL is_alpha, GLenum* void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, BOOL is_alpha, int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3, INT texture_idx, DWORD dst) { - tex_op_args tex_op_args = {{0}, {0}, {0}}; + struct tex_op_args tex_op_args = {{0}, {0}, {0}}; GLenum portion = is_alpha ? GL_ALPHA : GL_RGB; GLenum target = GL_COMBINER0_NV + stage; GLenum output;

1 0

Henri Verbeet : wined3d: Get rid of the GL_SupportedExt typedef.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 5d6f29818f24236f66b4ff7c7742f3ae41b9afcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d6f29818f24236f66b4ff7c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 3 22:27:23 2011 +0200 wined3d: Get rid of the GL_SupportedExt typedef. --- dlls/wined3d/directx.c | 11 +++++++---- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_gl.h | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 504cb2c..8453af1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -72,11 +72,14 @@ enum wined3d_gl_vendor static const GUID IID_D3DDEVICE_D3DUID = { 0xaeb2cdd4, 0x6e41, 0x43ea, { 0x94,0x1c,0x83,0x61,0xcc,0x76,0x07,0x81 } }; /* Extension detection */ -static const struct { +static const struct +{ const char *extension_string; - GL_SupportedExt extension; + enum wined3d_gl_extension extension; DWORD version; -} EXTENSION_MAP[] = { +} +EXTENSION_MAP[] = +{ /* APPLE */ {"GL_APPLE_client_storage", APPLE_CLIENT_STORAGE, 0 }, {"GL_APPLE_fence", APPLE_FENCE, 0 }, @@ -446,7 +449,7 @@ static inline BOOL test_arb_vs_offset_limit(const struct wined3d_gl_info *gl_inf return ret; } -static DWORD ver_for_ext(GL_SupportedExt ext) +static DWORD ver_for_ext(enum wined3d_gl_extension ext) { unsigned int i; for (i = 0; i < (sizeof(EXTENSION_MAP) / sizeof(*EXTENSION_MAP)); ++i) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index fe767ea..25cb4ee 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -249,7 +249,7 @@ struct wined3d_format_texture_info GLint gl_type; unsigned int conv_byte_count; unsigned int flags; - GL_SupportedExt extension; + enum wined3d_gl_extension extension; void (*convert)(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height); }; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 85e5fea..24c366e 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1721,7 +1721,7 @@ BOOL (WINAPI *pwglShareLists)(HGLRC, HGLRC) DECLSPEC_HIDDEN; USE_WGL_FUNC(wglShareLists) /* OpenGL extensions. */ -typedef enum wined3d_gl_extension +enum wined3d_gl_extension { WINED3D_GL_EXT_NONE, @@ -1845,7 +1845,7 @@ typedef enum wined3d_gl_extension WINED3D_GL_VERSION_2_0, WINED3D_GL_EXT_COUNT, -} GL_SupportedExt; +}; /* GL_APPLE_client_storage */ #ifndef GL_APPLE_client_storage diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 79b6f27..f4947f1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1139,7 +1139,7 @@ struct StateEntryTemplate { DWORD state; struct StateEntry content; - GL_SupportedExt extension; + enum wined3d_gl_extension extension; }; struct fragment_caps

1 0