[PATCH] WineD3D: Move an VBO support check to the state template=0A=

Stefan Doesinger stefan at codeweavers.com
Sat Jul 5 16:46:21 CDT 2008


=0A=
---=0A=
 dlls/wined3d/state.c |   14 ++++++--------=0A=
 1 files changed, 6 insertions(+), 8 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c=0A=
index 6550aa3..1237611 100644=0A=
--- a/dlls/wined3d/state.c=0A=
+++ b/dlls/wined3d/state.c=0A=
@@ -3728,13 +3728,11 @@ static void scissorrect(DWORD state, =
IWineD3DStateBlockImpl *stateblock, WineD3D=0A=
 }=0A=
 =0A=
 static void indexbuffer(DWORD state, IWineD3DStateBlockImpl =
*stateblock, WineD3DContext *context) {=0A=
-    if(GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT)) {=0A=
-        if(stateblock->streamIsUP || stateblock->pIndexData =3D=3D NULL =
) {=0A=
-            GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0));=0A=
-        } else {=0A=
-            IWineD3DIndexBufferImpl *ib =3D (IWineD3DIndexBufferImpl *) =
stateblock->pIndexData;=0A=
-            GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, =
ib->vbo));=0A=
-        }=0A=
+    if(stateblock->streamIsUP || stateblock->pIndexData =3D=3D NULL ) {=0A=
+        GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0));=0A=
+    } else {=0A=
+        IWineD3DIndexBufferImpl *ib =3D (IWineD3DIndexBufferImpl *) =
stateblock->pIndexData;=0A=
+        GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, =
ib->vbo));=0A=
     }=0A=
 }=0A=
 =0A=
@@ -3818,7 +3816,7 @@ const struct StateEntryTemplate =
misc_state_template[] =3D {=0A=
     { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLOFFSET),   { =
STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLOFFSET),   tex_bumpenvloffset  =
}, 0                               },=0A=
 =0A=
     { STATE_VIEWPORT,                                     { =
STATE_VIEWPORT,                                     viewport_miscpart   =
}, 0                               },=0A=
-    { STATE_INDEXBUFFER,                                  { =
STATE_INDEXBUFFER,                                  indexbuffer         =
}, 0                               },=0A=
+    { STATE_INDEXBUFFER,                                  { =
STATE_INDEXBUFFER,                                  indexbuffer         =
}, ARB_VERTEX_BUFFER_OBJECT        },=0A=
     { STATE_RENDER(WINED3DRS_ANTIALIAS),                  { =
STATE_RENDER(WINED3DRS_ANTIALIAS),                  state_antialias     =
}, 0                               },=0A=
     { STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE),         { =
STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE),         state_perspective   =
}, 0                               },=0A=
     { STATE_RENDER(WINED3DRS_ZENABLE),                    { =
STATE_RENDER(WINED3DRS_ZENABLE),                    state_zenable       =
}, 0                               },=0A=
-- =0A=
1.5.4.5=0A=
=0A=

------=_NextPart_000_0036_01C8E844.EB33CD80--




More information about the wine-patches mailing list