[PATCH] WineD3D: Remove more dead code=0A=

Stefan Doesinger stefan at codeweavers.com
Sat Jul 5 16:37:47 CDT 2008


=0A=
The opengl extension mentioned in that code was never=0A=
finished, and as far as I know there is no way to make use of=0A=
tangent data in the d3d fixed function pipeline as well=0A=
---=0A=
 dlls/wined3d/state.c |   42 ++----------------------------------------=0A=
 1 files changed, 2 insertions(+), 40 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c=0A=
index f665c05..6550aa3 100644=0A=
--- a/dlls/wined3d/state.c=0A=
+++ b/dlls/wined3d/state.c=0A=
@@ -3133,44 +3133,6 @@ static void loadVertexData(IWineD3DStateBlockImpl =
*stateblock, WineDirect3DVerte=0A=
     }=0A=
 #endif=0A=
 =0A=
-#if 0 /* tangents  ----------------------------------------------*/=0A=
-    if (sd->u.s.tangent.lpData || sd->u.s.tangent.VBO ||=0A=
-        sd->u.s.binormal.lpData || sd->u.s.binormal.VBO) {=0A=
-        /* TODO: tangents*/=0A=
-        if (GL_SUPPORT(EXT_COORDINATE_FRAME) {=0A=
-            if (sd->u.s.tangent.lpData || sd->u.s.tangent.VBO) {=0A=
-                glEnable(GL_TANGENT_ARRAY_EXT);=0A=
-                (GL_EXTCALL)(TangentPointerEXT)(=0A=
-                    WINED3D_ATR_GLTYPE(sd->u.s.tangent.dwType),=0A=
-                    sd->u.s.tangent.dwStride,=0A=
-                    sd->u.s.tangent.lpData + =
stateblock->loadBaseVertexIndex * sd->u.s.tangent.dwStride);=0A=
-            } else {=0A=
-                    glDisable(GL_TANGENT_ARRAY_EXT);=0A=
-            }=0A=
-            if (sd->u.s.binormal.lpData || sd->u.s.binormal.VBO) {=0A=
-                    glEnable(GL_BINORMAL_ARRAY_EXT);=0A=
-                    (GL_EXTCALL)(BinormalPointerEXT)(=0A=
-                        WINED3D_ATR_GLTYPE(sd->u.s.binormal.dwType),=0A=
-                        sd->u.s.binormal.dwStride,=0A=
-                        sd->u.s.binormal.lpData + =
stateblock->loadBaseVertexIndex * sd->u.s.binormal.dwStride);=0A=
-            } else{=0A=
-                    glDisable(GL_BINORMAL_ARRAY_EXT);=0A=
-            }=0A=
-=0A=
-        } else {=0A=
-            /* don't bother falling back to 'slow' as we don't support =
software tangents and binormals yet . */=0A=
-            /* FIXME: fixme once */=0A=
-            TRACE("Hardware support for tangents and binormals is not =
avaiable, tangents and binormals disabled.\n");=0A=
-        }=0A=
-    } else {=0A=
-        if (GL_SUPPORT(EXT_COORDINATE_FRAME) {=0A=
-             /* make sure fog is disabled */=0A=
-             glDisable(GL_TANGENT_ARRAY_EXT);=0A=
-             glDisable(GL_BINORMAL_ARRAY_EXT);=0A=
-        }=0A=
-    }=0A=
-#endif=0A=
-=0A=
     /* Point Size ----------------------------------------------*/=0A=
     if (sd->u.s.pSize.lpData || sd->u.s.pSize.VBO) {=0A=
 =0A=
@@ -3427,8 +3389,8 @@ static void streamsrc(DWORD state, =
IWineD3DStateBlockImpl *stateblock, WineD3DCo=0A=
     if (!useVertexShaderFunction && (BUFFER_OR_DATA(position2) || =
BUFFER_OR_DATA(normal2))) {=0A=
         FIXME("Tweening is only valid with vertex shaders\n");=0A=
     }=0A=
-    if (!useVertexShaderFunction && (BUFFER_OR_DATA(tangent) || =
BUFFER_OR_DATA(binormal))) {=0A=
-        FIXME("Tangent and binormal bump mapping is only valid with =
vertex shaders\n");=0A=
+    if (!useVertexShaderFunction && BUFFER_OR_DATA(binormal)) {=0A=
+        FIXME("Binormal bump mapping is only valid with vertex =
shaders\n");=0A=
     }=0A=
     if (!useVertexShaderFunction && (BUFFER_OR_DATA(tessFactor) || =
BUFFER_OR_DATA(fog) || BUFFER_OR_DATA(depth) || BUFFER_OR_DATA(sample))) =
{=0A=
         FIXME("Extended attributes are only valid with vertex =
shaders\n");=0A=
-- =0A=
1.5.4.5=0A=
=0A=

------=_NextPart_000_003A_01C8E844.EF3C8480--




More information about the wine-patches mailing list