wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Nikolay Sivov : d3d8: Fix debug messages.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 772290bd1fbe681f23874ee00ce265ea4fec0511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=772290bd1fbe681f23874ee00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 26 14:37:58 2017 +0300 d3d8: Fix debug messages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d7a933b..e255392 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1683,7 +1683,7 @@ static HRESULT WINAPI d3d8_device_EndStateBlock(IDirect3DDevice8 *iface, DWORD * hr = wined3d_device_end_stateblock(device->wined3d_device, &stateblock); if (FAILED(hr)) { - WARN("IWineD3DDevice_EndStateBlock returned an error\n"); + WARN("Failed to end the state block, %#x.\n", hr); wined3d_mutex_unlock(); return hr; } @@ -1799,7 +1799,7 @@ static HRESULT WINAPI d3d8_device_CreateStateBlock(IDirect3DDevice8 *iface, if (FAILED(hr)) { wined3d_mutex_unlock(); - ERR("IWineD3DDevice_CreateStateBlock failed, hr %#x\n", hr); + ERR("Failed to create the state block, hr %#x\n", hr); return hr; }

1 0

Nikolay Sivov : ddraw: Remove references to IWineD3DDevice that doesn' t exist anymore.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: f55a10a07d5918c59cd8019a713ba4f4646987bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f55a10a07d5918c59cd8019a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 25 09:10:15 2017 +0300 ddraw: Remove references to IWineD3DDevice that doesn't exist anymore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 4 +--- dlls/ddraw/device.c | 50 ++++++-------------------------------------------- dlls/ddraw/palette.c | 2 -- 3 files changed, 7 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f55a10a07d5918c59cd80…

1 0

Nikolay Sivov : dxgi: Fix naming in error traces.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: cb2b733b5a2f39b9fd7fa0f63c02663babb0a60d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb2b733b5a2f39b9fd7fa0f63… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 25 09:10:13 2017 +0300 dxgi: Fix naming in error traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 268b6f0..9e62e25 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -175,7 +175,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *ifac hr = IWineDXGIDevice_QueryInterface(iface, &IID_IWineDXGIDeviceParent, (void **)&dxgi_device_parent); if (FAILED(hr)) { - ERR("Device should implement IWineD3DDeviceParent\n"); + ERR("Device should implement IWineDXGIDeviceParent\n"); return E_FAIL; } @@ -405,7 +405,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l if (FAILED(hr = IWineDXGIDevice_QueryInterface(&device->IWineDXGIDevice_iface, &IID_IWineDXGIDeviceParent, (void **)&dxgi_device_parent))) { - ERR("DXGI device should implement IWineD3DDeviceParent.\n"); + ERR("DXGI device should implement IWineDXGIDeviceParent.\n"); IUnknown_Release(device->child_layer); wined3d_private_store_cleanup(&device->private_store); wined3d_mutex_unlock();

1 0

Matteo Bruni : ddraw: Get rid of multiple interfaces from vertex buffer objects.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 68709850f17d04bb908b5d4069dd06d1a0773f47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68709850f17d04bb908b5d406… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 24 19:37:26 2017 +0100 ddraw: Get rid of multiple interfaces from vertex buffer objects. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 4 +- dlls/ddraw/vertexbuffer.c | 164 +++------------------------------------------ 4 files changed, 12 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=68709850f17d04bb908b5…

1 0

Matteo Bruni : wined3d: Fix querying texture-related limits on core profile.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 4f8c502ea75afe2dd01acf8288f0d1a90a333d87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f8c502ea75afe2dd01acf828… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 24 19:37:25 2017 +0100 wined3d: Fix querying texture-related limits on core profile. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5b1605d..2b4fa10 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3346,8 +3346,8 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.blends = 1; gl_info->limits.buffers = 1; - gl_info->limits.textures = 1; - gl_info->limits.texture_coords = 1; + gl_info->limits.textures = 0; + gl_info->limits.texture_coords = 0; for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) gl_info->limits.uniform_blocks[i] = 0; gl_info->limits.fragment_samplers = 1; @@ -3412,23 +3412,33 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) } if (gl_info->supported[ARB_MULTITEXTURE]) { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &gl_max); - gl_info->limits.textures = min(MAX_TEXTURES, gl_max); - TRACE("Max textures: %d.\n", gl_info->limits.textures); + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &gl_max); + gl_info->limits.textures = min(MAX_TEXTURES, gl_max); + TRACE("Max textures: %d.\n", gl_info->limits.textures); + + if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, &gl_max); + gl_info->limits.texture_coords = min(MAX_TEXTURES, gl_max); + } + else + { + gl_info->limits.texture_coords = gl_info->limits.textures; + } + TRACE("Max texture coords: %d.\n", gl_info->limits.texture_coords); + } - if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) + if (gl_info->supported[ARB_FRAGMENT_PROGRAM] || gl_info->supported[ARB_FRAGMENT_SHADER]) { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, &gl_max); - gl_info->limits.texture_coords = min(MAX_TEXTURES, gl_max); - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &gl_max); + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &gl_max); gl_info->limits.fragment_samplers = gl_max; } else { - gl_info->limits.texture_coords = max(gl_info->limits.texture_coords, gl_max); - gl_info->limits.fragment_samplers = max(gl_info->limits.fragment_samplers, gl_max); + gl_info->limits.fragment_samplers = gl_info->limits.textures; } - TRACE("Max texture coords: %d.\n", gl_info->limits.texture_coords); TRACE("Max fragment samplers: %d.\n", gl_info->limits.fragment_samplers); if (gl_info->supported[ARB_VERTEX_SHADER]) @@ -3475,6 +3485,12 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) TRACE("Max vertex attributes: %u.\n", gl_info->limits.vertex_attribs); gl_info->limits.graphics_samplers = gl_info->limits.combined_samplers; } + else + { + gl_info->limits.textures = 1; + gl_info->limits.texture_coords = 1; + } + if (gl_info->supported[ARB_VERTEX_BLEND]) { gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VERTEX_UNITS_ARB, &gl_max);

1 0

Matteo Bruni : wined3d: Don' t require a separate sRGB GL texture if the format doesn' t support sRGB reads.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: ce77ef4ea0d38c9fe21584bbc777249f65092a57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce77ef4ea0d38c9fe21584bbc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 24 19:37:24 2017 +0100 wined3d: Don't require a separate sRGB GL texture if the format doesn't support sRGB reads. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7950011..4ccef50 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3914,11 +3914,11 @@ static inline void context_apply_state(struct wined3d_context *context, static inline BOOL needs_separate_srgb_gl_texture(const struct wined3d_context *context, const struct wined3d_texture *texture) { - unsigned int flags = texture->resource.format_flags; + unsigned int flags = texture->resource.format_flags + & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); return (!context->gl_info->supported[EXT_TEXTURE_SRGB_DECODE] - || (flags & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE)) - != (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE)) + || (flags && flags != (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE))) && context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL; }

1 0

Józef Kucia : wined3d: Always use correct sampler bind index for ld_raw and ld_structured.
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: adedebf47a9a02694b79965eb2aa670b3906b398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adedebf47a9a02694b79965eb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 24 12:27:41 2017 +0100 wined3d: Always use correct sampler bind index for ld_raw and ld_structured. 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/glsl_shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8345888..28d1c15 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5072,8 +5072,8 @@ static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) { const char *prefix = shader_glsl_get_prefix(ins->ctx->reg_maps->shader_version.type); const struct wined3d_shader_src_param *src = &ins->src[ins->src_count - 1]; + unsigned int i, swizzle, resource_idx, bind_idx, stride, src_idx = 0; const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; - unsigned int i, swizzle, resource_idx, stride, src_idx = 0; struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct wined3d_string_buffer *buffer = ins->ctx->buffer; struct glsl_src_param structure_idx, offset; @@ -5090,6 +5090,7 @@ static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) return; } stride = reg_maps->resource_info[resource_idx].stride; + bind_idx = shader_glsl_find_sampler(&reg_maps->sampler_map, resource_idx, WINED3D_SAMPLER_DEFAULT); function = "texelFetch"; resource = "sampler"; } @@ -5101,6 +5102,7 @@ static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) return; } stride = reg_maps->uav_resource_info[resource_idx].stride; + bind_idx = resource_idx; function = "imageLoad"; resource = "image"; } @@ -5123,7 +5125,7 @@ static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) swizzle = shader_glsl_swizzle_get_component(src->swizzle, i); shader_addline(buffer, "%s(%s_%s%u, %s + %u).x);\n", - function, prefix, resource, src->reg.idx[0].offset, address->buffer, swizzle); + function, prefix, resource, bind_idx, address->buffer, swizzle); } string_buffer_release(priv->string_buffers, address);

1 0

Józef Kucia : wined3d: Update UAV read bitmask for ld_raw and ld_structured instructions.
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: dae8785bea94c3b13f1ca7e582af1e9984ff1859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dae8785bea94c3b13f1ca7e58… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 24 12:27:40 2017 +0100 wined3d: Update UAV read bitmask for ld_raw and ld_structured instructions. 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/shader.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 14cb243..fa61674 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1331,11 +1331,15 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st || (WINED3DSIH_IMM_ATOMIC_AND <= ins.handler_idx && ins.handler_idx <= WINED3DSIH_IMM_ATOMIC_XOR && ins.handler_idx != WINED3DSIH_IMM_ATOMIC_CONSUME) - || ins.handler_idx == WINED3DSIH_LD_UAV_TYPED) + || ins.handler_idx == WINED3DSIH_LD_UAV_TYPED + || (ins.handler_idx == WINED3DSIH_LD_RAW && ins.src[1].reg.type == WINED3DSPR_UAV) + || (ins.handler_idx == WINED3DSIH_LD_STRUCTURED && ins.src[2].reg.type == WINED3DSPR_UAV)) { unsigned int reg_idx; - if (ins.handler_idx == WINED3DSIH_LD_UAV_TYPED) + if (ins.handler_idx == WINED3DSIH_LD_UAV_TYPED || ins.handler_idx == WINED3DSIH_LD_RAW) reg_idx = ins.src[1].reg.idx[0].offset; + else if (ins.handler_idx == WINED3DSIH_LD_STRUCTURED) + reg_idx = ins.src[2].reg.idx[0].offset; else if (WINED3DSIH_ATOMIC_AND <= ins.handler_idx && ins.handler_idx <= WINED3DSIH_ATOMIC_XOR) reg_idx = ins.dst[0].reg.idx[0].offset; else

1 0

Józef Kucia : wined3d: Implement ld_structured instruction.
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: 38e2a5ee22199dcd6dde82730bf4c22bb78defe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38e2a5ee22199dcd6dde82730… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 24 12:27:39 2017 +0100 wined3d: Implement ld_structured instruction. 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/glsl_shader.c | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 28a3b3b..8345888 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5068,28 +5068,51 @@ static void shader_glsl_ld_uav(const struct wined3d_shader_instruction *ins) shader_glsl_get_prefix(version->type), uav_idx, image_coord_param.param_str, dst_swizzle); } -static void shader_glsl_ld_raw(const struct wined3d_shader_instruction *ins) +static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) { const char *prefix = shader_glsl_get_prefix(ins->ctx->reg_maps->shader_version.type); - const struct wined3d_shader_src_param *src = &ins->src[1]; + const struct wined3d_shader_src_param *src = &ins->src[ins->src_count - 1]; + const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + unsigned int i, swizzle, resource_idx, stride, src_idx = 0; + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct wined3d_string_buffer *buffer = ins->ctx->buffer; + struct glsl_src_param structure_idx, offset; + struct wined3d_string_buffer *address; struct wined3d_shader_dst_param dst; const char *function, *resource; - struct glsl_src_param offset; - unsigned int i, swizzle; + resource_idx = src->reg.idx[0].offset; if (src->reg.type == WINED3DSPR_RESOURCE) { + if (resource_idx >= ARRAY_SIZE(reg_maps->resource_info)) + { + ERR("Invalid resource index %u.\n", resource_idx); + return; + } + stride = reg_maps->resource_info[resource_idx].stride; function = "texelFetch"; resource = "sampler"; } else { + if (resource_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) + { + ERR("Invalid UAV index %u.\n", resource_idx); + return; + } + stride = reg_maps->uav_resource_info[resource_idx].stride; function = "imageLoad"; resource = "image"; } - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &offset); + address = string_buffer_get(priv->string_buffers); + if (ins->handler_idx == WINED3DSIH_LD_STRUCTURED) + { + shader_glsl_add_src_param(ins, &ins->src[src_idx++], WINED3DSP_WRITEMASK_0, &structure_idx); + shader_addline(address, "%s * %u + ", structure_idx.param_str, stride); + } + shader_glsl_add_src_param(ins, &ins->src[src_idx++], WINED3DSP_WRITEMASK_0, &offset); + shader_addline(address, "%s / 4", offset.param_str); dst = ins->dst[0]; for (i = 0; i < 4; ++i) @@ -5099,9 +5122,11 @@ static void shader_glsl_ld_raw(const struct wined3d_shader_instruction *ins) continue; swizzle = shader_glsl_swizzle_get_component(src->swizzle, i); - shader_addline(buffer, "%s(%s_%s%u, %s / 4 + %u).x);\n", - function, prefix, resource, src->reg.idx[0].offset, offset.param_str, swizzle); + shader_addline(buffer, "%s(%s_%s%u, %s + %u).x);\n", + function, prefix, resource, src->reg.idx[0].offset, address->buffer, swizzle); } + + string_buffer_release(priv->string_buffers, address); } static void shader_glsl_store_uav(const struct wined3d_shader_instruction *ins) @@ -5139,8 +5164,8 @@ static void shader_glsl_store_uav(const struct wined3d_shader_instruction *ins) static void shader_glsl_store_buffer(const struct wined3d_shader_instruction *ins) { const char *prefix = shader_glsl_get_prefix(ins->ctx->reg_maps->shader_version.type); - struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct wined3d_string_buffer *buffer = ins->ctx->buffer; struct glsl_src_param structure_idx, offset, data; struct wined3d_string_buffer *address; @@ -9450,8 +9475,8 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ shader_glsl_ld, /* WINED3DSIH_LD2DMS */ NULL, - /* WINED3DSIH_LD_RAW */ shader_glsl_ld_raw, - /* WINED3DSIH_LD_STRUCTURED */ NULL, + /* WINED3DSIH_LD_RAW */ shader_glsl_ld_buffer, + /* WINED3DSIH_LD_STRUCTURED */ shader_glsl_ld_buffer, /* WINED3DSIH_LD_UAV_TYPED */ shader_glsl_ld_uav, /* WINED3DSIH_LIT */ shader_glsl_lit, /* WINED3DSIH_LOD */ NULL,

1 0

Józef Kucia : wined3d: Handle structured resource declarations.
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: 7cdd18f392882de4d779129d8e519b3dd3830305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cdd18f392882de4d779129d8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 24 12:27:38 2017 +0100 wined3d: Handle structured resource declarations. 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/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 13 +++++++++++++ dlls/wined3d/shader_sm4.c | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index eefc248..28a3b3b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9364,7 +9364,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_OUTPUT_SIV */ shader_glsl_nop, /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_glsl_nop, /* WINED3DSIH_DCL_RESOURCE_RAW */ shader_glsl_nop, - /* WINED3DSIH_DCL_RESOURCE_STRUCTURED */ NULL, + /* WINED3DSIH_DCL_RESOURCE_STRUCTURED */ shader_glsl_nop, /* WINED3DSIH_DCL_SAMPLER */ shader_glsl_nop, /* WINED3DSIH_DCL_STREAM */ NULL, /* WINED3DSIH_DCL_TEMPS */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 37c4352..14cb243 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1025,6 +1025,19 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st reg_maps->resource_info[reg_idx].data_type = WINED3D_DATA_UINT; reg_maps->resource_info[reg_idx].flags = WINED3D_VIEW_BUFFER_RAW; } + else if (ins.handler_idx == WINED3DSIH_DCL_RESOURCE_STRUCTURED) + { + unsigned int reg_idx = ins.declaration.structured_resource.reg.reg.idx[0].offset; + if (reg_idx >= ARRAY_SIZE(reg_maps->resource_info)) + { + ERR("Invalid resource index %u.\n", reg_idx); + break; + } + reg_maps->resource_info[reg_idx].type = WINED3D_SHADER_RESOURCE_BUFFER; + reg_maps->resource_info[reg_idx].data_type = WINED3D_DATA_UINT; + reg_maps->resource_info[reg_idx].flags = 0; + reg_maps->resource_info[reg_idx].stride = ins.declaration.structured_resource.byte_stride / 4; + } else if (ins.handler_idx == WINED3DSIH_DCL_SAMPLER) { if (ins.flags & WINED3DSI_SAMPLER_COMPARISON_MODE) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 877b27d..26aacc7 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -780,6 +780,8 @@ static void shader_sm5_read_dcl_resource_structured(struct wined3d_shader_instru { shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_RESOURCE, &ins->declaration.structured_resource.reg); ins->declaration.structured_resource.byte_stride = *tokens; + if (ins->declaration.structured_resource.byte_stride % 4) + FIXME("Byte stride %u is not multiple of 4.\n", ins->declaration.structured_resource.byte_stride); } static void shader_sm5_read_dcl_resource_raw(struct wined3d_shader_instruction *ins,

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
84
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 February 2017