August 2019 - Wine-devel - list.winehq.org

[PATCH 5/6] riched20: Clearly separate the selection setting functions.
by Huw Davies 15 Aug '19

15 Aug '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 13 ++++++++----- dlls/riched20/editor.c | 22 +++++++++++----------- dlls/riched20/editor.h | 3 ++- dlls/riched20/richole.c | 8 ++++---- dlls/riched20/txtsrv.c | 2 +- 5 files changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 54452c9241..e24937621b 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -122,8 +122,14 @@ int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how) return length; } - -int ME_SetSelection(ME_TextEditor *editor, int from, int to) +/****************************************************************** + * set_selection_cursors + * + * Updates the selection cursors. + * + * Note that this does not invalidate either the old or the new selections. + */ +int set_selection_cursors(ME_TextEditor *editor, int from, int to) { int selectionEnd = 0; const int len = ME_GetTextLength(editor); @@ -139,7 +145,6 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) { ME_SetCursorToStart(editor, &editor->pCursors[1]); ME_SetCursorToEnd(editor, &editor->pCursors[0], TRUE); - ME_InvalidateSelection(editor); return len + 1; } @@ -165,7 +170,6 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) end --; } editor->pCursors[1] = editor->pCursors[0]; - ME_Repaint(editor); } return end; } @@ -194,7 +198,6 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) { ME_SetCursorToEnd(editor, &editor->pCursors[0], FALSE); editor->pCursors[1] = editor->pCursors[0]; - ME_InvalidateSelection(editor); return len; } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 61f7a0e66b..118c64652e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1622,7 +1622,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre } else { style = editor->pBuffer->pDefaultStyle; ME_AddRefStyle(style); - ME_SetSelection(editor, 0, 0); + set_selection_cursors(editor, 0, 0); ME_InternalDeleteText(editor, &editor->pCursors[1], ME_GetTextLength(editor), FALSE); from = to = 0; @@ -1756,9 +1756,9 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre cf.dwMask = CFM_ALL2; ME_MoveCursorChars(editor, &lastcharCursor, -1, FALSE); ME_GetCharFormat(editor, &lastcharCursor, &linebreakCursor, &cf); - ME_SetSelection(editor, newto, -1); + set_selection_cursors(editor, newto, -1); ME_SetSelectionCharFormat(editor, &cf); - ME_SetSelection(editor, newto, newto); + set_selection_cursors(editor, newto, newto); ME_MoveCursorChars(editor, &linebreakCursor, -linebreakSize, FALSE); ME_GetTextW(editor, lastchar, 2, &linebreakCursor, linebreakSize, FALSE, FALSE); @@ -1781,7 +1781,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre ERR("EM_STREAMIN without SF_TEXT or SF_RTF\n"); /* put the cursor at the top */ if (!(format & SFF_SELECTION)) - ME_SetSelection(editor, 0, 0); + set_selection_cursors(editor, 0, 0); ME_CursorFromCharOfs(editor, from, &start); ME_UpdateLinkAttribute(editor, &start, to - from); } @@ -2147,14 +2147,14 @@ static int ME_GetTextRange(ME_TextEditor *editor, WCHAR *strText, } } -static int handle_EM_EXSETSEL( ME_TextEditor *editor, int to, int from ) +int set_selection( ME_TextEditor *editor, int to, int from ) { int end; TRACE("%d - %d\n", to, from ); ME_InvalidateSelection( editor ); - end = ME_SetSelection( editor, to, from ); + end = set_selection_cursors( editor, to, from ); ME_InvalidateSelection( editor ); update_caret( editor ); ME_SendSelChange( editor ); @@ -2682,7 +2682,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) case 'A': if (ctrl_is_down) { - handle_EM_EXSETSEL( editor, 0, -1 ); + set_selection( editor, 0, -1 ); return TRUE; } break; @@ -3796,7 +3796,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_SETSEL: { - return handle_EM_EXSETSEL( editor, wParam, lParam ); + return set_selection( editor, wParam, lParam ); } case EM_SETSCROLLPOS: { @@ -3821,7 +3821,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { CHARRANGE range = *(CHARRANGE *)lParam; - return handle_EM_EXSETSEL( editor, range.cpMin, range.cpMax ); + return set_selection( editor, range.cpMin, range.cpMax ); } case EM_SHOWSCROLLBAR: { @@ -4122,7 +4122,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, TRACE("WM_SETTEXT - NULL\n"); ME_SetCursorToStart(editor, &cursor); ME_UpdateLinkAttribute(editor, &cursor, INT_MAX); - ME_SetSelection(editor, 0, 0); + set_selection_cursors(editor, 0, 0); editor->nModifyStep = 0; ME_CommitUndo(editor); ME_EmptyUndoStack(editor); @@ -4813,7 +4813,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, HeapFree(GetProcessHeap(), 0, lpCompStr); if (dwIndex == GCS_COMPSTR) - ME_SetSelection(editor,editor->imeStartIndex, + set_selection_cursors(editor,editor->imeStartIndex, editor->imeStartIndex + dwBufLen/sizeof(WCHAR)); } ME_ReleaseStyle(style); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index f56d2a25de..800f5882a7 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -149,7 +149,7 @@ void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod) DECLSPEC_ /* caret.c */ void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; -int ME_SetSelection(ME_TextEditor *editor, int from, int to) DECLSPEC_HIDDEN; +int set_selection_cursors(ME_TextEditor *editor, int from, int to) DECLSPEC_HIDDEN; BOOL ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) DECLSPEC_HIDDEN; void hide_caret(ME_TextEditor *ed) DECLSPEC_HIDDEN; void show_caret(ME_TextEditor *ed) DECLSPEC_HIDDEN; @@ -255,6 +255,7 @@ void ME_RTFSpecialCharHook(struct _RTF_Info *info) DECLSPEC_HIDDEN; void ME_StreamInFill(ME_InStream *stream) DECLSPEC_HIDDEN; extern BOOL me_debug DECLSPEC_HIDDEN; void ME_ReplaceSel(ME_TextEditor *editor, BOOL can_undo, const WCHAR *str, int len) DECLSPEC_HIDDEN; +int set_selection( ME_TextEditor *editor, int to, int from ) DECLSPEC_HIDDEN; /* table.c */ BOOL ME_IsInTable(ME_DisplayItem *pItem) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 5a102a7607..4e8d450add 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2149,7 +2149,7 @@ static HRESULT WINAPI ITextRange_fnSelect(ITextRange *me) if (!This->child.reole) return CO_E_RELEASED; - ME_SetSelection(This->child.reole->editor, This->start, This->end); + set_selection(This->child.reole->editor, This->start, This->end); return S_OK; } @@ -4649,7 +4649,7 @@ static HRESULT WINAPI ITextSelection_fnSetStart(ITextSelection *me, LONG value) ME_GetSelectionOfs(This->reOle->editor, &start, &end); hr = textrange_setstart(This->reOle, value, &start, &end); if (hr == S_OK) - ME_SetSelection(This->reOle->editor, start, end); + set_selection(This->reOle->editor, start, end); return hr; } @@ -4684,7 +4684,7 @@ static HRESULT WINAPI ITextSelection_fnSetEnd(ITextSelection *me, LONG value) ME_GetSelectionOfs(This->reOle->editor, &start, &end); hr = textrange_setend(This->reOle, value, &start, &end); if (hr == S_OK) - ME_SetSelection(This->reOle->editor, start, end); + set_selection(This->reOle->editor, start, end); return hr; } @@ -4803,7 +4803,7 @@ static HRESULT WINAPI ITextSelection_fnCollapse(ITextSelection *me, LONG bStart) ME_GetSelectionOfs(This->reOle->editor, &start, &end); hres = range_Collapse(bStart, &start, &end); if (SUCCEEDED(hres)) - ME_SetSelection(This->reOle->editor, start, end); + set_selection(This->reOle->editor, start, end); return hres; } diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 9ce1d47601..12761621c4 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -290,7 +290,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxSetText(ITextServices *iface, LPC ME_InternalDeleteText(This->editor, &cursor, ME_GetTextLength(This->editor), FALSE); if(pszText) ME_InsertTextFromCursor(This->editor, 0, pszText, -1, This->editor->pBuffer->pDefaultStyle); - ME_SetSelection(This->editor, 0, 0); + set_selection_cursors(This->editor, 0, 0); This->editor->nModifyStep = 0; OleFlushClipboard(); ME_EmptyUndoStack(This->editor); -- 2.18.0

2 1

[PATCH 4/6] riched20: Don't force an update after an arrow key press.
by Huw Davies 15 Aug '19

15 Aug '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 0951bb9617..54452c9241 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1635,7 +1635,6 @@ ME_ArrowKey(ME_TextEditor *editor, int nVKey, BOOL extend, BOOL ctrl) *p = tmp_curs; ME_InvalidateSelection(editor); - ME_Repaint(editor); hide_caret(editor); ME_EnsureVisible(editor, &tmp_curs); update_caret(editor); -- 2.18.0

2 1

[PATCH 2/6] riched20: Don't force an update when styles are changed.
by Huw Davies 15 Aug '19

15 Aug '19

The appropriate region has already been invalidated and will be repainted in due course. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d0034fc317..61f7a0e66b 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3578,7 +3578,6 @@ static LRESULT handle_EM_SETCHARFORMAT( ME_TextEditor *editor, WPARAM flags, con { ME_WrapMarkedParagraphs( editor ); ME_UpdateScrollBar( editor ); - ME_Repaint( editor ); } return 1; } @@ -3730,7 +3729,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_CommitUndo(editor); ME_WrapMarkedParagraphs(editor); ME_UpdateScrollBar(editor); - ME_Repaint(editor); return TRUE; } @@ -4005,7 +4003,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, BOOL result = ME_SetSelectionParaFormat(editor, (PARAFORMAT2 *)lParam); ME_WrapMarkedParagraphs(editor); ME_UpdateScrollBar(editor); - ME_Repaint(editor); ME_CommitUndo(editor); return result; } -- 2.18.0

1 0

[PATCH 1/6] riched20: Move handling of EM_SETCHARFORMAT to a helper function.
by Huw Davies 15 Aug '19

15 Aug '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 91 +++++++++++++++++++++++------------------- 1 file changed, 51 insertions(+), 40 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1b78eab1da..d0034fc317 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3532,6 +3532,56 @@ static LRESULT ME_WmCreate(ME_TextEditor *editor, LPARAM lParam, BOOL unicode) return 0; } +static LRESULT handle_EM_SETCHARFORMAT( ME_TextEditor *editor, WPARAM flags, const CHARFORMAT2W *fmt_in ) +{ + CHARFORMAT2W fmt; + BOOL changed = TRUE; + ME_Cursor start, end; + + if (!cfany_to_cf2w( &fmt, fmt_in )) return 0; + + if (flags & SCF_ALL) + { + if (editor->mode & TM_PLAINTEXT) + { + ME_SetDefaultCharFormat( editor, &fmt ); + } + else + { + ME_SetCursorToStart( editor, &start ); + ME_SetCharFormat( editor, &start, NULL, &fmt ); + editor->nModifyStep = 1; + } + } + else if (flags & SCF_SELECTION) + { + if (editor->mode & TM_PLAINTEXT) return 0; + if (flags & SCF_WORD) + { + end = editor->pCursors[0]; + ME_MoveCursorWords( editor, &end, +1 ); + start = end; + ME_MoveCursorWords( editor, &start, -1 ); + ME_SetCharFormat( editor, &start, &end, &fmt ); + } + changed = ME_IsSelection( editor ); + ME_SetSelectionCharFormat( editor, &fmt ); + if (changed) editor->nModifyStep = 1; + } + else /* SCF_DEFAULT */ + { + ME_SetDefaultCharFormat( editor, &fmt ); + } + + ME_CommitUndo( editor ); + if (changed) + { + ME_WrapMarkedParagraphs( editor ); + ME_UpdateScrollBar( editor ); + ME_Repaint( editor ); + } + return 1; +} #define UNSUPPORTED_MSG(e) \ case e: \ @@ -3933,46 +3983,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case EM_GETEVENTMASK: return editor->nEventMask; case EM_SETCHARFORMAT: - { - CHARFORMAT2W p; - BOOL bRepaint = TRUE; - if (!cfany_to_cf2w(&p, (CHARFORMAT2W *)lParam)) - return 0; - if (wParam & SCF_ALL) { - if (editor->mode & TM_PLAINTEXT) { - ME_SetDefaultCharFormat(editor, &p); - } else { - ME_Cursor start; - ME_SetCursorToStart(editor, &start); - ME_SetCharFormat(editor, &start, NULL, &p); - editor->nModifyStep = 1; - } - } else if (wParam & SCF_SELECTION) { - if (editor->mode & TM_PLAINTEXT) - return 0; - if (wParam & SCF_WORD) { - ME_Cursor start; - ME_Cursor end = editor->pCursors[0]; - ME_MoveCursorWords(editor, &end, +1); - start = end; - ME_MoveCursorWords(editor, &start, -1); - ME_SetCharFormat(editor, &start, &end, &p); - } - bRepaint = ME_IsSelection(editor); - ME_SetSelectionCharFormat(editor, &p); - if (bRepaint) editor->nModifyStep = 1; - } else { /* SCF_DEFAULT */ - ME_SetDefaultCharFormat(editor, &p); - } - ME_CommitUndo(editor); - if (bRepaint) - { - ME_WrapMarkedParagraphs(editor); - ME_UpdateScrollBar(editor); - ME_Repaint(editor); - } - return 1; - } + return handle_EM_SETCHARFORMAT( editor, wParam, (CHARFORMAT2W *)lParam ); case EM_GETCHARFORMAT: { CHARFORMAT2W tmp, *dst = (CHARFORMAT2W *)lParam; -- 2.18.0

1 0

[PATCH 5/5] wined3d: Implement 3D texture clears in surface_cpu_blt_colour_fill().
by Henri Verbeet 15 Aug '19

15 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 73cf87d1d64..00278d5ca8b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2119,13 +2119,13 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, { struct wined3d_device *device = view->resource->device; struct wined3d_context_gl *context_gl = NULL; + unsigned int x, y, z, w, h, d, bpp, level; struct wined3d_context *context = NULL; struct wined3d_texture *texture; struct wined3d_bo_address data; - unsigned int x, y, w, h, bpp; struct wined3d_map_desc map; DWORD map_binding; - BYTE *row; + uint8_t *dst; DWORD c; TRACE("view %p, box %s, colour %s.\n", view, debug_box(box), debug_color(colour)); @@ -2152,18 +2152,28 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, context_gl = wined3d_context_gl(context); } + texture = texture_from_resource(view->resource); + level = view->sub_resource_idx % texture->level_count; + c = wined3d_format_convert_from_float(view->format, colour); bpp = view->format->byte_count; w = min(box->right, view->width) - min(box->left, view->width); h = min(box->bottom, view->height) - min(box->top, view->height); + if (view->resource->type != WINED3D_RTYPE_TEXTURE_3D) + { + d = 1; + } + else + { + d = wined3d_texture_get_level_depth(texture, level); + d = min(box->back, d) - min(box->front, d); + } - texture = texture_from_resource(view->resource); map_binding = texture->resource.map_binding; if (!wined3d_texture_load_location(texture, view->sub_resource_idx, context, map_binding)) ERR("Failed to load the sub-resource into %s.\n", wined3d_debug_location(map_binding)); wined3d_texture_invalidate_location(texture, view->sub_resource_idx, ~map_binding); - wined3d_texture_get_pitch(texture, view->sub_resource_idx % texture->level_count, - &map.row_pitch, &map.slice_pitch); + wined3d_texture_get_pitch(texture, level, &map.row_pitch, &map.slice_pitch); wined3d_texture_get_memory(texture, view->sub_resource_idx, &data, map_binding); map.data = wined3d_context_gl_map_bo_address(context_gl, &data, texture->sub_resources[view->sub_resource_idx].size, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_WRITE); @@ -2190,12 +2200,12 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, case 3: { - row = map.data; - for (x = 0; x < w; ++x, row += 3) + dst = map.data; + for (x = 0; x < w; ++x, dst += 3) { - row[0] = (c ) & 0xff; - row[1] = (c >> 8) & 0xff; - row[2] = (c >> 16) & 0xff; + dst[0] = (c ) & 0xff; + dst[1] = (c >> 8) & 0xff; + dst[2] = (c >> 16) & 0xff; } break; } @@ -2212,11 +2222,18 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, return; } - row = map.data; + dst = map.data; for (y = 1; y < h; ++y) { - row += map.row_pitch; - memcpy(row, map.data, w * bpp); + dst += map.row_pitch; + memcpy(dst, map.data, w * bpp); + } + + dst = map.data; + for (z = 1; z < d; ++z) + { + dst += map.slice_pitch; + memcpy(dst, map.data, w * h * bpp); } wined3d_context_gl_unmap_bo_address(context_gl, &data, GL_PIXEL_UNPACK_BUFFER); @@ -2246,7 +2263,7 @@ static void cpu_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de box.right = min(clear_rects[i].right, draw_rect->right); box.bottom = min(clear_rects[i].bottom, draw_rect->bottom); box.front = 0; - box.back = 1; + box.back = ~0u; if (box.left >= box.right || box.top >= box.bottom) continue; -- 2.11.0

1 0

[PATCH 4/5] wined3d: Set WINED3D_BLT_RAW for raw blits in cpu_blitter_blit().
by Henri Verbeet 15 Aug '19

15 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7009df23de7..73cf87d1d64 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2287,7 +2287,9 @@ static DWORD cpu_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit { case WINED3D_BLIT_OP_COLOR_BLIT: case WINED3D_BLIT_OP_DEPTH_BLIT: + break; case WINED3D_BLIT_OP_RAW_BLIT: + flags |= WINED3D_BLT_RAW; break; case WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST: flags |= WINED3D_BLT_ALPHA_TEST; -- 2.11.0

1 0

[PATCH 3/5] wined3d: Make the adapter responsible for flushes.
by Henri Verbeet 15 Aug '19

15 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 11 +++++++++++ dlls/wined3d/adapter_vk.c | 6 ++++++ dlls/wined3d/cs.c | 9 ++++----- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 65372169b16..61bdc8acd3c 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5105,6 +5105,16 @@ static void adapter_gl_destroy_query(struct wined3d_query *query) wined3d_cs_destroy_object(query->device->cs, wined3d_query_gl_destroy_object, query); } +static void adapter_gl_flush_context(struct wined3d_context *context) +{ + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + + TRACE("context_gl %p.\n", context_gl); + + if (context_gl->valid) + context_gl->gl_info->gl_ops.gl.p_glFlush(); +} + static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = { adapter_gl_destroy, @@ -5132,6 +5142,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = adapter_gl_destroy_sampler, adapter_gl_create_query, adapter_gl_destroy_query, + adapter_gl_flush_context, }; static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 4e79a7afb6b..bb98810fd5d 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -773,6 +773,11 @@ static void adapter_vk_destroy_query(struct wined3d_query *query) TRACE("query %p.\n", query); } +static void adapter_vk_flush_context(struct wined3d_context *context) +{ + TRACE("context %p.\n", context); +} + static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = { adapter_vk_destroy, @@ -800,6 +805,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = adapter_vk_destroy_sampler, adapter_vk_create_query, adapter_vk_destroy_query, + adapter_vk_flush_context, }; static unsigned int wined3d_get_wine_vk_version(void) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index a076253ce1b..32f9954a039 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1008,12 +1008,11 @@ void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, GLenum primitive_type, static void wined3d_cs_exec_flush(struct wined3d_cs *cs, const void *data) { - struct wined3d_context_gl *context_gl; + struct wined3d_context *context; - context_gl = wined3d_context_gl(context_acquire(cs->device, NULL, 0)); - if (context_gl->valid) - context_gl->gl_info->gl_ops.gl.p_glFlush(); - context_release(&context_gl->c); + context = context_acquire(cs->device, NULL, 0); + cs->device->adapter->adapter_ops->adapter_flush_context(context); + context_release(context); } void wined3d_cs_emit_flush(struct wined3d_cs *cs) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 17c5181222b..ecff67dfba7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2582,6 +2582,11 @@ static void adapter_no3d_destroy_query(struct wined3d_query *query) TRACE("query %p.\n", query); } +static void adapter_no3d_flush_context(struct wined3d_context *context) +{ + TRACE("context %p.\n", context); +} + static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = { adapter_no3d_destroy, @@ -2609,6 +2614,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = adapter_no3d_destroy_sampler, adapter_no3d_create_query, adapter_no3d_destroy_query, + adapter_no3d_flush_context, }; static void wined3d_adapter_no3d_init_d3d_info(struct wined3d_adapter *adapter, unsigned int wined3d_creation_flags) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 07ac9824010..3446a848bb7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2816,6 +2816,7 @@ struct wined3d_adapter_ops HRESULT (*adapter_create_query)(struct wined3d_device *device, enum wined3d_query_type type, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query); void (*adapter_destroy_query)(struct wined3d_query *query); + void (*adapter_flush_context)(struct wined3d_context *context); }; /* The adapter structure */ -- 2.11.0

1 0

[PATCH 2/5] wined3d: Make the adapter responsible for query creation and destruction.
by Henri Verbeet 15 Aug '19

15 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/adapter_vk.c | 16 ++++++++++++++++ dlls/wined3d/directx.c | 16 ++++++++++++++++ dlls/wined3d/query.c | 35 ++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 8 ++++++++ 5 files changed, 94 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index f8030bb3574..65372169b16 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5069,6 +5069,42 @@ static void adapter_gl_destroy_sampler(struct wined3d_sampler *sampler) wined3d_cs_destroy_object(sampler->device->cs, wined3d_sampler_gl_destroy_object, sampler_gl); } +static HRESULT adapter_gl_create_query(struct wined3d_device *device, enum wined3d_query_type type, + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query) +{ + TRACE("device %p, type %#x, parent %p, parent_ops %p, query %p.\n", + device, type, parent, parent_ops, query); + + return wined3d_query_gl_create(device, type, parent, parent_ops, query); +} + +static void wined3d_query_gl_destroy_object(void *object) +{ + struct wined3d_query *query = object; + + if (query->buffer_object) + { + struct wined3d_context *context; + + context = context_acquire(query->device, NULL, 0); + wined3d_query_gl_destroy_buffer_object(wined3d_context_gl(context), query); + context_release(context); + } + + /* Queries are specific to the GL context that created them. Not + * deleting the query will obviously leak it, but that's still better + * than potentially deleting a different query with the same id in this + * context, and (still) leaking the actual query. */ + query->query_ops->query_destroy(query); +} + +static void adapter_gl_destroy_query(struct wined3d_query *query) +{ + TRACE("query %p.\n", query); + + wined3d_cs_destroy_object(query->device->cs, wined3d_query_gl_destroy_object, query); +} + static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = { adapter_gl_destroy, @@ -5094,6 +5130,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = adapter_gl_destroy_unordered_access_view, adapter_gl_create_sampler, adapter_gl_destroy_sampler, + adapter_gl_create_query, + adapter_gl_destroy_query, }; static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index afe222a031e..4e79a7afb6b 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -759,6 +759,20 @@ static void adapter_vk_destroy_sampler(struct wined3d_sampler *sampler) wined3d_cs_destroy_object(sampler->device->cs, heap_free, sampler); } +static HRESULT adapter_vk_create_query(struct wined3d_device *device, enum wined3d_query_type type, + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query) +{ + TRACE("device %p, type %#x, parent %p, parent_ops %p, query %p.\n", + device, type, parent, parent_ops, query); + + return WINED3DERR_NOTAVAILABLE; +} + +static void adapter_vk_destroy_query(struct wined3d_query *query) +{ + TRACE("query %p.\n", query); +} + static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = { adapter_vk_destroy, @@ -784,6 +798,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = adapter_vk_destroy_unordered_access_view, adapter_vk_create_sampler, adapter_vk_destroy_sampler, + adapter_vk_create_query, + adapter_vk_destroy_query, }; static unsigned int wined3d_get_wine_vk_version(void) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4c9773a0b26..17c5181222b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2568,6 +2568,20 @@ static void adapter_no3d_destroy_sampler(struct wined3d_sampler *sampler) TRACE("sampler %p.\n", sampler); } +static HRESULT adapter_no3d_create_query(struct wined3d_device *device, enum wined3d_query_type type, + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query) +{ + TRACE("device %p, type %#x, parent %p, parent_ops %p, query %p.\n", + device, type, parent, parent_ops, query); + + return WINED3DERR_NOTAVAILABLE; +} + +static void adapter_no3d_destroy_query(struct wined3d_query *query) +{ + TRACE("query %p.\n", query); +} + static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = { adapter_no3d_destroy, @@ -2593,6 +2607,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = adapter_no3d_destroy_unordered_access_view, adapter_no3d_create_sampler, adapter_no3d_destroy_sampler, + adapter_no3d_create_query, + adapter_no3d_destroy_query, }; static void wined3d_adapter_no3d_init_d3d_info(struct wined3d_adapter *adapter, unsigned int wined3d_creation_flags) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index ec20a68440d..66965020b49 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -54,7 +54,7 @@ static void wined3d_query_create_buffer_object(struct wined3d_context_gl *contex query->buffer_object = buffer_object; } -static void wined3d_query_destroy_buffer_object(struct wined3d_context_gl *context_gl, struct wined3d_query *query) +void wined3d_query_gl_destroy_buffer_object(struct wined3d_context_gl *context_gl, struct wined3d_query *query) { const struct wined3d_gl_info *gl_info = context_gl->gl_info; @@ -93,7 +93,7 @@ static BOOL wined3d_query_buffer_queue_result(struct wined3d_context_gl *context if (wined3d_query_buffer_is_valid(query)) wined3d_query_buffer_invalidate(query); else - wined3d_query_destroy_buffer_object(context_gl, query); + wined3d_query_gl_destroy_buffer_object(context_gl, query); } if (!query->buffer_object) @@ -430,21 +430,6 @@ static void wined3d_query_destroy_object(void *object) if (!list_empty(&query->poll_list_entry)) list_remove(&query->poll_list_entry); - - if (query->buffer_object) - { - struct wined3d_context *context; - - context = context_acquire(query->device, NULL, 0); - wined3d_query_destroy_buffer_object(wined3d_context_gl(context), query); - context_release(context); - } - - /* Queries are specific to the GL context that created them. Not - * deleting the query will obviously leak it, but that's still better - * than potentially deleting a different query with the same id in this - * context, and (still) leaking the actual query. */ - query->query_ops->query_destroy(query); } ULONG CDECL wined3d_query_decref(struct wined3d_query *query) @@ -455,8 +440,11 @@ ULONG CDECL wined3d_query_decref(struct wined3d_query *query) if (!refcount) { + struct wined3d_device *device = query->device; + query->parent_ops->wined3d_object_destroyed(query->parent); - wined3d_cs_destroy_object(query->device->cs, wined3d_query_destroy_object, query); + wined3d_cs_destroy_object(device->cs, wined3d_query_destroy_object, query); + device->adapter->adapter_ops->adapter_destroy_query(query); } return refcount; @@ -1332,7 +1320,7 @@ static HRESULT wined3d_pipeline_query_create(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_query_create(struct wined3d_device *device, enum wined3d_query_type type, +HRESULT wined3d_query_gl_create(struct wined3d_device *device, enum wined3d_query_type type, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query) { TRACE("device %p, type %#x, parent %p, parent_ops %p, query %p.\n", @@ -1368,3 +1356,12 @@ HRESULT CDECL wined3d_query_create(struct wined3d_device *device, enum wined3d_q return WINED3DERR_NOTAVAILABLE; } } + +HRESULT CDECL wined3d_query_create(struct wined3d_device *device, enum wined3d_query_type type, + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query) +{ + TRACE("device %p, type %#x, parent %p, parent_ops %p, query %p.\n", + device, type, parent, parent_ops, query); + + return device->adapter->adapter_ops->adapter_create_query(device, type, parent, parent_ops, query); +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 04379247378..07ac9824010 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1785,6 +1785,11 @@ struct wined3d_query UINT64 *map_ptr; }; +HRESULT wined3d_query_gl_create(struct wined3d_device *device, enum wined3d_query_type type, void *parent, + const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query) DECLSPEC_HIDDEN; +void wined3d_query_gl_destroy_buffer_object(struct wined3d_context_gl *context_gl, + struct wined3d_query *query) DECLSPEC_HIDDEN; + struct wined3d_event_query { struct wined3d_query query; @@ -2808,6 +2813,9 @@ struct wined3d_adapter_ops HRESULT (*adapter_create_sampler)(struct wined3d_device *device, const struct wined3d_sampler_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_sampler **sampler); void (*adapter_destroy_sampler)(struct wined3d_sampler *sampler); + HRESULT (*adapter_create_query)(struct wined3d_device *device, enum wined3d_query_type type, + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query); + void (*adapter_destroy_query)(struct wined3d_query *query); }; /* The adapter structure */ -- 2.11.0

1 0

[PATCH 1/5] wined3d: Introduce a separate structure for OpenGL sampler information.
by Henri Verbeet 15 Aug '19

15 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 14 +++++++----- dlls/wined3d/context.c | 3 ++- dlls/wined3d/sampler.c | 50 ++++++++++++++++++++++-------------------- dlls/wined3d/state.c | 2 +- dlls/wined3d/view.c | 6 ++--- dlls/wined3d/wined3d_private.h | 20 ++++++++++++----- 6 files changed, 55 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 7c645aebfd6..f8030bb3574 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5027,7 +5027,7 @@ static void adapter_gl_destroy_unordered_access_view(struct wined3d_unordered_ac static HRESULT adapter_gl_create_sampler(struct wined3d_device *device, const struct wined3d_sampler_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_sampler **sampler) { - struct wined3d_sampler *sampler_gl; + struct wined3d_sampler_gl *sampler_gl; TRACE("device %p, desc %p, parent %p, parent_ops %p, sampler %p.\n", device, desc, parent, parent_ops, sampler); @@ -5038,20 +5038,20 @@ static HRESULT adapter_gl_create_sampler(struct wined3d_device *device, const st wined3d_sampler_gl_init(sampler_gl, device, desc, parent, parent_ops); TRACE("Created sampler %p.\n", sampler_gl); - *sampler = sampler_gl; + *sampler = &sampler_gl->s; return WINED3D_OK; } static void wined3d_sampler_gl_destroy_object(void *object) { - struct wined3d_sampler *sampler_gl = object; + struct wined3d_sampler_gl *sampler_gl = object; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; if (sampler_gl->name) { - context = context_acquire(sampler_gl->device, NULL, 0); + context = context_acquire(sampler_gl->s.device, NULL, 0); gl_info = wined3d_context_gl(context)->gl_info; GL_EXTCALL(glDeleteSamplers(1, &sampler_gl->name)); context_release(context); @@ -5062,9 +5062,11 @@ static void wined3d_sampler_gl_destroy_object(void *object) static void adapter_gl_destroy_sampler(struct wined3d_sampler *sampler) { - TRACE("sampler %p.\n", sampler); + struct wined3d_sampler_gl *sampler_gl = wined3d_sampler_gl(sampler); - wined3d_cs_destroy_object(sampler->device->cs, wined3d_sampler_gl_destroy_object, sampler); + TRACE("sampler_gl %p.\n", sampler_gl); + + wined3d_cs_destroy_object(sampler->device->cs, wined3d_sampler_gl_destroy_object, sampler_gl); } static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2d22409d50b..672efa7aef2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3797,7 +3797,8 @@ static void wined3d_context_gl_bind_shader_resources(struct wined3d_context_gl * sampler = device->default_sampler; else if (!(sampler = state->sampler[shader_type][entry->sampler_idx])) sampler = device->null_sampler; - wined3d_shader_resource_view_gl_bind(wined3d_shader_resource_view_gl(view), bind_idx, sampler, context_gl); + wined3d_shader_resource_view_gl_bind(wined3d_shader_resource_view_gl(view), + bind_idx, wined3d_sampler_gl(sampler), context_gl); } } diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 5a9170b6d4d..c4f4d3eec30 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -70,53 +70,55 @@ static void wined3d_sampler_init(struct wined3d_sampler *sampler, struct wined3d static void wined3d_sampler_gl_cs_init(void *object) { - struct wined3d_sampler *sampler = object; + struct wined3d_sampler_gl *sampler_gl = object; const struct wined3d_sampler_desc *desc; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; + GLuint name; - context = context_acquire(sampler->device, NULL, 0); + context = context_acquire(sampler_gl->s.device, NULL, 0); gl_info = wined3d_context_gl(context)->gl_info; - desc = &sampler->desc; - GL_EXTCALL(glGenSamplers(1, &sampler->name)); - GL_EXTCALL(glSamplerParameteri(sampler->name, GL_TEXTURE_WRAP_S, + desc = &sampler_gl->s.desc; + GL_EXTCALL(glGenSamplers(1, &name)); + GL_EXTCALL(glSamplerParameteri(name, GL_TEXTURE_WRAP_S, gl_info->wrap_lookup[desc->address_u - WINED3D_TADDRESS_WRAP])); - GL_EXTCALL(glSamplerParameteri(sampler->name, GL_TEXTURE_WRAP_T, + GL_EXTCALL(glSamplerParameteri(name, GL_TEXTURE_WRAP_T, gl_info->wrap_lookup[desc->address_v - WINED3D_TADDRESS_WRAP])); - GL_EXTCALL(glSamplerParameteri(sampler->name, GL_TEXTURE_WRAP_R, + GL_EXTCALL(glSamplerParameteri(name, GL_TEXTURE_WRAP_R, gl_info->wrap_lookup[desc->address_w - WINED3D_TADDRESS_WRAP])); - GL_EXTCALL(glSamplerParameterfv(sampler->name, GL_TEXTURE_BORDER_COLOR, &desc->border_color[0])); - GL_EXTCALL(glSamplerParameteri(sampler->name, GL_TEXTURE_MAG_FILTER, + GL_EXTCALL(glSamplerParameterfv(name, GL_TEXTURE_BORDER_COLOR, &desc->border_color[0])); + GL_EXTCALL(glSamplerParameteri(name, GL_TEXTURE_MAG_FILTER, wined3d_gl_mag_filter(desc->mag_filter))); - GL_EXTCALL(glSamplerParameteri(sampler->name, GL_TEXTURE_MIN_FILTER, + GL_EXTCALL(glSamplerParameteri(name, GL_TEXTURE_MIN_FILTER, wined3d_gl_min_mip_filter(desc->min_filter, desc->mip_filter))); - GL_EXTCALL(glSamplerParameterf(sampler->name, GL_TEXTURE_LOD_BIAS, desc->lod_bias)); - GL_EXTCALL(glSamplerParameterf(sampler->name, GL_TEXTURE_MIN_LOD, desc->min_lod)); - GL_EXTCALL(glSamplerParameterf(sampler->name, GL_TEXTURE_MAX_LOD, desc->max_lod)); + GL_EXTCALL(glSamplerParameterf(name, GL_TEXTURE_LOD_BIAS, desc->lod_bias)); + GL_EXTCALL(glSamplerParameterf(name, GL_TEXTURE_MIN_LOD, desc->min_lod)); + GL_EXTCALL(glSamplerParameterf(name, GL_TEXTURE_MAX_LOD, desc->max_lod)); if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) - GL_EXTCALL(glSamplerParameteri(sampler->name, GL_TEXTURE_MAX_ANISOTROPY, desc->max_anisotropy)); + GL_EXTCALL(glSamplerParameteri(name, GL_TEXTURE_MAX_ANISOTROPY, desc->max_anisotropy)); if (desc->compare) - GL_EXTCALL(glSamplerParameteri(sampler->name, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE)); - GL_EXTCALL(glSamplerParameteri(sampler->name, GL_TEXTURE_COMPARE_FUNC, + GL_EXTCALL(glSamplerParameteri(name, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE)); + GL_EXTCALL(glSamplerParameteri(name, GL_TEXTURE_COMPARE_FUNC, wined3d_gl_compare_func(desc->comparison_func))); if ((context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) && gl_info->supported[EXT_TEXTURE_SRGB_DECODE] && !desc->srgb_decode) - GL_EXTCALL(glSamplerParameteri(sampler->name, GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT)); + GL_EXTCALL(glSamplerParameteri(name, GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT)); checkGLcall("sampler creation"); - TRACE("Created sampler %u.\n", sampler->name); + TRACE("Created sampler %u.\n", name); + sampler_gl->name = name; context_release(context); } -void wined3d_sampler_gl_init(struct wined3d_sampler *sampler_gl, struct wined3d_device *device, +void wined3d_sampler_gl_init(struct wined3d_sampler_gl *sampler_gl, struct wined3d_device *device, const struct wined3d_sampler_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { TRACE("sampler_gl %p, device %p, desc %p, parent %p, parent_ops %p.\n", sampler_gl, device, desc, parent, parent_ops); - wined3d_sampler_init(sampler_gl, device, desc, parent, parent_ops); + wined3d_sampler_init(&sampler_gl->s, device, desc, parent, parent_ops); if (device->adapter->gl_info.supported[ARB_SAMPLER_OBJECTS]) wined3d_cs_init_object(device->cs, wined3d_sampler_gl_cs_init, sampler_gl); @@ -176,19 +178,19 @@ static void texture_gl_apply_base_level(struct wined3d_texture_gl *texture_gl, } /* This function relies on the correct texture being bound and loaded. */ -void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, +void wined3d_sampler_gl_bind(struct wined3d_sampler_gl *sampler_gl, unsigned int unit, struct wined3d_texture_gl *texture_gl, const struct wined3d_context_gl *context_gl) { const struct wined3d_gl_info *gl_info = context_gl->gl_info; if (gl_info->supported[ARB_SAMPLER_OBJECTS]) { - GL_EXTCALL(glBindSampler(unit, sampler->name)); + GL_EXTCALL(glBindSampler(unit, sampler_gl->name)); checkGLcall("bind sampler"); } else if (texture_gl) { - wined3d_texture_gl_apply_sampler_desc(texture_gl, &sampler->desc, context_gl); + wined3d_texture_gl_apply_sampler_desc(texture_gl, &sampler_gl->s.desc, context_gl); } else { @@ -196,5 +198,5 @@ void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, } if (texture_gl) - texture_gl_apply_base_level(texture_gl, &sampler->desc, gl_info); + texture_gl_apply_base_level(texture_gl, &sampler_gl->s.desc, gl_info); } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6df5a6d0190..4cdca277f63 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3639,7 +3639,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state } } - wined3d_sampler_bind(sampler, mapped_stage, texture_gl, context_gl); + wined3d_sampler_gl_bind(wined3d_sampler_gl(sampler), mapped_stage, texture_gl, context_gl); /* Trigger shader constant reloading (for NP2 texcoord fixup) */ if (!(texture_gl->t.flags & WINED3D_TEXTURE_POW2_MAT_IDENT)) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 43b4ac58f17..45ec39fbd21 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -818,7 +818,7 @@ HRESULT CDECL wined3d_shader_resource_view_create(const struct wined3d_view_desc } void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl *view_gl, - unsigned int unit, struct wined3d_sampler *sampler, struct wined3d_context_gl *context_gl) + unsigned int unit, struct wined3d_sampler_gl *sampler_gl, struct wined3d_context_gl *context_gl) { const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_texture_gl *texture_gl; @@ -828,7 +828,7 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl if (view_gl->gl_view.name) { wined3d_context_gl_bind_texture(context_gl, view_gl->gl_view.target, view_gl->gl_view.name); - wined3d_sampler_bind(sampler, unit, NULL, context_gl); + wined3d_sampler_gl_bind(sampler_gl, unit, NULL, context_gl); return; } @@ -840,7 +840,7 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl texture_gl = wined3d_texture_gl(wined3d_texture_from_resource(view_gl->v.resource)); wined3d_texture_gl_bind(texture_gl, context_gl, FALSE); - wined3d_sampler_bind(sampler, unit, texture_gl, context_gl); + wined3d_sampler_gl_bind(sampler_gl, unit, texture_gl, context_gl); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 05657764e61..04379247378 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3793,17 +3793,27 @@ struct wined3d_sampler { struct wine_rb_entry entry; LONG refcount; - GLuint name; struct wined3d_device *device; void *parent; const struct wined3d_parent_ops *parent_ops; struct wined3d_sampler_desc desc; }; -void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, - struct wined3d_texture_gl *texture_gl, const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +struct wined3d_sampler_gl +{ + struct wined3d_sampler s; + + GLuint name; +}; -void wined3d_sampler_gl_init(struct wined3d_sampler *sampler_gl, +static inline struct wined3d_sampler_gl *wined3d_sampler_gl(struct wined3d_sampler *sampler) +{ + return CONTAINING_RECORD(sampler, struct wined3d_sampler_gl, s); +} + +void wined3d_sampler_gl_bind(struct wined3d_sampler_gl *sampler_gl, unsigned int unit, + struct wined3d_texture_gl *texture_gl, const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +void wined3d_sampler_gl_init(struct wined3d_sampler_gl *sampler_gl, struct wined3d_device *device, const struct wined3d_sampler_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; @@ -4291,7 +4301,7 @@ static inline struct wined3d_shader_resource_view_gl *wined3d_shader_resource_vi } void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl *view_gl, unsigned int unit, - struct wined3d_sampler *sampler, struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; + struct wined3d_sampler_gl *sampler_gl, struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; HRESULT wined3d_shader_resource_view_gl_init(struct wined3d_shader_resource_view_gl *view_gl, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 1/5] widl: Introduce type_iface_get_async_iface().
by Zebediah Figura 14 Aug '19

14 Aug '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- tools/widl/header.c | 6 +++--- tools/widl/parser.y | 2 +- tools/widl/proxy.c | 12 ++++++------ tools/widl/typegen.c | 6 +++--- tools/widl/typetree.h | 7 +++++++ tools/widl/widl.c | 6 +++--- 6 files changed, 23 insertions(+), 16 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index a862a72b52..f4bf13aca8 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1651,8 +1651,8 @@ static void write_forward_decls(FILE *header, const statement_list_t *stmts) if (is_object(iface) || is_attr(iface->attrs, ATTR_DISPINTERFACE)) { write_forward(header, iface); - if (iface->details.iface->async_iface) - write_forward(header, iface->details.iface->async_iface); + if (type_iface_get_async_iface(iface)) + write_forward(header, type_iface_get_async_iface(iface)); } } else if (type_get_type(stmt->u.type) == TYPE_COCLASS) @@ -1688,7 +1688,7 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons if (type_get_type(stmt->u.type) == TYPE_INTERFACE) { type_t *iface = stmt->u.type; - type_t *async_iface = iface->details.iface->async_iface; + type_t *async_iface = type_iface_get_async_iface(iface); if (is_object(iface)) is_object_interface++; if (is_attr(stmt->u.type->attrs, ATTR_DISPINTERFACE) || is_object(stmt->u.type)) { diff --git a/tools/widl/parser.y b/tools/widl/parser.y index daff825771..e39d801464 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2809,7 +2809,7 @@ static void check_async_uuid(type_t *iface) inherit = iface->details.iface->inherit; if (inherit && strcmp(inherit->name, "IUnknown")) - inherit = inherit->details.iface->async_iface; + inherit = type_iface_get_async_iface(inherit); if (!inherit) error_loc("async_uuid applied to an interface with incompatible parent\n"); diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 466c46219f..22c045d788 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -739,7 +739,7 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) print_proxy( "{\n"); indent++; print_proxy( "%s_%s\n", - iface->details.iface->async_iface == iface ? "CStdAsyncStubBuffer" : "CStdStubBuffer", + type_iface_get_async_iface(iface) == iface ? "CStdAsyncStubBuffer" : "CStdStubBuffer", need_delegation_indirect(iface) ? "DELEGATING_METHODS" : "METHODS"); indent--; print_proxy( "}\n"); @@ -840,8 +840,8 @@ static void write_proxy_stmts(const statement_list_t *stmts, unsigned int *proc_ if (need_proxy(iface)) { write_proxy(iface, proc_offset); - if (iface->details.iface->async_iface) - write_proxy(iface->details.iface->async_iface, proc_offset); + if (type_iface_get_async_iface(iface)) + write_proxy(type_iface_get_async_iface(iface), proc_offset); } } } @@ -870,9 +870,9 @@ static void build_iface_list( const statement_list_t *stmts, type_t **ifaces[], { *ifaces = xrealloc( *ifaces, (*count + 1) * sizeof(**ifaces) ); (*ifaces)[(*count)++] = iface; - if (iface->details.iface->async_iface) + if (type_iface_get_async_iface(iface)) { - iface = iface->details.iface->async_iface; + iface = type_iface_get_async_iface(iface); *ifaces = xrealloc( *ifaces, (*count + 1) * sizeof(**ifaces) ); (*ifaces)[(*count)++] = iface; } @@ -1012,7 +1012,7 @@ static void write_proxy_routines(const statement_list_t *stmts) table_version = get_stub_mode() == MODE_Oif ? 2 : 1; for (i = 0; i < count; i++) { - if (interfaces[i]->details.iface->async_iface != interfaces[i]) continue; + if (type_iface_get_async_iface(interfaces[i]) != interfaces[i]) continue; if (table_version != 6) { fprintf(proxy, "static const IID *_AsyncInterfaceTable[] =\n"); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 86611aed68..47d12f59d1 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1394,7 +1394,7 @@ static void write_proc_func_header( FILE *file, int indent, const type_t *iface, if (is_attr( func->attrs, ATTR_NOTIFY )) ext_flags |= 0x08; /* HasNotify */ if (is_attr( func->attrs, ATTR_NOTIFYFLAG )) ext_flags |= 0x10; /* HasNotify2 */ - if (iface == iface->details.iface->async_iface) oi2_flags |= 0x20; + if (iface == type_iface_get_async_iface(iface)) oi2_flags |= 0x20; size = get_function_buffer_size( func, PASS_IN ); print_file( file, indent, "NdrFcShort(0x%x),\t/* client buffer = %u */\n", size, size ); @@ -1493,8 +1493,8 @@ static void for_each_iface(const statement_list_t *stmts, iface = stmt->u.type; if (!pred(iface)) continue; proc(iface, file, indent, offset); - if (iface->details.iface->async_iface) - proc(iface->details.iface->async_iface, file, indent, offset); + if (type_iface_get_async_iface(iface)) + proc(type_iface_get_async_iface(iface), file, indent, offset); } } diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 22232fc0a7..4eb0a0a57f 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -162,6 +162,13 @@ static inline type_t *type_iface_get_inherit(const type_t *type) return type->details.iface->inherit; } +static inline type_t *type_iface_get_async_iface(const type_t *type) +{ + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_INTERFACE); + return type->details.iface->async_iface; +} + static inline var_list_t *type_dispiface_get_props(const type_t *type) { type = type_get_real_type(type); diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 0bcf67ba73..1620dfdb3a 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -494,10 +494,10 @@ static void write_id_data_stmts(const statement_list_t *stmts) uuid = get_attrp(type->attrs, ATTR_UUID); write_id_guid(idfile, "IID", is_attr(type->attrs, ATTR_DISPINTERFACE) ? "DIID" : "IID", type->name, uuid); - if (type->details.iface->async_iface) + if (type_iface_get_async_iface(type)) { - uuid = get_attrp(type->details.iface->async_iface->attrs, ATTR_UUID); - write_id_guid(idfile, "IID", "IID", type->details.iface->async_iface->name, uuid); + uuid = get_attrp(type_iface_get_async_iface(type)->attrs, ATTR_UUID); + write_id_guid(idfile, "IID", "IID", type_iface_get_async_iface(type)->name, uuid); } } else if (type_get_type(type) == TYPE_COCLASS) -- 2.22.0

1 4