Commit 7e314011 authored by Stefan Dösinger's avatar Stefan Dösinger Committed by Alexandre Julliard

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

parent 27bac24a
...@@ -1108,23 +1108,6 @@ inline static void drawPrimitiveDrawStrided( ...@@ -1108,23 +1108,6 @@ inline static void drawPrimitiveDrawStrided(
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; 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 */ /* Make any shaders active */
This->shader_backend->shader_select(iface, usePixelShaderFunction, useVertexShaderFunction); This->shader_backend->shader_select(iface, usePixelShaderFunction, useVertexShaderFunction);
......
...@@ -2543,6 +2543,23 @@ static inline void handleStreams(IWineD3DStateBlockImpl *stateblock, BOOL useVer ...@@ -2543,6 +2543,23 @@ static inline void handleStreams(IWineD3DStateBlockImpl *stateblock, BOOL useVer
TRACE("Not loading vertex data\n"); TRACE("Not loading vertex data\n");
device->useDrawStridedSlow = TRUE; 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) { static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment