July 2008 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Create fragment processing state templates and select one.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: c15dfb87e9708f2ada3fc726e537107b02cfc874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c15dfb87e9708f2ada3fc726e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 4 15:01:26 2008 -0500 wined3d: Create fragment processing state templates and select one. For now the atifs selection sticks to the old rules, thus it is bound to the available and selected shader capabilities. We may want to change that in the future. --- dlls/wined3d/ati_fragment_shader.c | 4 ++++ dlls/wined3d/directx.c | 19 ++++++++++++++++++- dlls/wined3d/state.c | 4 ++++ dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 8377917..adc88d6 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -893,6 +893,10 @@ static void init_state_table() { ATIFSStateTable[STATE_RENDER(WINED3DRS_TEXTUREFACTOR)].representative = STATE_RENDER(WINED3DRS_TEXTUREFACTOR); } +const struct StateEntryTemplate atifs_fragmentstate_template[] = { + {0 /* Terminate */, { 0, 0 }}, +}; + /* GL_ATI_fragment_shader backend.It borrows a lot from a the * ARB shader backend, currently the whole vertex processing * code. This code would also forward pixel shaders, but if diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c1f68f8..b421519 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2890,6 +2890,20 @@ static const shader_backend_t *select_shader_backend(UINT Adapter, WINED3DDEVTYP return ret; } +static const struct StateEntryTemplate *select_fragment_implementation(UINT Adapter, WINED3DDEVTYPE DeviceType) { + int vs_selected_mode; + int ps_selected_mode; + + select_shader_mode(&GLINFO_LOCATION, DeviceType, &ps_selected_mode, &vs_selected_mode); + if (ps_selected_mode == SHADER_GLSL || ps_selected_mode == SHADER_ARB) { + return ffp_fragmentstate_template; + } else if (ps_selected_mode != SHADER_NONE && !GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { + return atifs_fragmentstate_template; + } else { + return ffp_fragmentstate_template; + } +} + /* Note: d3d8 passes in a pointer to a D3DCAPS8 structure, which is a true subset of a D3DCAPS9 structure. However, it has to come via a void * as the d3d8 interface cannot import the d3d9 header */ @@ -3393,6 +3407,7 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, IWineD3DDeviceImpl *object = NULL; IWineD3DImpl *This = (IWineD3DImpl *)iface; WINED3DDISPLAYMODE mode; + const struct StateEntryTemplate *frag_pipeline = NULL; int i; /* Validate the adapter number. If no adapters are available(no GL), ignore the adapter @@ -3446,8 +3461,10 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, select_shader_mode(&GLINFO_LOCATION, DeviceType, &object->ps_selected_mode, &object->vs_selected_mode); object->shader_backend = select_shader_backend(Adapter, DeviceType); + frag_pipeline = select_fragment_implementation(Adapter, DeviceType); + compile_state_table(object->StateTable, object->multistate_funcs, - ffp_vertexstate_template, NULL, misc_state_template, + ffp_vertexstate_template, frag_pipeline, misc_state_template, object->shader_backend->StateTable_remove); /* Prefer the vtable with functions optimized for single dirtifyable objects if the shader diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2813d92..60089ce 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5246,6 +5246,10 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { {0 /* Terminate */, { 0, 0 }}, }; +const struct StateEntryTemplate ffp_fragmentstate_template[] = { + {0 /* Terminate */, { 0, 0 }}, +}; + static int num_handlers(APPLYSTATEFUNC *funcs) { unsigned int i; for(i = 0; funcs[i]; i++); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 706fdff..af0ee3b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -595,6 +595,8 @@ struct StateEntryTemplate extern const struct StateEntryTemplate misc_state_template[]; extern const struct StateEntryTemplate ffp_vertexstate_template[]; +extern const struct StateEntryTemplate ffp_fragmentstate_template[]; +extern const struct StateEntryTemplate atifs_fragmentstate_template[]; /* "Base" state table */ extern const struct StateEntry FFPStateTable[];

1 0

Stefan Dösinger : wined3d: Communicate the atifs functions via the fragment pipeline impl.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: 94b723505f0e392879f2656a866ef41bbb7092d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94b723505f0e392879f2656a8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 14:48:23 2008 -0500 wined3d: Communicate the atifs functions via the fragment pipeline impl. Move those things out of the state table. --- dlls/wined3d/ati_fragment_shader.c | 136 ++++++++++++++++++++++++++++++++---- 1 files changed, 121 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=94b723505f0e392879f26…

1 0

Stefan Dösinger : wined3d: Remove the DLL load init function.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: 2d7cdc3ec2da8d574e53ea3de31d0734496da0e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d7cdc3ec2da8d574e53ea3de… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 14:52:37 2008 -0500 wined3d: Remove the DLL load init function. --- dlls/wined3d/arb_program_shader.c | 4 --- dlls/wined3d/ati_fragment_shader.c | 44 ------------------------------------ dlls/wined3d/baseshader.c | 2 - dlls/wined3d/glsl_shader.c | 3 -- dlls/wined3d/wined3d_main.c | 5 ---- dlls/wined3d/wined3d_private.h | 1 - 6 files changed, 0 insertions(+), 59 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 42b107a..4c70331 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2090,9 +2090,6 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_info } } -static void shader_arb_load_init(void) { -} - static void shader_arb_fragment_enable(IWineD3DDevice *iface, BOOL enable) { none_shader_backend.shader_fragment_enable(iface, enable); } @@ -2111,7 +2108,6 @@ const shader_backend_t arb_program_shader_backend = { shader_arb_generate_pshader, shader_arb_generate_vshader, shader_arb_get_caps, - shader_arb_load_init, shader_arb_fragment_enable, FFPStateTable }; diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 888ca14..e596201 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -856,44 +856,6 @@ static void set_bumpmat(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D /* our state table. Borrows lots of stuff from the base implementation */ struct StateEntry ATIFSStateTable[STATE_HIGHEST + 1]; -static void init_state_table() { - unsigned int i; - const DWORD rep = STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP); - memcpy(ATIFSStateTable, arb_program_shader_backend.StateTable_remove, sizeof(ATIFSStateTable)); - - for(i = 0; i < MAX_TEXTURES; i++) { - ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP)].apply = NULL; - ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP)].representative = rep; - ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_COLORARG1)].apply = NULL; - ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_COLORARG1)].representative = rep; - ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_COLORARG2)].apply = NULL; - ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_COLORARG2)].representative = rep; - ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_COLORARG0)].apply = NULL; - ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_COLORARG0)].representative = rep; - - ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_ALPHAOP)].apply = NULL; - ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_ALPHAOP)].representative = rep; - ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_ALPHAARG1)].apply = NULL; - ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_ALPHAARG1)].representative = rep; - ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_ALPHAARG2)].apply = NULL; - ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_ALPHAARG2)].representative = rep; - ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_ALPHAARG0)].apply = NULL; - ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_ALPHAARG0)].representative = rep; - - ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_RESULTARG)].apply = NULL; - ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_RESULTARG)].representative = rep; - - ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_BUMPENVMAT00)].apply = NULL; - ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_BUMPENVMAT01)].apply = NULL; - ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_BUMPENVMAT10)].apply = NULL; - ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_BUMPENVMAT11)].apply = NULL; - } - - ATIFSStateTable[STATE_RENDER(WINED3DRS_TEXTUREFACTOR)].apply = NULL; - ATIFSStateTable[STATE_RENDER(WINED3DRS_TEXTUREFACTOR)].representative = STATE_RENDER(WINED3DRS_TEXTUREFACTOR); - -} - const struct StateEntryTemplate atifs_fragmentstate_template[] = { {STATE_RENDER(WINED3DRS_TEXTUREFACTOR), { STATE_RENDER(WINED3DRS_TEXTUREFACTOR), state_texfactor_atifs }}, {STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), { STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), set_tex_op_atifs }}, @@ -1079,11 +1041,6 @@ static BOOL shader_atifs_dirty_const(IWineD3DDevice *iface) { return arb_program_shader_backend.shader_dirtifyable_constants(iface); } -static void shader_atifs_load_init(void) { - arb_program_shader_backend.shader_dll_load_init(); - init_state_table(); -} - static void shader_atifs_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_info, struct shader_caps *caps) { arb_program_shader_backend.shader_get_caps(devtype, gl_info, caps); @@ -1168,7 +1125,6 @@ const shader_backend_t atifs_shader_backend = { shader_atifs_generate_pshader, shader_atifs_generate_vshader, shader_atifs_get_caps, - shader_atifs_load_init, shader_atifs_fragment_enable, ATIFSStateTable }; diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 06dd69d..6f24c91 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1105,7 +1105,6 @@ static void shader_none_generate_pshader(IWineD3DPixelShader *iface, SHADER_BUFF static void shader_none_generate_vshader(IWineD3DVertexShader *iface, SHADER_BUFFER *buffer) { FIXME("NONE shader backend asked to generate a vertex shader\n"); } -static void shader_none_load_init(void) {} #define GLINFO_LOCATION (*gl_info) static void shader_none_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_info, struct shader_caps *pCaps) { @@ -1214,7 +1213,6 @@ const shader_backend_t none_shader_backend = { shader_none_generate_pshader, shader_none_generate_vshader, shader_none_get_caps, - shader_none_load_init, shader_none_fragment_enable, FFPStateTable }; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 34b86a3..9bbe418 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3689,8 +3689,6 @@ static void shader_glsl_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_inf TRACE_(d3d_caps)("Hardware pixel shader version %d.%d enabled (GLSL)\n", (pCaps->PixelShaderVersion >> 8) & 0xff, pCaps->PixelShaderVersion & 0xff); } -static void shader_glsl_load_init(void) {} - static void shader_glsl_fragment_enable(IWineD3DDevice *iface, BOOL enable) { none_shader_backend.shader_fragment_enable(iface, enable); } @@ -3709,7 +3707,6 @@ const shader_backend_t glsl_shader_backend = { shader_glsl_generate_pshader, shader_glsl_generate_vshader, shader_glsl_get_caps, - shader_glsl_load_init, shader_glsl_fragment_enable, FFPStateTable }; diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 27de876..b75fdf3 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -95,11 +95,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) DWORD len; WNDCLASSA wc; - atifs_shader_backend.shader_dll_load_init(); - glsl_shader_backend.shader_dll_load_init(); - arb_program_shader_backend.shader_dll_load_init(); - none_shader_backend.shader_dll_load_init(); - /* We need our own window class for a fake window which we use to retrieve GL capabilities */ /* We might need CS_OWNDC in the future if we notice strange things on Windows. * Various articles/posts about OpenGL problems on Windows recommend this. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index af0ee3b..168b940 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -300,7 +300,6 @@ typedef struct { void (*shader_generate_pshader)(IWineD3DPixelShader *iface, SHADER_BUFFER *buffer); void (*shader_generate_vshader)(IWineD3DVertexShader *iface, SHADER_BUFFER *buffer); void (*shader_get_caps)(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_info, struct shader_caps *caps); - void (*shader_dll_load_init)(void); void (*shader_fragment_enable)(IWineD3DDevice *iface, BOOL enable); const struct StateEntry *StateTable_remove; /* TODO: This has to go away */ } shader_backend_t;

1 0

Stefan Dösinger : wined3d: Move the viewport to the vertex and misc pipeline states.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: b4bee02556a9be770e5874309a9ba01550630ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4bee02556a9be770e5874309… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 13:16:23 2008 -0500 wined3d: Move the viewport to the vertex and misc pipeline states. --- dlls/wined3d/state.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e830268..bf942d4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3627,7 +3627,7 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W } } -static void viewport(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { +static void viewport_miscpart(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { UINT width, height; IWineD3DSurfaceImpl *target; @@ -3649,7 +3649,9 @@ static void viewport(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCon } checkGLcall("glViewport"); +} +static void viewport_vertexpart(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { stateblock->wineD3DDevice->posFixup[2] = 1.0 / stateblock->viewport.Width; stateblock->wineD3DDevice->posFixup[3] = -stateblock->wineD3DDevice->posFixup[1] / stateblock->viewport.Height; if(!isStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION))) { @@ -4839,7 +4841,7 @@ const struct StateEntry FFPStateTable[] = { /* , STATE_INDEXBUFFER */ STATE_INDEXBUFFER, indexbuffer }, { /* , STATE_VDECL */ STATE_VDECL, NULL }, { /* , STATE_VSHADER */ STATE_VDECL, NULL }, - { /* , STATE_VIEWPORT */ STATE_VIEWPORT, viewport }, + { /* , STATE_VIEWPORT */ STATE_VIEWPORT, NULL }, { /* , STATE_VERTEXSHADERCONSTANT */ STATE_VERTEXSHADERCONSTANT, NULL }, { /* , STATE_PIXELSHADERCONSTANT */ STATE_VERTEXSHADERCONSTANT, NULL }, /* Lights */ @@ -4911,6 +4913,8 @@ const struct StateEntryTemplate misc_state_template[] = { */ { STATE_VERTEXSHADERCONSTANT, { STATE_VERTEXSHADERCONSTANT, shaderconstant }}, { STATE_PIXELSHADERCONSTANT, { STATE_VERTEXSHADERCONSTANT, shaderconstant }}, + /* Viewport */ + { STATE_VIEWPORT, { STATE_VIEWPORT, viewport_miscpart }}, {0 /* Terminate */, { 0, 0 }}, }; @@ -4961,6 +4965,8 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_ACTIVELIGHT(5), { STATE_ACTIVELIGHT(5), light }}, { STATE_ACTIVELIGHT(6), { STATE_ACTIVELIGHT(6), light }}, { STATE_ACTIVELIGHT(7), { STATE_ACTIVELIGHT(7), light }}, + /* Viewport */ + { STATE_VIEWPORT, { STATE_VIEWPORT, viewport_vertexpart }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Stefan Dösinger : wined3d: indexbuffer -> misc.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: 1f5bce3454674eee49cbb08c5e2a94536cf3ff9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f5bce3454674eee49cbb08c5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 13:18:58 2008 -0500 wined3d: indexbuffer -> misc. --- dlls/wined3d/state.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index bf942d4..167239a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4838,7 +4838,7 @@ const struct StateEntry FFPStateTable[] = { /*511, WINED3DTS_WORLDMATRIX(255) */ STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(255)), transform_worldex }, /* Various Vertex states follow */ { /* , STATE_STREAMSRC */ STATE_VDECL, NULL }, - { /* , STATE_INDEXBUFFER */ STATE_INDEXBUFFER, indexbuffer }, + { /* , STATE_INDEXBUFFER */ STATE_INDEXBUFFER, NULL }, { /* , STATE_VDECL */ STATE_VDECL, NULL }, { /* , STATE_VSHADER */ STATE_VDECL, NULL }, { /* , STATE_VIEWPORT */ STATE_VIEWPORT, NULL }, @@ -4913,8 +4913,9 @@ const struct StateEntryTemplate misc_state_template[] = { */ { STATE_VERTEXSHADERCONSTANT, { STATE_VERTEXSHADERCONSTANT, shaderconstant }}, { STATE_PIXELSHADERCONSTANT, { STATE_VERTEXSHADERCONSTANT, shaderconstant }}, - /* Viewport */ + { STATE_VIEWPORT, { STATE_VIEWPORT, viewport_miscpart }}, + { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, indexbuffer }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Stefan Dösinger : wined3d: Move transforms to the vertex code.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: 68948f0c71d439b3d297ddbe6505f43a6bad6f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=68948f0c71d439b3d297ddbe6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 13:40:23 2008 -0500 wined3d: Move transforms to the vertex code. Some fragment pipeline implementations may want to register their own texture transform handlers. --- dlls/wined3d/state.c | 799 +++++++++++++++++++++++++++++++++----------------- 1 files changed, 533 insertions(+), 266 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=68948f0c71d439b3d297d…

1 0

Stefan Dösinger : wined3d: Move texture transform flag stuff to the vertex pipeline states.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: bdfaab5a946fa9f236b7039d32bd1f9eb163110d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdfaab5a946fa9f236b7039d3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 14:14:29 2008 -0500 wined3d: Move texture transform flag stuff to the vertex pipeline states. --- dlls/wined3d/state.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bdfaab5a946fa9f236b70…

1 0

Stefan Dösinger : wined3d: Move shader constants to the misc states.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: 4b831a5d3e15af9dccf7114bb4440133cb8fe721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b831a5d3e15af9dccf7114bb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 13:07:41 2008 -0500 wined3d: Move shader constants to the misc states. --- dlls/wined3d/state.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 94798a4..e830268 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4840,8 +4840,8 @@ const struct StateEntry FFPStateTable[] = { /* , STATE_VDECL */ STATE_VDECL, NULL }, { /* , STATE_VSHADER */ STATE_VDECL, NULL }, { /* , STATE_VIEWPORT */ STATE_VIEWPORT, viewport }, - { /* , STATE_VERTEXSHADERCONSTANT */ STATE_VERTEXSHADERCONSTANT, shaderconstant }, - { /* , STATE_PIXELSHADERCONSTANT */ STATE_VERTEXSHADERCONSTANT, shaderconstant }, + { /* , STATE_VERTEXSHADERCONSTANT */ STATE_VERTEXSHADERCONSTANT, NULL }, + { /* , STATE_PIXELSHADERCONSTANT */ STATE_VERTEXSHADERCONSTANT, NULL }, /* Lights */ { /* , STATE_ACTIVELIGHT(0) */ STATE_ACTIVELIGHT(0), NULL }, { /* , STATE_ACTIVELIGHT(1) */ STATE_ACTIVELIGHT(1), NULL }, @@ -4906,6 +4906,11 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_VDECL, { STATE_VDECL, streamsrc }}, { STATE_FRONTFACE, { STATE_FRONTFACE, frontface }}, { STATE_SCISSORRECT, { STATE_SCISSORRECT, scissorrect }}, + /* TODO: Move shader constant loading to vertex and fragment pipeline repectively, as soon as the pshader and + * vshader loadings are untied from each other + */ + { STATE_VERTEXSHADERCONSTANT, { STATE_VERTEXSHADERCONSTANT, shaderconstant }}, + { STATE_PIXELSHADERCONSTANT, { STATE_VERTEXSHADERCONSTANT, shaderconstant }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Alexandre Julliard : ntdll: Always restore the %gs register from the saved value in thread data.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: 13fbba6847713cc1a8d43051f998323fee9865af URL: http://source.winehq.org/git/wine.git/?a=commit;h=13fbba6847713cc1a8d43051f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 8 20:54:40 2008 +0200 ntdll: Always restore the %gs register from the saved value in thread data. --- dlls/ntdll/signal_i386.c | 25 ++++++------------------- 1 files changed, 6 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 4351844..4e0c5fa 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -582,10 +582,10 @@ typedef void (WINAPI *raise_func)( EXCEPTION_RECORD *rec, CONTEXT *context ); * init_handler * * Handler initialization when the full context is not needed. + * Return the stack pointer to use for pushing the exception data. */ static inline void *init_handler( const SIGCONTEXT *sigcontext, WORD *fs, WORD *gs ) { - void *stack = (void *)(ESP_sig(sigcontext) & ~3); TEB *teb = get_current_teb(); struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)teb->SystemReserved2; @@ -602,8 +602,8 @@ static inline void *init_handler( const SIGCONTEXT *sigcontext, WORD *fs, WORD * #endif wine_set_fs( thread_data->fs ); + wine_set_gs( thread_data->gs ); - /* now restore a proper %gs for the fault handler */ if (!wine_ldt_is_system(CS_sig(sigcontext)) || !wine_ldt_is_system(SS_sig(sigcontext))) /* 16-bit mode */ { @@ -614,24 +614,9 @@ static inline void *init_handler( const SIGCONTEXT *sigcontext, WORD *fs, WORD * * SS is still non-system segment. This is why both CS and SS * are checked. */ - wine_set_gs( thread_data->gs ); - stack = teb->WOW32Reserved; + return teb->WOW32Reserved; } -#ifdef __HAVE_VM86 - else if ((void *)EIP_sig(sigcontext) == vm86_return) /* vm86 mode */ - { - unsigned int *int_stack = stack; - /* fetch the saved %gs from the stack */ - wine_set_gs( int_stack[0] ); - } -#endif - else /* 32-bit mode */ - { -#ifdef GS_sig - wine_set_gs( GS_sig(sigcontext) ); -#endif - } - return stack; + return (void *)(ESP_sig(sigcontext) & ~3); } @@ -1553,6 +1538,8 @@ void signal_init_thread(void) ss.ss_flags = 0; if (sigaltstack(&ss, NULL) == -1) perror( "sigaltstack" ); #endif /* HAVE_SIGALTSTACK */ + + ntdll_get_thread_data()->gs = wine_get_gs(); } /**********************************************************************

1 0

Nikolay Sivov : gdiplus: Implemented GdipShearMatrix with tests.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: 4ea173ef9bbc3d4e158f5fa1bfa413144d5ce65f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ea173ef9bbc3d4e158f5fa1b… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jul 8 20:09:03 2008 +0400 gdiplus: Implemented GdipShearMatrix with tests. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/matrix.c | 24 ++++++++++++++ dlls/gdiplus/tests/matrix.c | 73 +++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 99 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b40b8a2..f62ccaa 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -598,7 +598,7 @@ @ stdcall GdipSetTextureTransform(ptr ptr) @ stub GdipSetTextureWrapMode @ stdcall GdipSetWorldTransform(ptr ptr) -@ stub GdipShearMatrix +@ stdcall GdipShearMatrix(ptr long long long) @ stdcall GdipStartPathFigure(ptr) @ stub GdipStringFormatGetGenericDefault @ stub GdipStringFormatGetGenericTypographic diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index 8714908..a29508d 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -280,6 +280,30 @@ GpStatus WINGDIPAPI GdipSetMatrixElements(GpMatrix *matrix, REAL m11, REAL m12, return Ok; } +GpStatus WINGDIPAPI GdipShearMatrix(GpMatrix *matrix, REAL shearX, REAL shearY, + GpMatrixOrder order) +{ + REAL shear[6]; + + if(!matrix) + return InvalidParameter; + + /* prepare transformation matrix */ + shear[0] = 1.0; + shear[1] = shearY; + shear[2] = shearX; + shear[3] = 1.0; + shear[4] = 0.0; + shear[5] = 0.0; + + if(order == MatrixOrderAppend) + matrix_multiply(matrix->matrix, shear, matrix->matrix); + else + matrix_multiply(shear, matrix->matrix, matrix->matrix); + + return Ok; +} + GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix *matrix, GpPointF *pts, INT count) { diff --git a/dlls/gdiplus/tests/matrix.c b/dlls/gdiplus/tests/matrix.c index 3d3c484..16c1517 100644 --- a/dlls/gdiplus/tests/matrix.c +++ b/dlls/gdiplus/tests/matrix.c @@ -149,6 +149,78 @@ static void test_invert(void) GdipDeleteMatrix(matrix); } +static void test_shear(void) +{ + GpStatus status; + GpMatrix *matrix = NULL; + GpMatrix *sheared = NULL; + BOOL equal; + + /* NULL */ + status = GdipShearMatrix(NULL, 0.0, 0.0, MatrixOrderPrepend); + expect(InvalidParameter, status); + + /* X only shearing, MatrixOrderPrepend */ + GdipCreateMatrix2(1.0, 2.0, 4.0, -1.0, 6.0, 3.0, &matrix); + status = GdipShearMatrix(matrix, 1.5, 0.0, MatrixOrderPrepend); + expect(Ok, status); + GdipCreateMatrix2(1.0, 2.0, 5.5, 2.0, 6.0, 3.0, &sheared); + GdipIsMatrixEqual(matrix, sheared, &equal); + expect(TRUE, equal); + GdipDeleteMatrix(sheared); + GdipDeleteMatrix(matrix); + + /* X only shearing, MatrixOrderAppend */ + GdipCreateMatrix2(1.0, 2.0, 4.0, -1.0, 6.0, 3.0, &matrix); + status = GdipShearMatrix(matrix, 1.5, 0.0, MatrixOrderAppend); + expect(Ok, status); + GdipCreateMatrix2(4.0, 2.0, 2.5, -1.0, 10.5, 3.0, &sheared); + GdipIsMatrixEqual(matrix, sheared, &equal); + expect(TRUE, equal); + GdipDeleteMatrix(sheared); + GdipDeleteMatrix(matrix); + + /* Y only shearing, MatrixOrderPrepend */ + GdipCreateMatrix2(1.0, 2.0, 4.0, -1.0, 6.0, 3.0, &matrix); + status = GdipShearMatrix(matrix, 0.0, 1.5, MatrixOrderPrepend); + expect(Ok, status); + GdipCreateMatrix2(7.0, 0.5, 4.0, -1.0, 6.0, 3.0, &sheared); + GdipIsMatrixEqual(matrix, sheared, &equal); + expect(TRUE, equal); + GdipDeleteMatrix(sheared); + GdipDeleteMatrix(matrix); + + /* Y only shearing, MatrixOrderAppend */ + GdipCreateMatrix2(1.0, 2.0, 4.0, -1.0, 6.0, 3.0, &matrix); + status = GdipShearMatrix(matrix, 0.0, 1.5, MatrixOrderAppend); + expect(Ok, status); + GdipCreateMatrix2(1.0, 3.5, 4.0, 5.0, 6.0, 12.0, &sheared); + GdipIsMatrixEqual(matrix, sheared, &equal); + expect(TRUE, equal); + GdipDeleteMatrix(sheared); + GdipDeleteMatrix(matrix); + + /* X,Y shearing, MatrixOrderPrepend */ + GdipCreateMatrix2(1.0, 2.0, 4.0, -1.0, 6.0, 3.0, &matrix); + status = GdipShearMatrix(matrix, 4.0, 1.5, MatrixOrderPrepend); + expect(Ok, status); + GdipCreateMatrix2(7.0, 0.5, 8.0, 7.0, 6.0, 3.0, &sheared); + GdipIsMatrixEqual(matrix, sheared, &equal); + expect(TRUE, equal); + GdipDeleteMatrix(sheared); + GdipDeleteMatrix(matrix); + + /* X,Y shearing, MatrixOrderAppend */ + GdipCreateMatrix2(1.0, 2.0, 4.0, -1.0, 6.0, 3.0, &matrix); + status = GdipShearMatrix(matrix, 4.0, 1.5, MatrixOrderAppend); + expect(Ok, status); + GdipCreateMatrix2(9.0, 3.5, 0.0, 5.0, 18.0, 12.0, &sheared); + GdipIsMatrixEqual(matrix, sheared, &equal); + expect(TRUE, equal); + GdipDeleteMatrix(sheared); + GdipDeleteMatrix(matrix); +} + START_TEST(matrix) { struct GdiplusStartupInput gdiplusStartupInput; @@ -165,6 +237,7 @@ START_TEST(matrix) test_transform(); test_isinvertible(); test_invert(); + test_shear(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index cdc2db0..1cc90c5 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -263,6 +263,7 @@ GpStatus WINGDIPAPI GdipCreateMatrix2(REAL,REAL,REAL,REAL,REAL,REAL,GpMatrix**); GpStatus WINGDIPAPI GdipCreateMatrix3(GDIPCONST GpRectF *,GDIPCONST GpPointF*,GpMatrix**); GpStatus WINGDIPAPI GdipCreateMatrix3I(GDIPCONST GpRect*,GDIPCONST GpPoint*,GpMatrix**); GpStatus WINGDIPAPI GdipInvertMatrix(GpMatrix*); +GpStatus WINGDIPAPI GdipShearMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipIsMatrixEqual(GDIPCONST GpMatrix*, GDIPCONST GpMatrix*, BOOL*); GpStatus WINGDIPAPI GdipIsMatrixIdentity(GDIPCONST GpMatrix*, BOOL*); GpStatus WINGDIPAPI GdipIsMatrixInvertible(GDIPCONST GpMatrix*, BOOL*);

1 0