December 2006 - Wine-Commits

Stefan Dösinger : wined3d: Move WINED3DRS_SCISSORTESTENABLE to the state table.
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: d7e55c28417656a045520b0c8278403f4e499788 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7e55c28417656a045520b0c8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:20:48 2006 +0100 wined3d: Move WINED3DRS_SCISSORTESTENABLE to the state table. --- dlls/wined3d/device.c | 12 +----------- dlls/wined3d/state.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0f82021..3a19db5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3424,6 +3424,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_WRAP14 : case WINED3DRS_WRAP15 : case WINED3DRS_MULTISAMPLEANTIALIAS : + case WINED3DRS_SCISSORTESTENABLE : StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; @@ -3434,17 +3435,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; } - case WINED3DRS_SCISSORTESTENABLE : - { - if(Value) { - glEnable(GL_SCISSOR_TEST); - checkGLcall("glEnable(GL_SCISSOR_TEST)"); - } else { - glDisable(GL_SCISSOR_TEST); - checkGLcall("glDisable(GL_SCISSOR_TEST)"); - } - break; - } case WINED3DRS_SLOPESCALEDEPTHBIAS : { if(Value) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 016c338..353793b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1115,6 +1115,16 @@ static void state_multisampleaa(DWORD st } } +static void state_scissor(DWORD state, IWineD3DStateBlockImpl *stateblock) { + if(stateblock->renderState[WINED3DRS_SCISSORTESTENABLE]) { + glEnable(GL_SCISSOR_TEST); + checkGLcall("glEnable(GL_SCISSOR_TEST)"); + } else { + glDisable(GL_SCISSOR_TEST); + checkGLcall("glDisable(GL_SCISSOR_TEST)"); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1296,7 +1306,7 @@ const struct StateEntry StateTable[] = { /*173, WINED3DRS_NORMALDEGREE */ STATE_RENDER(WINED3DRS_NORMALDEGREE), state_unknown }, /*172, WINED3DRS_POSITIONORDER */ /* Value assigned to 2 state names */ /*173, WINED3DRS_NORMALORDER */ /* Value assigned to 2 state names */ - { /*174, WINED3DRS_SCISSORTESTENABLE */ STATE_RENDER(WINED3DRS_SCISSORTESTENABLE), state_unknown }, + { /*174, WINED3DRS_SCISSORTESTENABLE */ STATE_RENDER(WINED3DRS_SCISSORTESTENABLE), state_scissor }, { /*175, WINED3DRS_SLOPESCALEDEPTHBIAS */ STATE_RENDER(WINED3DRS_DEPTHBIAS), state_unknown }, { /*176, WINED3DRS_ANTIALIASEDLINEENABLE */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_blend }, { /*177, undefined */ 0, state_undefined },

1 0

Stefan Dösinger : wined3d: Move WINED3DRS_DEPTHBIAS to the state table.
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: 30cf5e4e90e75db5751d56db5a3c7a244b9d33a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30cf5e4e90e75db5751d56db5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:20:52 2006 +0100 wined3d: Move WINED3DRS_DEPTHBIAS to the state table. --- dlls/wined3d/device.c | 47 ++--------------------------------------------- dlls/wined3d/state.c | 23 +++++++++++++++++++++-- 2 files changed, 23 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3a19db5..42fe537 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3425,6 +3425,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_WRAP15 : case WINED3DRS_MULTISAMPLEANTIALIAS : case WINED3DRS_SCISSORTESTENABLE : + case WINED3DRS_SLOPESCALEDEPTHBIAS : + case WINED3DRS_DEPTHBIAS : StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; @@ -3435,51 +3437,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; } - case WINED3DRS_SLOPESCALEDEPTHBIAS : - { - if(Value) { - tmpvalue.d = Value; - glEnable(GL_POLYGON_OFFSET_FILL); - checkGLcall("glEnable(GL_POLYGON_OFFSET_FILL)"); - glPolygonOffset(tmpvalue.f, *((float*)&This->stateBlock->renderState[WINED3DRS_DEPTHBIAS])); - checkGLcall("glPolygonOffset(...)"); - } else { - glDisable(GL_POLYGON_OFFSET_FILL); - checkGLcall("glDisable(GL_POLYGON_OFFSET_FILL)"); - } - break; - } - { - if(Value) { - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glEnable(GL_BLEND); - checkGLcall("glEnable(GL_BLEND)"); - glEnable(GL_LINE_SMOOTH); - checkGLcall("glEnable(GL_LINE_SMOOTH)"); - } else { - glDisable(GL_BLEND); - checkGLcall("glDisable(GL_BLEND)"); - glDisable(GL_LINE_SMOOTH); - checkGLcall("glDisable(GL_LINE_SMOOTH)"); - } - break; - } - - case WINED3DRS_DEPTHBIAS : - { - if(Value) { - tmpvalue.d = Value; - glEnable(GL_POLYGON_OFFSET_FILL); - checkGLcall("glEnable(GL_POLYGON_OFFSET_FILL)"); - glPolygonOffset(*((float*)&This->stateBlock->renderState[WINED3DRS_SLOPESCALEDEPTHBIAS]), tmpvalue.f); - checkGLcall("glPolygonOffset(...)"); - } else { - glDisable(GL_POLYGON_OFFSET_FILL); - checkGLcall("glDisable(GL_POLYGON_OFFSET_FILL)"); - } - break; - } - case WINED3DRS_TEXTUREPERSPECTIVE : { if (Value) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 353793b..5de3e51 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1125,6 +1125,25 @@ static void state_scissor(DWORD state, I } } +static void state_depthbias(DWORD state, IWineD3DStateBlockImpl *stateblock) { + union { + DWORD d; + float f; + } tmpvalue; + + if(stateblock->renderState[WINED3DRS_SLOPESCALEDEPTHBIAS] || + stateblock->renderState[WINED3DRS_DEPTHBIAS]) { + tmpvalue.d = stateblock->renderState[WINED3DRS_SLOPESCALEDEPTHBIAS]; + glEnable(GL_POLYGON_OFFSET_FILL); + checkGLcall("glEnable(GL_POLYGON_OFFSET_FILL)"); + glPolygonOffset(tmpvalue.f, *((float*)&stateblock->renderState[WINED3DRS_DEPTHBIAS])); + checkGLcall("glPolygonOffset(...)"); + } else { + glDisable(GL_POLYGON_OFFSET_FILL); + checkGLcall("glDisable(GL_POLYGON_OFFSET_FILL)"); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1307,7 +1326,7 @@ const struct StateEntry StateTable[] = /*172, WINED3DRS_POSITIONORDER */ /* Value assigned to 2 state names */ /*173, WINED3DRS_NORMALORDER */ /* Value assigned to 2 state names */ { /*174, WINED3DRS_SCISSORTESTENABLE */ STATE_RENDER(WINED3DRS_SCISSORTESTENABLE), state_scissor }, - { /*175, WINED3DRS_SLOPESCALEDEPTHBIAS */ STATE_RENDER(WINED3DRS_DEPTHBIAS), state_unknown }, + { /*175, WINED3DRS_SLOPESCALEDEPTHBIAS */ STATE_RENDER(WINED3DRS_DEPTHBIAS), state_depthbias }, { /*176, WINED3DRS_ANTIALIASEDLINEENABLE */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_blend }, { /*177, undefined */ 0, state_undefined }, { /*178, WINED3DRS_MINTESSELLATIONLEVEL */ STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_unknown }, @@ -1327,7 +1346,7 @@ const struct StateEntry StateTable[] = { /*192, WINED3DRS_COLORWRITEENABLE3 */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, { /*193, WINED3DRS_BLENDFACTOR */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_blend }, { /*194, WINED3DRS_SRGBWRITEENABLE */ 0, state_nogl }, - { /*195, WINED3DRS_DEPTHBIAS */ STATE_RENDER(WINED3DRS_DEPTHBIAS), state_unknown }, + { /*195, WINED3DRS_DEPTHBIAS */ STATE_RENDER(WINED3DRS_DEPTHBIAS), state_depthbias }, { /*196, undefined */ 0, state_undefined }, { /*197, undefined */ 0, state_undefined }, { /*198, WINED3DRS_WRAP8 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap },

1 0

Stefan Dösinger : wined3d: Move WINED3DRS_MULTISAMPLEANTIALIAS to the state table.
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: 0c1aba5fe239392afaff37acb1ed4c157bb73638 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c1aba5fe239392afaff37acb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:20:40 2006 +0100 wined3d: Move WINED3DRS_MULTISAMPLEANTIALIAS to the state table. --- dlls/wined3d/device.c | 19 +------------------ dlls/wined3d/state.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5505cd7..0f82021 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3423,6 +3423,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_WRAP13 : case WINED3DRS_WRAP14 : case WINED3DRS_WRAP15 : + case WINED3DRS_MULTISAMPLEANTIALIAS : StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; @@ -3433,24 +3434,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; } - case WINED3DRS_MULTISAMPLEANTIALIAS : - { - if( GL_SUPPORT(ARB_MULTISAMPLE) ) { - if(Value) { - glEnable(GL_MULTISAMPLE_ARB); - checkGLcall("glEnable(GL_MULTISAMPLE_ARB)"); - } else { - glDisable(GL_MULTISAMPLE_ARB); - checkGLcall("glDisable(GL_MULTISAMPLE_ARB)"); - } - } else { - if(Value) { - ERR("Multisample antialiasing not supported by gl\n"); - } - } - break; - } - case WINED3DRS_SCISSORTESTENABLE : { if(Value) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0635371..016c338 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1099,6 +1099,22 @@ static void state_wrap(DWORD state, IWin } } +static void state_multisampleaa(DWORD state, IWineD3DStateBlockImpl *stateblock) { + if( GL_SUPPORT(ARB_MULTISAMPLE) ) { + if(stateblock->renderState[WINED3DRS_MULTISAMPLEANTIALIAS]) { + glEnable(GL_MULTISAMPLE_ARB); + checkGLcall("glEnable(GL_MULTISAMPLE_ARB)"); + } else { + glDisable(GL_MULTISAMPLE_ARB); + checkGLcall("glDisable(GL_MULTISAMPLE_ARB)"); + } + } else { + if(stateblock->renderState[WINED3DRS_MULTISAMPLEANTIALIAS]) { + ERR("Multisample antialiasing not supported by gl\n"); + } + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1265,7 +1281,7 @@ const struct StateEntry StateTable[] = { /*158, WINED3DRS_POINTSCALE_A */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, { /*159, WINED3DRS_POINTSCALE_B */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, { /*160, WINED3DRS_POINTSCALE_C */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, - { /*161, WINED3DRS_MULTISAMPLEANTIALIAS */ STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_unknown }, + { /*161, WINED3DRS_MULTISAMPLEANTIALIAS */ STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_multisampleaa }, { /*162, WINED3DRS_MULTISAMPLEMASK */ STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), state_unknown }, { /*163, WINED3DRS_PATCHEDGESTYLE */ STATE_RENDER(WINED3DRS_PATCHEDGESTYLE), state_unknown }, { /*164, WINED3DRS_PATCHSEGMENTS */ STATE_RENDER(WINED3DRS_PATCHSEGMENTS), state_unknown },

1 0

Stefan Dösinger : wined3d: Move WINED3DRS_WRAPx to the state table.
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: 81dce7189d911bd2124e0cd0d349b316fc40b01d URL: http://source.winehq.org/git/wine.git/?a=commit;h=81dce7189d911bd2124e0cd0d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:20:45 2006 +0100 wined3d: Move WINED3DRS_WRAPx to the state table. --- dlls/wined3d/device.c | 32 ++++++------------------ dlls/wined3d/state.c | 63 ++++++++++++++++++++++++++++++++++++------------ 2 files changed, 55 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 57527ad..5505cd7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3407,16 +3407,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_LASTPIXEL : case WINED3DRS_SOFTWAREVERTEXPROCESSING : case WINED3DRS_POINTSPRITEENABLE : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - - /** not supported */ - case WINED3DRS_ZVISIBLE : - { - LEAVE_GL(); - return WINED3DERR_INVALIDCALL; - } - case WINED3DRS_WRAP0 : case WINED3DRS_WRAP1 : case WINED3DRS_WRAP2 : @@ -3433,21 +3423,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_WRAP13 : case WINED3DRS_WRAP14 : case WINED3DRS_WRAP15 : - /** - http://www.cosc.brocku.ca/Offerings/3P98/course/lectures/texture/ - http://msdn.microsoft.com/archive/default.asp?url=/archive/en-us/directx9_c… - http://www.gamedev.net/reference/programming/features/rendererdll3/page2.asp - Descussion that ways to turn on WRAPing to solve an opengl conversion problem. - http://www.flipcode.org/cgi-bin/fcmsg.cgi?thread_show=10248 - - so far as I can tell, wrapping and texture-coordinate generate go hand in hand, - */ - { - if(Value) { - ERR("(%p)->(%s,%d) Texture wraping not yet supported\n",This, debug_d3drenderstate(State), Value); - } + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; - } + + /** not supported */ + case WINED3DRS_ZVISIBLE : + { + LEAVE_GL(); + return WINED3DERR_INVALIDCALL; + } case WINED3DRS_MULTISAMPLEANTIALIAS : { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index bf1897e..0635371 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1068,6 +1068,37 @@ static void state_pointsprite(DWORD stat } } +static void state_wrap(DWORD state, IWineD3DStateBlockImpl *stateblock) { + /** + http://www.cosc.brocku.ca/Offerings/3P98/course/lectures/texture/ + http://msdn.microsoft.com/archive/default.asp?url=/archive/en-us/directx9_c… + http://www.gamedev.net/reference/programming/features/rendererdll3/page2.asp + Descussion that ways to turn on WRAPing to solve an opengl conversion problem. + http://www.flipcode.org/cgi-bin/fcmsg.cgi?thread_show=10248 + + so far as I can tell, wrapping and texture-coordinate generate go hand in hand, + */ + TRACE("Stub\n"); + if(stateblock->renderState[WINED3DRS_WRAP0] || + stateblock->renderState[WINED3DRS_WRAP1] || + stateblock->renderState[WINED3DRS_WRAP2] || + stateblock->renderState[WINED3DRS_WRAP3] || + stateblock->renderState[WINED3DRS_WRAP4] || + stateblock->renderState[WINED3DRS_WRAP5] || + stateblock->renderState[WINED3DRS_WRAP6] || + stateblock->renderState[WINED3DRS_WRAP7] || + stateblock->renderState[WINED3DRS_WRAP8] || + stateblock->renderState[WINED3DRS_WRAP9] || + stateblock->renderState[WINED3DRS_WRAP10] || + stateblock->renderState[WINED3DRS_WRAP11] || + stateblock->renderState[WINED3DRS_WRAP12] || + stateblock->renderState[WINED3DRS_WRAP13] || + stateblock->renderState[WINED3DRS_WRAP14] || + stateblock->renderState[WINED3DRS_WRAP15] ) { + ERR("(WINED3DRS_WRAP0) Texture wraping not yet supported\n"); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1201,14 +1232,14 @@ const struct StateEntry StateTable[] = { /*126, Undefined */ 0, state_undefined }, { /*127, Undefined */ 0, state_undefined }, /* Big hole ends */ - { /*128, WINED3DRS_WRAP0 */ STATE_RENDER(WINED3DRS_WRAP0), state_unknown }, - { /*129, WINED3DRS_WRAP1 */ STATE_RENDER(WINED3DRS_WRAP0), state_unknown }, - { /*130, WINED3DRS_WRAP2 */ STATE_RENDER(WINED3DRS_WRAP0), state_unknown }, - { /*131, WINED3DRS_WRAP3 */ STATE_RENDER(WINED3DRS_WRAP0), state_unknown }, - { /*132, WINED3DRS_WRAP4 */ STATE_RENDER(WINED3DRS_WRAP0), state_unknown }, - { /*133, WINED3DRS_WRAP5 */ STATE_RENDER(WINED3DRS_WRAP0), state_unknown }, - { /*134, WINED3DRS_WRAP6 */ STATE_RENDER(WINED3DRS_WRAP0), state_unknown }, - { /*135, WINED3DRS_WRAP7 */ STATE_RENDER(WINED3DRS_WRAP0), state_unknown }, + { /*128, WINED3DRS_WRAP0 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, + { /*129, WINED3DRS_WRAP1 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, + { /*130, WINED3DRS_WRAP2 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, + { /*131, WINED3DRS_WRAP3 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, + { /*132, WINED3DRS_WRAP4 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, + { /*133, WINED3DRS_WRAP5 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, + { /*134, WINED3DRS_WRAP6 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, + { /*135, WINED3DRS_WRAP7 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, { /*136, WINED3DRS_CLIPPING */ STATE_RENDER(WINED3DRS_CLIPPING), state_clipping }, { /*137, WINED3DRS_LIGHTING */ STATE_RENDER(WINED3DRS_LIGHTING) /* Vertex decl! */,state_lighting }, { /*138, WINED3DRS_EXTENTS */ STATE_RENDER(WINED3DRS_EXTENTS), state_unknown }, @@ -1273,14 +1304,14 @@ const struct StateEntry StateTable[] = { /*195, WINED3DRS_DEPTHBIAS */ STATE_RENDER(WINED3DRS_DEPTHBIAS), state_unknown }, { /*196, undefined */ 0, state_undefined }, { /*197, undefined */ 0, state_undefined }, - { /*198, WINED3DRS_WRAP8 */ STATE_RENDER(WINED3DRS_WRAP0), state_unknown }, - { /*199, WINED3DRS_WRAP9 */ STATE_RENDER(WINED3DRS_WRAP0), state_unknown }, - { /*200, WINED3DRS_WRAP10 */ STATE_RENDER(WINED3DRS_WRAP0), state_unknown }, - { /*201, WINED3DRS_WRAP11 */ STATE_RENDER(WINED3DRS_WRAP0), state_unknown }, - { /*202, WINED3DRS_WRAP12 */ STATE_RENDER(WINED3DRS_WRAP0), state_unknown }, - { /*203, WINED3DRS_WRAP13 */ STATE_RENDER(WINED3DRS_WRAP0), state_unknown }, - { /*204, WINED3DRS_WRAP14 */ STATE_RENDER(WINED3DRS_WRAP0), state_unknown }, - { /*205, WINED3DRS_WRAP15 */ STATE_RENDER(WINED3DRS_WRAP0), state_unknown }, + { /*198, WINED3DRS_WRAP8 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, + { /*199, WINED3DRS_WRAP9 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, + { /*200, WINED3DRS_WRAP10 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, + { /*201, WINED3DRS_WRAP11 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, + { /*202, WINED3DRS_WRAP12 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, + { /*203, WINED3DRS_WRAP13 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, + { /*204, WINED3DRS_WRAP14 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, + { /*205, WINED3DRS_WRAP15 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, { /*206, WINED3DRS_SEPARATEALPHABLENDENABLE */ STATE_RENDER(WINED3DRS_SEPARATEALPHABLENDENABLE), state_unknown }, { /*207, WINED3DRS_SRCBLENDALPHA */ STATE_RENDER(WINED3DRS_SEPARATEALPHABLENDENABLE), state_unknown }, { /*208, WINED3DRS_DESTBLENDALPHA */ STATE_RENDER(WINED3DRS_SEPARATEALPHABLENDENABLE), state_unknown },

1 0

Stefan Dösinger : wined3d: Move WINED3DRS_POINTSPRITEENABLE to the state table.
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: 920225d4a45308c9e89d5e116d4426ed2f8c60bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=920225d4a45308c9e89d5e116… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:20:36 2006 +0100 wined3d: Move WINED3DRS_POINTSPRITEENABLE to the state table. --- dlls/wined3d/device.c | 26 +------------------------- dlls/wined3d/state.c | 26 +++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 592ca84..57527ad 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3406,6 +3406,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_LOCALVIEWER : case WINED3DRS_LASTPIXEL : case WINED3DRS_SOFTWAREVERTEXPROCESSING : + case WINED3DRS_POINTSPRITEENABLE : StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; @@ -3415,31 +3416,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl LEAVE_GL(); return WINED3DERR_INVALIDCALL; } - case WINED3DRS_POINTSPRITEENABLE : - { - /* TODO: NV_POINT_SPRITE */ - if (!GL_SUPPORT(ARB_POINT_SPRITE)) { - TRACE("Point sprites not supported\n"); - break; - } - - /* - * Point sprites are always enabled. Value controls texture coordinate - * replacement mode. Must be set true for point sprites to use - * textures. - */ - glEnable(GL_POINT_SPRITE_ARB); - checkGLcall("glEnable(GL_POINT_SPRITE_ARB)"); - - if (Value) { - glTexEnvf(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, TRUE); - checkGLcall("glTexEnvf(GL_POINT_SPRITE, GL_COORD_REPLACE, TRUE)"); - } else { - glTexEnvf(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, FALSE); - checkGLcall("glTexEnvf(GL_POINT_SPRITE, GL_COORD_REPLACE, FALSE)"); - } - break; - } case WINED3DRS_WRAP0 : case WINED3DRS_WRAP1 : diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 01dbc0c..bf1897e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1044,6 +1044,30 @@ static void state_lastpixel(DWORD state, } } +static void state_pointsprite(DWORD state, IWineD3DStateBlockImpl *stateblock) { + /* TODO: NV_POINT_SPRITE */ + if (!GL_SUPPORT(ARB_POINT_SPRITE)) { + TRACE("Point sprites not supported\n"); + return; + } + + /* + * Point sprites are always enabled. Value controls texture coordinate + * replacement mode. Must be set true for point sprites to use + * textures. + */ + glEnable(GL_POINT_SPRITE_ARB); + checkGLcall("glEnable(GL_POINT_SPRITE_ARB)"); + + if (stateblock->renderState[WINED3DRS_POINTSPRITEENABLE]) { + glTexEnvf(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, TRUE); + checkGLcall("glTexEnvf(GL_POINT_SPRITE, GL_COORD_REPLACE, TRUE)"); + } else { + glTexEnvf(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, FALSE); + checkGLcall("glTexEnvf(GL_POINT_SPRITE, GL_COORD_REPLACE, FALSE)"); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1205,7 +1229,7 @@ const struct StateEntry StateTable[] = { /*153, WINED3DRS_SOFTWAREVERTEXPROCESSING */ 0, state_nogl }, { /*154, WINED3DRS_POINTSIZE */ STATE_RENDER(WINED3DRS_POINTSIZE), state_psize }, { /*155, WINED3DRS_POINTSIZE_MIN */ STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin }, - { /*156, WINED3DRS_POINTSPRITEENABLE */ STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), state_unknown }, + { /*156, WINED3DRS_POINTSPRITEENABLE */ STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), state_pointsprite }, { /*157, WINED3DRS_POINTSCALEENABLE */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, { /*158, WINED3DRS_POINTSCALE_A */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, { /*159, WINED3DRS_POINTSCALE_B */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale },

1 0

Stefan Dösinger : wined3d: Move WINED3DRS_LASTPIXEL to the state table.
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: c5344709b19cf2f0c26d9b19670ae25c83811264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5344709b19cf2f0c26d9b196… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:20:29 2006 +0100 wined3d: Move WINED3DRS_LASTPIXEL to the state table. --- dlls/wined3d/device.c | 11 +---------- dlls/wined3d/state.c | 10 +++++++++- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9bf2a74..44ea2cf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3404,19 +3404,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_COLORWRITEENABLE2 : case WINED3DRS_COLORWRITEENABLE3 : case WINED3DRS_LOCALVIEWER : + case WINED3DRS_LASTPIXEL : StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; - case WINED3DRS_LASTPIXEL : - { - if (Value) { - TRACE("Last Pixel Drawing Enabled\n"); - } else { - FIXME("Last Pixel Drawing Disabled, not handled yet\n"); - } - } - break; - case WINED3DRS_SOFTWAREVERTEXPROCESSING : { if (Value) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f640743..01dbc0c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1036,6 +1036,14 @@ static void state_localviewer(DWORD stat } } +static void state_lastpixel(DWORD state, IWineD3DStateBlockImpl *stateblock) { + if(stateblock->renderState[WINED3DRS_LASTPIXEL]) { + TRACE("Last Pixel Drawing Enabled\n"); + } else { + FIXME("Last Pixel Drawing Disabled, not handled yet\n"); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1055,7 +1063,7 @@ const struct StateEntry StateTable[] = { /* 13, WINED3DRS_PLANEMASK */ STATE_RENDER(WINED3DRS_PLANEMASK), state_unknown }, { /* 14, WINED3DRS_ZWRITEENABLE */ STATE_RENDER(WINED3DRS_ZWRITEENABLE), state_zwritenable }, { /* 15, WINED3DRS_ALPHATESTENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }, - { /* 16, WINED3DRS_LASTPIXEL */ STATE_RENDER(WINED3DRS_LASTPIXEL), state_unknown }, + { /* 16, WINED3DRS_LASTPIXEL */ STATE_RENDER(WINED3DRS_LASTPIXEL), state_lastpixel }, { /* 17, WINED3DRS_TEXTUREMAG */ 0 /* Handled in ddraw */, state_undefined }, { /* 18, WINED3DRS_TEXTUREMIN */ 0 /* Handled in ddraw */, state_undefined }, { /* 19, WINED3DRS_SRCBLEND */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_blend },

1 0

Stefan Dösinger : wined3d: WINED3DRS_SOFTWAREVERTEXPROCESSING is a nogl state.
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: 2b775221fdab87bc8ded876d7457df3943daa17d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b775221fdab87bc8ded876d7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:20:32 2006 +0100 wined3d: WINED3DRS_SOFTWAREVERTEXPROCESSING is a nogl state. --- dlls/wined3d/device.c | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 44ea2cf..592ca84 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3405,19 +3405,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_COLORWRITEENABLE3 : case WINED3DRS_LOCALVIEWER : case WINED3DRS_LASTPIXEL : + case WINED3DRS_SOFTWAREVERTEXPROCESSING : StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; - case WINED3DRS_SOFTWAREVERTEXPROCESSING : - { - if (Value) { - TRACE("Software Processing Enabled\n"); - } else { - TRACE("Software Processing Disabled\n"); - } - } - break; - /** not supported */ case WINED3DRS_ZVISIBLE : {

1 0

Stefan Dösinger : wined3d: Move WINED3DRS_LOCALVIEWER to the state table.
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: 580b9961f43f5baff8b0c31ff00b1e38a45c45ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=580b9961f43f5baff8b0c31ff… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:20:26 2006 +0100 wined3d: Move WINED3DRS_LOCALVIEWER to the state table. --- dlls/wined3d/device.c | 9 +-------- dlls/wined3d/state.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 85e65d0..9bf2a74 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3403,17 +3403,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_COLORWRITEENABLE1 : case WINED3DRS_COLORWRITEENABLE2 : case WINED3DRS_COLORWRITEENABLE3 : + case WINED3DRS_LOCALVIEWER : StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; - case WINED3DRS_LOCALVIEWER : - { - GLint state = (Value) ? 1 : 0; - TRACE("Local Viewer Enable to %ul\n", (BOOL) Value); - glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, state); - } - break; - case WINED3DRS_LASTPIXEL : { if (Value) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e30cc65..f640743 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1026,6 +1026,16 @@ static void state_colorwrite(DWORD state } } +static void state_localviewer(DWORD state, IWineD3DStateBlockImpl *stateblock) { + if(stateblock->renderState[WINED3DRS_LOCALVIEWER]) { + glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, 1); + checkGLcall("glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, 1)"); + } else { + glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, 0); + checkGLcall("glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, 0)"); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1173,7 +1183,7 @@ const struct StateEntry StateTable[] = { /*139, WINED3DRS_AMBIENT */ STATE_RENDER(WINED3DRS_AMBIENT), state_ambient }, { /*140, WINED3DRS_FOGVERTEXMODE */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, { /*141, WINED3DRS_COLORVERTEX */ STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }, - { /*142, WINED3DRS_LOCALVIEWER */ STATE_RENDER(WINED3DRS_LOCALVIEWER), state_unknown }, + { /*142, WINED3DRS_LOCALVIEWER */ STATE_RENDER(WINED3DRS_LOCALVIEWER), state_localviewer }, { /*143, WINED3DRS_NORMALIZENORMALS */ STATE_RENDER(WINED3DRS_NORMALIZENORMALS), state_normalize }, { /*144, WINED3DRS_COLORKEYBLENDENABLE */ STATE_RENDER(WINED3DRS_COLORKEYBLENDENABLE), state_unknown }, { /*145, WINED3DRS_DIFFUSEMATERIALSOURCE */ STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat },

1 0

Stefan Dösinger : wined3d: Move WINED3DRS_COLORWRITEENABLEx to the state table.
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: 4c64b86f5bd3504a612ba64569239f3096970cc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c64b86f5bd3504a612ba6456… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:20:22 2006 +0100 wined3d: Move WINED3DRS_COLORWRITEENABLEx to the state table. --- dlls/wined3d/device.c | 29 ++++------------------------- dlls/wined3d/state.c | 33 +++++++++++++++++++++++++++++---- 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 221e1b0..85e65d0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3399,24 +3399,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_POINTSCALE_B : case WINED3DRS_POINTSCALE_C : case WINED3DRS_POINTSCALEENABLE : + case WINED3DRS_COLORWRITEENABLE : + case WINED3DRS_COLORWRITEENABLE1 : + case WINED3DRS_COLORWRITEENABLE2 : + case WINED3DRS_COLORWRITEENABLE3 : StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; - case WINED3DRS_COLORWRITEENABLE : - { - TRACE("Color mask: r(%d) g(%d) b(%d) a(%d)\n", - Value & WINED3DCOLORWRITEENABLE_RED ? 1 : 0, - Value & WINED3DCOLORWRITEENABLE_GREEN ? 1 : 0, - Value & WINED3DCOLORWRITEENABLE_BLUE ? 1 : 0, - Value & WINED3DCOLORWRITEENABLE_ALPHA ? 1 : 0); - glColorMask(Value & WINED3DCOLORWRITEENABLE_RED ? GL_TRUE : GL_FALSE, - Value & WINED3DCOLORWRITEENABLE_GREEN ? GL_TRUE : GL_FALSE, - Value & WINED3DCOLORWRITEENABLE_BLUE ? GL_TRUE : GL_FALSE, - Value & WINED3DCOLORWRITEENABLE_ALPHA ? GL_TRUE : GL_FALSE); - checkGLcall("glColorMask(...)"); - } - break; - case WINED3DRS_LOCALVIEWER : { GLint state = (Value) ? 1 : 0; @@ -3677,16 +3666,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl break; } - case WINED3DRS_COLORWRITEENABLE1 : - case WINED3DRS_COLORWRITEENABLE2 : - case WINED3DRS_COLORWRITEENABLE3 : - { - /* depends on WINED3DRS_COLORWRITEENABLE. */ - if(0x0000000F != Value) - ERR("(%p)->(%s,%d) not yet implemented. Missing of cap D3DPMISCCAPS_INDEPENDENTWRITEMASKS wasn't honored?\n", This, debug_d3drenderstate(State), Value); - break; - } - case WINED3DRS_SRGBWRITEENABLE : { if(Value) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 89bddbb..e30cc65 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1001,6 +1001,31 @@ static void state_pscale(DWORD state, IW } } +static void state_colorwrite(DWORD state, IWineD3DStateBlockImpl *stateblock) { + DWORD Value = stateblock->renderState[WINED3DRS_COLORWRITEENABLE]; + + TRACE("Color mask: r(%d) g(%d) b(%d) a(%d)\n", + Value & D3DCOLORWRITEENABLE_RED ? 1 : 0, + Value & D3DCOLORWRITEENABLE_GREEN ? 1 : 0, + Value & D3DCOLORWRITEENABLE_BLUE ? 1 : 0, + Value & D3DCOLORWRITEENABLE_ALPHA ? 1 : 0); + glColorMask(Value & D3DCOLORWRITEENABLE_RED ? GL_TRUE : GL_FALSE, + Value & D3DCOLORWRITEENABLE_GREEN ? GL_TRUE : GL_FALSE, + Value & D3DCOLORWRITEENABLE_BLUE ? GL_TRUE : GL_FALSE, + Value & D3DCOLORWRITEENABLE_ALPHA ? GL_TRUE : GL_FALSE); + checkGLcall("glColorMask(...)"); + + /* depends on WINED3DRS_COLORWRITEENABLE. */ + if(stateblock->renderState[WINED3DRS_COLORWRITEENABLE1] != 0x0000000F || + stateblock->renderState[WINED3DRS_COLORWRITEENABLE2] != 0x0000000F || + stateblock->renderState[WINED3DRS_COLORWRITEENABLE3] != 0x0000000F ) { + ERR("(WINED3DRS_COLORWRITEENABLE1/2/3,%d,%d,%d) not yet implemented. Missing of cap D3DPMISCCAPS_INDEPENDENTWRITEMASKS wasn't honored?\n", + stateblock->renderState[WINED3DRS_COLORWRITEENABLE1], + stateblock->renderState[WINED3DRS_COLORWRITEENABLE2], + stateblock->renderState[WINED3DRS_COLORWRITEENABLE3]); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1174,7 +1199,7 @@ const struct StateEntry StateTable[] = { /*165, WINED3DRS_DEBUGMONITORTOKEN */ STATE_RENDER(WINED3DRS_DEBUGMONITORTOKEN), state_unknown }, { /*166, WINED3DRS_POINTSIZE_MAX */ STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_psizemax }, { /*167, WINED3DRS_INDEXEDVERTEXBLENDENABLE */ 0, state_nogl }, - { /*168, WINED3DRS_COLORWRITEENABLE */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_unknown }, + { /*168, WINED3DRS_COLORWRITEENABLE */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, { /*169, Undefined */ 0, state_undefined }, { /*170, WINED3DRS_TWEENFACTOR */ 0, state_nogl }, { /*171, WINED3DRS_BLENDOP */ STATE_RENDER(WINED3DRS_BLENDOP), state_blendop }, @@ -1198,9 +1223,9 @@ const struct StateEntry StateTable[] = { /*187, WINED3DRS_CCW_STENCILZFAIL */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, { /*188, WINED3DRS_CCW_STENCILPASS */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, { /*189, WINED3DRS_CCW_STENCILFUNC */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, - { /*190, WINED3DRS_COLORWRITEENABLE1 */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_unknown }, - { /*191, WINED3DRS_COLORWRITEENABLE2 */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_unknown }, - { /*192, WINED3DRS_COLORWRITEENABLE3 */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_unknown }, + { /*190, WINED3DRS_COLORWRITEENABLE1 */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, + { /*191, WINED3DRS_COLORWRITEENABLE2 */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, + { /*192, WINED3DRS_COLORWRITEENABLE3 */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, { /*193, WINED3DRS_BLENDFACTOR */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_blend }, { /*194, WINED3DRS_SRGBWRITEENABLE */ 0, state_nogl }, { /*195, WINED3DRS_DEPTHBIAS */ STATE_RENDER(WINED3DRS_DEPTHBIAS), state_unknown },

1 0

Stefan Dösinger : wined3d: Move point scale render states to the state table.
by Alexandre Julliard Dec. 11, 2006

Dec. 11, 2006

Module: wine Branch: master Commit: caa371a69ca085f5262ef63c63b49aaf6b1d270d URL: http://source.winehq.org/git/wine.git/?a=commit;h=caa371a69ca085f5262ef63c6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 23:20:19 2006 +0100 wined3d: Move point scale render states to the state table. --- dlls/wined3d/device.c | 50 ----------------------------------------- dlls/wined3d/state.c | 59 +++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 55 insertions(+), 54 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4e0bfe0..221e1b0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3402,56 +3402,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; - { - /* - * POINTSCALEENABLE controls how point size value is treated. If set to - * true, the point size is scaled with respect to height of viewport. - * When set to false point size is in pixels. - * - * http://msdn.microsoft.com/library/en-us/directx9_c/point_sprites.asp - */ - - /* Default values */ - GLfloat att[3] = {1.0f, 0.0f, 0.0f}; - - /* - * Minimum valid point size for OpenGL is 1.0f. For Direct3D it is 0.0f. - * This means that OpenGL will clamp really small point sizes to 1.0f. - * To correct for this we need to multiply by the scale factor when sizes - * are less than 1.0f. scale_factor = 1.0f / point_size. - */ - GLfloat pointSize = *((float*)&This->stateBlock->renderState[WINED3DRS_POINTSIZE]); - if(pointSize > 0.0f) { - GLfloat scaleFactor; - - if(pointSize < 1.0f) { - scaleFactor = pointSize * pointSize; - } else { - scaleFactor = 1.0f; - } - - if(This->stateBlock->renderState[WINED3DRS_POINTSCALEENABLE]) { - att[0] = *((float*)&This->stateBlock->renderState[WINED3DRS_POINTSCALE_A]) / - (This->stateBlock->viewport.Height * This->stateBlock->viewport.Height * scaleFactor); - att[1] = *((float*)&This->stateBlock->renderState[WINED3DRS_POINTSCALE_B]) / - (This->stateBlock->viewport.Height * This->stateBlock->viewport.Height * scaleFactor); - att[2] = *((float*)&This->stateBlock->renderState[WINED3DRS_POINTSCALE_C]) / - (This->stateBlock->viewport.Height * This->stateBlock->viewport.Height * scaleFactor); - } - } - - if(GL_SUPPORT(ARB_POINT_PARAMETERS)) { - GL_EXTCALL(glPointParameterfvARB)(GL_POINT_DISTANCE_ATTENUATION_ARB, att); - checkGLcall("glPointParameterfvARB(GL_DISTANCE_ATTENUATION_ARB, ..."); - } - else if(GL_SUPPORT(EXT_POINT_PARAMETERS)) { - GL_EXTCALL(glPointParameterfvEXT)(GL_DISTANCE_ATTENUATION_EXT, att); - checkGLcall("glPointParameterfvEXT(GL_DISTANCE_ATTENUATION_EXT, ..."); - } else { - TRACE("POINT_PARAMETERS not supported in this version of opengl\n"); - } - break; - } case WINED3DRS_COLORWRITEENABLE : { TRACE("Color mask: r(%d) g(%d) b(%d) a(%d)\n", diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 43889ee..89bddbb 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -950,6 +950,57 @@ static void state_psizemax(DWORD state, } } +static void state_pscale(DWORD state, IWineD3DStateBlockImpl *stateblock) { + /* TODO: Group this with the viewport */ + /* + * POINTSCALEENABLE controls how point size value is treated. If set to + * true, the point size is scaled with respect to height of viewport. + * When set to false point size is in pixels. + * + * http://msdn.microsoft.com/library/en-us/directx9_c/point_sprites.asp + */ + + /* Default values */ + GLfloat att[3] = {1.0f, 0.0f, 0.0f}; + + /* + * Minimum valid point size for OpenGL is 1.0f. For Direct3D it is 0.0f. + * This means that OpenGL will clamp really small point sizes to 1.0f. + * To correct for this we need to multiply by the scale factor when sizes + * are less than 1.0f. scale_factor = 1.0f / point_size. + */ + GLfloat pointSize = *((float*)&stateblock->renderState[WINED3DRS_POINTSIZE]); + if(pointSize > 0.0f) { + GLfloat scaleFactor; + + if(pointSize < 1.0f) { + scaleFactor = pointSize * pointSize; + } else { + scaleFactor = 1.0f; + } + + if(stateblock->renderState[WINED3DRS_POINTSCALEENABLE]) { + att[0] = *((float*)&stateblock->renderState[WINED3DRS_POINTSCALE_A]) / + (stateblock->viewport.Height * stateblock->viewport.Height * scaleFactor); + att[1] = *((float*)&stateblock->renderState[WINED3DRS_POINTSCALE_B]) / + (stateblock->viewport.Height * stateblock->viewport.Height * scaleFactor); + att[2] = *((float*)&stateblock->renderState[WINED3DRS_POINTSCALE_C]) / + (stateblock->viewport.Height * stateblock->viewport.Height * scaleFactor); + } + } + + if(GL_SUPPORT(ARB_POINT_PARAMETERS)) { + GL_EXTCALL(glPointParameterfvARB)(GL_POINT_DISTANCE_ATTENUATION_ARB, att); + checkGLcall("glPointParameterfvARB(GL_DISTANCE_ATTENUATION_ARB, ..."); + } + else if(GL_SUPPORT(EXT_POINT_PARAMETERS)) { + GL_EXTCALL(glPointParameterfvEXT)(GL_DISTANCE_ATTENUATION_EXT, att); + checkGLcall("glPointParameterfvEXT(GL_DISTANCE_ATTENUATION_EXT, ..."); + } else { + TRACE("POINT_PARAMETERS not supported in this version of opengl\n"); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1112,10 +1163,10 @@ const struct StateEntry StateTable[] = { /*154, WINED3DRS_POINTSIZE */ STATE_RENDER(WINED3DRS_POINTSIZE), state_psize }, { /*155, WINED3DRS_POINTSIZE_MIN */ STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin }, { /*156, WINED3DRS_POINTSPRITEENABLE */ STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), state_unknown }, - { /*157, WINED3DRS_POINTSCALEENABLE */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_unknown }, - { /*158, WINED3DRS_POINTSCALE_A */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_unknown }, - { /*159, WINED3DRS_POINTSCALE_B */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_unknown }, - { /*160, WINED3DRS_POINTSCALE_C */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_unknown }, + { /*157, WINED3DRS_POINTSCALEENABLE */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, + { /*158, WINED3DRS_POINTSCALE_A */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, + { /*159, WINED3DRS_POINTSCALE_B */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, + { /*160, WINED3DRS_POINTSCALE_C */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, { /*161, WINED3DRS_MULTISAMPLEANTIALIAS */ STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_unknown }, { /*162, WINED3DRS_MULTISAMPLEMASK */ STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), state_unknown }, { /*163, WINED3DRS_PATCHEDGESTYLE */ STATE_RENDER(WINED3DRS_PATCHEDGESTYLE), state_unknown },

1 0