wine-commits December 2016

wine-commits@winehq.org

2 participants
342 discussions

Nikolay Sivov : xmllite: Store empty element fields separately.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: f185dd51fdb4c1afeb2771445e3db304790f1eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=f185dd51fdb4c1afeb2771445… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:22 2016 +0300 xmllite: Store empty element fields separately. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 9484173..c3b68d2 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -253,7 +253,8 @@ typedef struct strval strvalues[StringValue_Last]; UINT depth; UINT max_depth; - BOOL empty_element; + BOOL is_empty_element; + struct element empty_element; UINT resume[XmlReadResume_Last]; /* offsets used to resume reader */ } xmlreader; @@ -433,7 +434,7 @@ static void reader_clear_elements(xmlreader *reader) reader_free(reader, elem); } list_init(&reader->elements); - reader->empty_element = FALSE; + reader->is_empty_element = FALSE; } static HRESULT reader_inc_depth(xmlreader *reader) @@ -479,7 +480,7 @@ static HRESULT reader_push_element(xmlreader *reader, strval *qname, strval *loc } list_add_head(&reader->elements, &elem->entry); - reader->empty_element = FALSE; + reader->is_empty_element = FALSE; return hr; } @@ -2075,7 +2076,9 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca { /* skip '/>' */ reader_skipn(reader, 2); - reader->empty_element = TRUE; + reader->is_empty_element = TRUE; + reader->empty_element.localname = *local; + reader->empty_element.qname = *qname; return S_OK; } @@ -2707,7 +2710,6 @@ static HRESULT WINAPI xmlreader_MoveToAttributeByName(IXmlReader* iface, static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) { xmlreader *This = impl_from_IXmlReader(iface); - struct element *elem; TRACE("(%p)\n", This); @@ -2715,11 +2717,16 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) This->attr = NULL; /* FIXME: support other node types with 'attributes' like DTD */ - elem = LIST_ENTRY(list_head(&This->elements), struct element, entry); - if (elem) - { - reader_set_strvalue(This, StringValue_QualifiedName, &elem->qname); - reader_set_strvalue(This, StringValue_LocalName, &elem->localname); + if (This->is_empty_element) { + reader_set_strvalue(This, StringValue_LocalName, &This->empty_element.localname); + reader_set_strvalue(This, StringValue_QualifiedName, &This->empty_element.qname); + } + else { + struct element *element = LIST_ENTRY(list_head(&This->elements), struct element, entry); + if (element) { + reader_set_strvalue(This, StringValue_LocalName, &element->localname); + reader_set_strvalue(This, StringValue_QualifiedName, &element->qname); + } } return S_OK; @@ -2841,7 +2848,7 @@ static BOOL WINAPI xmlreader_IsEmptyElement(IXmlReader* iface) TRACE("(%p)\n", This); /* Empty elements are not placed in stack, it's stored as a global reader flag that makes sense when current node is start tag of an element */ - return (reader_get_nodetype(This) == XmlNodeType_Element) ? This->empty_element : FALSE; + return (reader_get_nodetype(This) == XmlNodeType_Element) ? This->is_empty_element : FALSE; } static HRESULT WINAPI xmlreader_GetLineNumber(IXmlReader* iface, UINT *lineNumber) @@ -3024,7 +3031,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) list_init(&reader->elements); reader->depth = 0; reader->max_depth = 256; - reader->empty_element = FALSE; + reader->is_empty_element = FALSE; memset(reader->resume, 0, sizeof(reader->resume)); for (i = 0; i < StringValue_Last; i++)

1 0

Nikolay Sivov : xmllite: Improve writer methods tracing.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: a39251b09634db16d48c1da079e51dfb2d5dc644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a39251b09634db16d48c1da07… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:21 2016 +0300 xmllite: Improve writer methods tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/writer.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index bcc0e85..f7f2604 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -447,7 +447,7 @@ static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, v { xmlwriter *This = impl_from_IXmlWriter(iface); - TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IXmlWriter)) @@ -463,23 +463,23 @@ static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, v static ULONG WINAPI xmlwriter_AddRef(IXmlWriter *iface) { xmlwriter *This = impl_from_IXmlWriter(iface); - TRACE("%p\n", This); - return InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + return ref; } static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) { xmlwriter *This = impl_from_IXmlWriter(iface); - LONG ref; + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("%p\n", This); + TRACE("(%p)->>(%u)\n", This, ref); - ref = InterlockedDecrement(&This->ref); if (ref == 0) { struct element *element, *element2; IMalloc *imalloc = This->imalloc; - IXmlWriter_Flush(iface); + writeroutput_flush_stream(This->output); if (This->output) IUnknown_Release(&This->output->IXmlWriterOutput_iface); /* element stack */

1 0

Huw Davies : windowscodecs: Fix typo in 2 bpp conversion.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: a531ade2fdaa21571b0adeb01c9b17b67ed92850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a531ade2fdaa21571b0adeb01… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 9 14:38:04 2016 +0000 windowscodecs: Fix typo in 2 bpp conversion. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/converter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index e5bce44..e5d61e1 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -257,7 +257,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe *dstpixel++ = colors[srcval>>6]; if (x+1 < prc->Width) *dstpixel++ = colors[srcval>>4&0x3]; if (x+2 < prc->Width) *dstpixel++ = colors[srcval>>2&0x3]; - if (x+1 < prc->Width) *dstpixel++ = colors[srcval&0x3]; + if (x+3 < prc->Width) *dstpixel++ = colors[srcval&0x3]; } srcrow += srcstride; dstrow += cbStride;

1 0

Huw Davies : user32/tests: Add a test to show that released cache DCs are disabled.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: 78983d9fcd9f9e84748df68b8ce4e4981f678e0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=78983d9fcd9f9e84748df68b8… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 9 14:17:31 2016 +0000 user32/tests: Add a test to show that released cache DCs are disabled. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dce.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index 6ba234e..b5f9722 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -110,6 +110,12 @@ static void test_dc_attributes(void) } while (i > 0) ReleaseDC( hwnd_cache, hdcs[--i] ); + /* Released cache DCs are 'disabled' */ + rop = SetROP2( old_hdc, R2_BLACK ); + todo_wine ok( rop == 0, "got %d\n", rop ); + rop = GetROP2( old_hdc ); + todo_wine ok( rop == 0, "got %d\n", rop ); + /* test own DC */ hdc = GetDC( hwnd_owndc );

1 0

Józef Kucia : wined3d: Create texture views for unordered access views.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: 2dcfd128e1d172b477748f4dc9cbdeb3a9bc5896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dcfd128e1d172b477748f4dc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:45 2016 +0100 wined3d: Create texture views for unordered access views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 17 ++++++++++++++--- dlls/wined3d/view.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2ce99cb..61a9f61 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3406,8 +3406,9 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, struct wined3d_unordered_access_view *view; struct wined3d_texture *texture; struct wined3d_shader *shader; - struct gl_texture *gl_texture; + GLuint texture_name; unsigned int i; + GLint level; context->uses_uavs = 0; @@ -3438,8 +3439,18 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, wined3d_texture_load(texture, context, FALSE); wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_TEXTURE_RGB); - gl_texture = wined3d_texture_get_gl_texture(texture, FALSE); - GL_EXTCALL(glBindImageTexture(i, gl_texture->name, view->level_idx, GL_TRUE, 0, GL_READ_WRITE, + if (view->gl_view.name) + { + texture_name = view->gl_view.name; + level = 0; + } + else + { + texture_name = wined3d_texture_get_gl_texture(texture, FALSE)->name; + level = view->level_idx; + } + + GL_EXTCALL(glBindImageTexture(i, texture_name, level, GL_TRUE, 0, GL_READ_WRITE, view->format->glInternal)); } checkGLcall("Bind unordered access views"); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 27ee9d2..a57e890 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -610,8 +610,8 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces if (desc->u.texture.layer_idx || desc->u.texture.layer_count != depth_or_layer_count) { - FIXME("Unordered access view unsupported yet (layers %u-%u).\n", - desc->u.texture.layer_idx, desc->u.texture.layer_count); + create_texture_view(&view->gl_view, get_texture_view_target(desc, texture), + desc, texture, view->format); } view->layer_idx = desc->u.texture.layer_idx; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 29143be..69ba146 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3321,7 +3321,7 @@ struct wined3d_unordered_access_view const struct wined3d_parent_ops *parent_ops; const struct wined3d_format *format; - + struct wined3d_gl_view gl_view; unsigned int layer_idx; unsigned int layer_count; unsigned int level_idx;

1 0

Józef Kucia : wined3d: Do not try to create texture views for depth slices.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: b76f39936f8ae3da33c29424477ca0ba817822c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b76f39936f8ae3da33c294244… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:44 2016 +0100 wined3d: Do not try to create texture views for depth slices. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 237122d..27ee9d2 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -65,6 +65,7 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target const struct wined3d_format *view_format) { const struct wined3d_gl_info *gl_info; + unsigned int layer_idx, layer_count; struct wined3d_context *context; struct gl_texture *gl_texture; @@ -83,10 +84,19 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target wined3d_texture_prepare_texture(texture, context, FALSE); gl_texture = wined3d_texture_get_gl_texture(texture, FALSE); + layer_idx = desc->u.texture.layer_idx; + layer_count = desc->u.texture.layer_count; + if (view_target == GL_TEXTURE_3D && (layer_idx || layer_count != 1)) + { + FIXME("Depth slice (%u-%u) not supported.\n", layer_idx, layer_count); + layer_idx = 0; + layer_count = 1; + } + gl_info->gl_ops.gl.p_glGenTextures(1, &view->name); GL_EXTCALL(glTextureView(view->name, view->target, gl_texture->name, view_format->glInternal, desc->u.texture.level_idx, desc->u.texture.level_count, - desc->u.texture.layer_idx, desc->u.texture.layer_count)); + layer_idx, layer_count)); checkGLcall("Create texture view"); if (is_stencil_view_format(view_format))

1 0

Józef Kucia : wined3d: Extract get_texture_view_target() from wined3d_shader_resource_view_init( ).
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: dc4042653d37abab813c871f4eab4ed17ee3c93d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc4042653d37abab813c871f4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:43 2016 +0100 wined3d: Extract get_texture_view_target() from wined3d_shader_resource_view_init(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 59 ++++++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 036edf3..237122d 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -30,6 +30,36 @@ static BOOL is_stencil_view_format(const struct wined3d_format *format) || format->id == WINED3DFMT_X32_TYPELESS_G8X24_UINT; } +static GLenum get_texture_view_target(const struct wined3d_view_desc *desc, + const struct wined3d_texture *texture) +{ + static const struct + { + GLenum texture_target; + unsigned int view_flags; + GLenum view_target; + } + view_types[] = + { + {GL_TEXTURE_2D, 0, GL_TEXTURE_2D}, + {GL_TEXTURE_2D, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, + {GL_TEXTURE_2D_ARRAY, 0, GL_TEXTURE_2D}, + {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, + {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_CUBE, GL_TEXTURE_CUBE_MAP}, + {GL_TEXTURE_3D, 0, GL_TEXTURE_3D}, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(view_types); ++i) + { + if (view_types[i].texture_target == texture->target && view_types[i].view_flags == desc->flags) + return view_types[i].view_target; + } + + FIXME("Unhandled view flags %#x for texture target %#x.\n", desc->flags, texture->target); + return texture->target; +} + static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target, const struct wined3d_view_desc *desc, struct wined3d_texture *texture, const struct wined3d_format *view_format) @@ -357,22 +387,6 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) { - static const struct - { - GLenum texture_target; - unsigned int view_flags; - GLenum view_target; - } - view_types[] = - { - {GL_TEXTURE_2D, 0, GL_TEXTURE_2D}, - {GL_TEXTURE_2D, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, - {GL_TEXTURE_2D_ARRAY, 0, GL_TEXTURE_2D}, - {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, - {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_CUBE, GL_TEXTURE_CUBE_MAP}, - {GL_TEXTURE_3D, 0, GL_TEXTURE_3D}, - }; - const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; const struct wined3d_format *view_format; GLenum view_target; @@ -396,7 +410,6 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ else { struct wined3d_texture *texture = texture_from_resource(resource); - unsigned int i; if (!desc->u.texture.level_count || desc->u.texture.level_idx >= texture->level_count @@ -406,17 +419,7 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ || desc->u.texture.layer_count > texture->layer_count - desc->u.texture.layer_idx) return E_INVALIDARG; - view_target = texture->target; - for (i = 0; i < ARRAY_SIZE(view_types); ++i) - { - if (view_types[i].texture_target == texture->target && view_types[i].view_flags == desc->flags) - { - view_target = view_types[i].view_target; - break; - } - } - if (i == ARRAY_SIZE(view_types)) - FIXME("Unhandled view flags %#x for texture target %#x.\n", desc->flags, texture->target); + view_target = get_texture_view_target(desc, texture); if (resource->format->id == view_format->id && texture->target == view_target && !desc->u.texture.level_idx && desc->u.texture.level_count == texture->level_count

1 0

Józef Kucia : d3d11/tests: Add test showing that depth/stencil UAVs are not allowed.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: f7bc122e007c82c45e3e46c9d540492d82c06ecf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7bc122e007c82c45e3e46c9d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:42 2016 +0100 d3d11/tests: Add test showing that depth/stencil UAVs are not allowed. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 136 ++++++++++++++++++++++++----------------------- 1 file changed, 70 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7bc122e007c82c45e3e4…

1 0

Józef Kucia : wined3d: Extract create_texture_view() function from shader resource views.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: 7d2bfe78518bbfaf3c2a2f48c43d5b85a3454af9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d2bfe78518bbfaf3c2a2f48c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:41 2016 +0100 wined3d: Extract create_texture_view() function from shader resource views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 120 ++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 9 +++- 2 files changed, 67 insertions(+), 62 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index adbd159..036edf3 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -30,6 +30,57 @@ static BOOL is_stencil_view_format(const struct wined3d_format *format) || format->id == WINED3DFMT_X32_TYPELESS_G8X24_UINT; } +static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target, + const struct wined3d_view_desc *desc, struct wined3d_texture *texture, + const struct wined3d_format *view_format) +{ + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + struct gl_texture *gl_texture; + + view->target = view_target; + + context = context_acquire(texture->resource.device, NULL); + gl_info = context->gl_info; + + if (!gl_info->supported[ARB_TEXTURE_VIEW]) + { + context_release(context); + FIXME("OpenGL implementation does not support texture views.\n"); + return; + } + + wined3d_texture_prepare_texture(texture, context, FALSE); + gl_texture = wined3d_texture_get_gl_texture(texture, FALSE); + + gl_info->gl_ops.gl.p_glGenTextures(1, &view->name); + GL_EXTCALL(glTextureView(view->name, view->target, gl_texture->name, view_format->glInternal, + desc->u.texture.level_idx, desc->u.texture.level_count, + desc->u.texture.layer_idx, desc->u.texture.layer_count)); + checkGLcall("Create texture view"); + + if (is_stencil_view_format(view_format)) + { + static const GLint swizzle[] = {GL_ZERO, GL_RED, GL_ZERO, GL_ZERO}; + + if (!gl_info->supported[ARB_STENCIL_TEXTURING]) + { + context_release(context); + FIXME("OpenGL implementation does not support stencil texturing.\n"); + return; + } + + context_bind_texture(context, view->target, view->name); + gl_info->gl_ops.gl.p_glTexParameteriv(view->target, GL_TEXTURE_SWIZZLE_RGBA, swizzle); + gl_info->gl_ops.gl.p_glTexParameteri(view->target, GL_DEPTH_STENCIL_TEXTURE_MODE, GL_STENCIL_INDEX); + checkGLcall("Initialize stencil view"); + + context_invalidate_state(context, STATE_SHADER_RESOURCE_BINDING); + } + + context_release(context); +} + ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *view) { ULONG refcount = InterlockedIncrement(&view->refcount); @@ -259,14 +310,14 @@ static void wined3d_shader_resource_view_destroy_object(void *object) { struct wined3d_shader_resource_view *view = object; - if (view->object) + if (view->gl_view.name) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; context = context_acquire(view->resource->device, NULL); gl_info = context->gl_info; - gl_info->gl_ops.gl.p_glDeleteTextures(1, &view->object); + gl_info->gl_ops.gl.p_glDeleteTextures(1, &view->gl_view.name); checkGLcall("glDeleteTextures"); context_release(context); } @@ -302,55 +353,6 @@ void * CDECL wined3d_shader_resource_view_get_parent(const struct wined3d_shader return view->parent; } -static void wined3d_shader_resource_view_create_texture_view(struct wined3d_shader_resource_view *view, - const struct wined3d_view_desc *desc, struct wined3d_texture *texture, - const struct wined3d_format *view_format) -{ - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - struct gl_texture *gl_texture; - - context = context_acquire(texture->resource.device, NULL); - gl_info = context->gl_info; - - if (!gl_info->supported[ARB_TEXTURE_VIEW]) - { - context_release(context); - FIXME("OpenGL implementation does not support texture views.\n"); - return; - } - - wined3d_texture_prepare_texture(texture, context, FALSE); - gl_texture = wined3d_texture_get_gl_texture(texture, FALSE); - - gl_info->gl_ops.gl.p_glGenTextures(1, &view->object); - GL_EXTCALL(glTextureView(view->object, view->target, gl_texture->name, view_format->glInternal, - desc->u.texture.level_idx, desc->u.texture.level_count, - desc->u.texture.layer_idx, desc->u.texture.layer_count)); - checkGLcall("Create texture view"); - - if (is_stencil_view_format(view_format)) - { - static const GLint swizzle[] = {GL_ZERO, GL_RED, GL_ZERO, GL_ZERO}; - - if (!gl_info->supported[ARB_STENCIL_TEXTURING]) - { - context_release(context); - FIXME("OpenGL implementation does not support stencil texturing.\n"); - return; - } - - context_bind_texture(context, view->target, view->object); - gl_info->gl_ops.gl.p_glTexParameteriv(view->target, GL_TEXTURE_SWIZZLE_RGBA, swizzle); - gl_info->gl_ops.gl.p_glTexParameteri(view->target, GL_DEPTH_STENCIL_TEXTURE_MODE, GL_STENCIL_INDEX); - checkGLcall("Initialize stencil view"); - - context_invalidate_state(context, STATE_SHADER_RESOURCE_BINDING); - } - - context_release(context); -} - static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_view *view, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) @@ -373,6 +375,7 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; const struct wined3d_format *view_format; + GLenum view_target; view_format = wined3d_get_format(gl_info, desc->format_id); if (wined3d_format_is_typeless(view_format) @@ -386,9 +389,6 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ view->parent = parent; view->parent_ops = parent_ops; - view->target = GL_NONE; - view->object = 0; - if (resource->type == WINED3D_RTYPE_BUFFER) { FIXME("Buffer shader resource views not supported.\n"); @@ -406,19 +406,19 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ || desc->u.texture.layer_count > texture->layer_count - desc->u.texture.layer_idx) return E_INVALIDARG; - view->target = texture->target; + view_target = texture->target; for (i = 0; i < ARRAY_SIZE(view_types); ++i) { if (view_types[i].texture_target == texture->target && view_types[i].view_flags == desc->flags) { - view->target = view_types[i].view_target; + view_target = view_types[i].view_target; break; } } if (i == ARRAY_SIZE(view_types)) FIXME("Unhandled view flags %#x for texture target %#x.\n", desc->flags, texture->target); - if (resource->format->id == view_format->id && texture->target == view->target + if (resource->format->id == view_format->id && texture->target == view_target && !desc->u.texture.level_idx && desc->u.texture.level_count == texture->level_count && !desc->u.texture.layer_idx && desc->u.texture.layer_count == texture->layer_count && !is_stencil_view_format(view_format)) @@ -432,7 +432,7 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ else if (resource->format->typeless_id == view_format->typeless_id && resource->format->gl_view_class == view_format->gl_view_class) { - wined3d_shader_resource_view_create_texture_view(view, desc, texture, view_format); + create_texture_view(&view->gl_view, view_target, desc, texture, view_format); } else { @@ -476,9 +476,9 @@ void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view { struct wined3d_texture *texture; - if (view->object) + if (view->gl_view.name) { - context_bind_texture(context, view->target, view->object); + context_bind_texture(context, view->gl_view.target, view->gl_view.name); return; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dd2754b..29143be 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3292,6 +3292,12 @@ static inline struct wined3d_surface *wined3d_rendertarget_view_get_surface( void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarget_view *view, const struct wined3d_context *context, unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; +struct wined3d_gl_view +{ + GLenum target; + GLuint name; +}; + struct wined3d_shader_resource_view { LONG refcount; @@ -3300,8 +3306,7 @@ struct wined3d_shader_resource_view void *parent; const struct wined3d_parent_ops *parent_ops; - GLenum target; - GLuint object; + struct wined3d_gl_view gl_view; }; void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view,

1 0

Józef Kucia : d3d10core/tests: Add more tests for bind flags.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: 24989883384847cfa2afa7307462457f075b9c9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=24989883384847cfa2afa7307… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:40 2016 +0100 d3d10core/tests: Add more tests for bind flags. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 784a086..009442f 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1236,8 +1236,13 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R32_TYPELESS, 0, D3D10_BIND_SHADER_RESOURCE, 0, FALSE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 9, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, 9, D3D10_BIND_SHADER_RESOURCE | D3D10_BIND_DEPTH_STENCIL, 0, + TRUE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 9, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, FALSE, TRUE}, + {DXGI_FORMAT_R32_TYPELESS, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, 1, D3D10_BIND_RENDER_TARGET | D3D10_BIND_DEPTH_STENCIL, 0, + FALSE, TRUE}, {DXGI_FORMAT_R32_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_VERTEX_BUFFER, 0, FALSE, TRUE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_INDEX_BUFFER, 0, FALSE, TRUE}, @@ -1259,8 +1264,13 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R8G8B8A8_UINT, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_SNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_SINT, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D10_BIND_SHADER_RESOURCE, 0, FALSE, TRUE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, + {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_SHADER_RESOURCE, 0, FALSE, TRUE}, + {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_SHADER_RESOURCE | D3D10_BIND_DEPTH_STENCIL, 0, + FALSE, TRUE}, {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, + {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, }; if (!(device = create_device())) @@ -1373,7 +1383,8 @@ static void test_create_texture2d(void) hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, (ID3D10Texture2D **)&texture); todo_wine_if(tests[i].todo) - ok(hr == (tests[i].succeeds ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == (tests[i].succeeds ? S_OK : E_INVALIDARG), + "Test %u: Got unexpected hr %#x (format %#x).\n", i, hr, desc.Format); if (SUCCEEDED(hr)) ID3D10Texture2D_Release(texture);

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2016