- Timestamp:
- Oct 14, 2017 2:54:32 AM (7 years ago)
- Location:
- trunk/src/VBox/Devices/Graphics
- Files:
-
- 3 edited
-
DevVGA-SVGA3d-info.cpp (modified) (1 diff)
-
DevVGA-SVGA3d-ogl.cpp (modified) (1 diff)
-
shaderlib/shaderapi.c (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-info.cpp
r69046 r69092 1602 1602 if (pContext->state.aClipPlane[i].fValid) 1603 1603 pHlp->pfnPrintf(pHlp, "aClipPlane[%#04x]: [ " FLOAT_FMT_STR ", " FLOAT_FMT_STR ", " FLOAT_FMT_STR ", " FLOAT_FMT_STR " ]\n", 1604 i, 1604 1605 FLOAT_FMT_ARGS(pContext->state.aClipPlane[i].plane[0]), 1605 1606 FLOAT_FMT_ARGS(pContext->state.aClipPlane[i].plane[1]), -
trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp
r69046 r69092 6420 6420 # else 6421 6421 PVMSVGA3DSURFACE pTexture = pState->papSurfaces[pContext->aSidActiveTexture[i]]; 6422 AssertMsg(pTexture->id == pContext->aSidActiveTexture[i], ("%x vs %x\n", pTexture->id ==pContext->aSidActiveTexture[i]));6422 AssertMsg(pTexture->id == pContext->aSidActiveTexture[i], ("%x vs %x\n", pTexture->id, pContext->aSidActiveTexture[i])); 6423 6423 AssertMsg(pTexture->oglId.texture == (GLuint)activeTexture, 6424 6424 ("%x vs %x unit %d (active unit %d) sid=%x\n", pTexture->oglId.texture, activeTexture, i, -
trunk/src/VBox/Devices/Graphics/shaderlib/shaderapi.c
r62934 r69092 465 465 This = g_pCurrentContext->pDeviceContext; 466 466 467 Log(("(ShaderSetVertexShaderConstantB %p, srcData %p, start %d, count %d)\n", 468 srcData, start, count)); 467 Log(("(ShaderSetVertexShaderConstantB %p, srcData %p, start %d, count %d)\n", pShaderContext, srcData, start, count)); 469 468 470 469 if (!srcData || start >= MAX_CONST_B) … … 495 494 This = g_pCurrentContext->pDeviceContext; 496 495 497 Log(("(ShaderSetVertexShaderConstantI %p, srcData %p, start %d, count %d)\n", 498 srcData, start, count)); 496 Log(("(ShaderSetVertexShaderConstantI %p, srcData %p, start %d, count %d)\n", pShaderContext, srcData, start, count)); 499 497 500 498 if (!srcData || start >= MAX_CONST_I) … … 522 520 This = g_pCurrentContext->pDeviceContext; 523 521 524 Log(("(ShaderSetVertexShaderConstantF %p, srcData %p, start %d, count %d)\n", 525 srcData, start, count)); 522 Log(("(ShaderSetVertexShaderConstantF %p, srcData %p, start %d, count %d)\n", pShaderContext, srcData, start, count)); 526 523 527 524 if (srcData == NULL || start + count > This->d3d_vshader_constantF || start > This->d3d_vshader_constantF) … … 550 547 This = g_pCurrentContext->pDeviceContext; 551 548 552 Log(("(ShaderSetPixelShaderConstantB %p, srcData %p, start %d, count %d)\n", 553 srcData, start, count)); 549 Log(("(ShaderSetPixelShaderConstantB %p, srcData %p, start %d, count %d)\n", pShaderContext, srcData, start, count)); 554 550 555 551 if (!srcData || start >= MAX_CONST_B) … … 580 576 This = g_pCurrentContext->pDeviceContext; 581 577 582 Log(("(ShaderSetPixelShaderConstantI %p, srcData %p, start %d, count %d)\n", 583 srcData, start, count)); 578 Log(("(ShaderSetPixelShaderConstantI %p, srcData %p, start %d, count %d)\n", pShaderContext, srcData, start, count)); 584 579 585 580 if (!srcData || start >= MAX_CONST_I) … … 607 602 This = g_pCurrentContext->pDeviceContext; 608 603 609 Log(("(ShaderSetPixelShaderConstantF %p, srcData %p, start %d, count %d)\n", 610 srcData, start, count)); 604 Log(("(ShaderSetPixelShaderConstantF %p, srcData %p, start %d, count %d)\n", pShaderContext, srcData, start, count)); 611 605 612 606 if (srcData == NULL || start + count > This->d3d_pshader_constantF || start > This->d3d_pshader_constantF)
Note:
See TracChangeset
for help on using the changeset viewer.

