August 2012 - Wine-commits - list.winehq.org

Alexandre Julliard : gdi32: Allow removing a driver from the stack based on its function table.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: bf528c5e9cba7ee95427c924b7d1ae7af50d0a8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf528c5e9cba7ee95427c924b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 21 12:59:18 2012 +0200 gdi32: Allow removing a driver from the stack based on its function table. --- dlls/gdi32/gdi_private.h | 7 ++++--- dlls/gdi32/path.c | 46 ++++++++++++++++------------------------------ 2 files changed, 20 insertions(+), 33 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 78ff1a7..bb1a5d1 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -170,11 +170,12 @@ static inline INT GDI_ROUND(double val) #define GET_DC_PHYSDEV(dc,func) \ get_physdev_entry_point( (dc)->physDev, FIELD_OFFSET(struct gdi_dc_funcs,func)) -static inline PHYSDEV pop_dc_driver( DC *dc, PHYSDEV dev ) +static inline PHYSDEV pop_dc_driver( DC *dc, const struct gdi_dc_funcs *funcs ) { - PHYSDEV *pdev = &dc->physDev; - while (*pdev && *pdev != dev) pdev = &(*pdev)->next; + PHYSDEV dev, *pdev = &dc->physDev; + while (*pdev && (*pdev)->funcs != funcs) pdev = &(*pdev)->next; if (!*pdev) return NULL; + dev = *pdev; *pdev = dev->next; return dev; } diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index a58f4e6..11e5e07 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -101,21 +101,6 @@ static inline struct path_physdev *get_path_physdev( PHYSDEV dev ) return (struct path_physdev *)dev; } -static inline void pop_path_driver( DC *dc, struct path_physdev *physdev ) -{ - pop_dc_driver( dc, &physdev->dev ); - HeapFree( GetProcessHeap(), 0, physdev ); -} - -static inline struct path_physdev *find_path_physdev( DC *dc ) -{ - PHYSDEV dev; - - for (dev = dc->physDev; dev->funcs != &null_driver; dev = dev->next) - if (dev->funcs == &path_driver) return get_path_physdev( dev ); - return NULL; -} - void free_gdi_path( struct gdi_path *path ) { HeapFree( GetProcessHeap(), 0, path->points ); @@ -805,7 +790,8 @@ static BOOL pathdrv_AbortPath( PHYSDEV dev ) if (!dc) return FALSE; free_gdi_path( physdev->path ); - pop_path_driver( dc, physdev ); + pop_dc_driver( dc, &path_driver ); + HeapFree( GetProcessHeap(), 0, physdev ); release_dc_ptr( dc ); return TRUE; } @@ -821,7 +807,8 @@ static BOOL pathdrv_EndPath( PHYSDEV dev ) if (!dc) return FALSE; dc->path = physdev->path; - pop_path_driver( dc, physdev ); + pop_dc_driver( dc, &path_driver ); + HeapFree( GetProcessHeap(), 0, physdev ); release_dc_ptr( dc ); return TRUE; } @@ -874,26 +861,25 @@ BOOL PATH_SavePath( DC *dst, DC *src ) BOOL PATH_RestorePath( DC *dst, DC *src ) { - struct path_physdev *physdev = find_path_physdev( dst ); + PHYSDEV dev; + struct path_physdev *physdev; - if (src->path && src->path_open) + if ((dev = pop_dc_driver( dst, &path_driver ))) { - if (!physdev) - { - if (!path_driver.pCreateDC( &dst->physDev, NULL, NULL, NULL, NULL )) return FALSE; - physdev = get_path_physdev( find_dc_driver( dst, &path_driver )); - } - else free_gdi_path( physdev->path ); + physdev = get_path_physdev( dev ); + free_gdi_path( physdev->path ); + HeapFree( GetProcessHeap(), 0, physdev ); + } + if (src->path && src->path_open) + { + if (!path_driver.pCreateDC( &dst->physDev, NULL, NULL, NULL, NULL )) return FALSE; + physdev = get_path_physdev( find_dc_driver( dst, &path_driver )); physdev->path = src->path; src->path_open = FALSE; src->path = NULL; } - else if (physdev) - { - free_gdi_path( physdev->path ); - pop_path_driver( dst, physdev ); - } + if (dst->path) free_gdi_path( dst->path ); dst->path = src->path; src->path = NULL;

1 0

Rico Schüller : d3dx9: Don' t double check the technique.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: f9a4a9db1b3ca802cfe2dbd75a8e8257750324a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9a4a9db1b3ca802cfe2dbd75… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Aug 21 12:26:22 2012 +0200 d3dx9: Don't double check the technique. --- dlls/d3dx9_36/effect.c | 16 +++------------- 1 files changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ef8fb86..d385015 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3527,19 +3527,9 @@ static HRESULT WINAPI ID3DXEffectImpl_SetTechnique(ID3DXEffect *iface, D3DXHANDL if (tech) { - UINT i; - - for (i = 0; i < base->technique_count; ++i) - { - struct d3dx_technique *t = get_technique_struct(base->technique_handles[i]); - - if (tech == t) - { - This->active_technique = get_technique_handle(t); - TRACE("Technique %u (%p)\n", i, tech); - return D3D_OK; - } - } + This->active_technique = get_technique_handle(tech); + TRACE("Technique %p\n", tech); + return D3D_OK; } WARN("Invalid argument supplied.\n");

1 0

Rico Schüller : d3dx9: Identify D3DTSS_CONSTANT and FVF states.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: 892308fdb68ed9a511c049065904babd276ac0bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=892308fdb68ed9a511c049065… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Aug 21 12:26:33 2012 +0200 d3dx9: Identify D3DTSS_CONSTANT and FVF states. --- dlls/d3dx9_36/effect.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d385015..72d44e7 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -324,12 +324,11 @@ state_table[] = {SC_TEXTURESTAGE, D3DTSS_BUMPENVLSCALE, "D3DTSS_BUMPENVLSCALE"}, {SC_TEXTURESTAGE, D3DTSS_BUMPENVLOFFSET, "D3DTSS_BUMPENVLOFFSET"}, {SC_TEXTURESTAGE, D3DTSS_TEXTURETRANSFORMFLAGS, "D3DTSS_TEXTURETRANSFORMFLAGS"}, - /* */ - {SC_UNKNOWN, 0, "UNKNOWN"}, + {SC_TEXTURESTAGE, D3DTSS_CONSTANT, "D3DTSS_CONSTANT"}, /* NPatchMode */ {SC_NPATCHMODE, 0, "NPatchMode"}, - /* */ - {SC_UNKNOWN, 0, "UNKNOWN"}, + /* FVF */ + {SC_FVF, 0, "FVF"}, /* Transform */ {SC_TRANSFORM, D3DTS_PROJECTION, "D3DTS_PROJECTION"}, {SC_TRANSFORM, D3DTS_VIEW, "D3DTS_VIEW"},

1 0

Rico Schüller : d3dx9: Remove not needed TRACE.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: becf83fd86aea090916fc596462fb371ff308aca URL: http://source.winehq.org/git/wine.git/?a=commit;h=becf83fd86aea090916fc5964… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Aug 21 12:26:40 2012 +0200 d3dx9: Remove not needed TRACE. --- dlls/d3dx9_36/effect.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 72d44e7..b54c398 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -456,11 +456,7 @@ static struct d3dx_technique *get_technique_by_name(struct ID3DXBaseEffectImpl * { struct d3dx_technique *tech = get_technique_struct(base->technique_handles[i]); - if (!strcmp(tech->name, name)) - { - TRACE("Returning technique %p\n", tech); - return tech; - } + if (!strcmp(tech->name, name)) return tech; } return NULL;

1 0

Rico Schüller : d3dx9: Avoid TRUE : FALSE conditional expression.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: 77993a610e80ca716df809d0424ac35409df7b05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77993a610e80ca716df809d04… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Aug 21 12:26:45 2012 +0200 d3dx9: Avoid TRUE : FALSE conditional expression. --- dlls/d3dx9_36/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b54c398..53c94bc 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -903,7 +903,7 @@ inline static FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) static inline BOOL get_bool(LPCVOID data) { - return (*(DWORD *)data) ? TRUE : FALSE; + return (*(DWORD *)data) != 0; } static void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indata, D3DXPARAMETER_TYPE intype) @@ -1735,7 +1735,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetBool(ID3DXBaseEffect *iface, D3DXHA if (param && !param->element_count && param->rows == 1 && param->columns == 1) { /* crop input */ - b = b ? TRUE : FALSE; + b = b != 0; set_number(param->data, param->type, &b, D3DXPT_BOOL); return D3D_OK; }

1 0

Józef Kucia : d3dx9: ID3DXConstantTable:: SetMatrix should set scalar constants.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: 978971e1ac364ba3734eb7290ae3747dc0cadf17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=978971e1ac364ba3734eb7290… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Aug 21 14:52:14 2012 +0200 d3dx9: ID3DXConstantTable::SetMatrix should set scalar constants. --- dlls/d3dx9_36/shader.c | 6 ++++++ dlls/d3dx9_36/tests/shader.c | 10 ++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 9482518..faab0a4 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -988,6 +988,12 @@ static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev row_offset = 4; registers_per_matrix = desc.Rows; } + else if (desc.Class == D3DXPC_SCALAR) + { + column_offset = 1; + row_offset = 1; + registers_per_matrix = 1; + } else { FIXME("Unhandled variable class %#x\n", desc.Class); diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 8bfea43..916136e 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -636,6 +636,16 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) "The variable f was not set correctly by ID3DXConstantTable_SetVector, got %f, should be %f\n", out[0], f4.x); + memset(out, 0, sizeof(out)); + IDirect3DDevice9_SetVertexShaderConstantF(device, 6, out, 1); + res = ID3DXConstantTable_SetMatrix(ctable, device, "f", &mvp); + ok(res == D3D_OK, "ID3DXConstantTable_SetMatrix failed on variable f: 0x%08x\n", res); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 6, out, 1); + ok(out[0] == U(S(mvp))._11 && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, + "The variable f was not set correctly by ID3DXConstantTable_SetMatrix, got %f, should be %f\n", + out[0], U(S(mvp))._11); + refcnt = ID3DXConstantTable_Release(ctable); ok(refcnt == 0, "The constant table reference count was %u, should be 0\n", refcnt); }

1 0

Józef Kucia : d3dx9: ID3DXConstantTable:: SetVector shouldn't change the value of matrix constants.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: 2f73fd6ed506111633bb0c3515539ef261233d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f73fd6ed506111633bb0c351… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Aug 21 14:52:15 2012 +0200 d3dx9: ID3DXConstantTable::SetVector shouldn't change the value of matrix constants. --- dlls/d3dx9_36/shader.c | 3 +++ dlls/d3dx9_36/tests/shader.c | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index faab0a4..d5d5018 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -921,6 +921,9 @@ static HRESULT set_vector_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev return D3DERR_INVALIDCALL; } + if (desc.Class == D3DXPC_MATRIX_ROWS || desc.Class == D3DXPC_MATRIX_COLUMNS) + return D3D_OK; + switch (desc.RegisterSet) { case D3DXRS_FLOAT4: diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 916136e..12725f2 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -646,6 +646,27 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) "The variable f was not set correctly by ID3DXConstantTable_SetMatrix, got %f, should be %f\n", out[0], U(S(mvp))._11); + /* Clear registers */ + memset(out, 0, sizeof(out)); + IDirect3DDevice9_SetVertexShaderConstantF(device, 0, out, 4); + + /* SetVector shouldn't change the value of a matrix constant */ + res = ID3DXConstantTable_SetVector(ctable, device, "mvp", &f4); + ok(res == D3D_OK, "ID3DXConstantTable_SetVector failed on variable f: 0x%08x\n", res); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 0, out, 4); + ok(out[0] == 0.0f && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f + && out[4] == 0.0f && out[5] == 0.0f && out[6] == 0.0f && out[7] == 0.0f + && out[8] == 0.0f && out[9] == 0.0f && out[10] == 0.0f && out[11] == 0.0f + && out[12] == 0.0f && out[13] == 0.0f && out[14] == 0.0f && out[15] == 0.0f, + "The variable mvp was not set correctly by ID3DXConstantTable_SetVector, " + "got {%f, %f, %f, %f; %f, %f, %f, %f; %f, %f, %f %f; %f, %f, %f, %f}, " + "should be all 0.0f\n", + out[0], out[1], out[2], out[3], + out[4], out[5], out[6], out[7], + out[8], out[9], out[10], out[11], + out[12], out[13], out[14], out[15]); + refcnt = ID3DXConstantTable_Release(ctable); ok(refcnt == 0, "The constant table reference count was %u, should be 0\n", refcnt); }

1 0

Matteo Bruni : wined3d: Fix blending test expected results.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: f89f30e0c01f60e67c5a004068deccbfcd60fbe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f89f30e0c01f60e67c5a00406… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Aug 20 22:34:57 2012 +0200 wined3d: Fix blending test expected results. --- dlls/wined3d/utils.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4f8108f..8db556d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1138,9 +1138,9 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined a = color >> 24; r = (color & 0x00ff0000) >> 16; - r_range = format->red_size < 8 ? 1 << (8 - format->red_size - 1) : 1; - a_range = format->alpha_size < 8 ? 1 << (8 - format->alpha_size - 1) : 1; - if (format->red_size && (r < 0x80 - r_range || r > 0x80 + r_range)) + r_range = format->red_size < 8 ? 1 << (8 - format->red_size) : 1; + a_range = format->alpha_size < 8 ? 1 << (8 - format->alpha_size) : 1; + if (format->red_size && (r < 0x7f - r_range || r > 0x7f + r_range)) match = FALSE; else if (format->alpha_size > 1 && (a < 0xbf - a_range || a > 0xbf + a_range)) match = FALSE;

1 0

Matteo Bruni : wined3d: Force ARB shader programs reselection on bool/ int constant changes.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: 7cc4f47afe2dbb112b0a84cb557160872e71c016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cc4f47afe2dbb112b0a84cb5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Aug 20 22:34:58 2012 +0200 wined3d: Force ARB shader programs reselection on bool/int constant changes. The ARB shader backend hardcodes some constant-dependent state in the shader itself (e.g. branch taken/not taken). So, we have to make sure to update the selected ARB shader when the application modifies non-float constants. --- dlls/wined3d/arb_program_shader.c | 38 ++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c8799df..c1a0718 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -625,6 +625,8 @@ static void shader_arb_vs_local_constants(const struct arb_vs_compiled_shader *g checkGLcall("Load vs int consts"); } +static void shader_arb_select(const struct wined3d_context *context, BOOL usePS, BOOL useVS); + /** * Loads the app-supplied constants into the currently set ARB_[vertex/fragment]_programs. * @@ -632,13 +634,38 @@ static void shader_arb_vs_local_constants(const struct arb_vs_compiled_shader *g * worry about the Integers or Booleans */ /* GL locking is done by the caller (state handler) */ -static void shader_arb_load_constants(const struct wined3d_context *context, char usePixelShader, char useVertexShader) +static void shader_arb_load_constants_internal(const struct wined3d_context *context, + char usePixelShader, char useVertexShader, BOOL from_shader_select) { struct wined3d_device *device = context->swapchain->device; - const struct wined3d_state *state = &device->stateBlock->state; + const struct wined3d_stateblock *stateblock = device->stateBlock; + const struct wined3d_state *state = &stateblock->state; const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_arb_priv *priv = device->shader_priv; + if (!from_shader_select) + { + const struct wined3d_shader *vshader = state->vertex_shader, *pshader = state->pixel_shader; + if (vshader + && (stateblock->changed.vertexShaderConstantsB & vshader->reg_maps.boolean_constants + || (!gl_info->supported[NV_VERTEX_PROGRAM2_OPTION] + && (stateblock->changed.vertexShaderConstantsI + & vshader->reg_maps.integer_constants & ~vshader->reg_maps.local_int_consts)))) + { + TRACE("bool/integer vertex shader constants potentially modified, forcing shader reselection.\n"); + shader_arb_select(context, usePixelShader, useVertexShader); + } + else if (pshader + && (stateblock->changed.pixelShaderConstantsB & pshader->reg_maps.boolean_constants + || (!gl_info->supported[NV_FRAGMENT_PROGRAM_OPTION] + && (stateblock->changed.pixelShaderConstantsI + & pshader->reg_maps.integer_constants & ~pshader->reg_maps.local_int_consts)))) + { + TRACE("bool/integer pixel shader constants potentially modified, forcing shader reselection.\n"); + shader_arb_select(context, usePixelShader, useVertexShader); + } + } + if (context != priv->last_context) { memset(priv->vshader_const_dirty, 1, @@ -676,6 +703,11 @@ static void shader_arb_load_constants(const struct wined3d_context *context, cha } } +static void shader_arb_load_constants(const struct wined3d_context *context, char ps, char vs) +{ + shader_arb_load_constants_internal(context, ps, vs, FALSE); +} + static void shader_arb_update_float_vertex_constants(struct wined3d_device *device, UINT start, UINT count) { struct wined3d_context *context = context_get_current(); @@ -4662,7 +4694,7 @@ static void shader_arb_select(const struct wined3d_context *context, BOOL usePS, priv->pshader_const_dirty[i] = 1; } /* Also takes care of loading local constants */ - shader_arb_load_constants(context, TRUE, FALSE); + shader_arb_load_constants_internal(context, TRUE, FALSE, TRUE); } else {

1 0

Matteo Bruni : wined3d: Use BOOL instead of char in shader_load_constants() .
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: d37f8ea8664c2d8378bcf28f96656273c2d4496f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37f8ea8664c2d8378bcf28f9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Aug 20 22:34:59 2012 +0200 wined3d: Use BOOL instead of char in shader_load_constants(). --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c1a0718..c4064b9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -635,7 +635,7 @@ static void shader_arb_select(const struct wined3d_context *context, BOOL usePS, */ /* GL locking is done by the caller (state handler) */ static void shader_arb_load_constants_internal(const struct wined3d_context *context, - char usePixelShader, char useVertexShader, BOOL from_shader_select) + BOOL usePixelShader, BOOL useVertexShader, BOOL from_shader_select) { struct wined3d_device *device = context->swapchain->device; const struct wined3d_stateblock *stateblock = device->stateBlock; @@ -703,7 +703,7 @@ static void shader_arb_load_constants_internal(const struct wined3d_context *con } } -static void shader_arb_load_constants(const struct wined3d_context *context, char ps, char vs) +static void shader_arb_load_constants(const struct wined3d_context *context, BOOL ps, BOOL vs) { shader_arb_load_constants_internal(context, ps, vs, FALSE); } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8e6b23a..66c30f8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -712,7 +712,7 @@ static void shader_glsl_load_np2fixup_constants(void *shader_priv, */ /* GL locking is done by the caller (state handler) */ static void shader_glsl_load_constants(const struct wined3d_context *context, - char usePixelShader, char useVertexShader) + BOOL usePixelShader, BOOL useVertexShader) { const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_device *device = context->swapchain->device; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2244ccd..8b9b81c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1487,7 +1487,7 @@ static void shader_none_select_depth_blt(void *shader_priv, const struct wined3d static void shader_none_deselect_depth_blt(void *shader_priv, const struct wined3d_gl_info *gl_info) {} static void shader_none_update_float_vertex_constants(struct wined3d_device *device, UINT start, UINT count) {} static void shader_none_update_float_pixel_constants(struct wined3d_device *device, UINT start, UINT count) {} -static void shader_none_load_constants(const struct wined3d_context *context, char usePS, char useVS) {} +static void shader_none_load_constants(const struct wined3d_context *context, BOOL usePS, BOOL useVS) {} static void shader_none_load_np2fixup_constants(void *shader_priv, const struct wined3d_gl_info *gl_info, const struct wined3d_state *state) {} static void shader_none_destroy(struct wined3d_shader *shader) {} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c23a6fa..1bc28c6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -769,7 +769,7 @@ struct wined3d_shader_backend_ops void (*shader_deselect_depth_blt)(void *shader_priv, const struct wined3d_gl_info *gl_info); void (*shader_update_float_vertex_constants)(struct wined3d_device *device, UINT start, UINT count); void (*shader_update_float_pixel_constants)(struct wined3d_device *device, UINT start, UINT count); - void (*shader_load_constants)(const struct wined3d_context *context, char usePS, char useVS); + void (*shader_load_constants)(const struct wined3d_context *context, BOOL usePS, BOOL useVS); void (*shader_load_np2fixup_constants)(void *shader_priv, const struct wined3d_gl_info *gl_info, const struct wined3d_state *state); void (*shader_destroy)(struct wined3d_shader *shader);

1 0