Stefan Dösinger : wined3d: Move debugging fixmes from drawprim to the stream source handler.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Jan 8 14:44:04 CST 2007


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

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Sat Jan  6 18:13:21 2007 +0100

wined3d: Move debugging fixmes from drawprim to the stream source handler.

---

 dlls/wined3d/drawprim.c |   17 -----------------
 dlls/wined3d/state.c    |   17 +++++++++++++++++
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c
index e8fdb12..f2aec53 100644
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
@@ -1108,23 +1108,6 @@ inline static void drawPrimitiveDrawStri
 
     IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
 
-/* Generate some fixme's if unsupported functionality is being used */
-#define BUFFER_OR_DATA(_attribute) dataLocations->u.s._attribute.lpData
-    /* TODO: Either support missing functionality in fixupVertices or by creating a shader to replace the pipeline. */
-    if (!useVertexShaderFunction && (BUFFER_OR_DATA(blendMatrixIndices) || BUFFER_OR_DATA(blendWeights))) {
-        FIXME("Blending data is only valid with vertex shaders %p %p\n",dataLocations->u.s.blendWeights.lpData,dataLocations->u.s.blendWeights.lpData);
-    }
-    if (!useVertexShaderFunction && (BUFFER_OR_DATA(position2) || BUFFER_OR_DATA(normal2))) {
-        FIXME("Tweening is only valid with vertex shaders\n");
-    }
-    if (!useVertexShaderFunction && (BUFFER_OR_DATA(tangent) || BUFFER_OR_DATA(binormal))) {
-        FIXME("Tangent and binormal bump mapping is only valid with vertex shaders\n");
-    }
-    if (!useVertexShaderFunction && (BUFFER_OR_DATA(tessFactor) || BUFFER_OR_DATA(fog) || BUFFER_OR_DATA(depth) || BUFFER_OR_DATA(sample))) {
-        FIXME("Extended attributes are only valid with vertex shaders\n");
-    }
-#undef BUFFER_OR_DATA
-
     /* Make any shaders active */
     This->shader_backend->shader_select(iface, usePixelShaderFunction, useVertexShaderFunction);
 
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index a8bdce3..34aa4bc 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -2543,6 +2543,23 @@ static inline void handleStreams(IWineD3
         TRACE("Not loading vertex data\n");
         device->useDrawStridedSlow = TRUE;
     }
+
+/* Generate some fixme's if unsupported functionality is being used */
+#define BUFFER_OR_DATA(_attribute) dataLocations->u.s._attribute.lpData
+    /* TODO: Either support missing functionality in fixupVertices or by creating a shader to replace the pipeline. */
+    if (!useVertexShaderFunction && (BUFFER_OR_DATA(blendMatrixIndices) || BUFFER_OR_DATA(blendWeights))) {
+        FIXME("Blending data is only valid with vertex shaders %p %p\n",dataLocations->u.s.blendWeights.lpData,dataLocations->u.s.blendWeights.lpData);
+    }
+    if (!useVertexShaderFunction && (BUFFER_OR_DATA(position2) || BUFFER_OR_DATA(normal2))) {
+        FIXME("Tweening is only valid with vertex shaders\n");
+    }
+    if (!useVertexShaderFunction && (BUFFER_OR_DATA(tangent) || BUFFER_OR_DATA(binormal))) {
+        FIXME("Tangent and binormal bump mapping is only valid with vertex shaders\n");
+    }
+    if (!useVertexShaderFunction && (BUFFER_OR_DATA(tessFactor) || BUFFER_OR_DATA(fog) || BUFFER_OR_DATA(depth) || BUFFER_OR_DATA(sample))) {
+        FIXME("Extended attributes are only valid with vertex shaders\n");
+    }
+#undef BUFFER_OR_DATA
 }
 
 static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock) {




More information about the wine-cvs mailing list