Changeset 41424 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

May 23, 2012 7:31:16 PM (13 years ago)

Author:

vboxsync

Message:

wined3d: more logging

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/device.c (modified) (12 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/device.c

@@ -3032 +3032 @@
             iface, srcData, start, count);
 
-    if (!srcData || start >= MAX_CONST_B) return WINED3DERR_INVALIDCALL;
+    if (!srcData || start >= MAX_CONST_B)
+    {
+        ERR("incorrect vertex shader const data: start(%u), srcData(0x%p), count(%u)", start, srcData, count);
+        return WINED3DERR_INVALIDCALL;
+    }
 
     memcpy(&This->updateStateBlock->vertexShaderConstantB[start], srcData, cnt * sizeof(BOOL));
@@ -3060 +3064 @@
 
     if (dstData == NULL || cnt < 0)
+    {
+        ERR("incorrect vertex shader const data: start(%u), dstData(0x%p), count(%u)", start, dstData, count);
         return WINED3DERR_INVALIDCALL;
+    }
 
     memcpy(dstData, &This->stateBlock->vertexShaderConstantB[start], cnt * sizeof(BOOL));
@@ -3078 +3085 @@
             iface, srcData, start, count);
 
-    if (!srcData || start >= MAX_CONST_I) return WINED3DERR_INVALIDCALL;
+    if (!srcData || start >= MAX_CONST_I)
+    {
+        ERR("incorrect vertex shader const data: start(%u), srcData(0x%p), count(%u)", start, srcData, count);
+        return WINED3DERR_INVALIDCALL;
+    }
 
     memcpy(&This->updateStateBlock->vertexShaderConstantI[start * 4], srcData, cnt * sizeof(int) * 4);
@@ -3107 +3118 @@
 
     if (dstData == NULL || ((signed int) MAX_CONST_I - (signed int) start) <= 0)
+    {
+        ERR("incorrect vertex shader const data: start(%u), dstData(0x%p), count(%u)", start, dstData, count);
         return WINED3DERR_INVALIDCALL;
+    }
 
     memcpy(dstData, &This->stateBlock->vertexShaderConstantI[start * 4], cnt * sizeof(int) * 4);
@@ -3127 +3141 @@
     /* Specifically test start > limit to catch MAX_UINT overflows when adding start + count */
     if (srcData == NULL || start + count > This->d3d_vshader_constantF || start > This->d3d_vshader_constantF)
+    {
+        ERR("incorrect vertex shader const data: start(%u), srcData(0x%p), count(%u)", start, srcData, count);
         return WINED3DERR_INVALIDCALL;
+    }
 
     memcpy(&This->updateStateBlock->vertexShaderConstantF[start * 4], srcData, count * sizeof(float) * 4);
@@ -3161 +3178 @@
 
     if (dstData == NULL || cnt < 0)
+    {
+        ERR("incorrect vertex shader const data: start(%u), dstData(0x%p), count(%u)", start, dstData, count);
         return WINED3DERR_INVALIDCALL;
+    }
 
     memcpy(dstData, &This->stateBlock->vertexShaderConstantF[start * 4], cnt * sizeof(float) * 4);
@@ -3430 +3450 @@
             iface, srcData, start, count);
 
-    if (!srcData || start >= MAX_CONST_B) return WINED3DERR_INVALIDCALL;
+    if (!srcData || start >= MAX_CONST_B)
+    {
+        ERR("incorrect pixel shader const data: start(%u), srcData(0x%p), count(%u)", start, srcData, count);
+        return WINED3DERR_INVALIDCALL;
+    }
 
     memcpy(&This->updateStateBlock->pixelShaderConstantB[start], srcData, cnt * sizeof(BOOL));
@@ -3458 +3482 @@
 
     if (dstData == NULL || cnt < 0)
+    {
+        ERR("incorrect pixel shader const data: start(%u), dstData(0x%p), count(%u)", start, dstData, count);
         return WINED3DERR_INVALIDCALL;
+    }
 
     memcpy(dstData, &This->stateBlock->pixelShaderConstantB[start], cnt * sizeof(BOOL));
@@ -3476 +3503 @@
             iface, srcData, start, count);
 
-    if (!srcData || start >= MAX_CONST_I) return WINED3DERR_INVALIDCALL;
+    if (!srcData || start >= MAX_CONST_I)
+    {
+        ERR("incorrect pixel shader const data: start(%u), srcData(0x%p), count(%u)", start, srcData, count);
+        return WINED3DERR_INVALIDCALL;
+    }
 
     memcpy(&This->updateStateBlock->pixelShaderConstantI[start * 4], srcData, cnt * sizeof(int) * 4);
@@ -3505 +3536 @@
 
     if (dstData == NULL || cnt < 0)
+    {
+        ERR("incorrect pixel shader const data: start(%u), dstData(0x%p), count(%u)", start, dstData, count);
         return WINED3DERR_INVALIDCALL;
+    }
 
     memcpy(dstData, &This->stateBlock->pixelShaderConstantI[start * 4], cnt * sizeof(int) * 4);
@@ -3525 +3559 @@
     /* Specifically test start > limit to catch MAX_UINT overflows when adding start + count */
     if (srcData == NULL || start + count > This->d3d_pshader_constantF || start > This->d3d_pshader_constantF)
+    {
+        ERR("incorrect pixel shader const data: start(%u), srcData(0x%p), count(%u)", start, srcData, count);
         return WINED3DERR_INVALIDCALL;
+    }
 
     memcpy(&This->updateStateBlock->pixelShaderConstantF[start * 4], srcData, count * sizeof(float) * 4);
@@ -3559 +3596 @@
 
     if (dstData == NULL || cnt < 0)
+    {
+        ERR("incorrect pixel shader const data: start(%u), dstData(0x%p), count(%u)", start, dstData, count);
         return WINED3DERR_INVALIDCALL;
+    }
 
     memcpy(dstData, &This->stateBlock->pixelShaderConstantF[start * 4], cnt * sizeof(float) * 4);