Henri Verbeet : wined3d: Pass the number of components to glVertexBlendARB( ).

Alexandre Julliard julliard at winehq.org
Thu Mar 26 11:05:47 CDT 2009


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Thu Mar 26 10:43:41 2009 +0100

wined3d: Pass the number of components to glVertexBlendARB().

---

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

diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index ab18459..b4e5642 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -4026,13 +4026,13 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, const WineDirect3
         (sd->u.s.blendMatrixIndices.lpData) || (sd->u.s.blendMatrixIndices.VBO) ) {
 
         if (GL_SUPPORT(ARB_VERTEX_BLEND)) {
-            TRACE("Blend %d %p %d\n", WINED3D_ATR_FORMAT(sd->u.s.blendWeights.dwType),
+            TRACE("Blend %d %p %d\n", WINED3D_ATR_SIZE(sd->u.s.blendWeights.dwType),
                 sd->u.s.blendWeights.lpData + stateblock->loadBaseVertexIndex * sd->u.s.blendWeights.dwStride, sd->u.s.blendWeights.dwStride + offset[sd->u.s.blendWeights.streamNo]);
 
             glEnableClientState(GL_WEIGHT_ARRAY_ARB);
             checkGLcall("glEnableClientState(GL_WEIGHT_ARRAY_ARB)");
 
-            GL_EXTCALL(glVertexBlendARB(WINED3D_ATR_FORMAT(sd->u.s.blendWeights.dwType) + 1));
+            GL_EXTCALL(glVertexBlendARB(WINED3D_ATR_SIZE(sd->u.s.blendWeights.dwType) + 1));
 
             VTRACE(("glWeightPointerARB(%d, GL_FLOAT, %d, %p)\n",
                 WINED3D_ATR_FORMAT(sd->u.s.blendWeights.dwType) ,




More information about the wine-cvs mailing list