wine-commits June 2016

wine-commits@winehq.org

2 participants
592 discussions

Józef Kucia : wined3d: Use single function for STATE_CONSTANT_BUFFER.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: a0269a4ab154e8f11ba7ea47971603dfc10a7ac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0269a4ab154e8f11ba7ea479… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 22 11:37:33 2016 +0200 wined3d: Use single function for STATE_CONSTANT_BUFFER. 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/state.c | 51 +++++++++++---------------------------------------- 1 file changed, 11 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6b9cd3d..b157389 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4832,53 +4832,24 @@ void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state gl_info->gl_ops.gl.p_glDisable(GL_FRAMEBUFFER_SRGB); } -static void state_cb(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, - enum wined3d_shader_type type, unsigned int base, unsigned int count) +static void state_cb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + enum wined3d_shader_type shader_type = state_id - STATE_CONSTANT_BUFFER(0); + const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_buffer *buffer; - unsigned int i; + unsigned int i, base, count; + + TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + wined3d_gl_limits_get_uniform_block_range(&gl_info->limits, shader_type, &base, &count); for (i = 0; i < count; ++i) { - buffer = state->cb[type][i]; + buffer = state->cb[shader_type][i]; GL_EXTCALL(glBindBufferBase(GL_UNIFORM_BUFFER, base + i, buffer ? buffer->buffer_object : 0)); } checkGLcall("glBindBufferBase"); } -static void state_cb_vs(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - const struct wined3d_gl_limits *limits = &context->gl_info->limits; - unsigned int base, count; - - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - - wined3d_gl_limits_get_uniform_block_range(limits, WINED3D_SHADER_TYPE_VERTEX, &base, &count); - state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_VERTEX, base, count); -} - -static void state_cb_gs(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - const struct wined3d_gl_limits *limits = &context->gl_info->limits; - unsigned int base, count; - - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - - wined3d_gl_limits_get_uniform_block_range(limits, WINED3D_SHADER_TYPE_GEOMETRY, &base, &count); - state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_GEOMETRY, base, count); -} - -static void state_cb_ps(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - const struct wined3d_gl_limits *limits = &context->gl_info->limits; - unsigned int base, count; - - TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - - wined3d_gl_limits_get_uniform_block_range(limits, WINED3D_SHADER_TYPE_PIXEL, &base, &count); - state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_PIXEL, base, count); -} - static void state_cb_warn(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); @@ -4896,11 +4867,11 @@ static void state_shader_resource_binding(struct wined3d_context *context, const struct StateEntryTemplate misc_state_template[] = { - { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), state_cb_vs, }, ARB_UNIFORM_BUFFER_OBJECT }, + { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), state_cb, }, ARB_UNIFORM_BUFFER_OBJECT }, { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), state_cb_warn, }, WINED3D_GL_EXT_NONE }, - { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY),{ STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY),state_cb_gs, }, ARB_UNIFORM_BUFFER_OBJECT }, + { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY),{ STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY),state_cb, }, ARB_UNIFORM_BUFFER_OBJECT }, { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY),{ STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY),state_cb_warn, }, WINED3D_GL_EXT_NONE }, - { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), state_cb_ps, }, ARB_UNIFORM_BUFFER_OBJECT }, + { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), state_cb, }, ARB_UNIFORM_BUFFER_OBJECT }, { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), state_cb_warn, }, WINED3D_GL_EXT_NONE }, { STATE_SHADER_RESOURCE_BINDING, { STATE_SHADER_RESOURCE_BINDING, state_shader_resource_binding}, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SRCBLEND), { STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE), NULL }, WINED3D_GL_EXT_NONE },

1 0

Józef Kucia : wined3d: Introduce wined3d_gl_limits_get_uniform_block_range().
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: f6bd191385431929f5a8847a8a3556e6309850df URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6bd191385431929f5a8847a8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 22 11:37:32 2016 +0200 wined3d: Introduce wined3d_gl_limits_get_uniform_block_range(). 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 | 17 +++++++---------- dlls/wined3d/state.c | 14 +++++++++----- dlls/wined3d/utils.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 9 ++++++--- 4 files changed, 49 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b4ddf89..3aa9626 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7518,13 +7518,14 @@ static void shader_glsl_init_ps_uniform_locations(const struct wined3d_gl_info * static void shader_glsl_init_uniform_block_bindings(const struct wined3d_gl_info *gl_info, struct shader_glsl_priv *priv, GLuint program_id, - const struct wined3d_shader_reg_maps *reg_maps, unsigned int base, unsigned int count) + const struct wined3d_shader_reg_maps *reg_maps) { + struct wined3d_string_buffer *name = string_buffer_get(&priv->string_buffers); const char *prefix = shader_glsl_get_prefix(reg_maps->shader_version.type); + unsigned int i, base, count; GLuint block_idx; - unsigned int i; - struct wined3d_string_buffer *name = string_buffer_get(&priv->string_buffers); + wined3d_gl_limits_get_uniform_block_range(&gl_info->limits, reg_maps->shader_version.type, &base, &count); for (i = 0; i < count; ++i) { if (!reg_maps->cb_sizes[i]) @@ -7819,8 +7820,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const if (entry->vs.pos_fixup_location != -1) entry->constant_update_mask |= WINED3D_SHADER_CONST_POS_FIXUP; - shader_glsl_init_uniform_block_bindings(gl_info, priv, program_id, &vshader->reg_maps, - 0, gl_info->limits.vertex_uniform_blocks); + shader_glsl_init_uniform_block_bindings(gl_info, priv, program_id, &vshader->reg_maps); } else { @@ -7860,8 +7860,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const if (gshader) { entry->constant_update_mask |= WINED3D_SHADER_CONST_POS_FIXUP; - shader_glsl_init_uniform_block_bindings(gl_info, priv, program_id, &gshader->reg_maps, - gl_info->limits.vertex_uniform_blocks, gl_info->limits.geometry_uniform_blocks); + shader_glsl_init_uniform_block_bindings(gl_info, priv, program_id, &gshader->reg_maps); } if (ps_id) @@ -7876,9 +7875,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const if (entry->ps.ycorrection_location != -1) entry->constant_update_mask |= WINED3D_SHADER_CONST_PS_Y_CORR; - shader_glsl_init_uniform_block_bindings(gl_info, priv, program_id, &pshader->reg_maps, - gl_info->limits.vertex_uniform_blocks + gl_info->limits.geometry_uniform_blocks, - gl_info->limits.fragment_uniform_blocks); + shader_glsl_init_uniform_block_bindings(gl_info, priv, program_id, &pshader->reg_maps); } else { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index bc55263..6b9cd3d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4849,30 +4849,34 @@ static void state_cb(const struct wined3d_gl_info *gl_info, const struct wined3d static void state_cb_vs(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_limits *limits = &context->gl_info->limits; + unsigned int base, count; TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_VERTEX, 0, limits->vertex_uniform_blocks); + wined3d_gl_limits_get_uniform_block_range(limits, WINED3D_SHADER_TYPE_VERTEX, &base, &count); + state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_VERTEX, base, count); } static void state_cb_gs(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_limits *limits = &context->gl_info->limits; + unsigned int base, count; TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_GEOMETRY, - limits->vertex_uniform_blocks, limits->geometry_uniform_blocks); + wined3d_gl_limits_get_uniform_block_range(limits, WINED3D_SHADER_TYPE_GEOMETRY, &base, &count); + state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_GEOMETRY, base, count); } static void state_cb_ps(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_limits *limits = &context->gl_info->limits; + unsigned int base, count; TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_PIXEL, - limits->vertex_uniform_blocks + limits->geometry_uniform_blocks, limits->fragment_uniform_blocks); + wined3d_gl_limits_get_uniform_block_range(limits, WINED3D_SHADER_TYPE_PIXEL, &base, &count); + state_cb(context->gl_info, state, WINED3D_SHADER_TYPE_PIXEL, base, count); } static void state_cb_warn(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9575b39..01e56eb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5748,3 +5748,30 @@ BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) return TRUE; } + +void wined3d_gl_limits_get_uniform_block_range(const struct wined3d_gl_limits *gl_limits, + enum wined3d_shader_type shader_type, unsigned int *base, unsigned int *count) +{ + *base = 0; + *count = gl_limits->vertex_uniform_blocks; + + if (shader_type == WINED3D_SHADER_TYPE_VERTEX) + return; + + *base += *count; + *count = gl_limits->geometry_uniform_blocks; + + if (shader_type == WINED3D_SHADER_TYPE_GEOMETRY) + return; + + *base += *count; + *count = gl_limits->fragment_uniform_blocks; + + if (shader_type == WINED3D_SHADER_TYPE_PIXEL) + return; + + *base += *count; + *count = 0; + + ERR("Unhandled shader type %#x.\n", shader_type); +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 701e93e..ce094ca 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1971,9 +1971,9 @@ struct wined3d_gl_limits UINT lights; UINT textures; UINT texture_coords; - UINT vertex_uniform_blocks; - UINT geometry_uniform_blocks; - UINT fragment_uniform_blocks; + unsigned int vertex_uniform_blocks; + unsigned int geometry_uniform_blocks; + unsigned int fragment_uniform_blocks; UINT fragment_samplers; UINT vertex_samplers; UINT combined_samplers; @@ -2004,6 +2004,9 @@ struct wined3d_gl_limits UINT arb_ps_temps; }; +void wined3d_gl_limits_get_uniform_block_range(const struct wined3d_gl_limits *gl_limits, + enum wined3d_shader_type shader_type, unsigned int *base, unsigned int *count) DECLSPEC_HIDDEN; + struct wined3d_gl_info { DWORD selected_gl_version;

1 0

Józef Kucia : wined3d: Recognize SM5 dcl_tgsm_structured opcode.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: e2384387e0f56c175916083df8577527bc2d97c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2384387e0f56c175916083df… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 22 11:37:31 2016 +0200 wined3d: Recognize SM5 dcl_tgsm_structured opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 8 ++++++++ dlls/wined3d/shader_sm4.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 9 +++++++++ 5 files changed, 31 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f81e8ea..2e070fb 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5251,6 +5251,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, /* WINED3DSIH_DCL_TGSM_RAW */ NULL, + /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 921904f..b4ddf89 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8589,6 +8589,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, /* WINED3DSIH_DCL_TGSM_RAW */ NULL, + /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1859c0f..4a3f53d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -81,6 +81,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ "dcl_tessellator_output_primitive", /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ "dcl_tessellator_partitioning", /* WINED3DSIH_DCL_TGSM_RAW */ "dcl_tgsm_raw", + /* WINED3DSIH_DCL_TGSM_STRUCTURED */ "dcl_tgsm_structured", /* WINED3DSIH_DCL_THREAD_GROUP */ "dcl_thread_group", /* WINED3DSIH_DCL_UAV_TYPED */ "dcl_uav_typed", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", @@ -2279,6 +2280,13 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe shader_dump_dst_param(&buffer, &ins.declaration.tgsm_raw.reg, &shader_version); shader_addline(&buffer, ", %u", ins.declaration.tgsm_raw.byte_count); } + else if (ins.handler_idx == WINED3DSIH_DCL_TGSM_STRUCTURED) + { + shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); + shader_dump_dst_param(&buffer, &ins.declaration.tgsm_structured.reg, &shader_version); + shader_addline(&buffer, ", %u, %u", ins.declaration.tgsm_structured.byte_stride, + ins.declaration.tgsm_structured.structure_count); + } else if (ins.handler_idx == WINED3DSIH_DCL_THREAD_GROUP) { shader_addline(&buffer, "%s %u, %u, %u", shader_opcode_names[ins.handler_idx], diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 959b10c..8961dc5 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -222,6 +222,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_THREAD_GROUP = 0x9b, WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, WINED3D_SM5_OP_DCL_TGSM_RAW = 0x9f, + WINED3D_SM5_OP_DCL_TGSM_STRUCTURED = 0xa0, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, WINED3D_SM5_OP_LD_UAV_TYPED = 0xa3, WINED3D_SM5_OP_STORE_UAV_TYPED = 0xa4, @@ -637,6 +638,15 @@ static void shader_sm5_read_dcl_tgsm_raw(struct wined3d_shader_instruction *ins, ins->declaration.tgsm_raw.byte_count = *tokens; } +static void shader_sm5_read_dcl_tgsm_structured(struct wined3d_shader_instruction *ins, + DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, + struct wined3d_sm4_data *priv) +{ + shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_FLOAT, &ins->declaration.tgsm_structured.reg); + ins->declaration.tgsm_structured.byte_stride = *tokens++; + ins->declaration.tgsm_structured.structure_count = *tokens; +} + static void shader_sm5_read_dcl_resource_structured(struct wined3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) @@ -799,6 +809,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm4_read_dcl_resource}, {WINED3D_SM5_OP_DCL_TGSM_RAW, WINED3DSIH_DCL_TGSM_RAW, "", "", shader_sm5_read_dcl_tgsm_raw}, + {WINED3D_SM5_OP_DCL_TGSM_STRUCTURED, WINED3DSIH_DCL_TGSM_STRUCTURED, "", "", + shader_sm5_read_dcl_tgsm_structured}, {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", "", shader_sm5_read_dcl_resource_structured}, {WINED3D_SM5_OP_LD_UAV_TYPED, WINED3DSIH_LD_UAV_TYPED, "u", "iU"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 45207df..701e93e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -595,6 +595,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE, WINED3DSIH_DCL_TESSELLATOR_PARTITIONING, WINED3DSIH_DCL_TGSM_RAW, + WINED3DSIH_DCL_TGSM_STRUCTURED, WINED3DSIH_DCL_THREAD_GROUP, WINED3DSIH_DCL_UAV_TYPED, WINED3DSIH_DCL_VERTICES_OUT, @@ -920,6 +921,13 @@ struct wined3d_shader_tgsm_raw unsigned int byte_count; }; +struct wined3d_shader_tgsm_structured +{ + struct wined3d_shader_dst_param reg; + unsigned int byte_stride; + unsigned int structure_count; +}; + struct wined3d_shader_thread_group_size { unsigned int x, y, z; @@ -953,6 +961,7 @@ struct wined3d_shader_instruction const struct wined3d_shader_immediate_constant_buffer *icb; struct wined3d_shader_structured_resource structured_resource; struct wined3d_shader_tgsm_raw tgsm_raw; + struct wined3d_shader_tgsm_structured tgsm_structured; struct wined3d_shader_thread_group_size thread_group_size; enum wined3d_tessellator_domain tessellator_domain; enum wined3d_tessellator_output_primitive tessellator_output_primitive;

1 0

Józef Kucia : wined3d: Recognize SM5 dcl_tgsm_raw opcode.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: 6778ceca2c52d67c066b8b01d9270c681664810b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6778ceca2c52d67c066b8b01d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 22 11:37:30 2016 +0200 wined3d: Recognize SM5 dcl_tgsm_raw opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 7 +++++++ dlls/wined3d/shader_sm4.c | 11 +++++++++++ dlls/wined3d/wined3d_private.h | 8 ++++++++ 5 files changed, 28 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 00cc495..f81e8ea 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5250,6 +5250,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, + /* WINED3DSIH_DCL_TGSM_RAW */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index bb2beb4..921904f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8588,6 +8588,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, + /* WINED3DSIH_DCL_TGSM_RAW */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b79416f..1859c0f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -80,6 +80,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ "dcl_tessellator_domain", /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ "dcl_tessellator_output_primitive", /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ "dcl_tessellator_partitioning", + /* WINED3DSIH_DCL_TGSM_RAW */ "dcl_tgsm_raw", /* WINED3DSIH_DCL_THREAD_GROUP */ "dcl_thread_group", /* WINED3DSIH_DCL_UAV_TYPED */ "dcl_uav_typed", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", @@ -2272,6 +2273,12 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); shader_dump_tessellator_partitioning(&buffer, ins.declaration.tessellator_partitioning); } + else if (ins.handler_idx == WINED3DSIH_DCL_TGSM_RAW) + { + shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); + shader_dump_dst_param(&buffer, &ins.declaration.tgsm_raw.reg, &shader_version); + shader_addline(&buffer, ", %u", ins.declaration.tgsm_raw.byte_count); + } else if (ins.handler_idx == WINED3DSIH_DCL_THREAD_GROUP) { shader_addline(&buffer, "%s %u, %u, %u", shader_opcode_names[ins.handler_idx], diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 447861c..959b10c 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -221,6 +221,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT = 0x99, WINED3D_SM5_OP_DCL_THREAD_GROUP = 0x9b, WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, + WINED3D_SM5_OP_DCL_TGSM_RAW = 0x9f, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, WINED3D_SM5_OP_LD_UAV_TYPED = 0xa3, WINED3D_SM5_OP_STORE_UAV_TYPED = 0xa4, @@ -628,6 +629,14 @@ static void shader_sm5_read_dcl_thread_group(struct wined3d_shader_instruction * ins->declaration.thread_group_size.z = *tokens++; } +static void shader_sm5_read_dcl_tgsm_raw(struct wined3d_shader_instruction *ins, + DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, + struct wined3d_sm4_data *priv) +{ + shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_FLOAT, &ins->declaration.tgsm_raw.reg); + ins->declaration.tgsm_raw.byte_count = *tokens; +} + static void shader_sm5_read_dcl_resource_structured(struct wined3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) @@ -788,6 +797,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm5_read_dcl_thread_group}, {WINED3D_SM5_OP_DCL_UAV_TYPED, WINED3DSIH_DCL_UAV_TYPED, "", "", shader_sm4_read_dcl_resource}, + {WINED3D_SM5_OP_DCL_TGSM_RAW, WINED3DSIH_DCL_TGSM_RAW, "", "", + shader_sm5_read_dcl_tgsm_raw}, {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", "", shader_sm5_read_dcl_resource_structured}, {WINED3D_SM5_OP_LD_UAV_TYPED, WINED3DSIH_LD_UAV_TYPED, "u", "iU"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 40eb8e0..45207df 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -594,6 +594,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_TESSELLATOR_DOMAIN, WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE, WINED3DSIH_DCL_TESSELLATOR_PARTITIONING, + WINED3DSIH_DCL_TGSM_RAW, WINED3DSIH_DCL_THREAD_GROUP, WINED3DSIH_DCL_UAV_TYPED, WINED3DSIH_DCL_VERTICES_OUT, @@ -913,6 +914,12 @@ struct wined3d_shader_structured_resource unsigned int byte_stride; }; +struct wined3d_shader_tgsm_raw +{ + struct wined3d_shader_dst_param reg; + unsigned int byte_count; +}; + struct wined3d_shader_thread_group_size { unsigned int x, y, z; @@ -945,6 +952,7 @@ struct wined3d_shader_instruction UINT count; const struct wined3d_shader_immediate_constant_buffer *icb; struct wined3d_shader_structured_resource structured_resource; + struct wined3d_shader_tgsm_raw tgsm_raw; struct wined3d_shader_thread_group_size thread_group_size; enum wined3d_tessellator_domain tessellator_domain; enum wined3d_tessellator_output_primitive tessellator_output_primitive;

1 0

Józef Kucia : wined3d: Recognize vThreadID register.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: 12754d0f255b3514a0b9f5b67b628fa936edd536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12754d0f255b3514a0b9f5b67… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 22 11:37:29 2016 +0200 wined3d: Recognize vThreadID register. 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 | 4 ++++ dlls/wined3d/shader_sm4.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7682850..b79416f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1752,6 +1752,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "g"); break; + case WINED3DSPR_THREADID: + shader_addline(buffer, "vThreadID"); + break; + case WINED3DSPR_THREADGROUPID: shader_addline(buffer, "vThreadGroupID"); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 6e224f6..447861c 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -252,6 +252,7 @@ enum wined3d_sm4_register_type WINED3D_SM5_RT_DOMAIN_LOCATION = 0x1c, WINED3D_SM5_RT_UAV = 0x1e, WINED3D_SM5_RT_SHARED_MEMORY = 0x1f, + WINED3D_SM5_RT_THREAD_ID = 0x20, WINED3D_SM5_RT_THREAD_GROUP_ID = 0x21, WINED3D_SM5_RT_LOCAL_THREAD_ID = 0x22, WINED3D_SM5_RT_LOCAL_THREAD_INDEX = 0x24, @@ -833,7 +834,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* UNKNOWN */ ~0u, /* WINED3D_SM5_RT_UAV */ WINED3DSPR_UAV, /* WINED3D_SM5_RT_SHARED_MEMORY */ WINED3DSPR_GROUPSHAREDMEM, - /* UNKNOWN */ ~0u, + /* WINED3D_SM5_RT_THREAD_ID */ WINED3DSPR_THREADID, /* WINED3D_SM5_RT_THREAD_GROUP_ID */ WINED3DSPR_THREADGROUPID, /* WINED3D_SM5_RT_LOCAL_THREAD_ID */ WINED3DSPR_LOCALTHREADID, /* UNKNOWN */ ~0u, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 78cbe24..40eb8e0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -388,6 +388,7 @@ enum wined3d_shader_register_type WINED3DSPR_PATCHCONST, WINED3DSPR_TESSCOORD, WINED3DSPR_GROUPSHAREDMEM, + WINED3DSPR_THREADID, WINED3DSPR_THREADGROUPID, WINED3DSPR_LOCALTHREADID, WINED3DSPR_LOCALTHREADINDEX,

1 0

Henri Verbeet : wined3d: Send palette destruction through the command stream.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: bb6417d5afc52d84d6acf16b5d7445de40716578 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb6417d5afc52d84d6acf16b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 22 10:39:04 2016 +0200 wined3d: Send palette destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/palette.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index fadcc43..ba9c42e 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -33,6 +33,11 @@ ULONG CDECL wined3d_palette_incref(struct wined3d_palette *palette) return refcount; } +static void wined3d_palette_destroy_object(void *object) +{ + HeapFree(GetProcessHeap(), 0, object); +} + ULONG CDECL wined3d_palette_decref(struct wined3d_palette *palette) { ULONG refcount = InterlockedDecrement(&palette->ref); @@ -40,7 +45,7 @@ ULONG CDECL wined3d_palette_decref(struct wined3d_palette *palette) TRACE("%p decreasing refcount to %u.\n", palette, refcount); if (!refcount) - HeapFree(GetProcessHeap(), 0, palette); + wined3d_cs_emit_destroy_object(palette->device->cs, wined3d_palette_destroy_object, palette); return refcount; }

1 0

Henri Verbeet : wined3d: Send query destruction through the command stream.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: 97eb359588725f6d1c38146a606856b50588dbdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=97eb359588725f6d1c38146a6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 22 10:39:03 2016 +0200 wined3d: Send query destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 61 ++++++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 410ce6c..c8d6b47 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -233,41 +233,46 @@ ULONG CDECL wined3d_query_incref(struct wined3d_query *query) return refcount; } -ULONG CDECL wined3d_query_decref(struct wined3d_query *query) +static void wined3d_query_destroy_object(void *object) { - ULONG refcount = InterlockedDecrement(&query->ref); + struct wined3d_query *query = object; - TRACE("%p decreasing refcount to %u.\n", query, refcount); + /* Queries are specific to the GL context that created them. Not + * deleting the query will obviously leak it, but that's still better + * than potentially deleting a different query with the same id in this + * context, and (still) leaking the actual query. */ + if (query->type == WINED3D_QUERY_TYPE_EVENT) + { + struct wined3d_event_query *event_query = query->extendedData; + if (event_query) wined3d_event_query_destroy(event_query); + } + else if (query->type == WINED3D_QUERY_TYPE_OCCLUSION) + { + struct wined3d_occlusion_query *oq = query->extendedData; - if (!refcount) + if (oq->context) context_free_occlusion_query(oq); + HeapFree(GetProcessHeap(), 0, query->extendedData); + } + else if (query->type == WINED3D_QUERY_TYPE_TIMESTAMP) { - /* Queries are specific to the GL context that created them. Not - * deleting the query will obviously leak it, but that's still better - * than potentially deleting a different query with the same id in this - * context, and (still) leaking the actual query. */ - if (query->type == WINED3D_QUERY_TYPE_EVENT) - { - struct wined3d_event_query *event_query = query->extendedData; - if (event_query) wined3d_event_query_destroy(event_query); - } - else if (query->type == WINED3D_QUERY_TYPE_OCCLUSION) - { - struct wined3d_occlusion_query *oq = query->extendedData; + struct wined3d_timestamp_query *tq = query->extendedData; - if (oq->context) context_free_occlusion_query(oq); - HeapFree(GetProcessHeap(), 0, query->extendedData); - } - else if (query->type == WINED3D_QUERY_TYPE_TIMESTAMP) - { - struct wined3d_timestamp_query *tq = query->extendedData; + if (tq->context) + context_free_timestamp_query(tq); + HeapFree(GetProcessHeap(), 0, query->extendedData); + } - if (tq->context) - context_free_timestamp_query(tq); - HeapFree(GetProcessHeap(), 0, query->extendedData); - } + HeapFree(GetProcessHeap(), 0, query); +} - HeapFree(GetProcessHeap(), 0, query); - } +ULONG CDECL wined3d_query_decref(struct wined3d_query *query) +{ + ULONG refcount = InterlockedDecrement(&query->ref); + + TRACE("%p decreasing refcount to %u.\n", query, refcount); + + if (!refcount) + wined3d_cs_emit_destroy_object(query->device->cs, wined3d_query_destroy_object, query); return refcount; }

1 0

Henri Verbeet : wined3d: Send vertex declaration destruction through the command stream.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: 9ba058e94c2662f5296c95adeafd29c59b137249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ba058e94c2662f5296c95ade… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 22 10:39:02 2016 +0200 wined3d: Send vertex declaration destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/vertexdeclaration.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index febd695..c8704e9 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -50,6 +50,14 @@ ULONG CDECL wined3d_vertex_declaration_incref(struct wined3d_vertex_declaration return refcount; } +static void wined3d_vertex_declaration_destroy_object(void *object) +{ + struct wined3d_vertex_declaration *declaration = object; + + HeapFree(GetProcessHeap(), 0, declaration->elements); + HeapFree(GetProcessHeap(), 0, declaration); +} + ULONG CDECL wined3d_vertex_declaration_decref(struct wined3d_vertex_declaration *declaration) { ULONG refcount = InterlockedDecrement(&declaration->ref); @@ -58,9 +66,9 @@ ULONG CDECL wined3d_vertex_declaration_decref(struct wined3d_vertex_declaration if (!refcount) { - HeapFree(GetProcessHeap(), 0, declaration->elements); declaration->parent_ops->wined3d_object_destroyed(declaration->parent); - HeapFree(GetProcessHeap(), 0, declaration); + wined3d_cs_emit_destroy_object(declaration->device->cs, + wined3d_vertex_declaration_destroy_object, declaration); } return refcount;

1 0

Henri Verbeet : wined3d: Send shader destruction through the command stream.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: 87f667b46843589c4656b7373f28536343e06f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f667b46843589c4656b7373… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 22 10:39:01 2016 +0200 wined3d: Send shader destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8f3e145..7682850 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2650,6 +2650,12 @@ ULONG CDECL wined3d_shader_incref(struct wined3d_shader *shader) return refcount; } +static void wined3d_shader_destroy_object(void *object) +{ + shader_cleanup(object); + HeapFree(GetProcessHeap(), 0, object); +} + ULONG CDECL wined3d_shader_decref(struct wined3d_shader *shader) { ULONG refcount = InterlockedDecrement(&shader->ref); @@ -2658,9 +2664,8 @@ ULONG CDECL wined3d_shader_decref(struct wined3d_shader *shader) if (!refcount) { - shader_cleanup(shader); shader->parent_ops->wined3d_object_destroyed(shader->parent); - HeapFree(GetProcessHeap(), 0, shader); + wined3d_cs_emit_destroy_object(shader->device->cs, wined3d_shader_destroy_object, shader); } return refcount;

1 0

Henri Verbeet : wined3d: Send sampler object desctruction through the command stream.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: 29788075e0bc736c09f92c9200ecf56509f601c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29788075e0bc736c09f92c920… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 22 10:39:00 2016 +0200 wined3d: Send sampler object desctruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/sampler.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 865198b..1a2e2a1 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -33,23 +33,28 @@ ULONG CDECL wined3d_sampler_incref(struct wined3d_sampler *sampler) return refcount; } -ULONG CDECL wined3d_sampler_decref(struct wined3d_sampler *sampler) +static void wined3d_sample_destroy_object(void *object) { - ULONG refcount = InterlockedDecrement(&sampler->refcount); + struct wined3d_sampler *sampler = object; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; + context = context_acquire(sampler->device, NULL); + gl_info = context->gl_info; + GL_EXTCALL(glDeleteSamplers(1, &sampler->name)); + context_release(context); + + HeapFree(GetProcessHeap(), 0, sampler); +} + +ULONG CDECL wined3d_sampler_decref(struct wined3d_sampler *sampler) +{ + ULONG refcount = InterlockedDecrement(&sampler->refcount); + TRACE("%p decreasing refcount to %u.\n", sampler, refcount); if (!refcount) - { - context = context_acquire(sampler->device, NULL); - gl_info = context->gl_info; - GL_EXTCALL(glDeleteSamplers(1, &sampler->name)); - context_release(context); - - HeapFree(GetProcessHeap(), 0, sampler); - } + wined3d_cs_emit_destroy_object(sampler->device->cs, wined3d_sample_destroy_object, sampler); return refcount; }

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
60
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 June 2016