June 2019 - Wine-commits - list.winehq.org

Alexandre Julliard : vmm.vxd: Build with msvcrt.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 2c36c977f7e2e4bc8b3e544960343b3153a8f330 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c36c977f7e2e4bc8b3e5449… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:39:22 2019 +0200 vmm.vxd: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vmm.vxd/Makefile.in | 2 ++ dlls/vmm.vxd/vmm.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/vmm.vxd/Makefile.in b/dlls/vmm.vxd/Makefile.in index 28a5302..854907e 100644 --- a/dlls/vmm.vxd/Makefile.in +++ b/dlls/vmm.vxd/Makefile.in @@ -1,4 +1,6 @@ MODULE = vmm.vxd +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ vmm.c diff --git a/dlls/vmm.vxd/vmm.c b/dlls/vmm.vxd/vmm.c index 833a8d1..373e826 100644 --- a/dlls/vmm.vxd/vmm.c +++ b/dlls/vmm.vxd/vmm.c @@ -20,9 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : vnbt.vxd: Build with msvcrt.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 9b895af1df5c515a4e59e21412a4f51a3b981bbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b895af1df5c515a4e59e214… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:39:32 2019 +0200 vnbt.vxd: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vnbt.vxd/Makefile.in | 2 ++ dlls/vnbt.vxd/vnbt.c | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/vnbt.vxd/Makefile.in b/dlls/vnbt.vxd/Makefile.in index 8fc6b3e..63b8c69 100644 --- a/dlls/vnbt.vxd/Makefile.in +++ b/dlls/vnbt.vxd/Makefile.in @@ -1,5 +1,7 @@ MODULE = vnbt.vxd IMPORTS = iphlpapi ws2_32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ vnbt.c diff --git a/dlls/vnbt.vxd/vnbt.c b/dlls/vnbt.vxd/vnbt.c index 17f7d96..fd1dbdc 100644 --- a/dlls/vnbt.vxd/vnbt.c +++ b/dlls/vnbt.vxd/vnbt.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -29,10 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(vxd); -#ifndef INADDR_NONE -#define INADDR_NONE ~0UL -#endif - typedef struct _nbtInfo { DWORD ip;

1 0

Alexandre Julliard : vnetbios.vxd: Build with msvcrt.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 938661fc8ae8359ae48f92fb0b1ccc5c96f5c46f URL: https://source.winehq.org/git/wine.git/?a=commit;h=938661fc8ae8359ae48f92fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:39:39 2019 +0200 vnetbios.vxd: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vnetbios.vxd/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/vnetbios.vxd/Makefile.in b/dlls/vnetbios.vxd/Makefile.in index 8e8cb60..3878648 100644 --- a/dlls/vnetbios.vxd/Makefile.in +++ b/dlls/vnetbios.vxd/Makefile.in @@ -1,5 +1,7 @@ MODULE = vnetbios.vxd IMPORTS = netapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ vnetbios.c

1 0

Alexandre Julliard : vssapi: Build with msvcrt.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: d31da0443bbc1632272070b37f6f48dca7557e88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d31da0443bbc1632272070b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:39:58 2019 +0200 vssapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vssapi/Makefile.in | 2 ++ dlls/vssapi/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/vssapi/Makefile.in b/dlls/vssapi/Makefile.in index 867a562..f04be0e 100644 --- a/dlls/vssapi/Makefile.in +++ b/dlls/vssapi/Makefile.in @@ -1,4 +1,6 @@ MODULE = vssapi.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/vssapi/main.c b/dlls/vssapi/main.c index 526772a..ce06ca2 100644 --- a/dlls/vssapi/main.c +++ b/dlls/vssapi/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h" #include "winbase.h"

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to wined3d_buffer_gl_destroy_buffer_object ().
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 633cd82a3dc8c0eb0461b070179122ffc6bb605d URL: https://source.winehq.org/git/wine.git/?a=commit;h=633cd82a3dc8c0eb0461b070… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 25 02:47:24 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_buffer_gl_destroy_buffer_object(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 5aca952..2ed3984 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -140,11 +140,10 @@ static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct w /* Context activation is done by the caller. */ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl, - struct wined3d_context *context) + struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_resource *resource = &buffer_gl->b.resource; - const struct wined3d_gl_info *gl_info = context->gl_info; if (!buffer_gl->buffer_object) return; @@ -172,7 +171,7 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu if (resource->bind_flags & WINED3D_BIND_STREAM_OUTPUT) { device_invalidate_state(resource->device, STATE_STREAM_OUTPUT); - if (context->transform_feedback_active) + if (context_gl->c.transform_feedback_active) { /* We have to make sure that transform feedback is not active * when deleting a potentially bound transform feedback buffer. @@ -269,7 +268,7 @@ fail: /* Clean up all BO init, but continue because we can work without a BO :-) */ ERR("Failed to create a buffer object. Continuing, but performance issues may occur.\n"); buffer_gl->b.flags &= ~WINED3D_BUFFER_USE_BO; - wined3d_buffer_gl_destroy_buffer_object(buffer_gl, &context_gl->c); + wined3d_buffer_gl_destroy_buffer_object(buffer_gl, context_gl); buffer_clear_dirty_areas(&buffer_gl->b); return FALSE; } @@ -758,7 +757,7 @@ static void buffer_unload(struct wined3d_resource *resource) wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_BUFFER); - wined3d_buffer_gl_destroy_buffer_object(wined3d_buffer_gl(buffer), context); + wined3d_buffer_gl_destroy_buffer_object(wined3d_buffer_gl(buffer), wined3d_context_gl(context)); buffer_clear_dirty_areas(buffer); context_release(context); @@ -787,7 +786,7 @@ static void wined3d_buffer_gl_destroy_object(void *object) if (buffer_gl->buffer_object) { context = context_acquire(buffer_gl->b.resource.device, NULL, 0); - wined3d_buffer_gl_destroy_buffer_object(buffer_gl, context); + wined3d_buffer_gl_destroy_buffer_object(buffer_gl, wined3d_context_gl(context)); context_release(context); heap_free(buffer_gl->b.conversion_map);

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_load_program_resources ().
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 84f8bf24002104fbc4ccbbaef4289ee633f1fa31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84f8bf24002104fbc4ccbbae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 25 02:47:25 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_load_program_resources(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c1f9d4c..4b31656 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -799,16 +799,16 @@ static void shader_glsl_load_images(const struct wined3d_gl_info *gl_info, struc } /* Context activation is done by the caller. */ -static void shader_glsl_load_program_resources(const struct wined3d_context *context, +static void shader_glsl_load_program_resources(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, GLuint program_id, const struct wined3d_shader *shader) { const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; - shader_glsl_init_uniform_block_bindings(context->gl_info, priv, program_id, reg_maps); - shader_glsl_load_icb(context->gl_info, priv, program_id, reg_maps); + shader_glsl_init_uniform_block_bindings(context_gl->c.gl_info, priv, program_id, reg_maps); + shader_glsl_load_icb(context_gl->c.gl_info, priv, program_id, reg_maps); /* Texture unit mapping is set up to be the same each time the shader * program is used so we can hardcode the sampler uniform values. */ - shader_glsl_load_samplers(context, priv, program_id, reg_maps); + shader_glsl_load_samplers(&context_gl->c, priv, program_id, reg_maps); } static void append_transform_feedback_varying(const char **varyings, unsigned int *varying_count, @@ -9966,6 +9966,7 @@ static void shader_glsl_init_ps_uniform_locations(const struct wined3d_gl_info * static HRESULT shader_glsl_compile_compute_shader(struct shader_glsl_priv *priv, const struct wined3d_context *context, struct wined3d_shader *shader) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_context_data *ctx_data = context->shader_backend_data; struct wined3d_string_buffer *buffer = &priv->shader_buffer; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -10033,7 +10034,7 @@ static HRESULT shader_glsl_compile_compute_shader(struct shader_glsl_priv *priv, GL_EXTCALL(glUseProgram(program_id)); checkGLcall("glUseProgram"); - shader_glsl_load_program_resources(context, priv, program_id, shader); + shader_glsl_load_program_resources(context_gl, priv, program_id, shader); shader_glsl_load_images(gl_info, priv, program_id, &shader->reg_maps); entry->constant_update_mask = 0; @@ -10092,6 +10093,7 @@ static void set_glsl_compute_shader_program(const struct wined3d_context *contex static void set_glsl_shader_program(const struct wined3d_context *context, const struct wined3d_state *state, struct shader_glsl_priv *priv, struct glsl_context_data *ctx_data) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); const struct wined3d_d3d_info *d3d_info = context->d3d_info; const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_shader *pre_rasterization_shader; @@ -10414,7 +10416,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const if (entry->vs.base_vertex_id_location != -1) entry->constant_update_mask |= WINED3D_SHADER_CONST_BASE_VERTEX_ID; - shader_glsl_load_program_resources(context, priv, program_id, vshader); + shader_glsl_load_program_resources(context_gl, priv, program_id, vshader); } else { @@ -10452,14 +10454,14 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const entry->constant_update_mask |= WINED3D_SHADER_CONST_VS_POINTSIZE; if (hshader) - shader_glsl_load_program_resources(context, priv, program_id, hshader); + shader_glsl_load_program_resources(context_gl, priv, program_id, hshader); if (dshader) { if (entry->ds.pos_fixup_location != -1) entry->constant_update_mask |= WINED3D_SHADER_CONST_POS_FIXUP; - shader_glsl_load_program_resources(context, priv, program_id, dshader); + shader_glsl_load_program_resources(context_gl, priv, program_id, dshader); } if (gshader) @@ -10467,7 +10469,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const if (entry->gs.pos_fixup_location != -1) entry->constant_update_mask |= WINED3D_SHADER_CONST_POS_FIXUP; - shader_glsl_load_program_resources(context, priv, program_id, gshader); + shader_glsl_load_program_resources(context_gl, priv, program_id, gshader); } if (ps_id) @@ -10482,7 +10484,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_load_program_resources(context, priv, program_id, pshader); + shader_glsl_load_program_resources(context_gl, priv, program_id, pshader); shader_glsl_load_images(gl_info, priv, program_id, &pshader->reg_maps); } else

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_init_transform_feedback ().
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 3484871f2cef3ba430f2010752e66a2da1ea124f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3484871f2cef3ba430f20107… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 25 02:47:26 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_init_transform_feedback(). 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, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4b31656..e0220d1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -938,11 +938,11 @@ static BOOL shader_glsl_generate_transform_feedback_varyings(struct wined3d_stri return have_varyings_to_record; } -static void shader_glsl_init_transform_feedback(const struct wined3d_context *context, +static void shader_glsl_init_transform_feedback(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, GLuint program_id, struct wined3d_shader *shader) { const struct wined3d_stream_output_desc *so_desc = &shader->u.gs.so_desc; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_string_buffer *buffer; unsigned int i, count, length; const char **varyings; @@ -10342,7 +10342,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const GL_EXTCALL(glAttachShader(program_id, gs_id)); checkGLcall("glAttachShader"); - shader_glsl_init_transform_feedback(context, priv, program_id, gshader); + shader_glsl_init_transform_feedback(context_gl, priv, program_id, gshader); list_add_head(&gshader->linked_programs, &entry->gs.shader_entry); }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_ffp_vertex_normalmatrix_uniform ().
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 973d96eb7e47b2ddd4a38b108b8f737a3207e77e URL: https://source.winehq.org/git/wine.git/?a=commit;h=973d96eb7e47b2ddd4a38b10… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 25 02:47:27 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_ffp_vertex_normalmatrix_uniform(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e0220d1..80e58cc 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1308,18 +1308,18 @@ static void transpose_matrix(struct wined3d_matrix *out, const struct wined3d_ma *out = temp; } -static void shader_glsl_ffp_vertex_normalmatrix_uniform(const struct wined3d_context *context, +static void shader_glsl_ffp_vertex_normalmatrix_uniform(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, struct glsl_shader_prog_link *prog) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_matrix mv; float mat[3 * 3]; if (prog->vs.normal_matrix_location == -1) return; - get_modelview_matrix(context, state, 0, &mv); - compute_normal_matrix(mat, context->d3d_info->wined3d_creation_flags & WINED3D_LEGACY_FFP_LIGHTING, &mv); + get_modelview_matrix(&context_gl->c, state, 0, &mv); + compute_normal_matrix(mat, context_gl->c.d3d_info->wined3d_creation_flags & WINED3D_LEGACY_FFP_LIGHTING, &mv); GL_EXTCALL(glUniformMatrix3fv(prog->vs.normal_matrix_location, 1, FALSE, mat)); checkGLcall("glUniformMatrix3fv"); @@ -1516,6 +1516,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context const struct wined3d_shader *vshader = state->shader[WINED3D_SHADER_TYPE_VERTEX]; const struct wined3d_shader *pshader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; const struct glsl_context_data *ctx_data = context->shader_backend_data; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct glsl_shader_prog_link *prog = ctx_data->glsl_program; const struct wined3d_gl_info *gl_info = context->gl_info; float position_fixup[4 * WINED3D_MAX_VIEWPORTS]; @@ -1580,7 +1581,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context GL_EXTCALL(glUniformMatrix4fv(prog->vs.modelview_matrix_location[0], 1, FALSE, &mat._11)); checkGLcall("glUniformMatrix4fv"); - shader_glsl_ffp_vertex_normalmatrix_uniform(context, state, prog); + shader_glsl_ffp_vertex_normalmatrix_uniform(context_gl, state, prog); } if (update_mask & WINED3D_SHADER_CONST_FFP_VERTEXBLEND)

1 0

Henri Verbeet : wined3d: Move texture2d_load_renderbuffer() to texture.c.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 1f8a3b04b93da7a9c674801a931111f766bf5487 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f8a3b04b93da7a9c674801a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 25 02:47:28 2019 +0430 wined3d: Move texture2d_load_renderbuffer() to texture.c. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 39 --------------------------------------- dlls/wined3d/texture.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 39 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fc8be38..3668c61 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1423,45 +1423,6 @@ static HRESULT wined3d_texture_blt_special(struct wined3d_texture *dst_texture, } /* Context activation is done by the caller. */ -BOOL texture2d_load_renderbuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, DWORD dst_location) -{ - unsigned int level = sub_resource_idx % texture->level_count; - const RECT rect = {0, 0, - wined3d_texture_get_level_width(texture, level), - wined3d_texture_get_level_height(texture, level)}; - struct wined3d_texture_sub_resource *sub_resource; - DWORD src_location, locations; - - sub_resource = &texture->sub_resources[sub_resource_idx]; - locations = sub_resource->locations; - if (texture->resource.bind_flags & WINED3D_BIND_DEPTH_STENCIL) - { - FIXME("Unimplemented copy from %s for depth/stencil buffers.\n", - wined3d_debug_location(locations)); - return FALSE; - } - - if (locations & WINED3D_LOCATION_RB_MULTISAMPLE) - src_location = WINED3D_LOCATION_RB_MULTISAMPLE; - else if (locations & WINED3D_LOCATION_RB_RESOLVED) - src_location = WINED3D_LOCATION_RB_RESOLVED; - else if (locations & WINED3D_LOCATION_TEXTURE_SRGB) - src_location = WINED3D_LOCATION_TEXTURE_SRGB; - else if (locations & WINED3D_LOCATION_TEXTURE_RGB) - src_location = WINED3D_LOCATION_TEXTURE_RGB; - else if (locations & WINED3D_LOCATION_DRAWABLE) - src_location = WINED3D_LOCATION_DRAWABLE; - else /* texture2d_blt_fbo() will load the source location if necessary. */ - src_location = WINED3D_LOCATION_TEXTURE_RGB; - - texture2d_blt_fbo(texture->resource.device, context, WINED3D_TEXF_POINT, texture, - sub_resource_idx, src_location, &rect, texture, sub_resource_idx, dst_location, &rect); - - return TRUE; -} - -/* Context activation is done by the caller. */ static void fbo_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_context *context) { struct wined3d_blitter *next; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4ae869b..88db249 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2528,6 +2528,44 @@ static BOOL wined3d_texture_load_drawable(struct wined3d_texture *texture, return TRUE; } +static BOOL wined3d_texture_load_renderbuffer(struct wined3d_texture *texture, + unsigned int sub_resource_idx, struct wined3d_context *context, DWORD dst_location) +{ + unsigned int level = sub_resource_idx % texture->level_count; + const RECT rect = {0, 0, + wined3d_texture_get_level_width(texture, level), + wined3d_texture_get_level_height(texture, level)}; + struct wined3d_texture_sub_resource *sub_resource; + DWORD src_location, locations; + + sub_resource = &texture->sub_resources[sub_resource_idx]; + locations = sub_resource->locations; + if (texture->resource.bind_flags & WINED3D_BIND_DEPTH_STENCIL) + { + FIXME("Unimplemented copy from %s for depth/stencil buffers.\n", + wined3d_debug_location(locations)); + return FALSE; + } + + if (locations & WINED3D_LOCATION_RB_MULTISAMPLE) + src_location = WINED3D_LOCATION_RB_MULTISAMPLE; + else if (locations & WINED3D_LOCATION_RB_RESOLVED) + src_location = WINED3D_LOCATION_RB_RESOLVED; + else if (locations & WINED3D_LOCATION_TEXTURE_SRGB) + src_location = WINED3D_LOCATION_TEXTURE_SRGB; + else if (locations & WINED3D_LOCATION_TEXTURE_RGB) + src_location = WINED3D_LOCATION_TEXTURE_RGB; + else if (locations & WINED3D_LOCATION_DRAWABLE) + src_location = WINED3D_LOCATION_DRAWABLE; + else /* texture2d_blt_fbo() will load the source location if necessary. */ + src_location = WINED3D_LOCATION_TEXTURE_RGB; + + texture2d_blt_fbo(texture->resource.device, context, WINED3D_TEXF_POINT, texture, + sub_resource_idx, src_location, &rect, texture, sub_resource_idx, dst_location, &rect); + + return TRUE; +} + static BOOL wined3d_texture_gl_load_texture(struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, struct wined3d_context_gl *context_gl, BOOL srgb) { @@ -2702,7 +2740,7 @@ static BOOL wined3d_texture_gl_load_location(struct wined3d_texture *texture, case WINED3D_LOCATION_RB_RESOLVED: case WINED3D_LOCATION_RB_MULTISAMPLE: - return texture2d_load_renderbuffer(texture, sub_resource_idx, context, location); + return wined3d_texture_load_renderbuffer(texture, sub_resource_idx, context, location); case WINED3D_LOCATION_TEXTURE_RGB: case WINED3D_LOCATION_TEXTURE_SRGB: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f796d12..b6f4b67 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3551,8 +3551,6 @@ void texture2d_get_blt_info(const struct wined3d_texture_gl *texture_gl, unsigne const RECT *rect, struct wined3d_blt_info *info) DECLSPEC_HIDDEN; void texture2d_load_fb_texture(struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; -BOOL texture2d_load_renderbuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD src_location, DWORD dst_location) DECLSPEC_HIDDEN;

1 0

Jactry Zeng : d3d8/tests: Add tests for 32-bit depth format support.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 1ae07c048a8256dcd64bd8ab3963839f2e58a4fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ae07c048a8256dcd64bd8ab… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Jun 25 02:47:42 2019 +0430 d3d8/tests: Add tests for 32-bit depth format support. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b0a279b..03eb695 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8261,6 +8261,16 @@ static void test_check_device_format(void) D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_INDEXBUFFER, D3DFMT_INDEX16); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D8_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, D3DFMT_D32); + todo_wine ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), + "Got unexpected hr %#x.\n", hr); + + hr = IDirect3D8_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_R5G6B5, D3DFMT_D32); + todo_wine ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), + "Got unexpected hr %#x.\n", hr); + IDirect3D8_Release(d3d); }

1 0