wine-devel July 2016

[email protected]

46 participants
227 discussions

Start a nNew thread

Re: [PATCH 5/6] d3d10core/tests: Add visual tests for locking vertexbuffers

by Marvin

7 years, 9 months

Re: [PATCH 4/6] ddraw/tests: Add visual tests for locking vertexbuffers

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24539 Your paranoid android. === w8 (32 bit visual) === visual.c:1688: Test failed: Expected buffer mapped unsyncronized. Flags = DDLOCK_NOOVERWRITE. dwCaps = 0x10000. visual.c:1688: Test failed: Expected buffer mapped unsyncronized. Flags = DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS. dwCaps = 0x10000. visual.c:1688: Test failed: Expected buffer mapped unsyncronized. Flags = DDLOCK_NOOVERWRITE | DDLOCK_READONLY. dwCaps = 0x10000. === w864 (32 bit visual) === visual.c:307: Test failed: Clear rectangle 3(pos, neg) has color 0000ff00 visual.c:309: Test failed: Clear rectangle 1(pos, pos) has color 0000ff00 visual.c:311: Test failed: Clear rectangle 4(NULL) has color 0000ff00 visual.c:313: Test failed: Clear rectangle 4(neg, neg) has color 0000ff00 visual.c:1688: Test failed: Expected buffer mapped unsyncronized. Flags = DDLOCK_NOOVERWRITE. dwCaps = 0x10000. visual.c:1688: Test failed: Expected buffer mapped unsyncronized. Flags = DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS. dwCaps = 0x10000. visual.c:1688: Test failed: Expected buffer mapped unsyncronized. Flags = DDLOCK_NOOVERWRITE | DDLOCK_READONLY. dwCaps = 0x10000. === w1064 (32 bit visual) === visual.c:307: Test failed: Clear rectangle 3(pos, neg) has color 0000ff00 visual.c:309: Test failed: Clear rectangle 1(pos, pos) has color 0000ff00 visual.c:311: Test failed: Clear rectangle 4(NULL) has color 0000ff00 visual.c:313: Test failed: Clear rectangle 4(neg, neg) has color 0000ff00 visual.c:1688: Test failed: Expected buffer mapped unsyncronized. Flags = DDLOCK_NOOVERWRITE. dwCaps = 0x10000. visual.c:1688: Test failed: Expected buffer mapped unsyncronized. Flags = DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS. dwCaps = 0x10000. visual.c:1688: Test failed: Expected buffer mapped unsyncronized. Flags = DDLOCK_NOOVERWRITE | DDLOCK_READONLY. dwCaps = 0x10000.

7 years, 9 months

Re: [PATCH] msxml2: Share source with msxml3

by Alexandre Julliard

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/msxml2/Makefile.in | 49 ++++++++++++++++++++++++++++++++++++-- > dlls/msxml2/main.c | 63 ------------------------------------------------- > dlls/msxml2/msxml2.spec | 2 +- > 3 files changed, 48 insertions(+), 66 deletions(-) > delete mode 100644 dlls/msxml2/main.c Is there a real need for this? -- Alexandre Julliard julliard(a)winehq.org

7 years, 9 months

Re: [PATCH 3/8] wined3d: Implement SM5 deriv_rtx_coarse instruction.

by Matteo Bruni

2016-07-22 12:28 GMT+02:00 Józef Kucia <jkucia(a)codeweavers.com>: > + if (!gl_info->supported[ARB_DERIVATIVE_CONTROL]) > + { > + FIXME("OpenGL implementation does not support ARB_derivative_control.\n"); > + return; > + } What about using the generic dFdx()/dFdy() builtins (maybe with a WARN) for the coarse and fine variants when ARB_derivative_control isn't supported? I don't know that it's particularly relevant in practice, it just seems something we don't need to strictly depend on.

7 years, 9 months

Re: [PATCH 3/8] wined3d: Implement SM5 deriv_rtx_coarse instruction.

by Henri Verbeet

On 22 July 2016 at 12:28, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +static void shader_glsl_derivative(const struct wined3d_shader_instruction *ins) > +{ > + const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; > + struct wined3d_string_buffer *buffer = ins->ctx->buffer; > + struct glsl_src_param src_param; > + const char *instruction; > + DWORD write_mask; > + > + if (!gl_info->supported[ARB_DERIVATIVE_CONTROL]) > + { > + FIXME("OpenGL implementation does not support ARB_derivative_control.\n"); > + return; > + } > + > + switch (ins->handler_idx) > + { > + case WINED3DSIH_DSX_COARSE: instruction = "dFdxCoarse"; break; > + default: ERR("Unhandled opcode %#x.\n", ins->handler_idx); return; > + } > + > + write_mask = shader_glsl_append_dst(buffer, ins); > + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); > + shader_addline(buffer, "%s(%s));\n", instruction, src_param.param_str); > +} It doesn't matter that much, but is there any reason shader_glsl_map2gl() can't handle these?

7 years, 9 months

Re: d3dx9_36: Fix a typo in TRACE() message.

by Matteo Bruni

2016-07-25 10:24 GMT+02:00 Andrey Gusev <andrey.goosev(a)gmail.com>: > > + TRACE("pout %p, pv %p, pviewport %p, pprojection %p, pview %p, pworld %p\n", pout, pv, pviewport, pprojection, pview, pworld); While you're there, can you please clean up the function? Like dropping all the 'p' prefixes from the function arguments and using the current d3d style for the function body. Also the TRACE line seems a bit too long.

7 years, 9 months

Re: include: Fix prototypes of D3DXFillXXXTextureTx for d3dx9.

by Matteo Bruni

2016-07-21 11:06 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > -HRESULT WINAPI D3DXFillTextureTX(struct IDirect3DTexture9 *texture, const DWORD *function, > - const D3DXVECTOR4 *constants, UINT numconstants); > -HRESULT WINAPI D3DXFillCubeTextureTX(struct IDirect3DCubeTexture9 *cube, const DWORD *function, > - const D3DXVECTOR4 *constants, UINT numconstants); > -HRESULT WINAPI D3DXFillVolumeTextureTX(struct IDirect3DVolumeTexture9 *volume, const DWORD *function, > - const D3DXVECTOR4 *constants, UINT numconstants); > +HRESULT WINAPI D3DXFillTextureTX(struct IDirect3DTexture9 *texture, ID3DXTextureShader *texture_shader); > +HRESULT WINAPI D3DXFillCubeTextureTX(struct IDirect3DCubeTexture9 *cube, ID3DXTextureShader *texture_shader); > +HRESULT WINAPI D3DXFillVolumeTextureTX(struct IDirect3DVolumeTexture9 *volume, ID3DXTextureShader *texture_shader); Do you know where the old prototypes came from? In all the versions of the header I have around (which go back to _30) I see the "new" prototype but it's possible that it changed even further back. It's also possible these have always been wrong, although that seems somewhat unlikely to me.

7 years, 9 months

Re: [PATCH] d3dx9: Implement D3DXCreateTextureShader with stubbed ID3DXTextureShader interface.

by Matteo Bruni

2016-07-21 11:06 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > +HRESULT WINAPI D3DXCreateTextureShader(const DWORD *function, ID3DXTextureShader **texture_shader) > +{ > + struct d3dx9_texture_shader *object; > + > + TRACE("function %p, texture_shader %p.\n", function, texture_shader); > + > + if (!function || !texture_shader) > + return D3DERR_INVALIDCALL; > + > + object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); > + if (!object) > + return E_OUTOFMEMORY; > + > + object->ID3DXTextureShader_iface.lpVtbl = &d3dx9_texture_shader_vtbl; > + object->ref = 1; > + > + *texture_shader = &object->ID3DXTextureShader_iface; > + > + return D3D_OK; > +} It would be nice to have a test for this.

7 years, 9 months

Re: [PATCH] d3dx10: Add D3DXCpuOptimizations stub

by Alex Henrie

+ * Copyright (C) 2007 David Adam + * Copyright (C) 2007 Tony Wasserka Did these people actually contribute anything to this patch? +/* This guaud is the same as D3DX9 to prevent double-inclusion */ Did you mean "guard"? Also, D3DX_CPU_OPTIMIZATION was already defined in d3dx9_30_main.c. I would remove the old definition from d3dx9_30_main.c and make it include d3dx10math.h instead. -Alex

7 years, 9 months

Re: [v3 PATCH] d3dx10: Add D3DXCpuOptimizations stub

by Matteo Bruni

2016-07-20 11:20 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: Hi Alistair, I'm afraid this is going to be a bit nitpicky. It also means the patch is mostly okay though. > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/d3dx10_43/d3dx10_43.spec | 2 +- > dlls/d3dx10_43/d3dx10_43_main.c | 11 +++++++-- > include/Makefile.in | 1 + > include/d3dx10.h | 1 + > include/d3dx10math.h | 49 +++++++++++++++++++++++++++++++++++++++++ > 5 files changed, 61 insertions(+), 3 deletions(-) > create mode 100644 include/d3dx10math.h > > diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec > index ab696e8..f410be8 100644 > --- a/dlls/d3dx10_43/d3dx10_43.spec > +++ b/dlls/d3dx10_43/d3dx10_43.spec > @@ -70,7 +70,7 @@ > @ stdcall D3DXColorAdjustSaturation(ptr ptr float) d3dx9_36.D3DXColorAdjustSaturation > @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx9_36.D3DXComputeBoundingBox > @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx9_36.D3DXComputeBoundingSphere > -@ stub D3DXCpuOptimizations(long) > +@ stdcall D3DXCpuOptimizations(long) > @ stdcall D3DXCreateMatrixStack(long ptr) d3dx9_36.D3DXCreateMatrixStack > @ stdcall D3DXFloat16To32Array(ptr ptr long) d3dx9_36.D3DXFloat16To32Array > @ stdcall D3DXFloat32To16Array(ptr ptr long) d3dx9_36.D3DXFloat32To16Array > diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c > index 0c1ff80..408cf22 100644 > --- a/dlls/d3dx10_43/d3dx10_43_main.c > +++ b/dlls/d3dx10_43/d3dx10_43_main.c > @@ -34,8 +34,8 @@ > #include "objbase.h" > > #include "d3d10_1.h" > -#include "d3dx10core.h" > -#include "d3dx10tex.h" > +#include "d3dx10.h" > + > > WINE_DEFAULT_DEBUG_CHANNEL(d3dx); No reason to add double whitespace lines here. > > @@ -210,3 +210,10 @@ HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_dat > > return E_NOTIMPL; > } > + > +D3DX_CPU_OPTIMIZATION WINAPI D3DXCpuOptimizations(BOOL enable) > +{ > + FIXME("enable %d stub.\n", enable); Can you please use %#x when tracing BOOL arguments? > +#include "d3dx10.h" > + > +/* This guard is the same as D3DX9 to prevent double-inclusion */ > +#ifndef __D3DX9MATH_H__ > +#define __D3DX9MATH_H__ > + > +#include <math.h> > + > + > +typedef enum _D3DX_CPU_OPTIMIZATION > +{ > + D3DX_NOT_OPTIMIZED = 0, > + D3DX_3DNOW_OPTIMIZED = 1, > + D3DX_SSE2_OPTIMIZED = 2, > + D3DX_SSE_OPTIMIZED = 3 > +} D3DX_CPU_OPTIMIZATION; I would go the other way and drop all the initializers instead. It's fine either way though. Also double whitespace again. > + > +#ifdef __cplusplus > +extern "C" { > +#endif > + > +D3DX_CPU_OPTIMIZATION WINAPI D3DXCpuOptimizations(BOOL enable); > + > +#ifdef __cplusplus > +} > +#endif > + > + > +/*#include <d3dx10math.inl> */ I don't like this. Either introduce d3dx10math.inl and make this an actual include (preferred) or just remove the line for the time being.

7 years, 9 months

← Newer
1
2
3
4
5
6
7
8
...
23
Older →

Jump to page:

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-devel July 2016