Stefan Dösinger : wined3d: Inherit from the proper state table in atifs.

Alexandre Julliard julliard at winehq.org
Fri Mar 28 10:02:53 CDT 2008


Module: wine
Branch: master
Commit: f63ce1c4891b205d70f012c618c7d10ff67d70bd
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f63ce1c4891b205d70f012c618c7d10ff67d70bd

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Wed Mar 26 22:48:06 2008 +0100

wined3d: Inherit from the proper state table in atifs.

---

 dlls/wined3d/ati_fragment_shader.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c
index 90d33c7..d4b95db 100644
--- a/dlls/wined3d/ati_fragment_shader.c
+++ b/dlls/wined3d/ati_fragment_shader.c
@@ -727,7 +727,7 @@ struct StateEntry ATIFSStateTable[STATE_HIGHEST + 1];
 static void init_state_table() {
     unsigned int i;
     const DWORD rep = STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP);
-    memcpy(ATIFSStateTable, FFPStateTable, sizeof(ATIFSStateTable));
+    memcpy(ATIFSStateTable, arb_program_shader_backend.StateTable, sizeof(ATIFSStateTable));
 
     for(i = 0; i < MAX_TEXTURES; i++) {
         ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP)].apply = set_tex_op_atifs;
@@ -835,8 +835,8 @@ static BOOL shader_atifs_dirty_const(IWineD3DDevice *iface) {
 }
 
 static void shader_atifs_load_init(void) {
-    init_state_table();
     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) {




More information about the wine-cvs mailing list