wine-commits July 2019

wine-commits@winehq.org

2 participants
228 discussions

Paul Gofman : wined3d: Fixup 3D sampler when sampling 2D texture for PS models 2 and 3.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: 34eeb0a877e7a5bb3be77e0ea0d9cd4e08862f34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34eeb0a877e7a5bb3be77e0e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jul 3 17:56:41 2019 +0300 wined3d: Fixup 3D sampler when sampling 2D texture for PS models 2 and 3. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/shader.c | 37 +++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 6 ++++-- 3 files changed, 40 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index ab2d0bb..d786f68 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -25946,7 +25946,7 @@ static void test_mismatched_sample_types(void) { {"2d_2d", (IDirect3DBaseTexture9 **)&tex_2d, &ps_2d, 0x00707070}, {"3d_3d", (IDirect3DBaseTexture9 **)&volume, &ps_3d, 0x00303030}, - {"2d_3d", (IDirect3DBaseTexture9 **)&tex_2d, &ps_3d, 0x00707070, 0x00b2cce5, TRUE}, + {"2d_3d", (IDirect3DBaseTexture9 **)&tex_2d, &ps_3d, 0x00707070, 0x00b2cce5}, {"3d_2d", (IDirect3DBaseTexture9 **)&volume, &ps_2d, 0x00303030, 0x00b2cce5, TRUE, 0x00202020}, }; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 93d33a6..d856fea 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -4003,6 +4003,39 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 } } } + else if (shader->reg_maps.shader_version.major <= 3) + { + for (i = 0; i < shader->limits->sampler; ++i) + { + enum wined3d_shader_resource_type resource_type; + enum wined3d_shader_tex_types tex_type; + + if (!(resource_type = shader->reg_maps.resource_info[i].type)) + continue; + + switch (resource_type) + { + case WINED3D_SHADER_RESOURCE_TEXTURE_3D: + tex_type = WINED3D_SHADER_TEX_3D; + break; + case WINED3D_SHADER_RESOURCE_TEXTURE_CUBE: + tex_type = WINED3D_SHADER_TEX_CUBE; + break; + default: + tex_type = WINED3D_SHADER_TEX_2D; + break; + } + + if ((texture = state->textures[i])) + { + if (texture->resource.type == WINED3D_RTYPE_TEXTURE_2D + && resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_3D + && !(texture->resource.usage & WINED3DUSAGE_LEGACY_CUBEMAP)) + tex_type = WINED3D_SHADER_TEX_2D; + } + args->tex_types |= tex_type << i * WINED3D_PSARGS_TEXTYPE_SHIFT; + } + } if (shader->reg_maps.shader_version.major >= 4) { @@ -4201,7 +4234,7 @@ static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_d } enum wined3d_shader_resource_type pixelshader_get_resource_type(const struct wined3d_shader_reg_maps *reg_maps, - unsigned int resource_idx, WORD tex_types) + unsigned int resource_idx, DWORD tex_types) { static enum wined3d_shader_resource_type shader_resource_type_from_shader_tex_types[] = { @@ -4212,7 +4245,7 @@ enum wined3d_shader_resource_type pixelshader_get_resource_type(const struct win unsigned int idx; - if (reg_maps->shader_version.major != 1) + if (reg_maps->shader_version.major > 3) return reg_maps->resource_info[resource_idx].type; if (!reg_maps->resource_info[resource_idx].type) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7cda311..b959a28 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1365,6 +1365,7 @@ enum wined3d_shader_tex_types WINED3D_SHADER_TEX_2D = 0, WINED3D_SHADER_TEX_3D = 1, WINED3D_SHADER_TEX_CUBE = 2, + WINED3D_SHADER_TEX_ERR = 3, }; struct ps_compile_args @@ -1372,8 +1373,8 @@ struct ps_compile_args struct color_fixup_desc color_fixup[WINED3D_MAX_FRAGMENT_SAMPLERS]; enum wined3d_vertex_processing_mode vp_mode; enum wined3d_ffp_ps_fog_mode fog; + DWORD tex_types; /* ps 1 - 3, 16 textures */ WORD tex_transform; /* ps 1.0-1.3, 4 textures */ - WORD tex_types; /* ps 1.0 - 1.4, 6 textures */ WORD srgb_correction; /* Bitmap for NP2 texcoord fixups (16 samplers max currently). D3D9 has a limit of 16 samplers and the fixup is superfluous @@ -1381,6 +1382,7 @@ struct ps_compile_args WORD np2_fixup; WORD shadow; /* WINED3D_MAX_FRAGMENT_SAMPLERS, 16 */ WORD texcoords_initialized; /* WINED3D_MAX_TEXTURES, 8 */ + WORD padding_to_dword; DWORD pointsprite : 1; DWORD flatshading : 1; DWORD alpha_test_func : 3; @@ -4445,7 +4447,7 @@ struct wined3d_shader }; enum wined3d_shader_resource_type pixelshader_get_resource_type(const struct wined3d_shader_reg_maps *reg_maps, - unsigned int resource_idx, WORD tex_types) DECLSPEC_HIDDEN; + unsigned int resource_idx, DWORD tex_types) DECLSPEC_HIDDEN; void find_ps_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, BOOL position_transformed, struct ps_compile_args *args, const struct wined3d_context *context) DECLSPEC_HIDDEN;

1 0

Paul Gofman : wined3d: Do not modify shader register maps in backends.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: 9607a427dedb897c42a775b4b7afc3260292e059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9607a427dedb897c42a775b4… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jul 3 17:56:40 2019 +0300 wined3d: Do not modify shader register maps in backends. Signed-off-by: Paul Gofman <gofmanp(a)gmail.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 | 31 +++++++++++++++++++----------- dlls/wined3d/glsl_shader.c | 33 +++++++++++++++++++++++--------- dlls/wined3d/shader.c | 40 ++++++++++++++++----------------------- dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 62 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9607a427dedb897c42a7…

1 0

Paul Gofman : d3d9/tests: Test sample and texture dimensions mismatch.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: 577c28d362ab5c2d1682a433a1b64561d5d07d41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=577c28d362ab5c2d1682a433… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jul 3 17:56:39 2019 +0300 d3d9/tests: Test sample and texture dimensions mismatch. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 240 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 240 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=577c28d362ab5c2d1682…

1 0

Jacek Caban : winmm: Build with msvcrt.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: f09c0e7c0d2dd263570fe11829fe4c83ca042ac2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f09c0e7c0d2dd263570fe118… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 2 20:00:47 2019 +0200 winmm: Build with msvcrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/Makefile.in | 2 + dlls/winmm/driver.c | 6 +-- dlls/winmm/joystick.c | 8 ---- dlls/winmm/lolvldrv.c | 3 -- dlls/winmm/mci.c | 106 ++++++++++++++++++++++++------------------------- dlls/winmm/waveform.c | 2 +- 6 files changed, 55 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f09c0e7c0d2dd263570f…

1 0

Jacek Caban : winmm: Use condition variable to sleep in timer thread.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: f277ef7e688799dc71f621794f853a5e09678d85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f277ef7e688799dc71f62179… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 2 20:00:31 2019 +0200 winmm: Use condition variable to sleep in timer thread. We have fast condition variable implementation now, so performance should not be a problem. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/time.c | 81 ++++++++++--------------------------------------------- 1 file changed, 14 insertions(+), 67 deletions(-) diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index e055f6b..22c8985 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -20,24 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include <errno.h> #include <time.h> -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#ifdef HAVE_POLL_H -#include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -#include <sys/poll.h> -#endif #include "windef.h" #include "winbase.h" @@ -74,7 +59,7 @@ static CRITICAL_SECTION TIME_cbcrst = { &critsect_debug, -1, 0, 0, 0, 0 }; static HANDLE TIME_hMMTimer; static BOOL TIME_TimeToDie = TRUE; -static int TIME_fdWake[2] = { -1, -1 }; +static CONDITION_VARIABLE TIME_cv; /* link timer at the appropriate spot in the list */ static inline void link_timer( WINE_TIMERENTRY *timer ) @@ -116,8 +101,6 @@ static inline void link_timer( WINE_TIMERENTRY *timer ) #define MMSYSTIME_MININTERVAL (1) #define MMSYSTIME_MAXINTERVAL (65535) -#ifdef HAVE_POLL - /************************************************************************** * TIME_MMSysTimeCallback */ @@ -195,12 +178,8 @@ static int TIME_MMSysTimeCallback(void) */ static DWORD CALLBACK TIME_MMSysTimeThread(LPVOID arg) { - int sleep_time, ret; - char readme[16]; - struct pollfd pfd; - - pfd.fd = TIME_fdWake[0]; - pfd.events = POLLIN; + int sleep_time; + BOOL ret; TRACE("Starting main winmm thread\n"); @@ -214,20 +193,12 @@ static DWORD CALLBACK TIME_MMSysTimeThread(LPVOID arg) if (sleep_time == 0) continue; - LeaveCriticalSection(&WINMM_cs); - ret = poll(&pfd, 1, sleep_time); - EnterCriticalSection(&WINMM_cs); - - if (ret < 0) + ret = SleepConditionVariableCS(&TIME_cv, &WINMM_cs, sleep_time); + if (!ret && GetLastError() != ERROR_TIMEOUT) { - if (errno != EINTR && errno != EAGAIN) - { - ERR("Unexpected error in poll: %s(%d)\n", strerror(errno), errno); - break; - } + ERR("Unexpected error in poll: %s(%d)\n", strerror(errno), errno); + break; } - - while (ret > 0) ret = read(TIME_fdWake[0], readme, sizeof(readme)); } CloseHandle(TIME_hMMTimer); TIME_hMMTimer = NULL; @@ -242,35 +213,15 @@ static DWORD CALLBACK TIME_MMSysTimeThread(LPVOID arg) */ static void TIME_MMTimeStart(void) { + HMODULE mod; TIME_TimeToDie = 0; + if (TIME_hMMTimer) return; - if (TIME_fdWake[0] < 0) { - if (pipe(TIME_fdWake) < 0) { - TIME_fdWake[0] = TIME_fdWake[1] = -1; - ERR("Cannot create pipe: %s\n", strerror(errno)); - } else { - fcntl(TIME_fdWake[0], F_SETFL, O_NONBLOCK); - fcntl(TIME_fdWake[1], F_SETFL, O_NONBLOCK); - } - } - - if (!TIME_hMMTimer) { - HMODULE mod; - GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)TIME_MMSysTimeThread, &mod); - TIME_hMMTimer = CreateThread(NULL, 0, TIME_MMSysTimeThread, mod, 0, NULL); - SetThreadPriority(TIME_hMMTimer, THREAD_PRIORITY_TIME_CRITICAL); - } + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)TIME_MMSysTimeThread, &mod); + TIME_hMMTimer = CreateThread(NULL, 0, TIME_MMSysTimeThread, mod, 0, NULL); + SetThreadPriority(TIME_hMMTimer, THREAD_PRIORITY_TIME_CRITICAL); } -#else /* HAVE_POLL */ - -static void TIME_MMTimeStart(void) -{ - FIXME( "not starting system thread\n" ); -} - -#endif /* HAVE_POLL */ - /************************************************************************** * TIME_MMTimeStop */ @@ -282,8 +233,6 @@ void TIME_MMTimeStop(void) ERR("Timer still active?!\n"); CloseHandle(TIME_hMMTimer); } - close(TIME_fdWake[0]); - close(TIME_fdWake[1]); DeleteCriticalSection(&TIME_cbcrst); } } @@ -312,7 +261,6 @@ MMRESULT WINAPI timeSetEvent(UINT wDelay, UINT wResol, LPTIMECALLBACK lpFunc, WORD wNewID = 0; LPWINE_TIMERENTRY lpNewTimer; LPWINE_TIMERENTRY lpTimer; - const char c = 'c'; TRACE("(%u, %u, %p, %08lX, %04X);\n", wDelay, wResol, lpFunc, dwUser, wFlags); @@ -346,7 +294,7 @@ MMRESULT WINAPI timeSetEvent(UINT wDelay, UINT wResol, LPTIMECALLBACK lpFunc, LeaveCriticalSection(&WINMM_cs); /* Wake the service thread in case there is work to be done */ - write(TIME_fdWake[1], &c, sizeof(c)); + WakeConditionVariable(&TIME_cv); TRACE("=> %u\n", wNewID + 1); @@ -373,9 +321,8 @@ MMRESULT WINAPI timeKillEvent(UINT wID) } } if (list_empty(&timer_list)) { - char c = 'q'; TIME_TimeToDie = 1; - write(TIME_fdWake[1], &c, sizeof(c)); + WakeConditionVariable(&TIME_cv); } LeaveCriticalSection(&WINMM_cs);

1 0

Henri Verbeet : wined3d: Merge wined3d_texture_download_data() and wined3d_texture_gl_download_data().
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: 3bc3fce811422818be284941fd4e5225da897b4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bc3fce811422818be284941… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 5 16:26:22 2019 +0430 wined3d: Merge wined3d_texture_download_data() and wined3d_texture_gl_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 174 ++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 2 - 2 files changed, 87 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3bc3fce811422818be28…

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to wined3d_pipeline_statistics_query_end ().
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: 7b13749fc8378f8d2e6ef600d9b54f6bfdab3118 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b13749fc8378f8d2e6ef600… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 5 16:26:21 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_pipeline_statistics_query_end(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 08f2e82..d6f7879 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -956,9 +956,9 @@ static BOOL wined3d_pipeline_query_ops_poll(struct wined3d_query *query, DWORD f } static void wined3d_pipeline_statistics_query_end(struct wined3d_pipeline_statistics_query *query, - struct wined3d_context *context) + struct wined3d_context_gl *context_gl) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GL_EXTCALL(glEndQuery(GL_VERTICES_SUBMITTED_ARB)); GL_EXTCALL(glEndQuery(GL_PRIMITIVES_SUBMITTED_ARB)); @@ -990,7 +990,7 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD { if ((context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { - wined3d_pipeline_statistics_query_end(pq, &context_gl->c); + wined3d_pipeline_statistics_query_end(pq, context_gl); } else { @@ -1031,7 +1031,7 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD { if ((context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { - wined3d_pipeline_statistics_query_end(pq, &context_gl->c); + wined3d_pipeline_statistics_query_end(pq, context_gl); context_release(&context_gl->c); poll = TRUE; }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to wined3d_so_statistics_query_end().
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: 3c82bb74eb4569b04980e8674f0df82367c4e373 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c82bb74eb4569b04980e867… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 5 16:26:20 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_so_statistics_query_end(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 5d24011..08f2e82 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -817,9 +817,9 @@ static BOOL wined3d_so_statistics_query_ops_poll(struct wined3d_query *query, DW } static void wined3d_so_statistics_query_end(struct wined3d_so_statistics_query *query, - struct wined3d_context *context) + struct wined3d_context_gl *context_gl) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) { @@ -850,7 +850,7 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D { if ((context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { - wined3d_so_statistics_query_end(pq, &context_gl->c); + wined3d_so_statistics_query_end(pq, context_gl); } else { @@ -894,7 +894,7 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D { if ((context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { - wined3d_so_statistics_query_end(pq, &context_gl->c); + wined3d_so_statistics_query_end(pq, context_gl); context_release(&context_gl->c); poll = TRUE;

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to wined3d_query_buffer_queue_result( ).
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: 5f69c15645f65dab0b7e8805e3f845a8c96a565e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f69c15645f65dab0b7e8805… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 5 16:26:19 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_query_buffer_queue_result(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 10ca7d6..5d24011 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -73,16 +73,16 @@ static void wined3d_query_destroy_buffer_object(struct wined3d_context_gl *conte * object allows us to avoid these implicit flushes. An additional benefit is * that it allows us to poll the query status from the application-thread * instead of from the csmt-thread. */ -static BOOL wined3d_query_buffer_queue_result(struct wined3d_context *context, struct wined3d_query *query, GLuint id) +static BOOL wined3d_query_buffer_queue_result(struct wined3d_context_gl *context_gl, + struct wined3d_query *query, GLuint id) { - 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; GLsync tmp_sync; if (!gl_info->supported[ARB_QUERY_BUFFER_OBJECT] || !gl_info->supported[ARB_BUFFER_STORAGE]) return FALSE; /* Don't use query buffers without CSMT, mainly for simplicity. */ - if (!context->device->cs->thread) + if (!context_gl->c.device->cs->thread) return FALSE; if (query->buffer_object) @@ -684,7 +684,7 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD gl_info = context_gl->c.gl_info; GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); checkGLcall("glEndQuery()"); - wined3d_query_buffer_queue_result(&context_gl->c, query, oq->id); + wined3d_query_buffer_queue_result(context_gl, query, oq->id); context_release(&context_gl->c); poll = TRUE;

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to wined3d_query_destroy_buffer_object ().
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: ca35a55637a11f75b48e03d3f2fed8cc47813aac URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca35a55637a11f75b48e03d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 5 16:26:18 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_query_destroy_buffer_object(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index b167737..10ca7d6 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -54,9 +54,9 @@ static void wined3d_query_create_buffer_object(struct wined3d_context_gl *contex query->buffer_object = buffer_object; } -static void wined3d_query_destroy_buffer_object(struct wined3d_context *context, struct wined3d_query *query) +static void wined3d_query_destroy_buffer_object(struct wined3d_context_gl *context_gl, struct wined3d_query *query) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GL_EXTCALL(glDeleteBuffers(1, &query->buffer_object)); checkGLcall("query buffer object destruction"); @@ -93,7 +93,7 @@ static BOOL wined3d_query_buffer_queue_result(struct wined3d_context *context, s if (wined3d_query_buffer_is_valid(query)) wined3d_query_buffer_invalidate(query); else - wined3d_query_destroy_buffer_object(context, query); + wined3d_query_destroy_buffer_object(context_gl, query); } if (!query->buffer_object) @@ -434,8 +434,9 @@ static void wined3d_query_destroy_object(void *object) if (query->buffer_object) { struct wined3d_context *context; + context = context_acquire(query->device, NULL, 0); - wined3d_query_destroy_buffer_object(context, query); + wined3d_query_destroy_buffer_object(wined3d_context_gl(context), query); context_release(context); }

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
23
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 July 2019