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

Alexandre Julliard : tdi.sys: Build with msvcrt.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 2eec1676ac94101685e06b8c7368f66264f48cab URL: https://source.winehq.org/git/wine.git/?a=commit;h=2eec1676ac94101685e06b8c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:10:42 2019 +0200 tdi.sys: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tdi.sys/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/tdi.sys/Makefile.in b/dlls/tdi.sys/Makefile.in index d414ff7..9d5e05f 100644 --- a/dlls/tdi.sys/Makefile.in +++ b/dlls/tdi.sys/Makefile.in @@ -1,5 +1,7 @@ MODULE = tdi.sys EXTRADLLFLAGS = -Wl,--subsystem,native +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c

1 0

Alexandre Julliard : toolhelp: Build with msvcrt.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 06252f931665276ce2a2f957c3588f4a6ade4c81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06252f931665276ce2a2f957… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:11:12 2019 +0200 toolhelp: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/toolhelp.dll16/Makefile.in | 2 +- dlls/toolhelp.dll16/toolhelp.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/toolhelp.dll16/Makefile.in b/dlls/toolhelp.dll16/Makefile.in index 64d0de3..3c9b33f 100644 --- a/dlls/toolhelp.dll16/Makefile.in +++ b/dlls/toolhelp.dll16/Makefile.in @@ -1,4 +1,4 @@ MODULE = toolhelp.dll16 -EXTRADLLFLAGS = -m16 +EXTRADLLFLAGS = -m16 -mno-cygwin C_SRCS = toolhelp.c diff --git a/dlls/toolhelp.dll16/toolhelp.c b/dlls/toolhelp.dll16/toolhelp.c index 02e8d6a..f2b520b 100644 --- a/dlls/toolhelp.dll16/toolhelp.c +++ b/dlls/toolhelp.dll16/toolhelp.c @@ -19,14 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include <stdlib.h> #include <string.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif #include <ctype.h> #include <assert.h> #include "windef.h"

1 0

Alexandre Julliard : traffic: Build with msvcrt.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: de293035d19ce9718a555aea5cb9ee3af5a29ea8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de293035d19ce9718a555aea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:11:18 2019 +0200 traffic: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/traffic/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/traffic/Makefile.in b/dlls/traffic/Makefile.in index cbed340..e823eb3 100644 --- a/dlls/traffic/Makefile.in +++ b/dlls/traffic/Makefile.in @@ -1,4 +1,6 @@ MODULE = traffic.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ traffic_main.c

1 0

Alexandre Julliard : twain: Build with msvcrt.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 6b30142f828dc58e8338dee94479125d56293ec0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b30142f828dc58e8338dee9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:11:31 2019 +0200 twain: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/twain.dll16/Makefile.in | 2 +- dlls/twain.dll16/twain.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/twain.dll16/Makefile.in b/dlls/twain.dll16/Makefile.in index e9b5434..b92d0a9 100644 --- a/dlls/twain.dll16/Makefile.in +++ b/dlls/twain.dll16/Makefile.in @@ -1,4 +1,4 @@ MODULE = twain.dll16 -EXTRADLLFLAGS = -m16 -Wb,--main-module,twain_32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,twain_32.dll C_SRCS = twain.c diff --git a/dlls/twain.dll16/twain.c b/dlls/twain.dll16/twain.c index 92ebf57..56a1d5e 100644 --- a/dlls/twain.dll16/twain.c +++ b/dlls/twain.dll16/twain.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"

1 0

Alexandre Julliard : twain_32: Build with msvcrt.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 04eb97f9caaef57466fc7842ece01d6a3a9e5564 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04eb97f9caaef57466fc7842… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:12:08 2019 +0200 twain_32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/twain_32/Makefile.in | 2 ++ dlls/twain_32/dsm_ctrl.c | 2 -- dlls/twain_32/twain32_main.c | 2 -- dlls/twain_32/twain_i.h | 4 ---- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/twain_32/Makefile.in b/dlls/twain_32/Makefile.in index c82b5a7..6fb2126 100644 --- a/dlls/twain_32/Makefile.in +++ b/dlls/twain_32/Makefile.in @@ -1,6 +1,8 @@ MODULE = twain_32.dll IMPORTS = user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ dsm_ctrl.c \ twain32_main.c diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index 0b20986..3f7ead4 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdlib.h> #include <stdarg.h> #include <stdio.h> diff --git a/dlls/twain_32/twain32_main.c b/dlls/twain_32/twain32_main.c index 016680b..b1beb96 100644 --- a/dlls/twain_32/twain32_main.c +++ b/dlls/twain_32/twain32_main.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" diff --git a/dlls/twain_32/twain_i.h b/dlls/twain_32/twain_i.h index 4d33135..7939d23 100644 --- a/dlls/twain_32/twain_i.h +++ b/dlls/twain_32/twain_i.h @@ -20,10 +20,6 @@ #ifndef _TWAIN32_H #define _TWAIN32_H -#ifndef __WINE_CONFIG_H -# error You must include config.h first -#endif - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : typelib: Build with msvcrt.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 663a0b33fb61d065e643f2aeb9953c84d6727bc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=663a0b33fb61d065e643f2ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 10:12:19 2019 +0200 typelib: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/typelib.dll16/Makefile.in | 2 +- dlls/typelib.dll16/typelib.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/typelib.dll16/Makefile.in b/dlls/typelib.dll16/Makefile.in index b4d39ee..62c5b93 100644 --- a/dlls/typelib.dll16/Makefile.in +++ b/dlls/typelib.dll16/Makefile.in @@ -1,5 +1,5 @@ MODULE = typelib.dll16 IMPORTS = oleaut32 advapi32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,oleaut32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,oleaut32.dll C_SRCS = typelib.c diff --git a/dlls/typelib.dll16/typelib.c b/dlls/typelib.dll16/typelib.c index ee06cfb..50354a5 100644 --- a/dlls/typelib.dll16/typelib.c +++ b/dlls/typelib.dll16/typelib.c @@ -21,9 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdlib.h> #include <string.h> #include <stdarg.h>

1 0

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

24 Jun '19

Module: wine Branch: master Commit: 620bb8455186dfedcccb6c0bd652c00b728ada34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=620bb8455186dfedcccb6c0b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Jun 22 03:49:16 2019 +0430 wined3d: Pass a wined3d_context_gl structure to find_arb_ps_compile_args(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 273c4f3..7b06d64 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4414,15 +4414,15 @@ static struct arb_vs_compiled_shader *find_arb_vshader(struct wined3d_shader *sh } static void find_arb_ps_compile_args(const struct wined3d_state *state, - const struct wined3d_context *context, const struct wined3d_shader *shader, + const struct wined3d_context_gl *context_gl, const struct wined3d_shader *shader, struct arb_ps_compile_args *args) { - const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; int i; WORD int_skip; - find_ps_compile_args(state, shader, context->stream_info.position_transformed, &args->super, context); + find_ps_compile_args(state, shader, context_gl->c.stream_info.position_transformed, &args->super, &context_gl->c); /* This forces all local boolean constants to 1 to make them stateblock independent */ args->bools = shader->reg_maps.local_bool_consts; @@ -4564,7 +4564,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context struct arb_ps_compiled_shader *compiled; TRACE("Using pixel shader %p.\n", ps); - find_arb_ps_compile_args(state, context, ps, &compile_args); + find_arb_ps_compile_args(state, context_gl, ps, &compile_args); compiled = find_arb_pshader(context_gl, ps, &compile_args); priv->current_fprogram_id = compiled->prgId; priv->compiled_fprog = compiled;

1 0

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

24 Jun '19

Module: wine Branch: master Commit: 8c231b018b58d6b6276bea7ac0d3b9371d21dc91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c231b018b58d6b6276bea7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Jun 22 03:49:17 2019 +0430 wined3d: Pass a wined3d_context_gl structure to find_arb_vs_compile_args(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7b06d64..c07b23a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4470,18 +4470,17 @@ static void find_arb_ps_compile_args(const struct wined3d_state *state, } static void find_arb_vs_compile_args(const struct wined3d_state *state, - const struct wined3d_context *context, const struct wined3d_shader *shader, + const struct wined3d_context_gl *context_gl, const struct wined3d_shader *shader, struct arb_vs_compile_args *args) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const struct wined3d_device *device = shader->device; const struct wined3d_adapter *adapter = device->adapter; - const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_d3d_info *d3d_info = context->d3d_info; int i; WORD int_skip; - find_vs_compile_args(state, shader, context->stream_info.swizzle_map, &args->super, context); + find_vs_compile_args(state, shader, context_gl->c.stream_info.swizzle_map, &args->super, &context_gl->c); args->clip.boolclip_compare = 0; if (use_ps(state)) @@ -4496,7 +4495,7 @@ static void find_arb_vs_compile_args(const struct wined3d_state *state, { args->ps_signature = ~0; if (!d3d_info->vs_clipping && adapter->fragment_pipe == &arbfp_fragment_pipeline) - args->clip.boolclip.clip_texcoord = ffp_clip_emul(context) ? d3d_info->limits.ffp_blend_stages : 0; + args->clip.boolclip.clip_texcoord = ffp_clip_emul(&context_gl->c) ? d3d_info->limits.ffp_blend_stages : 0; /* Otherwise: Setting boolclip_compare set clip_texcoord to 0 */ } @@ -4632,7 +4631,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context const struct wined3d_shader_signature *ps_input_sig; TRACE("Using vertex shader %p\n", vs); - find_arb_vs_compile_args(state, context, vs, &compile_args); + find_arb_vs_compile_args(state, context_gl, vs, &compile_args); /* Instead of searching for the signature in the signature list, read the one from the * current pixel shader. It's maybe not the shader where the signature came from, but it

1 0

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

24 Jun '19

Module: wine Branch: master Commit: 1381d179f972cfd8c5d86f392a0e366b9783aec5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1381d179f972cfd8c5d86f39… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Jun 22 03:49:18 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_buffer_gl_bind(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8e1ac48..b664214 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -133,10 +133,8 @@ void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD loc } /* Context activation is done by the caller. */ -static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context) +static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - wined3d_context_gl_bind_bo(context_gl, buffer_gl->buffer_type_hint, buffer_gl->buffer_object); } @@ -200,6 +198,7 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu /* Context activation is done by the caller. */ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; GLenum gl_usage = GL_STATIC_DRAW; GLenum error; @@ -228,7 +227,7 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf goto fail; } - wined3d_buffer_gl_bind(buffer_gl, context); + wined3d_buffer_gl_bind(buffer_gl, context_gl); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) { @@ -541,10 +540,11 @@ ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_map_range *range; - wined3d_buffer_gl_bind(buffer_gl, context); + wined3d_buffer_gl_bind(buffer_gl, context_gl); while (range_count--) { @@ -645,6 +645,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); const struct wined3d_gl_info *gl_info = context->gl_info; @@ -680,7 +681,7 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, switch (location) { case WINED3D_LOCATION_SYSMEM: - wined3d_buffer_gl_bind(buffer_gl, context); + wined3d_buffer_gl_bind(buffer_gl, context_gl); GL_EXTCALL(glGetBufferSubData(buffer_gl->buffer_type_hint, 0, buffer->resource.size, buffer->resource.heap_memory)); checkGLcall("buffer download"); @@ -1011,6 +1012,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, unsigned int offset, unsigned int size, BYTE **data, DWORD flags) { struct wined3d_device *device = buffer_gl->b.resource.device; + struct wined3d_context_gl *context_gl; struct wined3d_context *context; LONG count; BYTE *base; @@ -1052,6 +1054,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, const struct wined3d_gl_info *gl_info; context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context); gl_info = context->gl_info; if (flags & WINED3D_MAP_DISCARD) @@ -1070,7 +1073,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, if (count == 1) { - wined3d_buffer_gl_bind(buffer_gl, context); + wined3d_buffer_gl_bind(buffer_gl, context_gl); /* Filter redundant WINED3D_MAP_DISCARD maps. The 3DMark2001 * multitexture fill rate test seems to depend on this. When @@ -1168,12 +1171,14 @@ static void wined3d_buffer_gl_unmap(struct wined3d_buffer_gl *buffer_gl) { struct wined3d_device *device = buffer_gl->b.resource.device; const struct wined3d_gl_info *gl_info; + struct wined3d_context_gl *context_gl; struct wined3d_context *context; context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context); gl_info = context->gl_info; - wined3d_buffer_gl_bind(buffer_gl, context); + wined3d_buffer_gl_bind(buffer_gl, context_gl); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) {

1 0

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

24 Jun '19

Module: wine Branch: master Commit: 5239000a9e0ddbc9da81e8f432d7f19264abec45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5239000a9e0ddbc9da81e8f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Jun 22 03:49:19 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_buffer_gl_create_buffer_object(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b664214..5aca952 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -196,10 +196,10 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu } /* Context activation is done by the caller. */ -static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context) +static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buffer_gl, + 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_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GLenum gl_usage = GL_STATIC_DRAW; GLenum error; @@ -269,7 +269,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); + wined3d_buffer_gl_destroy_buffer_object(buffer_gl, &context_gl->c); buffer_clear_dirty_areas(&buffer_gl->b); return FALSE; } @@ -615,6 +615,9 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); + switch (location) { case WINED3D_LOCATION_SYSMEM: @@ -626,7 +629,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, return TRUE; case WINED3D_LOCATION_BUFFER: - if (wined3d_buffer_gl(buffer)->buffer_object) + if (buffer_gl->buffer_object) return TRUE; if (!(buffer->flags & WINED3D_BUFFER_USE_BO)) @@ -634,7 +637,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, WARN("Trying to create BO for buffer %p with no WINED3D_BUFFER_USE_BO.\n", buffer); return FALSE; } - return wined3d_buffer_gl_create_buffer_object(wined3d_buffer_gl(buffer), context); + return wined3d_buffer_gl_create_buffer_object(buffer_gl, context_gl); default: ERR("Invalid location %s.\n", wined3d_debug_location(location));

1 0