March 2017 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Use context_get_tex_unit_mapping() in context_bind_shader_resources().
by Alexandre Julliard March 15, 2017

March 15, 2017

Module: wine Branch: master Commit: 57757a3bd9d32056736efad701a410abc20578a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57757a3bd9d32056736efad70… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 15 12:00:04 2017 +0100 wined3d: Use context_get_tex_unit_mapping() in context_bind_shader_resources(). 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 | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e1ecbbb..f625329 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3394,21 +3394,24 @@ static void context_load_shader_resources(struct wined3d_context *context, const } static void context_bind_shader_resources(struct wined3d_context *context, - const struct wined3d_state *state, enum wined3d_shader_type shader_type, - unsigned int base_idx, unsigned int count) + const struct wined3d_state *state, enum wined3d_shader_type shader_type) { + unsigned int bind_idx, shader_sampler_count, base, count, i; const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_device *device = context->device; struct wined3d_shader_sampler_map_entry *entry; struct wined3d_shader_resource_view *view; - unsigned int shader_sampler_count, i; const struct wined3d_shader *shader; struct wined3d_sampler *sampler; + const DWORD *tex_unit_map; GLuint sampler_name; if (!(shader = state->shader[shader_type])) return; + tex_unit_map = context_get_tex_unit_mapping(context, + &shader->reg_maps.shader_version, &base, &count); + shader_sampler_count = shader->reg_maps.sampler_map.count; if (shader_sampler_count > count) FIXME("Shader %p needs %u samplers, but only %u are supported.\n", @@ -3418,6 +3421,9 @@ static void context_bind_shader_resources(struct wined3d_context *context, for (i = 0; i < count; ++i) { entry = &shader->reg_maps.sampler_map.entries[i]; + bind_idx = base + entry->bind_idx; + if (tex_unit_map) + bind_idx = tex_unit_map[bind_idx]; if (!(view = state->shader_resource_view[shader_type][entry->resource_idx])) { @@ -3432,25 +3438,13 @@ static void context_bind_shader_resources(struct wined3d_context *context, else sampler_name = device->null_sampler; - context_active_texture(context, gl_info, base_idx + entry->bind_idx); - GL_EXTCALL(glBindSampler(base_idx + entry->bind_idx, sampler_name)); + context_active_texture(context, gl_info, bind_idx); + GL_EXTCALL(glBindSampler(bind_idx, sampler_name)); checkGLcall("glBindSampler"); wined3d_shader_resource_view_bind(view, context); } } -static void context_bind_graphics_shader_resources(struct wined3d_context *context, - const struct wined3d_state *state) -{ - unsigned int i, base_idx, count; - - for (i = 0; i < WINED3D_SHADER_TYPE_GRAPHICS_COUNT; ++i) - { - wined3d_gl_limits_get_texture_unit_range(&context->gl_info->limits, i, &base_idx, &count); - context_bind_shader_resources(context, state, i, base_idx, count); - } -} - static void context_load_unordered_access_resources(struct wined3d_context *context, const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) { @@ -3613,7 +3607,8 @@ BOOL context_apply_draw_state(struct wined3d_context *context, if (context->update_shader_resource_bindings) { - context_bind_graphics_shader_resources(context, state); + for (i = 0; i < WINED3D_SHADER_TYPE_GRAPHICS_COUNT; ++i) + context_bind_shader_resources(context, state, i); context->update_shader_resource_bindings = 0; if (gl_info->limits.combined_samplers == gl_info->limits.graphics_samplers) context->update_compute_shader_resource_bindings = 1; @@ -3668,10 +3663,7 @@ void context_apply_compute_state(struct wined3d_context *context, if (context->update_compute_shader_resource_bindings) { - unsigned int base_idx, count; - wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, - WINED3D_SHADER_TYPE_COMPUTE, &base_idx, &count); - context_bind_shader_resources(context, state, WINED3D_SHADER_TYPE_COMPUTE, base_idx, count); + context_bind_shader_resources(context, state, WINED3D_SHADER_TYPE_COMPUTE); context->update_compute_shader_resource_bindings = 0; if (gl_info->limits.combined_samplers == gl_info->limits.graphics_samplers) context->update_shader_resource_bindings = 1;

1 0

Józef Kucia : d3d9/tests: Add test for vertex textures.
by Alexandre Julliard March 14, 2017

March 14, 2017

Module: wine Branch: master Commit: a5fb297ae46fea06d5354901c1b3ab2ae39a2ec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5fb297ae46fea06d5354901c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 14 13:16:01 2017 +0100 d3d9/tests: Add test for vertex textures. 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/d3d9/tests/visual.c | 129 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 2fa3032..59a2e7d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -22408,6 +22408,134 @@ static void test_drawindexedprimitiveup(void) DestroyWindow(window); } +static void test_vertex_texture(void) +{ + static const D3DVERTEXELEMENT9 decl_elements[] = + { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + D3DDECL_END() + }; + static const struct vec3 quad[] = + { + {-1.0f, -1.0f, 0.0f}, + {-1.0f, 1.0f, 0.0f}, + { 1.0f, -1.0f, 0.0f}, + { 1.0f, 1.0f, 0.0f}, + }; + static const DWORD vs_code[] = + { + 0xfffe0300, /* vs_3_0 */ + 0x05000051, 0xa00f0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, /* def c0, 0, 0, 0, 0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x0200001f, 0x90000000, 0xa00f0800, /* dcl_2d s0 */ + 0x0200001f, 0x80000000, 0xe00f0000, /* dcl_position o0 */ + 0x0200001f, 0x8000000a, 0xe00f0001, /* dcl_color o1 */ + 0x0300005f, 0xe00f0001, 0xa0000000, 0xa0e40800, /* texldl o1, c0.x, s0 */ + 0x02000001, 0xe00f0000, 0x90e40000, /* mov o0, v0 */ + 0x0000ffff, /* end */ + }; + static const DWORD ps_code[] = + { + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x8000000a, 0x900f0000, /* dcl_color v0 */ + 0x02000001, 0x800f0800, 0x90e40000, /* mov oC0, v0 */ + 0x0000ffff, /* end */ + }; + static const DWORD texture_data[4] = {0x00ffff00, 0x00ffff00, 0x00ffff00, 0x00ffff00}; + IDirect3DVertexDeclaration9 *declaration; + IDirect3DTexture9 *texture; + IDirect3DVertexShader9 *vs; + IDirect3DPixelShader9 *ps; + IDirect3DDevice9 *device; + D3DLOCKED_RECT lr; + IDirect3D9 *d3d; + D3DCOLOR color; + ULONG refcount; + D3DCAPS9 caps; + HWND window; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create D3D object.\n"); + + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create D3D device.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.VertexShaderVersion < D3DVS_VERSION(3, 0) || caps.PixelShaderVersion < D3DPS_VERSION(3, 0)) + { + skip("SM3 is not supported.\n"); + goto done; + } + if (!(caps.VertexTextureFilterCaps & D3DPTFILTERCAPS_MAGFPOINT) + || !(caps.VertexTextureFilterCaps & D3DPTFILTERCAPS_MINFPOINT)) + { + skip("Vertex texture point filtering is not supported, caps %#x.\n", caps.VertexTextureFilterCaps); + goto done; + } + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_QUERY_VERTEXTEXTURE, D3DRTYPE_TEXTURE, D3DFMT_A8R8G8B8); + if (hr != D3D_OK) + { + skip("No vertex texture fetch support for D3DFMT_A8R8G8B8, hr %#x.\n", hr); + goto done; + } + + hr = IDirect3DDevice9_CreateTexture(device, 2, 2, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture, NULL); + ok(hr == D3D_OK, "Failed to create texture, hr %#x.\n", hr); + memset(&lr, 0, sizeof(lr)); + hr = IDirect3DTexture9_LockRect(texture, 0, &lr, NULL, 0); + ok(hr == D3D_OK, "Failed to lock texture, hr %#x.\n", hr); + memcpy(lr.pBits, texture_data, sizeof(texture_data)); + hr = IDirect3DTexture9_UnlockRect(texture, 0); + ok(hr == D3D_OK, "Failed to unlock texture, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetTexture(device, D3DVERTEXTEXTURESAMPLER0, (IDirect3DBaseTexture9 *)texture); + ok(hr == D3D_OK, "Failed to set texture, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &declaration); + ok(SUCCEEDED(hr), "Failed to create vertex declaration, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateVertexShader(device, vs_code, &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, ps_code, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetVertexDeclaration(device, declaration); + ok(SUCCEEDED(hr), "Failed to set vertex declaration, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, vs); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, ps); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 160, 360); + ok(color == texture_data[0], "Got unexpected color 0x%08x.\n", color); + + IDirect3DPixelShader9_Release(ps); + IDirect3DVertexShader9_Release(vs); + IDirect3DTexture9_Release(texture); + IDirect3DVertexDeclaration9_Release(declaration); +done: + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -22537,4 +22665,5 @@ START_TEST(visual) test_max_index16(); test_backbuffer_resize(); test_drawindexedprimitiveup(); + test_vertex_texture(); }

1 0

Józef Kucia : wined3d: Use layout qualifiers to bind GLSL samplers.
by Alexandre Julliard March 14, 2017

March 14, 2017

Module: wine Branch: master Commit: 761d59f9c04c948ad543bab6b5c1b64148a9a65f URL: http://source.winehq.org/git/wine.git/?a=commit;h=761d59f9c04c948ad543bab6b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 14 13:15:59 2017 +0100 wined3d: Use layout qualifiers to bind GLSL samplers. 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 | 63 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 34427ea..e363791 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -620,6 +620,31 @@ static void shader_glsl_load_samplers_range(const struct wined3d_gl_info *gl_inf string_buffer_release(&priv->string_buffers, sampler_name); } +static unsigned int shader_glsl_map_tex_unit(const struct wined3d_context *context, + const struct wined3d_shader_version *shader_version, unsigned int sampler_idx) +{ + const DWORD *tex_unit_map; + unsigned int base, count; + + tex_unit_map = context_get_tex_unit_mapping(context, shader_version, &base, &count); + if (sampler_idx >= count) + return WINED3D_UNMAPPED_STAGE; + if (!tex_unit_map) + return base + sampler_idx; + return tex_unit_map[base + sampler_idx]; +} + +static void shader_glsl_append_sampler_binding_qualifier(struct wined3d_string_buffer *buffer, + const struct wined3d_context *context, const struct wined3d_shader_version *shader_version, + unsigned int sampler_idx) +{ + unsigned int mapped_unit = shader_glsl_map_tex_unit(context, shader_version, sampler_idx); + if (mapped_unit != WINED3D_UNMAPPED_STAGE) + shader_addline(buffer, "layout(binding = %u)\n", mapped_unit); + else + ERR("Unmapped sampler %u.\n", sampler_idx); +} + /* Context activation is done by the caller. */ static void shader_glsl_load_samplers(const struct wined3d_context *context, struct shader_glsl_priv *priv, GLuint program_id, const struct wined3d_shader_reg_maps *reg_maps) @@ -630,6 +655,9 @@ static void shader_glsl_load_samplers(const struct wined3d_context *context, unsigned int base, count; const char *prefix; + if (shader_glsl_use_layout_binding_qualifier(gl_info)) + return; + shader_version = reg_maps ? &reg_maps->shader_version : NULL; prefix = shader_glsl_get_prefix(shader_version ? shader_version->type : WINED3D_SHADER_TYPE_PIXEL); tex_unit_map = context_get_tex_unit_mapping(context, shader_version, &base, &count); @@ -2202,6 +2230,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont FIXME("Unhandled resource type %#x.\n", reg_maps->resource_info[entry->resource_idx].type); break; } + + if (shader_glsl_use_layout_binding_qualifier(gl_info)) + shader_glsl_append_sampler_binding_qualifier(buffer, context, version, entry->bind_idx); shader_addline(buffer, "uniform %s%s %s_sampler%u;\n", sampler_type_prefix, sampler_type, prefix, entry->bind_idx); } @@ -8055,13 +8086,14 @@ static void shader_glsl_ffp_fragment_op(struct wined3d_string_buffer *buffer, un /* Context activation is done by the caller. */ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv *priv, - const struct ffp_frag_settings *settings, const struct wined3d_gl_info *gl_info) + const struct ffp_frag_settings *settings, const struct wined3d_context *context) { struct wined3d_string_buffer *tex_reg_name = string_buffer_get(&priv->string_buffers); enum wined3d_cmp_func alpha_test_func = settings->alpha_test_func + 1; - BOOL legacy_context = gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]; struct wined3d_string_buffer *buffer = &priv->shader_buffer; BYTE lum_map = 0, bump_map = 0, tex_map = 0, tss_const_map = 0; + const struct wined3d_gl_info *gl_info = context->gl_info; + BOOL legacy_context = gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]; BOOL tempreg_used = FALSE, tfactor_used = FALSE; UINT lowest_disabled_stage; GLuint shader_id; @@ -8133,6 +8165,8 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * shader_glsl_add_version_declaration(buffer, gl_info, NULL); + if (gl_info->supported[ARB_SHADING_LANGUAGE_420PACK]) + shader_addline(buffer, "#extension GL_ARB_shading_language_420pack : enable\n"); if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) shader_addline(buffer, "#extension GL_ARB_texture_rectangle : enable\n"); @@ -8147,6 +8181,8 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * for (stage = 0; stage < MAX_TEXTURES; ++stage) { + const char *sampler_type; + if (tss_const_map & (1u << stage)) shader_addline(buffer, "uniform vec4 tss_const%u;\n", stage); @@ -8156,24 +8192,31 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * switch (settings->op[stage].tex_type) { case WINED3D_GL_RES_TYPE_TEX_1D: - shader_addline(buffer, "uniform sampler1D ps_sampler%u;\n", stage); + sampler_type = "1D"; break; case WINED3D_GL_RES_TYPE_TEX_2D: - shader_addline(buffer, "uniform sampler2D ps_sampler%u;\n", stage); + sampler_type = "2D"; break; case WINED3D_GL_RES_TYPE_TEX_3D: - shader_addline(buffer, "uniform sampler3D ps_sampler%u;\n", stage); + sampler_type = "3D"; break; case WINED3D_GL_RES_TYPE_TEX_CUBE: - shader_addline(buffer, "uniform samplerCube ps_sampler%u;\n", stage); + sampler_type = "Cube"; break; case WINED3D_GL_RES_TYPE_TEX_RECT: - shader_addline(buffer, "uniform sampler2DRect ps_sampler%u;\n", stage); + sampler_type = "2DRect"; break; default: FIXME("Unhandled sampler type %#x.\n", settings->op[stage].tex_type); + sampler_type = NULL; break; } + if (sampler_type) + { + if (shader_glsl_use_layout_binding_qualifier(gl_info)) + shader_glsl_append_sampler_binding_qualifier(buffer, context, NULL, stage); + shader_addline(buffer, "uniform sampler%s ps_sampler%u;\n", sampler_type, stage); + } shader_addline(buffer, "vec4 tex%u;\n", stage); @@ -8499,7 +8542,7 @@ static struct glsl_ffp_vertex_shader *shader_glsl_find_ffp_vertex_shader(struct } static struct glsl_ffp_fragment_shader *shader_glsl_find_ffp_fragment_shader(struct shader_glsl_priv *priv, - const struct wined3d_gl_info *gl_info, const struct ffp_frag_settings *args) + const struct ffp_frag_settings *args, const struct wined3d_context *context) { struct glsl_ffp_fragment_shader *glsl_desc; const struct ffp_frag_desc *desc; @@ -8511,7 +8554,7 @@ static struct glsl_ffp_fragment_shader *shader_glsl_find_ffp_fragment_shader(str return NULL; glsl_desc->entry.settings = *args; - glsl_desc->id = shader_glsl_generate_ffp_fragment_shader(priv, args, gl_info); + glsl_desc->id = shader_glsl_generate_ffp_fragment_shader(priv, args, context); list_init(&glsl_desc->linked_programs); add_ffp_frag_shader(&priv->ffp_fragment_shaders, &glsl_desc->entry); @@ -8832,7 +8875,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct ffp_frag_settings settings; gen_ffp_frag_op(context, state, &settings, FALSE); - ffp_shader = shader_glsl_find_ffp_fragment_shader(priv, gl_info, &settings); + ffp_shader = shader_glsl_find_ffp_fragment_shader(priv, &settings, context); ps_id = ffp_shader->id; ps_list = &ffp_shader->linked_programs; }

1 0

Józef Kucia : wined3d: Introduce context_get_tex_unit_mapping() helper function.
by Alexandre Julliard March 14, 2017

March 14, 2017

Module: wine Branch: master Commit: 12edaf9ad01db5f759616488267aa36a732f1314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12edaf9ad01db5f7596164882… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 14 13:15:58 2017 +0100 wined3d: Introduce context_get_tex_unit_mapping() helper function. 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 | 37 +++++++++++++++++++++++++++++++++++++ dlls/wined3d/glsl_shader.c | 35 ++++++----------------------------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 45 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 42b1245..e1ecbbb 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2081,6 +2081,43 @@ void context_destroy(struct wined3d_device *device, struct wined3d_context *cont if (destroy) HeapFree(GetProcessHeap(), 0, context); } +const DWORD *context_get_tex_unit_mapping(const struct wined3d_context *context, + const struct wined3d_shader_version *shader_version, unsigned int *base, unsigned int *count) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + if (!shader_version) + { + *base = 0; + *count = MAX_TEXTURES; + return context->tex_unit_map; + } + + if (shader_version->major >= 4) + { + wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, shader_version->type, base, count); + return NULL; + } + + switch (shader_version->type) + { + case WINED3D_SHADER_TYPE_PIXEL: + *base = 0; + *count = MAX_FRAGMENT_SAMPLERS; + break; + case WINED3D_SHADER_TYPE_VERTEX: + *base = MAX_FRAGMENT_SAMPLERS; + *count = MAX_VERTEX_SAMPLERS; + break; + default: + ERR("Unhandled shader type %#x.\n", shader_version->type); + *base = 0; + *count = 0; + } + + return context->tex_unit_map; +} + /* Context activation is done by the caller. */ static void set_blit_dimension(const struct wined3d_gl_info *gl_info, UINT width, UINT height) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 572d2ef..34427ea 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -624,36 +624,15 @@ static void shader_glsl_load_samplers_range(const struct wined3d_gl_info *gl_inf static void shader_glsl_load_samplers(const struct wined3d_context *context, struct shader_glsl_priv *priv, GLuint program_id, const struct wined3d_shader_reg_maps *reg_maps) { - const struct wined3d_shader_version *version = &reg_maps->shader_version; - const char *prefix = shader_glsl_get_prefix(version->type); const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_shader_version *shader_version; const DWORD *tex_unit_map; unsigned int base, count; + const char *prefix; - if (reg_maps->shader_version.major >= 4) - { - tex_unit_map = NULL; - wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, version->type, &base, &count); - } - else - { - tex_unit_map = context->tex_unit_map; - switch (reg_maps->shader_version.type) - { - case WINED3D_SHADER_TYPE_PIXEL: - base = 0; - count = MAX_FRAGMENT_SAMPLERS; - break; - case WINED3D_SHADER_TYPE_VERTEX: - base = MAX_FRAGMENT_SAMPLERS; - count = MAX_VERTEX_SAMPLERS; - break; - default: - ERR("Unhandled shader type %#x.\n", reg_maps->shader_version.type); - return; - } - } - + shader_version = reg_maps ? &reg_maps->shader_version : NULL; + prefix = shader_glsl_get_prefix(shader_version ? shader_version->type : WINED3D_SHADER_TYPE_PIXEL); + tex_unit_map = context_get_tex_unit_mapping(context, shader_version, &base, &count); shader_glsl_load_samplers_range(gl_info, priv, program_id, prefix, base, count, tex_unit_map); } @@ -9096,9 +9075,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const { entry->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS; - shader_glsl_load_samplers_range(gl_info, priv, program_id, - shader_glsl_get_prefix(WINED3D_SHADER_TYPE_PIXEL), - 0, MAX_TEXTURES, context->tex_unit_map); + shader_glsl_load_samplers(context, priv, program_id, NULL); } for (i = 0; i < MAX_TEXTURES; ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 80b7236..8637dd3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1926,6 +1926,8 @@ void context_free_event_query(struct wined3d_event_query *query) DECLSPEC_HIDDEN void context_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN; GLenum context_get_offscreen_gl_buffer(const struct wined3d_context *context) DECLSPEC_HIDDEN; +const DWORD *context_get_tex_unit_mapping(const struct wined3d_context *context, + const struct wined3d_shader_version *shader_version, unsigned int *base, unsigned int *count) DECLSPEC_HIDDEN; DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; void context_gl_resource_released(struct wined3d_device *device, GLuint name, BOOL rb_namespace) DECLSPEC_HIDDEN;

1 0

Matteo Bruni : ddraw: Fix d3d6 version of ComputeSphereVisibility().
by Alexandre Julliard March 14, 2017

March 14, 2017

Module: wine Branch: master Commit: 8bfc9e66143e8cb079432ba94187f4e9baeb08d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bfc9e66143e8cb079432ba94… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 14 00:09:57 2017 +0100 ddraw: Fix d3d6 version of ComputeSphereVisibility(). 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/device.c | 122 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 88 insertions(+), 34 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 6e212c9..772ce3e 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4494,46 +4494,48 @@ static HRESULT WINAPI d3d_device3_DrawIndexedPrimitiveVB(IDirect3DDevice3 *iface * *****************************************************************************/ -static DWORD in_plane(UINT idx, struct wined3d_vec4 p, D3DVECTOR center, D3DVALUE radius) +static DWORD in_plane(UINT idx, struct wined3d_vec4 p, D3DVECTOR center, D3DVALUE radius, BOOL equality) { float distance, norm; norm = sqrtf(p.x * p.x + p.y * p.y + p.z * p.z); distance = (p.x * center.u1.x + p.y * center.u2.y + p.z * center.u3.z + p.w) / norm; - if (fabs(distance) < radius) - return D3DSTATUS_CLIPUNIONLEFT << idx; - if (distance < -radius) - return (D3DSTATUS_CLIPUNIONLEFT | D3DSTATUS_CLIPINTERSECTIONLEFT) << idx; + if (equality) + { + if (fabs(distance) <= radius) + return D3DSTATUS_CLIPUNIONLEFT << idx; + if (distance <= -radius) + return (D3DSTATUS_CLIPUNIONLEFT | D3DSTATUS_CLIPINTERSECTIONLEFT) << idx; + } + else + { + if (fabs(distance) < radius) + return D3DSTATUS_CLIPUNIONLEFT << idx; + if (distance < -radius) + return (D3DSTATUS_CLIPUNIONLEFT | D3DSTATUS_CLIPINTERSECTIONLEFT) << idx; + } return 0; } -static HRESULT WINAPI d3d_device7_ComputeSphereVisibility(IDirect3DDevice7 *iface, - D3DVECTOR *centers, D3DVALUE *radii, DWORD sphere_count, DWORD flags, DWORD *return_values) +static void prepare_clip_space_planes(struct d3d_device *device, struct wined3d_vec4 *plane) { - struct wined3d_vec4 plane[12]; - DWORD enabled_planes; D3DMATRIX m, temp; - HRESULT hr; - UINT i, j; - TRACE("iface %p, centers %p, radii %p, sphere_count %u, flags %#x, return_values %p.\n", - iface, centers, radii, sphere_count, flags, return_values); + /* We want the wined3d matrices since those include the legacy viewport + * transformation. */ + wined3d_mutex_lock(); + wined3d_device_get_transform(device->wined3d_device, + WINED3D_TS_WORLD, (struct wined3d_matrix *)&m); - hr = d3d_device7_GetTransform(iface, D3DTRANSFORMSTATE_WORLD, &m); - if (hr != DD_OK) - return DDERR_INVALIDPARAMS; - hr = d3d_device7_GetTransform(iface, D3DTRANSFORMSTATE_VIEW, &temp); - if (hr != DD_OK) - return DDERR_INVALIDPARAMS; + wined3d_device_get_transform(device->wined3d_device, + WINED3D_TS_VIEW, (struct wined3d_matrix *)&temp); multiply_matrix(&m, &temp, &m); - hr = d3d_device7_GetTransform(iface, D3DTRANSFORMSTATE_PROJECTION, &temp); - if (hr != DD_OK) - return DDERR_INVALIDPARAMS; + wined3d_device_get_transform(device->wined3d_device, + WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&temp); multiply_matrix(&m, &temp, &m); - - IDirect3DDevice7_GetRenderState(iface, D3DRENDERSTATE_CLIPPLANEENABLE, &enabled_planes); + wined3d_mutex_unlock(); /* Left plane. */ plane[0].x = m._14 + m._11; @@ -4570,33 +4572,85 @@ static HRESULT WINAPI d3d_device7_ComputeSphereVisibility(IDirect3DDevice7 *ifac plane[5].y = m._24 - m._23; plane[5].z = m._34 - m._33; plane[5].w = m._44 - m._43; +} - for (j = 6; j < 12; ++j) - IDirect3DDevice7_GetClipPlane(iface, j - 6, (D3DVALUE *)&plane[j]); +static void compute_sphere_visibility(struct wined3d_vec4 plane[12], DWORD enabled_planes, BOOL equality, + D3DVECTOR *centers, D3DVALUE *radii, DWORD sphere_count, DWORD *return_values) +{ + UINT i, j; for (i = 0; i < sphere_count; ++i) { return_values[i] = 0; - for (j = 0; j < 6; ++j) - return_values[i] |= in_plane(j, plane[j], centers[i], radii[i]); - for (; j < 12; ++j) - if (enabled_planes & 1u << (j - 6)) - return_values[i] |= in_plane(j, plane[j], centers[i], radii[i]); + for (j = 0; j < 12; ++j) + if (enabled_planes & 1u << j) + return_values[i] |= in_plane(j, plane[j], centers[i], radii[i], equality); } +} + +static HRESULT WINAPI d3d_device7_ComputeSphereVisibility(IDirect3DDevice7 *iface, + D3DVECTOR *centers, D3DVALUE *radii, DWORD sphere_count, DWORD flags, DWORD *return_values) +{ + struct wined3d_vec4 plane[12]; + DWORD enabled_planes = 0x3f; + DWORD user_clip_planes; + UINT j; + + TRACE("iface %p, centers %p, radii %p, sphere_count %u, flags %#x, return_values %p.\n", + iface, centers, radii, sphere_count, flags, return_values); + + prepare_clip_space_planes(impl_from_IDirect3DDevice7(iface), plane); + IDirect3DDevice7_GetRenderState(iface, D3DRENDERSTATE_CLIPPLANEENABLE, &user_clip_planes); + enabled_planes |= user_clip_planes << 6; + for (j = 6; j < 12; ++j) + IDirect3DDevice7_GetClipPlane(iface, j - 6, (D3DVALUE *)&plane[j]); + + compute_sphere_visibility(plane, enabled_planes, FALSE, centers, radii, sphere_count, return_values); return D3D_OK; } static HRESULT WINAPI d3d_device3_ComputeSphereVisibility(IDirect3DDevice3 *iface, D3DVECTOR *centers, D3DVALUE *radii, DWORD sphere_count, DWORD flags, DWORD *return_values) { - struct d3d_device *device = impl_from_IDirect3DDevice3(iface); + static const DWORD enabled_planes = 0x3f; + struct wined3d_vec4 plane[6]; + unsigned int i, j; TRACE("iface %p, centers %p, radii %p, sphere_count %u, flags %#x, return_values %p.\n", iface, centers, radii, sphere_count, flags, return_values); - return IDirect3DDevice7_ComputeSphereVisibility(&device->IDirect3DDevice7_iface, - centers, radii, sphere_count, flags, return_values); + prepare_clip_space_planes(impl_from_IDirect3DDevice3(iface), plane); + + compute_sphere_visibility(plane, enabled_planes, TRUE, centers, radii, sphere_count, return_values); + for (i = 0; i < sphere_count; ++i) + { + BOOL intersect_frustum = FALSE, outside_frustum = FALSE; + DWORD d3d7_result = return_values[i]; + + return_values[i] = 0; + + for (j = 0; j < 6; ++j) + { + DWORD clip = (d3d7_result >> j) & (D3DSTATUS_CLIPUNIONLEFT | D3DSTATUS_CLIPINTERSECTIONLEFT); + + if (clip == D3DSTATUS_CLIPUNIONLEFT) + { + return_values[i] |= D3DVIS_INTERSECT_LEFT << j * 2; + intersect_frustum = TRUE; + } + else if (clip) + { + return_values[i] |= D3DVIS_OUTSIDE_LEFT << j * 2; + outside_frustum = TRUE; + } + } + if (outside_frustum) + return_values[i] |= D3DVIS_OUTSIDE_FRUSTUM; + else if (intersect_frustum) + return_values[i] |= D3DVIS_INTERSECT_FRUSTUM; + } + return D3D_OK; } /*****************************************************************************

1 0

Matteo Bruni : ddraw/tests: Cleanup and extend d3d7 ComputeSphereVisibility() tests.
by Alexandre Julliard March 14, 2017

March 14, 2017

Module: wine Branch: master Commit: 52512b3d012ccef4e5eeba3263e7d7cf3366fa4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=52512b3d012ccef4e5eeba326… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 14 00:09:56 2017 +0100 ddraw/tests: Cleanup and extend d3d7 ComputeSphereVisibility() tests. 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/tests/d3d.c | 189 ---------------------------------------------- dlls/ddraw/tests/ddraw7.c | 107 ++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 189 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52512b3d012ccef4e5eeb…

1 0

Matteo Bruni : ddraw: Take user clip planes into account in d3d7 ComputeSphereVisibility().
by Alexandre Julliard March 14, 2017

March 14, 2017

Module: wine Branch: master Commit: 5f5e83977b8a184b28ced55210978d22ac56a607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f5e83977b8a184b28ced5521… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 14 00:09:55 2017 +0100 ddraw: Take user clip planes into account in d3d7 ComputeSphereVisibility(). 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/device.c | 105 +++++++++++++++++++++++++++++----------------------- 1 file changed, 59 insertions(+), 46 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 56a4a6b..6e212c9 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4494,24 +4494,26 @@ static HRESULT WINAPI d3d_device3_DrawIndexedPrimitiveVB(IDirect3DDevice3 *iface * *****************************************************************************/ -static DWORD in_plane(UINT plane, D3DVECTOR normal, D3DVALUE origin_plane, D3DVECTOR center, D3DVALUE radius) +static DWORD in_plane(UINT idx, struct wined3d_vec4 p, D3DVECTOR center, D3DVALUE radius) { float distance, norm; - norm = sqrtf(normal.u1.x * normal.u1.x + normal.u2.y * normal.u2.y + normal.u3.z * normal.u3.z); - distance = ( origin_plane + normal.u1.x * center.u1.x + normal.u2.y * center.u2.y + normal.u3.z * center.u3.z ) / norm; + norm = sqrtf(p.x * p.x + p.y * p.y + p.z * p.z); + distance = (p.x * center.u1.x + p.y * center.u2.y + p.z * center.u3.z + p.w) / norm; - if ( fabs( distance ) < radius ) return D3DSTATUS_CLIPUNIONLEFT << plane; - if ( distance < -radius ) return (D3DSTATUS_CLIPUNIONLEFT | D3DSTATUS_CLIPINTERSECTIONLEFT) << plane; + if (fabs(distance) < radius) + return D3DSTATUS_CLIPUNIONLEFT << idx; + if (distance < -radius) + return (D3DSTATUS_CLIPUNIONLEFT | D3DSTATUS_CLIPINTERSECTIONLEFT) << idx; return 0; } static HRESULT WINAPI d3d_device7_ComputeSphereVisibility(IDirect3DDevice7 *iface, D3DVECTOR *centers, D3DVALUE *radii, DWORD sphere_count, DWORD flags, DWORD *return_values) { + struct wined3d_vec4 plane[12]; + DWORD enabled_planes; D3DMATRIX m, temp; - D3DVALUE origin_plane[6]; - D3DVECTOR vec[6]; HRESULT hr; UINT i, j; @@ -4519,56 +4521,67 @@ static HRESULT WINAPI d3d_device7_ComputeSphereVisibility(IDirect3DDevice7 *ifac iface, centers, radii, sphere_count, flags, return_values); hr = d3d_device7_GetTransform(iface, D3DTRANSFORMSTATE_WORLD, &m); - if ( hr != DD_OK ) return DDERR_INVALIDPARAMS; + if (hr != DD_OK) + return DDERR_INVALIDPARAMS; hr = d3d_device7_GetTransform(iface, D3DTRANSFORMSTATE_VIEW, &temp); - if ( hr != DD_OK ) return DDERR_INVALIDPARAMS; + if (hr != DD_OK) + return DDERR_INVALIDPARAMS; multiply_matrix(&m, &temp, &m); hr = d3d_device7_GetTransform(iface, D3DTRANSFORMSTATE_PROJECTION, &temp); - if ( hr != DD_OK ) return DDERR_INVALIDPARAMS; + if (hr != DD_OK) + return DDERR_INVALIDPARAMS; multiply_matrix(&m, &temp, &m); -/* Left plane */ - vec[0].u1.x = m._14 + m._11; - vec[0].u2.y = m._24 + m._21; - vec[0].u3.z = m._34 + m._31; - origin_plane[0] = m._44 + m._41; - -/* Right plane */ - vec[1].u1.x = m._14 - m._11; - vec[1].u2.y = m._24 - m._21; - vec[1].u3.z = m._34 - m._31; - origin_plane[1] = m._44 - m._41; - -/* Top plane */ - vec[2].u1.x = m._14 - m._12; - vec[2].u2.y = m._24 - m._22; - vec[2].u3.z = m._34 - m._32; - origin_plane[2] = m._44 - m._42; - -/* Bottom plane */ - vec[3].u1.x = m._14 + m._12; - vec[3].u2.y = m._24 + m._22; - vec[3].u3.z = m._34 + m._32; - origin_plane[3] = m._44 + m._42; - -/* Front plane */ - vec[4].u1.x = m._13; - vec[4].u2.y = m._23; - vec[4].u3.z = m._33; - origin_plane[4] = m._43; - -/* Back plane*/ - vec[5].u1.x = m._14 - m._13; - vec[5].u2.y = m._24 - m._23; - vec[5].u3.z = m._34 - m._33; - origin_plane[5] = m._44 - m._43; + IDirect3DDevice7_GetRenderState(iface, D3DRENDERSTATE_CLIPPLANEENABLE, &enabled_planes); + + /* Left plane. */ + plane[0].x = m._14 + m._11; + plane[0].y = m._24 + m._21; + plane[0].z = m._34 + m._31; + plane[0].w = m._44 + m._41; + + /* Right plane. */ + plane[1].x = m._14 - m._11; + plane[1].y = m._24 - m._21; + plane[1].z = m._34 - m._31; + plane[1].w = m._44 - m._41; + + /* Top plane. */ + plane[2].x = m._14 - m._12; + plane[2].y = m._24 - m._22; + plane[2].z = m._34 - m._32; + plane[2].w = m._44 - m._42; + + /* Bottom plane. */ + plane[3].x = m._14 + m._12; + plane[3].y = m._24 + m._22; + plane[3].z = m._34 + m._32; + plane[3].w = m._44 + m._42; + + /* Front plane. */ + plane[4].x = m._13; + plane[4].y = m._23; + plane[4].z = m._33; + plane[4].w = m._43; + + /* Back plane. */ + plane[5].x = m._14 - m._13; + plane[5].y = m._24 - m._23; + plane[5].z = m._34 - m._33; + plane[5].w = m._44 - m._43; + + for (j = 6; j < 12; ++j) + IDirect3DDevice7_GetClipPlane(iface, j - 6, (D3DVALUE *)&plane[j]); for (i = 0; i < sphere_count; ++i) { return_values[i] = 0; for (j = 0; j < 6; ++j) - return_values[i] |= in_plane(j, vec[j], origin_plane[j], centers[i], radii[i]); + return_values[i] |= in_plane(j, plane[j], centers[i], radii[i]); + for (; j < 12; ++j) + if (enabled_planes & 1u << (j - 6)) + return_values[i] |= in_plane(j, plane[j], centers[i], radii[i]); } return D3D_OK;

1 0

Piotr Caban : msvcr: Fix strftime spec file entry.
by Alexandre Julliard March 14, 2017

March 14, 2017

Module: wine Branch: master Commit: 282b9e6c905eab8e131f1c2b92ceddcc5df13db2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=282b9e6c905eab8e131f1c2b9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 14 17:42:09 2017 +0100 msvcr: Fix strftime spec file entry. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec | 6 +++--- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 6 +++--- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcr70/msvcr70.spec | 4 ++-- dlls/msvcr71/msvcr71.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.spec | 6 +++--- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 6 +++--- 15 files changed, 35 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=282b9e6c905eab8e131f1…

1 0

Alistair Leslie-Hughes : dpnet/tests: Stop thread test from failing.
by Alexandre Julliard March 14, 2017

March 14, 2017

Module: wine Branch: master Commit: 1bca8df8cbc87691627f6d0f643fc355eb11b30e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bca8df8cbc87691627f6d0f6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Mar 12 22:01:09 2017 +0000 dpnet/tests: Stop thread test from failing. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/thread.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/dpnet/tests/thread.c b/dlls/dpnet/tests/thread.c index 7129739..99de2be 100644 --- a/dlls/dpnet/tests/thread.c +++ b/dlls/dpnet/tests/thread.c @@ -119,7 +119,7 @@ static void test_enum_hosts(void) DPN_APPLICATION_DESC appdesc; DPNHANDLE async = 0, async2 = 0; static const WCHAR localhost[] = {'1','2','7','.','0','.','0','.','1',0}; - DWORD threadcnt; + DWORD threadcnt, threadorig; enumevent = CreateEventA( NULL, TRUE, FALSE, NULL); @@ -170,9 +170,10 @@ static void test_enum_hosts(void) ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Client_EnumHosts failed with 0x%08x\n", hr); todo_wine ok(async, "No Handle returned\n"); - hr = IDirectPlay8ThreadPool_GetThreadCount(pool1, -1, &threadcnt, 0); + /* The first EnumHosts call will increase the thread count */ + hr = IDirectPlay8ThreadPool_GetThreadCount(pool1, -1, &threadorig, 0); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(threadcnt == 6, "got %d\n", threadcnt); + todo_wine ok(threadorig > 1, "got %d\n", threadorig); hr = IDirectPlay8Client_EnumHosts(client, &appdesc, host, local, NULL, 0, INFINITE, 0, INFINITE, NULL, &async2, 0); ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Client_EnumHosts failed with 0x%08x\n", hr); @@ -181,21 +182,21 @@ static void test_enum_hosts(void) hr = IDirectPlay8ThreadPool_GetThreadCount(pool1, -1, &threadcnt, 0); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(threadcnt == 6, "got %d\n", threadcnt); + ok(threadcnt == threadorig, "got %d\n", threadcnt); hr = IDirectPlay8Client_CancelAsyncOperation(client, async, 0); ok(hr == S_OK, "IDirectPlay8Client_CancelAsyncOperation failed with 0x%08x\n", hr); hr = IDirectPlay8ThreadPool_GetThreadCount(pool1, -1, &threadcnt, 0); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(threadcnt == 6, "got %d\n", threadcnt); + ok(threadcnt == threadorig, "got %d\n", threadcnt); hr = IDirectPlay8Client_CancelAsyncOperation(client, async2, 0); ok(hr == S_OK, "IDirectPlay8Client_CancelAsyncOperation failed with 0x%08x\n", hr); hr = IDirectPlay8ThreadPool_GetThreadCount(pool1, -1, &threadcnt, 0); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(threadcnt == 6, "got %d\n", threadcnt); + ok(threadcnt == threadorig, "got %d\n", threadcnt); IDirectPlay8Address_Release(local); IDirectPlay8Address_Release(host);

1 0

Józef Kucia : wined3d: Add support for samplers in geometry shaders.
by Alexandre Julliard March 14, 2017

March 14, 2017

Module: wine Branch: master Commit: 2ac254a0ff9be1227140abdb98b4d8327e3e4780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ac254a0ff9be1227140abdb9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 14 13:16:00 2017 +0100 wined3d: Add support for samplers in geometry shaders. 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/directx.c | 8 +++++++- dlls/wined3d/utils.c | 5 +++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 671fb94..1a56b81 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3407,6 +3407,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.uniform_blocks[i] = 0; gl_info->limits.fragment_samplers = 1; gl_info->limits.vertex_samplers = 0; + gl_info->limits.geometry_samplers = 0; gl_info->limits.compute_samplers = 0; gl_info->limits.combined_samplers = gl_info->limits.fragment_samplers + gl_info->limits.vertex_samplers; gl_info->limits.graphics_samplers = gl_info->limits.combined_samplers; @@ -3619,6 +3620,9 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_GEOMETRY] = min(gl_max, WINED3D_MAX_CBS); TRACE("Max geometry uniform blocks: %u (%d).\n", gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_GEOMETRY], gl_max); + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS, &gl_max); + gl_info->limits.geometry_samplers = gl_max; + TRACE("Max geometry samplers: %u.\n", gl_info->limits.geometry_samplers); } if (gl_info->supported[ARB_FRAGMENT_SHADER]) { @@ -3691,7 +3695,8 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) } gl_info->limits.fragment_samplers = min(gl_info->limits.fragment_samplers, MAX_GL_FRAGMENT_SAMPLERS); - sampler_count = gl_info->limits.vertex_samplers + gl_info->limits.fragment_samplers; + sampler_count = gl_info->limits.vertex_samplers + gl_info->limits.fragment_samplers + + gl_info->limits.geometry_samplers; if (gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->limits.combined_samplers < sampler_count) { /* The minimum value for GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS in OpenGL @@ -3701,6 +3706,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) sampler_count, gl_info->limits.combined_samplers); gl_info->limits.fragment_samplers = min(gl_info->limits.fragment_samplers, 16); gl_info->limits.vertex_samplers = min(gl_info->limits.vertex_samplers, 16); + gl_info->limits.geometry_samplers = min(gl_info->limits.geometry_samplers, 16); } /* A majority of OpenGL implementations allow us to statically partition diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6fe96e4..f22c314 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6015,6 +6015,11 @@ void wined3d_gl_limits_get_texture_unit_range(const struct wined3d_gl_limits *gl return; *base += *count; + *count = gl_limits->geometry_samplers; + if (shader_type == WINED3D_SHADER_TYPE_GEOMETRY) + return; + + *base += *count; *count = 0; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8637dd3..cdcb1d1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2277,6 +2277,7 @@ struct wined3d_gl_limits unsigned int uniform_blocks[WINED3D_SHADER_TYPE_COUNT]; unsigned int fragment_samplers; unsigned int vertex_samplers; + unsigned int geometry_samplers; unsigned int compute_samplers; unsigned int graphics_samplers; unsigned int combined_samplers;

1 0