July 2008 - Wine-Commits - list.winehq.org

Mikołaj Zalewski : comctl32: statusbar: WM_SETFONT should change the bar height.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: 9aee00e8fa359d2ed0cacc50845fd85caa66331b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aee00e8fa359d2ed0cacc508… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Jul 16 20:21:09 2008 +0200 comctl32: statusbar: WM_SETFONT should change the bar height. --- dlls/comctl32/comctl32.h | 1 + dlls/comctl32/commctrl.c | 11 +++++++ dlls/comctl32/status.c | 69 ++++++++++++++++++++--------------------- dlls/comctl32/tests/status.c | 63 +++++++++++++++++++++++++++++++++----- 4 files changed, 101 insertions(+), 43 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index 51320e6..da9243f 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -148,6 +148,7 @@ HWND COMCTL32_CreateToolTip (HWND); VOID COMCTL32_RefreshSysColors(void); void COMCTL32_DrawInsertMark(HDC hDC, const RECT *lpRect, COLORREF clrInsertMark, BOOL bHorizontal); void COMCTL32_EnsureBitmapSize(HBITMAP *pBitmap, int cxMinWidth, int cyMinHeight, COLORREF crBackground); +void COMCTL32_GetFontMetrics(HFONT hFont, TEXTMETRICW *ptm); INT Str_GetPtrWtoA (LPCWSTR lpSrc, LPSTR lpDest, INT nMaxLen); INT Str_GetPtrAtoW (LPCSTR lpSrc, LPWSTR lpDest, INT nMaxLen); BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc); diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 4ff2075..1863dbf 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1561,6 +1561,17 @@ void COMCTL32_EnsureBitmapSize(HBITMAP *pBitmap, int cxMinWidth, int cyMinHeight return; } +void COMCTL32_GetFontMetrics(HFONT hFont, TEXTMETRICW *ptm) +{ + HDC hdc = GetDC(NULL); + HFONT hOldFont; + + hOldFont = SelectObject(hdc, hFont); + GetTextMetricsW(hdc, ptm); + SelectObject(hdc, hOldFont); + ReleaseDC(NULL, hdc); +} + /*********************************************************************** * MirrorIcon [COMCTL32.414] * diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 3744280..1b97b41 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -108,6 +108,35 @@ static inline LPCSTR debugstr_t(LPCWSTR text, BOOL isW) return isW ? debugstr_w(text) : debugstr_a((LPCSTR)text); } +static UINT +STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr) +{ + HTHEME theme; + UINT height; + TEXTMETRICW tm; + + COMCTL32_GetFontMetrics(infoPtr->hFont ? infoPtr->hFont : infoPtr->hDefaultFont, &tm); + height = tm.tmHeight + 4 + infoPtr->verticalBorder; + + if ((theme = GetWindowTheme(infoPtr->Self))) + { + /* Determine bar height from theme such that the content area is + * textHeight pixels large */ + HDC hdc = GetDC(infoPtr->Self); + RECT r; + memset (&r, 0, sizeof (r)); + r.bottom = tm.tmHeight; + if (SUCCEEDED(GetThemeBackgroundExtent(theme, hdc, SP_PANE, 0, &r, &r))) + { + height = r.bottom - r.top; + } + ReleaseDC(infoPtr->Self, hdc); + } + + TRACE(" textHeight=%d+%d, final height=%d\n", tm.tmHeight, tm.tmInternalLeading, height); + return height; +} + static void STATUSBAR_DrawSizeGrip (HTHEME theme, HDC hdc, LPRECT lpRect) { @@ -913,8 +942,7 @@ STATUSBAR_WMCreate (HWND hwnd, const CREATESTRUCTA *lpCreate) NONCLIENTMETRICSW nclm; DWORD dwStyle; RECT rect; - int len, textHeight = 0; - HDC hdc; + int len; TRACE("\n"); infoPtr = (STATUS_INFO*)Alloc (sizeof(STATUS_INFO)); @@ -971,17 +999,7 @@ STATUSBAR_WMCreate (HWND hwnd, const CREATESTRUCTA *lpCreate) dwStyle &= ~WS_BORDER; SetWindowLongW (hwnd, GWL_STYLE, dwStyle); - if ((hdc = GetDC (hwnd))) { - TEXTMETRICW tm; - HFONT hOldFont; - - hOldFont = SelectObject (hdc, infoPtr->hDefaultFont); - GetTextMetricsW (hdc, &tm); - textHeight = tm.tmHeight; - SelectObject (hdc, hOldFont); - ReleaseDC (hwnd, hdc); - } - TRACE(" textHeight=%d\n", textHeight); + infoPtr->height = STATUSBAR_ComputeHeight(infoPtr); if (dwStyle & SBT_TOOLTIPS) { infoPtr->hwndToolTip = @@ -1002,28 +1020,6 @@ STATUSBAR_WMCreate (HWND hwnd, const CREATESTRUCTA *lpCreate) } } - if (!(dwStyle & CCS_NORESIZE)) { /* don't resize wnd if it doesn't want it ! */ - HTHEME theme; - infoPtr->height = textHeight + 4 + infoPtr->verticalBorder; - - if ((theme = GetWindowTheme (hwnd))) - { - /* Determine bar height from theme such that the content area is - * textHeight pixels large */ - HDC hdc = GetDC (hwnd); - RECT r; - memset (&r, 0, sizeof (r)); - r.bottom = textHeight; - if (SUCCEEDED(GetThemeBackgroundExtent (theme, hdc, SP_PANE, 0, &r, &r))) - { - infoPtr->height = r.bottom - r.top; - } - ReleaseDC (hwnd, hdc); - } - - STATUSBAR_SetPartBounds (infoPtr); - } - return 0; create_fail: @@ -1099,6 +1095,9 @@ STATUSBAR_WMSetFont (STATUS_INFO *infoPtr, HFONT font, BOOL redraw) { infoPtr->hFont = font; TRACE("%p\n", infoPtr->hFont); + + infoPtr->height = STATUSBAR_ComputeHeight(infoPtr); + SendMessageW(infoPtr->Self, WM_SIZE, 0, 0); /* update size */ if (redraw) InvalidateRect(infoPtr->Self, NULL, FALSE); diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index 18501fb..b6c5b7b 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -24,6 +24,8 @@ #include "wine/test.h" +#define SUBCLASS_NAME "MyStatusBar" + #define expect(expected,got) ok (expected == got,"Expected %d, got %d\n",expected,got) #define expect_rect(_left,_top,_right,_bottom,got) do { RECT _rcExp = {_left, _top, _right, _bottom}; \ ok(memcmp(&_rcExp, &(got), sizeof(RECT)) == 0, "Expected rect {%d,%d, %d,%d}, got {%d,%d, %d,%d}\n", \ @@ -34,6 +36,7 @@ static HINSTANCE hinst; static WNDPROC g_status_wndproc; static RECT g_rcCreated; static HWND g_hMainWnd; +static int g_wmsize_count = 0; static HWND create_status_control(DWORD style, DWORD exstyle) { @@ -51,34 +54,46 @@ static HWND create_status_control(DWORD style, DWORD exstyle) static LRESULT WINAPI create_test_wndproc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { + LRESULT ret; + if (msg == WM_CREATE) { CREATESTRUCT *cs = (CREATESTRUCT *)lParam; - LRESULT ret = CallWindowProc(g_status_wndproc, hwnd, msg, wParam, lParam); + ret = CallWindowProc(g_status_wndproc, hwnd, msg, wParam, lParam); GetWindowRect(hwnd, &g_rcCreated); MapWindowPoints(HWND_DESKTOP, g_hMainWnd, (LPPOINT)&g_rcCreated, 2); ok(cs->x == g_rcCreated.left, "CREATESTRUCT.x modified\n"); ok(cs->y == g_rcCreated.top, "CREATESTRUCT.y modified\n"); - return ret; + } else if (msg == WM_SIZE) + { + g_wmsize_count++; + ret = CallWindowProc(g_status_wndproc, hwnd, msg, wParam, lParam); } - return CallWindowProc(g_status_wndproc, hwnd, msg, wParam, lParam); + else + ret = CallWindowProc(g_status_wndproc, hwnd, msg, wParam, lParam); + + return ret; } -static void test_create() +static void register_subclass() { WNDCLASSEX cls; - RECT rc; - HWND hwnd; cls.cbSize = sizeof(WNDCLASSEX); GetClassInfoEx(NULL, STATUSCLASSNAME, &cls); g_status_wndproc = cls.lpfnWndProc; cls.lpfnWndProc = create_test_wndproc; - cls.lpszClassName = "MyStatusBar"; + cls.lpszClassName = SUBCLASS_NAME; cls.hInstance = NULL; ok(RegisterClassEx(&cls), "RegisterClassEx failed\n"); +} - ok((hwnd = CreateWindowA("MyStatusBar", "", WS_CHILD|WS_VISIBLE|SBARS_SIZEGRIP, 0, 0, 100, 100, +static void test_create() +{ + RECT rc; + HWND hwnd; + + ok((hwnd = CreateWindowA(SUBCLASS_NAME, "", WS_CHILD|WS_VISIBLE|SBARS_SIZEGRIP, 0, 0, 100, 100, g_hMainWnd, NULL, NULL, 0)) != NULL, "CreateWindowA failed\n"); MapWindowPoints(HWND_DESKTOP, g_hMainWnd, (LPPOINT)&rc, 2); GetWindowRect(hwnd, &rc); @@ -91,6 +106,35 @@ static void test_create() DestroyWindow(hwnd); } +static void test_setfont() +{ + HFONT hFont; + RECT rc1, rc2; + HWND hwndStatus = CreateWindow(SUBCLASS_NAME, NULL, WS_CHILD|WS_VISIBLE, + 0, 0, 300, 20, g_hMainWnd, NULL, NULL, NULL); + + GetClientRect(hwndStatus, &rc1); + hFont = CreateFont(32, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, "Tahoma"); + + g_wmsize_count = 0; + SendMessage(hwndStatus, WM_SETFONT, (WPARAM)hFont, TRUE); + ok(g_wmsize_count > 0, "WM_SETFONT should issue WM_SIZE\n"); + + GetClientRect(hwndStatus, &rc2); + todo_wine expect_rect(0, 0, 672, 42, rc2); + + g_wmsize_count = 0; + SendMessage(hwndStatus, WM_SETFONT, (WPARAM)hFont, TRUE); + ok(g_wmsize_count > 0, "WM_SETFONT should issue WM_SIZE\n"); + + GetClientRect(hwndStatus, &rc2); + todo_wine expect_rect(0, 0, 672, 42, rc2); + + DestroyWindow(hwndStatus); + DeleteObject(hFont); +} + static void test_status_control(void) { HWND hWndStatus; @@ -246,6 +290,9 @@ START_TEST(status) InitCommonControls(); + register_subclass(); + test_status_control(); test_create(); + test_setfont(); }

1 0

Mikołaj Zalewski : comctl32: statusbar: Don' t issue a WM_PAINT during a WM_CREATE.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: f7cda904cd7b3fcd37aa2b42bd43ba5553b894f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7cda904cd7b3fcd37aa2b42b… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Jul 16 17:47:29 2008 +0200 comctl32: statusbar: Don't issue a WM_PAINT during a WM_CREATE. --- dlls/comctl32/status.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 33ffcbf..3744280 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -934,15 +934,13 @@ STATUSBAR_WMCreate (HWND hwnd, const CREATESTRUCTA *lpCreate) STATUSBAR_NotifyFormat(infoPtr, infoPtr->Notify, NF_REQUERY); - GetClientRect (hwnd, &rect); - InvalidateRect (hwnd, &rect, 0); - UpdateWindow(hwnd); - ZeroMemory (&nclm, sizeof(nclm)); nclm.cbSize = sizeof(nclm); SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, nclm.cbSize, &nclm, 0); infoPtr->hDefaultFont = CreateFontIndirectW (&nclm.lfStatusFont); + GetClientRect (hwnd, &rect); + /* initialize simple case */ infoPtr->part0.bound = rect; infoPtr->part0.text = 0;

1 0

Stefan Dösinger : wined3d: Test for multisampling in the template.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: d247953687fd657cb7b27564b3a9a4cf4a1f984b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d247953687fd657cb7b27564b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 5 15:59:21 2008 -0500 wined3d: Test for multisampling in the template. --- dlls/wined3d/state.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 93ce543..9caa24b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1633,19 +1633,19 @@ static void state_wrap(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DC } } -static void state_multisampleaa(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { - if( GL_SUPPORT(ARB_MULTISAMPLE) ) { - if(stateblock->renderState[WINED3DRS_MULTISAMPLEANTIALIAS]) { - glEnable(GL_MULTISAMPLE_ARB); - checkGLcall("glEnable(GL_MULTISAMPLE_ARB)"); - } else { - glDisable(GL_MULTISAMPLE_ARB); - checkGLcall("glDisable(GL_MULTISAMPLE_ARB)"); - } +static void state_msaa_w(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + if(stateblock->renderState[WINED3DRS_MULTISAMPLEANTIALIAS]) { + WARN("Multisample antialiasing not supported by gl\n"); + } +} + +static void state_msaa(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + if(stateblock->renderState[WINED3DRS_MULTISAMPLEANTIALIAS]) { + glEnable(GL_MULTISAMPLE_ARB); + checkGLcall("glEnable(GL_MULTISAMPLE_ARB)"); } else { - if(stateblock->renderState[WINED3DRS_MULTISAMPLEANTIALIAS]) { - WARN("Multisample antialiasing not supported by gl\n"); - } + glDisable(GL_MULTISAMPLE_ARB); + checkGLcall("glDisable(GL_MULTISAMPLE_ARB)"); } } @@ -3940,7 +3940,8 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_ADAPTIVETESS_Z), { STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation }, 0 }, { STATE_RENDER(WINED3DRS_ADAPTIVETESS_W), { STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation }, 0 }, { STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), { STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation }, 0 }, - { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_multisampleaa }, 0 }, + { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_msaa }, ARB_MULTISAMPLE }, + { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_msaa_w }, 0 }, { STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), { STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), state_multisampmask }, 0 }, { STATE_RENDER(WINED3DRS_COLORWRITEENABLE), { STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, 0 }, { STATE_RENDER(WINED3DRS_BLENDOP), { STATE_RENDER(WINED3DRS_BLENDOP), state_blendop }, EXT_BLEND_MINMAX },

1 0

Stefan Dösinger : wined3d: Move the point sprite support test into the template.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: 9c1b6581c660b9147b94cdfd46ee4faf3ad3f7e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c1b6581c660b9147b94cdfd4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 5 15:49:50 2008 -0500 wined3d: Move the point sprite support test into the template. --- dlls/wined3d/state.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 69bbb50..93ce543 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1586,13 +1586,14 @@ static void state_lastpixel(DWORD state, IWineD3DStateBlockImpl *stateblock, Win } } -static void state_pointsprite(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { +static void state_pointsprite_w(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { /* TODO: NV_POINT_SPRITE */ - if (!GL_SUPPORT(ARB_POINT_SPRITE)) { + if (stateblock->renderState[WINED3DRS_POINTSPRITEENABLE]) { TRACE("Point sprites not supported\n"); - return; } +} +static void state_pointsprite(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { if (stateblock->renderState[WINED3DRS_POINTSPRITEENABLE]) { glEnable(GL_POINT_SPRITE_ARB); checkGLcall("glEnable(GL_POINT_SPRITE_ARB)"); @@ -4334,7 +4335,8 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin_arb }, ARB_POINT_PARAMETERS }, { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin_ext }, EXT_POINT_PARAMETERS }, { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin_w }, 0 }, - { STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), { STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), state_pointsprite }, 0 }, + { STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), { STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), state_pointsprite }, ARB_POINT_SPRITE }, + { STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), { STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), state_pointsprite_w }, 0 }, { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, 0 }, { STATE_RENDER(WINED3DRS_POINTSCALE_A), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, 0 }, { STATE_RENDER(WINED3DRS_POINTSCALE_B), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, 0 },

1 0

Stefan Dösinger : wined3d: Split the psizemax state handler.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: 94e455343d12802d5a712d224781aaa41a65650e URL: http://source.winehq.org/git/wine.git/?a=commit;h=94e455343d12802d5a712d224… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 5 15:47:59 2008 -0500 wined3d: Split the psizemax state handler. --- dlls/wined3d/state.c | 37 +++++++++++++++++++++++++++---------- 1 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f4f5959..69bbb50 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1433,21 +1433,36 @@ static void state_psizemin_arb(DWORD state, IWineD3DStateBlockImpl *stateblock, checkGLcall("glPointParameterfARB(...)"); } -static void state_psizemax(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { +static void state_psizemax_arb(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { union { DWORD d; float f; } tmpvalue; tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MAX]; - if(GL_SUPPORT(ARB_POINT_PARAMETERS)) { - GL_EXTCALL(glPointParameterfARB)(GL_POINT_SIZE_MAX_ARB, tmpvalue.f); - checkGLcall("glPointParameterfARB(...)"); - } - else if(GL_SUPPORT(EXT_POINT_PARAMETERS)) { - GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MAX_EXT, tmpvalue.f); - checkGLcall("glPointParameterfEXT(...)"); - } else if(tmpvalue.f != 64.0) { + GL_EXTCALL(glPointParameterfARB)(GL_POINT_SIZE_MAX_ARB, tmpvalue.f); + checkGLcall("glPointParameterfARB(...)"); +} + +static void state_psizemax_ext(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + union { + DWORD d; + float f; + } tmpvalue; + + tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MAX]; + GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MAX_EXT, tmpvalue.f); + checkGLcall("glPointParameterfEXT(...)"); +} + +static void state_psizemax_w(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + union { + DWORD d; + float f; + } tmpvalue; + + tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MAX]; + if(tmpvalue.f != 64.0) { FIXME("WINED3DRS_POINTSIZE_MAX not supported on this opengl, value is %f\n", tmpvalue.f); } } @@ -4324,7 +4339,9 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_RENDER(WINED3DRS_POINTSCALE_A), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, 0 }, { STATE_RENDER(WINED3DRS_POINTSCALE_B), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, 0 }, { STATE_RENDER(WINED3DRS_POINTSCALE_C), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, 0 }, - { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_psizemax }, 0 }, + { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_psizemax_arb }, ARB_POINT_PARAMETERS }, + { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_psizemax_ext }, EXT_POINT_PARAMETERS }, + { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_psizemax_w }, 0 }, /* Samplers for NP2 texture matrix adjustions */ { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler_texmatrix }, 0 }, { STATE_SAMPLER(1), { STATE_SAMPLER(1), sampler_texmatrix }, 0 },

1 0

Stefan Dösinger : wined3d: Move the range fog support test to the template.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: 710b9a76b3469fa65ccf80ecca6e90b69e293472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=710b9a76b3469fa65ccf80ecc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 5 15:38:43 2008 -0500 wined3d: Move the range fog support test to the template. --- dlls/wined3d/state.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 529d33e..34950cc 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1186,19 +1186,19 @@ static void state_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo } } +static void state_rangefog_w(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + if(stateblock->renderState[WINED3DRS_RANGEFOGENABLE]) { + WARN("Range fog enabled, but not supported by this opengl implementation\n"); + } +} + static void state_rangefog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { if(stateblock->renderState[WINED3DRS_RANGEFOGENABLE]) { - if (GL_SUPPORT(NV_FOG_DISTANCE)) { - glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_RADIAL_NV); - checkGLcall("glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_RADIAL_NV)"); - } else { - WARN("Range fog enabled, but not supported by this opengl implementation\n"); - } + glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_RADIAL_NV); + checkGLcall("glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_RADIAL_NV)"); } else { - if (GL_SUPPORT(NV_FOG_DISTANCE)) { - glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV); - checkGLcall("glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV)"); - } + glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV); + checkGLcall("glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV)"); } } @@ -4286,7 +4286,8 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_RENDER(WINED3DRS_FOGVERTEXMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, 0 }, { STATE_RENDER(WINED3DRS_FOGCOLOR), { STATE_RENDER(WINED3DRS_FOGCOLOR), state_fogcolor }, 0 }, { STATE_RENDER(WINED3DRS_FOGDENSITY), { STATE_RENDER(WINED3DRS_FOGDENSITY), state_fogdensity }, 0 }, - { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), state_rangefog }, 0 }, + { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), state_rangefog }, NV_FOG_DISTANCE }, + { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), state_rangefog_w }, 0 }, { STATE_RENDER(WINED3DRS_CLIPPING), { STATE_RENDER(WINED3DRS_CLIPPING), state_clipping }, 0 }, { STATE_RENDER(WINED3DRS_CLIPPLANEENABLE), { STATE_RENDER(WINED3DRS_CLIPPING), state_clipping }, 0 }, { STATE_RENDER(WINED3DRS_LIGHTING), { STATE_RENDER(WINED3DRS_LIGHTING), state_lighting }, 0 },

1 0

Stefan Dösinger : wined3d: Move a few extension checks into the state template.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: df4dcc34aacd172b66be19487e87f1e3cfdbd1f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df4dcc34aacd172b66be19487… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 5 15:35:53 2008 -0500 wined3d: Move a few extension checks into the state template. --- dlls/wined3d/state.c | 53 +++++++++++++++++++++++++++++-------------------- 1 files changed, 31 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index bbd8a1d..529d33e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -451,14 +451,13 @@ static void state_blend(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D } } +static void state_blendfactor_w(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + WARN("Unsupported in local OpenGL implementation: glBlendColorEXT\n"); +} + static void state_blendfactor(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { float col[4]; - if(!GL_SUPPORT(EXT_BLEND_COLOR)) { - WARN("Unsupported in local OpenGL implementation: glBlendColorEXT\n"); - return; - } - TRACE("Setting BlendFactor to %d\n", stateblock->renderState[WINED3DRS_BLENDFACTOR]); D3DCOLORTOGLFLOAT4(stateblock->renderState[WINED3DRS_BLENDFACTOR], col); GL_EXTCALL(glBlendColorEXT (col[0],col[1],col[2],col[3])); @@ -594,15 +593,14 @@ static void state_clipping(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine } } +static void state_blendop_w(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + WARN("Unsupported in local OpenGL implementation: glBlendEquation\n"); +} + static void state_blendop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { int blendEquation = GL_FUNC_ADD; int blendEquationAlpha = GL_FUNC_ADD; - if(!GL_SUPPORT(EXT_BLEND_MINMAX)) { - WARN("Unsupported in local OpenGL implementation: glBlendEquation\n"); - return; - } - /* BLENDOPALPHA requires GL_EXT_blend_equation_separate, so make sure it is around */ if(stateblock->renderState[WINED3DRS_BLENDOPALPHA] && !GL_SUPPORT(EXT_BLEND_EQUATION_SEPARATE)) { WARN("Unsupported in local OpenGL implementation: glBlendEquationSeparateEXT\n"); @@ -868,7 +866,7 @@ state_stencil(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *c } } -static void state_stencilwrite(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { +static void state_stencilwrite2s(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { DWORD mask; if(stateblock->wineD3DDevice->stencilBufferTarget) { @@ -877,17 +875,25 @@ static void state_stencilwrite(DWORD state, IWineD3DStateBlockImpl *stateblock, mask = 0; } - if(GL_SUPPORT(EXT_STENCIL_TWO_SIDE)) { - GL_EXTCALL(glActiveStencilFaceEXT(GL_BACK)); - checkGLcall("glActiveStencilFaceEXT(GL_BACK)"); - glStencilMask(mask); - checkGLcall("glStencilMask"); - GL_EXTCALL(glActiveStencilFaceEXT(GL_FRONT)); - checkGLcall("glActiveStencilFaceEXT(GL_FRONT)"); - glStencilMask(mask); + GL_EXTCALL(glActiveStencilFaceEXT(GL_BACK)); + checkGLcall("glActiveStencilFaceEXT(GL_BACK)"); + glStencilMask(mask); + checkGLcall("glStencilMask"); + GL_EXTCALL(glActiveStencilFaceEXT(GL_FRONT)); + checkGLcall("glActiveStencilFaceEXT(GL_FRONT)"); + glStencilMask(mask); +} + +static void state_stencilwrite(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + DWORD mask; + + if(stateblock->wineD3DDevice->stencilBufferTarget) { + mask = stateblock->renderState[WINED3DRS_STENCILWRITEMASK]; } else { - glStencilMask(mask); + mask = 0; } + + glStencilMask(mask); checkGLcall("glStencilMask"); } @@ -3867,6 +3873,7 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_STENCILFUNC), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, 0 }, { STATE_RENDER(WINED3DRS_STENCILREF), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, 0 }, { STATE_RENDER(WINED3DRS_STENCILMASK), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, 0 }, + { STATE_RENDER(WINED3DRS_STENCILWRITEMASK), { STATE_RENDER(WINED3DRS_STENCILWRITEMASK), state_stencilwrite2s}, EXT_STENCIL_TWO_SIDE }, { STATE_RENDER(WINED3DRS_STENCILWRITEMASK), { STATE_RENDER(WINED3DRS_STENCILWRITEMASK), state_stencilwrite }, 0 }, { STATE_RENDER(WINED3DRS_TWOSIDEDSTENCILMODE), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, 0 }, { STATE_RENDER(WINED3DRS_CCW_STENCILFAIL), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, 0 }, @@ -3905,13 +3912,15 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_multisampleaa }, 0 }, { STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), { STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), state_multisampmask }, 0 }, { STATE_RENDER(WINED3DRS_COLORWRITEENABLE), { STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, 0 }, - { STATE_RENDER(WINED3DRS_BLENDOP), { STATE_RENDER(WINED3DRS_BLENDOP), state_blendop }, 0 }, + { STATE_RENDER(WINED3DRS_BLENDOP), { STATE_RENDER(WINED3DRS_BLENDOP), state_blendop }, EXT_BLEND_MINMAX }, + { STATE_RENDER(WINED3DRS_BLENDOP), { STATE_RENDER(WINED3DRS_BLENDOP), state_blendop_w }, 0 }, { STATE_RENDER(WINED3DRS_SCISSORTESTENABLE), { STATE_RENDER(WINED3DRS_SCISSORTESTENABLE), state_scissor }, 0 }, { STATE_RENDER(WINED3DRS_SLOPESCALEDEPTHBIAS), { STATE_RENDER(WINED3DRS_DEPTHBIAS), state_depthbias }, 0 }, { STATE_RENDER(WINED3DRS_COLORWRITEENABLE1), { STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, 0 }, { STATE_RENDER(WINED3DRS_COLORWRITEENABLE2), { STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, 0 }, { STATE_RENDER(WINED3DRS_COLORWRITEENABLE3), { STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, 0 }, - { STATE_RENDER(WINED3DRS_BLENDFACTOR), { STATE_RENDER(WINED3DRS_BLENDFACTOR), state_blendfactor }, 0 }, + { STATE_RENDER(WINED3DRS_BLENDFACTOR), { STATE_RENDER(WINED3DRS_BLENDFACTOR), state_blendfactor }, EXT_BLEND_COLOR }, + { STATE_RENDER(WINED3DRS_BLENDFACTOR), { STATE_RENDER(WINED3DRS_BLENDFACTOR), state_blendfactor_w }, 0 }, { STATE_RENDER(WINED3DRS_DEPTHBIAS), { STATE_RENDER(WINED3DRS_DEPTHBIAS), state_depthbias }, 0 }, /* Samplers */ { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler }, 0 },

1 0

Stefan Dösinger : wined3d: Split the psizemin handler.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: 7740dda1dac182f3f8dbe7b3b915f220b45949cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7740dda1dac182f3f8dbe7b3b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 5 15:45:39 2008 -0500 wined3d: Split the psizemin handler. --- dlls/wined3d/state.c | 37 +++++++++++++++++++++++++++---------- 1 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 34950cc..f4f5959 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1399,25 +1399,40 @@ static void state_normalize(DWORD state, IWineD3DStateBlockImpl *stateblock, Win } } -static void state_psizemin(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { +static void state_psizemin_w(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { union { DWORD d; float f; } tmpvalue; tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MIN]; - if(GL_SUPPORT(ARB_POINT_PARAMETERS)) { - GL_EXTCALL(glPointParameterfARB)(GL_POINT_SIZE_MIN_ARB, tmpvalue.f); - checkGLcall("glPointParameterfARB(...)"); - } - else if(GL_SUPPORT(EXT_POINT_PARAMETERS)) { - GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MIN_EXT, tmpvalue.f); - checkGLcall("glPointParameterfEXT(...)"); - } else if(tmpvalue.f != 1.0) { + if(tmpvalue.f != 1.0) { FIXME("WINED3DRS_POINTSIZE_MIN not supported on this opengl, value is %f\n", tmpvalue.f); } } +static void state_psizemin_ext(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + union { + DWORD d; + float f; + } tmpvalue; + + tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MIN]; + GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MIN_EXT, tmpvalue.f); + checkGLcall("glPointParameterfEXT(...)"); +} + +static void state_psizemin_arb(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + union { + DWORD d; + float f; + } tmpvalue; + + tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MIN]; + GL_EXTCALL(glPointParameterfARB)(GL_POINT_SIZE_MIN_ARB, tmpvalue.f); + checkGLcall("glPointParameterfARB(...)"); +} + static void state_psizemax(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { union { DWORD d; @@ -4301,7 +4316,9 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_RENDER(WINED3DRS_EMISSIVEMATERIALSOURCE), { STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }, 0 }, { STATE_RENDER(WINED3DRS_VERTEXBLEND), { STATE_RENDER(WINED3DRS_VERTEXBLEND), state_vertexblend }, 0 }, { STATE_RENDER(WINED3DRS_POINTSIZE), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, 0 }, - { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin }, 0 }, + { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin_arb }, ARB_POINT_PARAMETERS }, + { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin_ext }, EXT_POINT_PARAMETERS }, + { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin_w }, 0 }, { STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), { STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), state_pointsprite }, 0 }, { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, 0 }, { STATE_RENDER(WINED3DRS_POINTSCALE_A), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, 0 },

1 0

Stefan Dösinger : wined3d: Move an extension check into the state template.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: 3ee9de462e08967eac0942cd42d25ed01f19c5e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ee9de462e08967eac0942cd4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 5 15:23:47 2008 -0500 wined3d: Move an extension check into the state template. --- dlls/wined3d/nvidia_texture_shader.c | 106 +++++++++++++++++----------------- 1 files changed, 52 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ee9de462e08967eac094…

1 0

Stefan Dösinger : wined3d: Add extension information to the states.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: 35f33ef4091ec81995bc8bb340ee24932d709548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35f33ef4091ec81995bc8bb34… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 5 15:04:16 2008 -0500 wined3d: Add extension information to the states. This patch adds a new field to the state templates. If this extension field is != 0, then the line is only applied to the final state table if the extension is supported. Once a line is applied to the final table, all further templates for this state from the same pipeline part are ignored. This allows removing some extension checks from the state handlers, which cleans them up and saves a few CPU cycles when applying the states. --- dlls/wined3d/ati_fragment_shader.c | 228 +++--- dlls/wined3d/directx.c | 2 +- dlls/wined3d/nvidia_texture_shader.c | 464 ++++++------ dlls/wined3d/state.c | 1349 +++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 + 5 files changed, 1037 insertions(+), 1008 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35f33ef4091ec81995bc8…

1 0