[Bug 12357] New: Wine 0.9.59 & 3Dmark Patch Error

[wine-bugs at winehq.org]

http://bugs.winehq.org/show_bug.cgi?id=12357

           Summary: Wine 0.9.59 & 3Dmark Patch Error
           Product: Wine
           Version: CVS/GIT
          Platform: PC
               URL: http://bellegueulle.damien.neuf.fr
        OS/Version: Linux
            Status: UNCONFIRMED
          Severity: blocker
          Priority: P2
         Component: directx-d3d
        AssignedTo: wine-bugs at winehq.org
        ReportedBy: bellegueulle.damien at neuf.fr


Error in patch 3dmark.diff for Wine 0.9.59 and Wine CVS :

patching file dlls/wined3d/directx.c
Hunk #1 succeeded at 839 (offset 95 lines).
Hunk #2 FAILED at 2244.
Hunk #3 FAILED at 2571.
Hunk #4 FAILED at 2657.


***************
*** 2243,2249 ****
                                        WINED3DPMISCCAPS_CLIPTLVERTS          
|
                                        WINED3DPMISCCAPS_CLIPPLANESCALEDPOINTS
|
                                        WINED3DPMISCCAPS_MASKZ                
|
-                                       WINED3DPMISCCAPS_BLENDOP;
                                      /* TODO:
                                          WINED3DPMISCCAPS_NULLREFERENCE
                                         
WINED3DPMISCCAPS_INDEPENDENTWRITEMASKS
--- 2244,2255 ----
                                        WINED3DPMISCCAPS_CLIPTLVERTS          
|
                                        WINED3DPMISCCAPS_CLIPPLANESCALEDPOINTS
|
                                        WINED3DPMISCCAPS_MASKZ                
|
+ //                                  WINED3DPMISCCAPS_BLENDOP;
+                                       WINED3DPMISCCAPS_TSSARGTEMP           
|
+                                     WINED3DPMISCCAPS_FOGANDSPECULARALPHA   |
+                                     WINED3DPMISCCAPS_SEPARATEALPHABLEND    |
+                                     WINED3DPMISCCAPS_BLENDOP           |
+                                     WINED3DPMISCCAPS_FOGVERTEXCLAMPED;
                                      /* TODO:
                                          WINED3DPMISCCAPS_NULLREFERENCE
                                         
WINED3DPMISCCAPS_INDEPENDENTWRITEMASKS
***************
*** 2565,2571 ****
      *pCaps->MaxVertexBlendMatrixIndex   = 0;

      *pCaps->MaxAnisotropy   = GL_LIMITS(anisotropy);
-     *pCaps->MaxPointSize    = GL_LIMITS(pointsize);


      *pCaps->VertexProcessingCaps = WINED3DVTXPCAPS_DIRECTIONALLIGHTS |
--- 2571,2578 ----
      *pCaps->MaxVertexBlendMatrixIndex   = 0;

      *pCaps->MaxAnisotropy   = GL_LIMITS(anisotropy);
+ //    *pCaps->MaxPointSize    = GL_LIMITS(pointsize);
+     *pCaps->MaxPointSize    = 64.0f;


      *pCaps->VertexProcessingCaps = WINED3DVTXPCAPS_DIRECTIONALLIGHTS |
***************
*** 2650,2656 ****
         ------------------------------------------------ */
      if (This->dxVersion > 8) {
          /* d3d9.dll sets D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES here
because StretchRects is implemented in d3d9 */
-         *pCaps->DevCaps2                          =
WINED3DDEVCAPS2_STREAMOFFSET;
          /* TODO: VS3.0 needs at least
D3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET */
          *pCaps->MaxNpatchTessellationLevel        = 0;
          *pCaps->MasterAdapterOrdinal              = 0;
--- 2657,2667 ----
         ------------------------------------------------ */
      if (This->dxVersion > 8) {
          /* d3d9.dll sets D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES here
because StretchRects is implemented in d3d9 */
+ //        *pCaps->DevCaps2                          =
WINED3DDEVCAPS2_STREAMOFFSET;
+       *pCaps->DevCaps2                          =
WINED3DDEVCAPS2_STREAMOFFSET        |
+                                                  
WINED3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES |
+                                                  
WINED3DDEVCAPS2_PRESAMPLEDDMAPNPATCH |
+                                                  
WINED3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET;
          /* TODO: VS3.0 needs at least
D3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET */
          *pCaps->MaxNpatchTessellationLevel        = 0;
          *pCaps->MasterAdapterOrdinal              = 0;


-- 
Configure bugmail: http://bugs.winehq.org/userprefs.cgi?tab=email
Do not reply to this email, post in Bugzilla using the
above URL to reply.
------- You are receiving this mail because: -------
You are watching all bug changes.