Stefan Dösinger : wined3d: Do not print the fixed / unfixed vertices warning with shaders.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Feb 21 06:00:59 CST 2007


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

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Tue Feb 20 22:42:34 2007 +0100

wined3d: Do not print the fixed / unfixed vertices warning with shaders.

---

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

diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c
index 9162c01..0a2ec8e 100644
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
@@ -178,7 +178,6 @@ void primitiveDeclarationConvertToStridedData(
             TRACE("Stream is up %d, %p\n", element->Stream, This->stateBlock->streamSource[element->Stream]);
             streamVBO = 0;
             data    = (BYTE *)This->stateBlock->streamSource[element->Stream];
-            if(fixup && *fixup) FIXME("Missing fixed and unfixed vertices, expect graphics glitches\n");
         } else {
             TRACE("Stream isn't up %d, %p\n", element->Stream, This->stateBlock->streamSource[element->Stream]);
             if(!isPreLoaded[element->Stream]) {
@@ -189,7 +188,10 @@ void primitiveDeclarationConvertToStridedData(
             data    = IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[element->Stream], 0, &streamVBO);
             if(fixup) {
                 if( streamVBO != 0) *fixup = TRUE;
-                else if(*fixup) FIXME("Missing fixed and unfixed vertices, expect graphics glitches\n");
+                else if(*fixup && This->stateBlock->vertexShader == NULL) {
+                    /* This may be bad with the fixed function pipeline */
+                    FIXME("Missing fixed and unfixed vertices, expect graphics glitches\n");
+                }
             }
         }
         stride  = This->stateBlock->streamStride[element->Stream];




More information about the wine-cvs mailing list