January 2015 - Wine-Commits

Nikolay Sivov : dwrite: Initial support of cluster metrics computation.
by Alexandre Julliard Jan. 20, 2015

Jan. 20, 2015

Module: wine Branch: master Commit: 0ee49eb4c882552a0a2ab17e24bd8efe8086d610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ee49eb4c882552a0a2ab17e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 12 00:03:31 2015 +0300 dwrite: Initial support of cluster metrics computation. --- dlls/dwrite/layout.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 89 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index beb97b3..785ded8 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -134,6 +134,9 @@ struct dwrite_textlayout { DWRITE_LINE_BREAKPOINT *nominal_breakpoints; DWRITE_LINE_BREAKPOINT *actual_breakpoints; + DWRITE_CLUSTER_METRICS *clusters; + UINT32 clusters_count; + /* gdi-compatible layout specifics */ BOOL gdicompatible; FLOAT pixels_per_dip; @@ -206,6 +209,12 @@ static inline struct dwrite_typography *impl_from_IDWriteTypography(IDWriteTypog return CONTAINING_RECORD(iface, struct dwrite_typography, IDWriteTypography_iface); } +static inline const char *debugstr_run(const struct layout_run *run) +{ + return wine_dbg_sprintf("[%u,%u]", run->descr.textPosition, run->descr.textPosition + + run->descr.stringLength); +} + static struct layout_run *alloc_layout_run(void) { struct layout_run *ret; @@ -254,7 +263,7 @@ static void free_layout_runs(struct dwrite_textlayout *layout) } } -/* should only be called for ranges with inline objects */ +/* Used to resolve break condition by forcing stronger condition over weaker. */ static inline DWRITE_BREAK_CONDITION override_break_condition(DWRITE_BREAK_CONDITION existingbreak, DWRITE_BREAK_CONDITION newbreak) { switch (existingbreak) { @@ -273,6 +282,7 @@ static inline DWRITE_BREAK_CONDITION override_break_condition(DWRITE_BREAK_CONDI return existingbreak; } +/* Actual breakpoint data gets updated with break condition required by inline object set for range 'cur'. */ static HRESULT layout_update_breakpoints_range(struct dwrite_textlayout *layout, const struct layout_range *cur) { DWRITE_BREAK_CONDITION before, after; @@ -320,14 +330,75 @@ static HRESULT layout_update_breakpoints_range(struct dwrite_textlayout *layout, static struct layout_range *get_layout_range_by_pos(struct dwrite_textlayout *layout, UINT32 pos); +static void init_cluster_metrics(const struct layout_run *run, DWRITE_CLUSTER_METRICS *metrics) +{ + metrics->width = 0.0; + metrics->length = 1; + metrics->canWrapLineAfter = FALSE; + metrics->isWhitespace = FALSE; + metrics->isNewline = FALSE; + metrics->isSoftHyphen = FALSE; + metrics->isRightToLeft = run->run.bidiLevel & 1; + metrics->padding = 0; +} + +/* + + All clusters in a 'run' will be added to 'layout' data, starting at index pointed to by 'cluster'. + On return 'cluster' is updated to point to next metrics struct to be filled in on next call. + +*/ +static void layout_set_cluster_metrics(struct dwrite_textlayout *layout, const struct layout_run *run, UINT32 *cluster) +{ + DWRITE_CLUSTER_METRICS *metrics = &layout->clusters[*cluster]; + UINT16 glyph; + UINT32 i; + + glyph = run->descr.clusterMap[0]; + init_cluster_metrics(run, metrics); + + for (i = 0; i < run->descr.stringLength; i++) { + BOOL newcluster = glyph != run->descr.clusterMap[i]; + + /* add new cluster on starting glyph change or simply when run is over */ + if (newcluster || i == run->descr.stringLength - 1) { + UINT8 breakcondition; + UINT16 j; + + for (j = glyph; j < run->descr.clusterMap[i]; j++) + metrics->width += run->run.glyphAdvances[j]; + + /* FIXME: also set isWhitespace, isNewline and isSoftHyphen */ + breakcondition = newcluster ? layout->nominal_breakpoints[i].breakConditionBefore : + layout->nominal_breakpoints[i].breakConditionAfter; + metrics->canWrapLineAfter = breakcondition == DWRITE_BREAK_CONDITION_CAN_BREAK || + breakcondition == DWRITE_BREAK_CONDITION_MUST_BREAK; + + /* advance to next cluster */ + glyph = run->descr.clusterMap[i]; + *cluster += 1; + metrics++; + init_cluster_metrics(run, metrics); + } + else + metrics->length++; + } +} + static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) { IDWriteTextAnalyzer *analyzer; struct layout_range *range; struct layout_run *run; + UINT32 cluster = 0; HRESULT hr; free_layout_runs(layout); + heap_free(layout->clusters); + layout->clusters_count = 0; + layout->clusters = heap_alloc(layout->len*sizeof(DWRITE_CLUSTER_METRICS)); + if (!layout->clusters) + return E_OUTOFMEMORY; hr = get_textanalyzer(&analyzer); if (FAILED(hr)) @@ -368,8 +439,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) hr = IDWriteFontCollection_FindFamilyName(range->collection, range->fontfamily, &index, &exists); if (FAILED(hr) || !exists) { - WARN("[%u,%u]: family %s not found in collection %p\n", run->descr.textPosition, run->descr.textPosition+run->descr.stringLength, - debugstr_w(range->fontfamily), range->collection); + WARN("%s: family %s not found in collection %p\n", debugstr_run(run), debugstr_w(range->fontfamily), range->collection); continue; } @@ -380,7 +450,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) hr = IDWriteFontFamily_GetFirstMatchingFont(family, range->weight, range->stretch, range->style, &font); IDWriteFontFamily_Release(family); if (FAILED(hr)) { - WARN("[%u,%u]: failed to get a matching font\n", run->descr.textPosition, run->descr.textPosition+run->descr.stringLength); + WARN("%s: failed to get a matching font\n", debugstr_run(run)); continue; } @@ -428,7 +498,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) if (FAILED(hr)) { heap_free(text_props); heap_free(glyph_props); - WARN("[%u,%u]: shaping failed 0x%08x\n", run->descr.textPosition, run->descr.textPosition+run->descr.stringLength, hr); + WARN("%s: shaping failed 0x%08x\n", debugstr_run(run), hr); continue; } @@ -456,12 +526,14 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) heap_free(text_props); heap_free(glyph_props); if (FAILED(hr)) - WARN("[%u,%u]: failed to get glyph placement info, 0x%08x\n", run->descr.textPosition, - run->descr.textPosition+run->descr.stringLength, hr); + WARN("%s: failed to get glyph placement info, 0x%08x\n", debugstr_run(run), hr); run->run.glyphAdvances = run->advances; run->run.glyphOffsets = run->offsets; + /* now set cluster metrics */ + layout_set_cluster_metrics(layout, run, &cluster); + continue; memerr: @@ -478,6 +550,9 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) break; } + if (hr == S_OK) + layout->clusters_count = cluster + 1; + IDWriteTextAnalyzer_Release(analyzer); return hr; } @@ -1006,6 +1081,7 @@ static ULONG WINAPI dwritetextlayout_Release(IDWriteTextLayout2 *iface) release_format_data(&This->format); heap_free(This->nominal_breakpoints); heap_free(This->actual_breakpoints); + heap_free(This->clusters); heap_free(This->str); heap_free(This); } @@ -2127,6 +2203,8 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * layout->recompute = TRUE; layout->nominal_breakpoints = NULL; layout->actual_breakpoints = NULL; + layout->clusters_count = 0; + layout->clusters = NULL; list_init(&layout->runs); list_init(&layout->ranges); memset(&layout->format, 0, sizeof(layout->format)); @@ -2147,8 +2225,10 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * goto fail; range = alloc_layout_range(layout, &r); - if (!range) - return E_OUTOFMEMORY; + if (!range) { + hr = E_OUTOFMEMORY; + goto fail; + } list_add_head(&layout->ranges, &range->entry); return S_OK;

1 0

Jacek Caban : mshtml: Removed TRACEs from dispex_query_interface.
by Alexandre Julliard Jan. 20, 2015

Jan. 20, 2015

Module: wine Branch: master Commit: 7cbb683705487de184f11fb2f33b461dae3160da URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cbb683705487de184f11fb2f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 20 16:24:27 2015 +0100 mshtml: Removed TRACEs from dispex_query_interface. --- dlls/mshtml/dispex.c | 23 +++++++---------------- dlls/mshtml/htmlelem.c | 2 ++ dlls/mshtml/htmlelemcol.c | 2 ++ dlls/mshtml/main.c | 2 ++ dlls/mshtml/mshtml_private.h | 3 +++ 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index a97f09d..ff4e28a 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -649,8 +649,9 @@ static HRESULT WINAPI Function_QueryInterface(IUnknown *iface, REFIID riid, void { func_disp_t *This = impl_from_IUnknown(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IUnknown_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; @@ -1669,26 +1670,16 @@ static IDispatchExVtbl DispatchExVtbl = { BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv) { - static const IID IID_UndocumentedScriptIface = - {0x719c3050,0xf9d3,0x11cf,{0xa4,0x93,0x00,0x40,0x05,0x23,0xa8,0xa0}}; - static const IID IID_IDispatchJS = - {0x719c3050,0xf9d3,0x11cf,{0xa4,0x93,0x00,0x40,0x05,0x23,0xa8,0xa6}}; - - if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); + if(IsEqualGUID(&IID_IDispatch, riid)) *ppv = &This->IDispatchEx_iface; - }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { - TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); + else if(IsEqualGUID(&IID_IDispatchEx, riid)) *ppv = &This->IDispatchEx_iface; - }else if(IsEqualGUID(&IID_IDispatchJS, riid)) { - TRACE("(%p)->(IID_IDispatchJS %p) returning NULL\n", This, ppv); + else if(IsEqualGUID(&IID_IDispatchJS, riid)) *ppv = NULL; - }else if(IsEqualGUID(&IID_UndocumentedScriptIface, riid)) { - TRACE("(%p)->(IID_UndocumentedScriptIface %p) returning NULL\n", This, ppv); + else if(IsEqualGUID(&IID_UndocumentedScriptIface, riid)) *ppv = NULL; - }else { + else return FALSE; - } if(*ppv) IUnknown_AddRef((IUnknown*)*ppv); diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index da7c0f7..8120761 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -4276,6 +4276,8 @@ static HRESULT WINAPI HTMLAttributeCollection_QueryInterface(IHTMLAttributeColle { HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + if(IsEqualGUID(&IID_IUnknown, riid)) { *ppv = &This->IHTMLAttributeCollection_iface; }else if(IsEqualGUID(&IID_IHTMLAttributeCollection, riid)) { diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 1542926..ca5e1d5 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -218,6 +218,8 @@ static HRESULT WINAPI HTMLElementCollection_QueryInterface(IHTMLElementCollectio { HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + if(IsEqualGUID(&IID_IUnknown, riid)) { *ppv = &This->IHTMLElementCollection_iface; }else if(IsEqualGUID(&IID_IHTMLElementCollection, riid)) { diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index e5cf325..8d9f1ac 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -545,6 +545,8 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_ICustomDoc); X(IID_IDispatch); X(IID_IDispatchEx); + X(IID_IDispatchJS); + X(IID_UndocumentedScriptIface); X(IID_IEnumConnections); X(IID_IEnumVARIANT); X(IID_IHlinkTarget); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1f391a4..a53fcec 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1061,6 +1061,9 @@ DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); DEFINE_GUID(CLSID_JScript, 0xf414c260,0x6ac0,0x11cf, 0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58); DEFINE_GUID(CLSID_VBScript, 0xb54f3741,0x5b07,0x11cf, 0xa4,0xb0,0x00,0xaa,0x00,0x4a,0x55,0xe8); +DEFINE_GUID(IID_UndocumentedScriptIface,0x719c3050,0xf9d3,0x11cf,0xa4,0x93,0x00,0x40,0x05,0x23,0xa8,0xa0); +DEFINE_GUID(IID_IDispatchJS,0x719c3050,0xf9d3,0x11cf,0xa4,0x93,0x00,0x40,0x05,0x23,0xa8,0xa6); + /* memory allocation functions */ static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len)

1 0

Matteo Bruni : wined3d: Use the core version of glDrawElementsInstanced.
by Alexandre Julliard Jan. 20, 2015

Jan. 20, 2015

Module: wine Branch: master Commit: aff0c389ccc9df72624f5f42b7d09319c3011d2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aff0c389ccc9df72624f5f42b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jan 20 15:47:07 2015 +0100 wined3d: Use the core version of glDrawElementsInstanced. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/drawprim.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b596eac..60269f1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2884,6 +2884,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glCompressedTexSubImage3D) /* OpenGL 1.3 */ USE_GL_FUNC(glDeleteBuffers) /* OpenGL 1.5 */ USE_GL_FUNC(glDrawBuffers) /* OpenGL 2.0 */ + USE_GL_FUNC(glDrawElementsInstanced) /* OpenGL 3.1 */ USE_GL_FUNC(glGenBuffers) /* OpenGL 1.5 */ USE_GL_FUNC(glGetBufferSubData) /* OpenGL 1.5 */ USE_GL_FUNC(glGetCompressedTexImage) /* OpenGL 1.3 */ @@ -2919,6 +2920,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glCompressedTexSubImage3D, glCompressedTexSubImage3DARB); MAP_GL_FUNCTION(glDeleteBuffers, glDeleteBuffersARB); MAP_GL_FUNCTION(glDrawBuffers, glDrawBuffersARB); + MAP_GL_FUNCTION(glDrawElementsInstanced, glDrawElementsInstancedARB); MAP_GL_FUNCTION(glGenBuffers, glGenBuffersARB); MAP_GL_FUNCTION(glGetBufferSubData, glGetBufferSubDataARB); MAP_GL_FUNCTION(glGetCompressedTexImage, glGetCompressedTexImageARB); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 265942c..12b03f6 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -60,9 +60,9 @@ static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primit } else { - GL_EXTCALL(glDrawElementsInstancedARB(primitive_type, count, idxtype, + GL_EXTCALL(glDrawElementsInstanced(primitive_type, count, idxtype, (const char *)idx_data + (idx_size * start_idx), instance_count)); - checkGLcall("glDrawElementsInstancedARB"); + checkGLcall("glDrawElementsInstanced"); } } }

1 0

Matteo Bruni : wined3d: Use the core gl*CompressedTex* functions.
by Alexandre Julliard Jan. 20, 2015

Jan. 20, 2015

Module: wine Branch: master Commit: 6bb32e47ff1daa0645c4d3ada4e239791c4a8404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bb32e47ff1daa0645c4d3ada… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jan 20 15:47:05 2015 +0100 wined3d: Use the core gl*CompressedTex* functions. --- dlls/wined3d/directx.c | 10 ++++++++++ dlls/wined3d/surface.c | 22 +++++++++++----------- dlls/wined3d/texture.c | 4 ++-- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a91090e..2566f9e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2878,9 +2878,14 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glBufferData) /* OpenGL 1.5 */ USE_GL_FUNC(glBufferSubData) /* OpenGL 1.5 */ USE_GL_FUNC(glColorMaski) /* OpenGL 3.0 */ + USE_GL_FUNC(glCompressedTexImage2D) /* OpenGL 1.3 */ + USE_GL_FUNC(glCompressedTexImage3D) /* OpenGL 1.3 */ + USE_GL_FUNC(glCompressedTexSubImage2D) /* OpenGL 1.3 */ + USE_GL_FUNC(glCompressedTexSubImage3D) /* OpenGL 1.3 */ USE_GL_FUNC(glDeleteBuffers) /* OpenGL 1.5 */ USE_GL_FUNC(glGenBuffers) /* OpenGL 1.5 */ USE_GL_FUNC(glGetBufferSubData) /* OpenGL 1.5 */ + USE_GL_FUNC(glGetCompressedTexImage) /* OpenGL 1.3 */ USE_GL_FUNC(glMapBuffer) /* OpenGL 1.5 */ USE_GL_FUNC(glUnmapBuffer) /* OpenGL 1.5 */ #undef USE_GL_FUNC @@ -2907,9 +2912,14 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glBufferData, glBufferDataARB); MAP_GL_FUNCTION(glBufferSubData, glBufferSubDataARB); MAP_GL_FUNCTION(glColorMaski, glColorMaskIndexedEXT); + MAP_GL_FUNCTION(glCompressedTexImage2D, glCompressedTexImage2DARB); + MAP_GL_FUNCTION(glCompressedTexImage3D, glCompressedTexImage3DARB); + MAP_GL_FUNCTION(glCompressedTexSubImage2D, glCompressedTexSubImage2DARB); + MAP_GL_FUNCTION(glCompressedTexSubImage3D, glCompressedTexSubImage3DARB); MAP_GL_FUNCTION(glDeleteBuffers, glDeleteBuffersARB); MAP_GL_FUNCTION(glGenBuffers, glGenBuffersARB); MAP_GL_FUNCTION(glGetBufferSubData, glGetBufferSubDataARB); + MAP_GL_FUNCTION(glGetCompressedTexImage, glGetCompressedTexImageARB); MAP_GL_FUNCTION(glMapBuffer, glMapBufferARB); MAP_GL_FUNCTION(glUnmapBuffer, glUnmapBufferARB); #undef MAP_GL_FUNCTION diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6b73fa8..43dfca0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1334,23 +1334,23 @@ static void surface_download_data(struct wined3d_surface *surface, const struct if (format->flags & WINED3DFMT_FLAG_COMPRESSED) { - TRACE("(%p) : Calling glGetCompressedTexImageARB level %d, format %#x, type %#x, data %p.\n", + TRACE("(%p) : Calling glGetCompressedTexImage level %d, format %#x, type %#x, data %p.\n", surface, surface->texture_level, format->glFormat, format->glType, data.addr); if (data.buffer_object) { GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, data.buffer_object)); checkGLcall("glBindBuffer"); - GL_EXTCALL(glGetCompressedTexImageARB(surface->texture_target, surface->texture_level, NULL)); - checkGLcall("glGetCompressedTexImageARB"); + GL_EXTCALL(glGetCompressedTexImage(surface->texture_target, surface->texture_level, NULL)); + checkGLcall("glGetCompressedTexImage"); GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); checkGLcall("glBindBuffer"); } else { - GL_EXTCALL(glGetCompressedTexImageARB(surface->texture_target, + GL_EXTCALL(glGetCompressedTexImage(surface->texture_target, surface->texture_level, data.addr)); - checkGLcall("glGetCompressedTexImageARB"); + checkGLcall("glGetCompressedTexImage"); } } else @@ -1515,30 +1515,30 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w else internal = format->glInternal; - TRACE("glCompressedTexSubImage2DARB, target %#x, level %d, x %d, y %d, w %d, h %d, " + TRACE("glCompressedTexSubImage2D, target %#x, level %d, x %d, y %d, w %d, h %d, " "format %#x, image_size %#x, addr %p.\n", surface->texture_target, surface->texture_level, dst_point->x, dst_point->y, update_w, update_h, internal, row_count * row_length, addr); if (row_length == src_pitch) { - GL_EXTCALL(glCompressedTexSubImage2DARB(surface->texture_target, surface->texture_level, + GL_EXTCALL(glCompressedTexSubImage2D(surface->texture_target, surface->texture_level, dst_point->x, dst_point->y, update_w, update_h, internal, row_count * row_length, addr)); } else { UINT row, y; - /* glCompressedTexSubImage2DARB() ignores pixel store state, so we - * can't use the unpack row length like below. */ + /* glCompressedTexSubImage2D() ignores pixel store state, so we + * can't use the unpack row length like for glTexSubImage2D. */ for (row = 0, y = dst_point->y; row < row_count; ++row) { - GL_EXTCALL(glCompressedTexSubImage2DARB(surface->texture_target, surface->texture_level, + GL_EXTCALL(glCompressedTexSubImage2D(surface->texture_target, surface->texture_level, dst_point->x, y, update_w, format->block_height, internal, row_length, addr)); y += format->block_height; addr += src_pitch; } } - checkGLcall("glCompressedTexSubImage2DARB"); + checkGLcall("glCompressedTexSubImage2D"); } else { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9138470..06e5681 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -885,9 +885,9 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi if (format->flags & WINED3DFMT_FLAG_COMPRESSED && mem) { - GL_EXTCALL(glCompressedTexImage2DARB(surface->texture_target, surface->texture_level, + GL_EXTCALL(glCompressedTexImage2D(surface->texture_target, surface->texture_level, internal, width, height, 0, surface->resource.size, mem)); - checkGLcall("glCompressedTexImage2DARB"); + checkGLcall("glCompressedTexImage2D"); } else {

1 0

Changhui Liu : gdiplus: Fix get_graphics_bounds when window origin point changed.
by Alexandre Julliard Jan. 19, 2015

Jan. 19, 2015

Module: wine Branch: master Commit: 5fa7402a36ee0e1238434598ff589e3de42f80cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fa7402a36ee0e1238434598f… Author: Changhui Liu <liuchanghui(a)linuxdeepin.com> Date: Mon Dec 22 16:43:47 2014 +0800 gdiplus: Fix get_graphics_bounds when window origin point changed. --- dlls/gdiplus/graphics.c | 3 +-- dlls/gdiplus/tests/graphics.c | 56 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 840d866..68a4ee5 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2029,8 +2029,7 @@ static GpStatus get_graphics_bounds(GpGraphics* graphics, GpRectF* rect) rect->Height = GetDeviceCaps(graphics->hdc, VERTRES); } - if (graphics->hdc && - (GetMapMode(graphics->hdc) != MM_TEXT || GetGraphicsMode(graphics->hdc) != GM_COMPATIBLE)) + if (graphics->hdc) { POINT points[2]; diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 8ce372b..fd4cf80 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -5548,6 +5548,61 @@ static void test_GdipFillRectangles(void) ReleaseDC(hwnd, hdc); } +static void test_GdipGetVisibleClipBounds_memoryDC(void) +{ + HDC hdc,dc; + HBITMAP bmp; + HGDIOBJ old; + RECT rect; + POINT pt; + int width = 0; + int height = 0; + GpGraphics* graphics = NULL; + GpRect boundRect; + GpStatus status; + + ok(GetClientRect(hwnd, &rect), "GetClientRect should have succeeded\n"); + width = rect.right - rect.left; + height = rect.bottom - rect.top; + + dc = GetDC(hwnd); + hdc = CreateCompatibleDC ( dc ); + bmp = CreateCompatibleBitmap ( dc, width, height ); + old = SelectObject (hdc, bmp); + + /*change the window origin is the key test point*/ + SetWindowOrgEx (hdc, rect.left+10, rect.top+10, &pt); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = GdipGetVisibleClipBoundsI(graphics, &boundRect); + expect(Ok, status); + + ok(boundRect.X==rect.left+10 && + boundRect.Y==rect.top+10 && + boundRect.Width==width && + boundRect.Height==height, "Expected GdipGetVisibleClipBoundsI ok\n"); + + status = GdipSetClipRectI(graphics, 0, 0, width, height, CombineModeReplace); + expect(Ok, status); + + status = GdipGetVisibleClipBoundsI(graphics, &boundRect); + expect(Ok, status); + + ok(boundRect.X==rect.left+10 && + boundRect.Y==rect.top+10 && + boundRect.Width==width-10 && + boundRect.Height==height-10, "Expected GdipGetVisibleClipBoundsI ok\n"); + + GdipDeleteGraphics(graphics); + + SelectObject (hdc, old); + DeleteObject (bmp); + DeleteDC (hdc); + ReleaseDC(hwnd, dc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -5619,6 +5674,7 @@ START_TEST(graphics) test_alpha_hdc(); test_bitmapfromgraphics(); test_GdipFillRectangles(); + test_GdipGetVisibleClipBounds_memoryDC(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0

Bruno Jesus : user32: Allocate memory based on HICON instead of DWORD to fix 64 bit problems.
by Alexandre Julliard Jan. 19, 2015

Jan. 19, 2015

Module: wine Branch: master Commit: da8bb1c4a5565b332159c8b9ee3d3b4378b80e57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8bb1c4a5565b332159c8b9e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jan 17 20:51:07 2015 -0200 user32: Allocate memory based on HICON instead of DWORD to fix 64 bit problems. --- dlls/user32/cursoricon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 3c31894..8504bdc 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1165,7 +1165,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, cursor = alloc_icon_handle( TRUE, header.num_steps ); if (!cursor) return 0; - frames = HeapAlloc( GetProcessHeap(), 0, sizeof(DWORD)*header.num_frames ); + frames = HeapAlloc( GetProcessHeap(), 0, sizeof(*frames) * header.num_frames ); if (!frames) { free_icon_handle( cursor );

1 0

Henri Verbeet : wined3d: Properly cleanup samplers on wined3d_device_reset () / wined3d_device_uninit_3d().
by Alexandre Julliard Jan. 19, 2015

Jan. 19, 2015

Module: wine Branch: master Commit: 525696fe6c4c54888255783cd1be4439ae700fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=525696fe6c4c54888255783cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 19 13:44:12 2015 +0100 wined3d: Properly cleanup samplers on wined3d_device_reset() / wined3d_device_uninit_3d(). --- dlls/wined3d/device.c | 9 ++++----- include/wine/rbtree.h | 8 ++++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 29ce04f..f640c9e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1032,9 +1032,8 @@ err_out: static void device_free_sampler(struct wine_rb_entry *entry, void *context) { struct wined3d_sampler *sampler = WINE_RB_ENTRY_VALUE(entry, struct wined3d_sampler, entry); - struct wined3d_device *device = context; - wine_rb_remove(&device->samplers, &sampler->desc); + wined3d_sampler_decref(sampler); } HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) @@ -1071,7 +1070,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) resource->resource_ops->resource_unload(resource); } - wine_rb_for_each_entry(&device->samplers, device_free_sampler, device); + wine_rb_clear(&device->samplers, device_free_sampler, NULL); /* Destroy the depth blt resources, they will be invalid after the reset. Also free shader * private data, it might contain opengl pointers @@ -4632,6 +4631,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, device->exStyle = exStyle; } + wine_rb_clear(&device->samplers, device_free_sampler, NULL); + if (reset_state) { TRACE("Resetting stateblock.\n"); @@ -4677,8 +4678,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, swapchain_update_render_to_fbo(swapchain); swapchain_update_draw_bindings(swapchain); - wine_rb_for_each_entry(&device->samplers, device_free_sampler, device); - if (reset_state && device->d3d_initialized) hr = create_primary_opengl_context(device, swapchain); diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h index 2276e30..13452d9 100644 --- a/include/wine/rbtree.h +++ b/include/wine/rbtree.h @@ -220,12 +220,16 @@ static inline void wine_rb_for_each_entry(struct wine_rb_tree *tree, wine_rb_tra wine_rb_postorder(tree, callback, context); } -static inline void wine_rb_destroy(struct wine_rb_tree *tree, wine_rb_traverse_func_t *callback, void *context) +static inline void wine_rb_clear(struct wine_rb_tree *tree, wine_rb_traverse_func_t *callback, void *context) { /* Note that we use postorder here because the callback will likely free the entry. */ if (callback) wine_rb_postorder(tree, callback, context); - tree->root = NULL; +} + +static inline void wine_rb_destroy(struct wine_rb_tree *tree, wine_rb_traverse_func_t *callback, void *context) +{ + wine_rb_clear(tree, callback, context); tree->functions->free(tree->stack.entries); }

1 0

Henri Verbeet : wined3d: Use the same flags for wined3d_texture_set_color_key() and the " color_key_flags" field it sets.
by Alexandre Julliard Jan. 19, 2015

Jan. 19, 2015

Module: wine Branch: master Commit: ca06f960edc0e1216eaa655c9a2eaf061af11afe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca06f960edc0e1216eaa655c9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 19 13:44:11 2015 +0100 wined3d: Use the same flags for wined3d_texture_set_color_key() and the "color_key_flags" field it sets. This fixes a regression introduced by commit a8ab56941577a01e17b947cddd374ba52ffd8245. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/surface.c | 14 +++++++------- dlls/wined3d/texture.c | 42 +++++++++++++++++++++--------------------- dlls/wined3d/utils.c | 4 ++-- include/wine/wined3d.h | 35 ++++++----------------------------- 6 files changed, 39 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca06f960edc0e1216eaa6…

1 0

Henri Verbeet : wined3d: Handle the SM4 SV_POSITION pixel shader input semantic in the GLSL shader backend.
by Alexandre Julliard Jan. 19, 2015

Jan. 19, 2015

Module: wine Branch: master Commit: 2912e2938e475a125db5aa33598607696b3e61ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=2912e2938e475a125db5aa335… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 19 13:44:09 2015 +0100 wined3d: Handle the SM4 SV_POSITION pixel shader input semantic in the GLSL shader backend. This is (mostly) equivalent to the vPos register in SM3. --- dlls/wined3d/glsl_shader.c | 29 ++++++++++++++++------------- dlls/wined3d/shader.c | 3 +++ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index efae51e..8f5e916 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1191,14 +1191,8 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont UINT in_count = min(vec4_varyings(version->major, gl_info), shader->limits->packed_input); if (use_vs(state)) - shader_addline(buffer, "varying vec4 %s_in[%u];\n", prefix, in_count); - else - /* TODO: Write a replacement shader for the fixed function - * vertex pipeline, so this isn't needed. For fixed function - * vertex processing + 3.0 pixel shader we need a separate - * function in the pixel shader that reads the fixed function - * color into the packed input registers. */ - shader_addline(buffer, "vec4 %s_in[%u];\n", prefix, in_count); + shader_addline(buffer, "varying vec4 %s_link[%u];\n", prefix, in_count); + shader_addline(buffer, "vec4 %s_in[%u];\n", prefix, in_count); } for (i = 0, map = reg_maps->bumpmat; map; map >>= 1, ++i) @@ -4154,7 +4148,16 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w semantic_idx = input_signature[i].semantic_idx; shader_glsl_write_mask_to_str(input_signature[i].mask, reg_mask); - if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_TEXCOORD)) + if (vertexprocessing == vertexshader) + { + if (!strcmp(semantic_name, "SV_POSITION")) + shader_addline(buffer, "ps_in[%u]%s = vpos%s;\n", + shader->u.ps.input_reg_map[i], reg_mask, reg_mask); + else + shader_addline(buffer, "ps_in[%u]%s = ps_link[%u]%s;\n", + shader->u.ps.input_reg_map[i], reg_mask, shader->u.ps.input_reg_map[i], reg_mask); + } + else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_TEXCOORD)) { if (semantic_idx < 8 && vertexprocessing == pretransformed) shader_addline(buffer, "ps_in[%u]%s = gl_TexCoord[%u]%s;\n", @@ -4276,7 +4279,7 @@ static void handle_ps3_input(struct wined3d_shader_buffer *buffer, else if (in_idx == in_count + 1) sprintf(destination, "gl_FrontSecondaryColor"); else - sprintf(destination, "ps_in[%u]", in_idx); + sprintf(destination, "ps_link[%u]", in_idx); semantic_name_in = input_signature[i].semantic_name; semantic_idx_in = input_signature[i].semantic_idx; @@ -4322,7 +4325,7 @@ static void handle_ps3_input(struct wined3d_shader_buffer *buffer, else if (i == in_count + 1) sprintf(destination, "gl_FrontSecondaryColor"); else - sprintf(destination, "ps_in[%u]", i); + sprintf(destination, "ps_link[%u]", i); if (size == 1) shader_addline(buffer, "%s.%s = 0.0;\n", destination, reg_mask); else shader_addline(buffer, "%s.%s = vec%u(0.0);\n", destination, reg_mask, size); @@ -4406,7 +4409,7 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer { UINT in_count = min(vec4_varyings(ps_major, gl_info), ps->limits->packed_input); /* This one is tricky: a 3.0 pixel shader reads from a 3.0 vertex shader */ - shader_addline(buffer, "varying vec4 ps_in[%u];\n", in_count); + shader_addline(buffer, "varying vec4 ps_link[%u];\n", in_count); shader_addline(buffer, "void order_ps_input(in vec4 vs_out[%u])\n{\n", vs->limits->packed_output); /* First, sort out position and point size. Those are not passed to the pixel shader */ @@ -4517,7 +4520,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); /* Pack 3.0 inputs */ - if (reg_maps->shader_version.major >= 3 && args->vp_mode != vertexshader) + if (reg_maps->shader_version.major >= 3) shader_glsl_input_pack(shader, buffer, shader->input_signature, reg_maps, args->vp_mode); /* Base Shader Body */ diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7218290..e1164db 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2506,6 +2506,9 @@ static HRESULT pixelshader_init(struct wined3d_shader *shader, struct wined3d_de memcpy(ptr, e->semantic_name, len + 1); shader->input_signature[e->register_idx].semantic_name = ptr; ptr += len + 1; + + if (!strcmp(e->semantic_name, "SV_POSITION")) + shader->reg_maps.vpos = 1; } }

1 0

Henri Verbeet : d3d10core/tests: Add a basic texturing test.
by Alexandre Julliard Jan. 19, 2015

Jan. 19, 2015

Module: wine Branch: master Commit: 6b4623008f885e25e77b1b367e0949b1b5b13ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b4623008f885e25e77b1b367… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 19 13:44:10 2015 +0100 d3d10core/tests: Add a basic texturing test. --- dlls/d3d10core/tests/device.c | 215 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 215 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 76830a4..8b51cda 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -2305,6 +2305,220 @@ done: DestroyWindow(window); } +static void test_texture(void) +{ + ID3D10RenderTargetView *backbuffer_rtv; + D3D10_SUBRESOURCE_DATA resource_data; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10SamplerState *sampler_state; + ID3D10ShaderResourceView *ps_srv; + D3D10_SAMPLER_DESC sampler_desc; + ID3D10InputLayout *input_layout; + D3D10_BUFFER_DESC buffer_desc; + ID3D10Texture2D *backbuffer; + unsigned int stride, offset; + IDXGISwapChain *swapchain; + ID3D10Texture2D *texture; + ID3D10VertexShader *vs; + ID3D10PixelShader *ps; + ID3D10Device *device; + D3D10_VIEWPORT vp; + unsigned int i, j; + ID3D10Buffer *vb; + ULONG refcount; + DWORD color; + HWND window; + HRESULT hr; + + static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }; + static const DWORD vs_code[] = + { +#if 0 + float4 main(float4 position : POSITION) : SV_POSITION + { + return position; + } +#endif + 0x43425844, 0xa7a2f22d, 0x83ff2560, 0xe61638bd, 0x87e3ce90, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 + Texture2D t; + SamplerState s; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + float2 p; + + p.x = position.x / 640.0f; + p.y = position.y / 480.0f; + return t.Sample(s, p); + } +#endif + 0x43425844, 0x1ce9b612, 0xc8176faa, 0xd37844af, 0xdb515605, 0x00000001, 0x00000134, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000098, 0x00000040, + 0x00000026, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, + 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, + 0x3b088889, 0x00000000, 0x00000000, 0x09000045, 0x001020f2, 0x00000000, 0x00100046, 0x00000000, + 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, + }; + static const struct + { + float x, y; + } + quad[] = + { + {-1.0f, -1.0f}, + {-1.0f, 1.0f}, + { 1.0f, -1.0f}, + { 1.0f, 1.0f}, + }; + static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; + static const DWORD bitmap_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + window = CreateWindowA("static", "d3d10core_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D10Texture2D, (void **)&backbuffer); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + + hr = ID3D10Device_CreateInputLayout(device, layout_desc, sizeof(layout_desc) / sizeof(*layout_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + buffer_desc.ByteWidth = sizeof(quad); + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + + resource_data.pSysMem = quad; + resource_data.SysMemPitch = 0; + resource_data.SysMemSlicePitch = 0; + + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &resource_data, &vb); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + texture_desc.Width = 4; + texture_desc.Height = 4; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + resource_data.pSysMem = bitmap_data; + resource_data.SysMemPitch = 4 * sizeof(*bitmap_data); + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr); + + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &ps_srv); + ok(SUCCEEDED(hr), "Failed to create shader resource view, hr %#x\n", hr); + + sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.AddressU = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressV = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D10_COMPARISON_NEVER; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 0.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 0.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = 0.0f; + + hr = ID3D10Device_CreateSamplerState(device, &sampler_desc, &sampler_state); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + + hr = ID3D10Device_CreateVertexShader(device, vs_code, sizeof(vs_code), &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)backbuffer, NULL, &backbuffer_rtv); + ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); + + ID3D10Device_OMSetRenderTargets(device, 1, &backbuffer_rtv, NULL); + ID3D10Device_IASetInputLayout(device, input_layout); + ID3D10Device_IASetPrimitiveTopology(device, D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + stride = sizeof(*quad); + offset = 0; + ID3D10Device_IASetVertexBuffers(device, 0, 1, &vb, &stride, &offset); + ID3D10Device_VSSetShader(device, vs); + ID3D10Device_PSSetShaderResources(device, 0, 1, &ps_srv); + ID3D10Device_PSSetSamplers(device, 0, 1, &sampler_state); + ID3D10Device_PSSetShader(device, ps); + + vp.TopLeftX = 0; + vp.TopLeftY = 0; + vp.Width = 640; + vp.Height = 480; + vp.MinDepth = 0.0f; + vp.MaxDepth = 1.0f; + ID3D10Device_RSSetViewports(device, 1, &vp); + + ID3D10Device_ClearRenderTargetView(device, backbuffer_rtv, red); + + ID3D10Device_Draw(device, 4, 0); + + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + color = get_texture_color(backbuffer, 80 + j * 160, 60 + i * 120); + ok(compare_color(color, bitmap_data[j + i * 4], 1), + "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + color, j, i, bitmap_data[j + i * 4]); + } + } + + ID3D10PixelShader_Release(ps); + ID3D10VertexShader_Release(vs); + ID3D10SamplerState_Release(sampler_state); + ID3D10ShaderResourceView_Release(ps_srv); + ID3D10Texture2D_Release(texture); + ID3D10Buffer_Release(vb); + ID3D10InputLayout_Release(input_layout); + ID3D10RenderTargetView_Release(backbuffer_rtv); + ID3D10Texture2D_Release(backbuffer); + IDXGISwapChain_Release(swapchain); + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(device) { test_create_texture2d(); @@ -2322,4 +2536,5 @@ START_TEST(device) test_scissor(); test_clear_state(); test_blend(); + test_texture(); }

1 0