Changeset 89123 in vbox
- Timestamp:
- May 17, 2021 8:16:19 PM (4 years ago)
- svn:sync-xref-src-repo-rev:
- 144464
- Location:
- trunk/src/VBox/Devices/Graphics
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp
r89121 r89123 170 170 *********************************************************************************************************************************/ 171 171 static int vmsvga3dContextDestroyOgl(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext, uint32_t cid); 172 static intvmsvga3dBackContextDestroy(PVGASTATECC pThisCC, uint32_t cid);172 static DECLCALLBACK(int) vmsvga3dBackContextDestroy(PVGASTATECC pThisCC, uint32_t cid); 173 173 static void vmsvgaColor2GLFloatArray(uint32_t color, GLfloat *pRed, GLfloat *pGreen, GLfloat *pBlue, GLfloat *pAlpha); 174 static intvmsvga3dBackSetLightData(PVGASTATECC pThisCC, uint32_t cid, uint32_t index, SVGA3dLightData *pData);175 static intvmsvga3dBackSetClipPlane(PVGASTATECC pThisCC, uint32_t cid, uint32_t index, float plane[4]);176 static intvmsvga3dBackShaderDestroy(PVGASTATECC pThisCC, uint32_t cid, uint32_t shid, SVGA3dShaderType type);177 static intvmsvga3dBackOcclusionQueryDelete(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext);178 static intvmsvga3dBackCreateTexture(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext, uint32_t idAssociatedContext, PVMSVGA3DSURFACE pSurface);174 static DECLCALLBACK(int) vmsvga3dBackSetLightData(PVGASTATECC pThisCC, uint32_t cid, uint32_t index, SVGA3dLightData *pData); 175 static DECLCALLBACK(int) vmsvga3dBackSetClipPlane(PVGASTATECC pThisCC, uint32_t cid, uint32_t index, float plane[4]); 176 static DECLCALLBACK(int) vmsvga3dBackShaderDestroy(PVGASTATECC pThisCC, uint32_t cid, uint32_t shid, SVGA3dShaderType type); 177 static DECLCALLBACK(int) vmsvga3dBackOcclusionQueryDelete(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext); 178 static DECLCALLBACK(int) vmsvga3dBackCreateTexture(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext, uint32_t idAssociatedContext, PVMSVGA3DSURFACE pSurface); 179 179 180 180 /* Generated by VBoxDef2LazyLoad from the VBoxSVGA3D.def and VBoxSVGA3DObjC.def files. */ … … 595 595 * @param pThisCC The VGA/VMSVGA state for ring-3. 596 596 */ 597 static intvmsvga3dBackInit(PPDMDEVINS pDevIns, PVGASTATE pThis, PVGASTATECC pThisCC)597 static DECLCALLBACK(int) vmsvga3dBackInit(PPDMDEVINS pDevIns, PVGASTATE pThis, PVGASTATECC pThisCC) 598 598 { 599 599 int rc; … … 828 828 829 829 /* We must delay window creation until the PowerOn phase. Init is too early and will cause failures. */ 830 static intvmsvga3dBackPowerOn(PPDMDEVINS pDevIns, PVGASTATE pThis, PVGASTATECC pThisCC)830 static DECLCALLBACK(int) vmsvga3dBackPowerOn(PPDMDEVINS pDevIns, PVGASTATE pThis, PVGASTATECC pThisCC) 831 831 { 832 832 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 1150 1150 } 1151 1151 1152 static intvmsvga3dBackReset(PVGASTATECC pThisCC)1152 static DECLCALLBACK(int) vmsvga3dBackReset(PVGASTATECC pThisCC) 1153 1153 { 1154 1154 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 1175 1175 } 1176 1176 1177 static intvmsvga3dBackTerminate(PVGASTATECC pThisCC)1177 static DECLCALLBACK(int) vmsvga3dBackTerminate(PVGASTATECC pThisCC) 1178 1178 { 1179 1179 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 1216 1216 1217 1217 1218 static voidvmsvga3dBackUpdateHostScreenViewport(PVGASTATECC pThisCC, uint32_t idScreen, VMSVGAVIEWPORT const *pOldViewport)1218 static DECLCALLBACK(void) vmsvga3dBackUpdateHostScreenViewport(PVGASTATECC pThisCC, uint32_t idScreen, VMSVGAVIEWPORT const *pOldViewport) 1219 1219 { 1220 1220 /** @todo Move the visible framebuffer content here, don't wait for the guest to … … 1381 1381 1382 1382 1383 static intvmsvga3dBackQueryCaps(PVGASTATECC pThisCC, SVGA3dDevCapIndex idx3dCaps, uint32_t *pu32Val)1383 static DECLCALLBACK(int) vmsvga3dBackQueryCaps(PVGASTATECC pThisCC, SVGA3dDevCapIndex idx3dCaps, uint32_t *pu32Val) 1384 1384 { 1385 1385 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 2004 2004 * @param pSurface The surface being destroyed. 2005 2005 */ 2006 static voidvmsvga3dBackSurfaceDestroy(PVGASTATECC pThisCC, PVMSVGA3DSURFACE pSurface)2006 static DECLCALLBACK(void) vmsvga3dBackSurfaceDestroy(PVGASTATECC pThisCC, PVMSVGA3DSURFACE pSurface) 2007 2007 { 2008 2008 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 2053 2053 2054 2054 2055 static intvmsvga3dBackSurfaceCopy(PVGASTATECC pThisCC, SVGA3dSurfaceImageId dest, SVGA3dSurfaceImageId src,2055 static DECLCALLBACK(int) vmsvga3dBackSurfaceCopy(PVGASTATECC pThisCC, SVGA3dSurfaceImageId dest, SVGA3dSurfaceImageId src, 2056 2056 uint32_t cCopyBoxes, SVGA3dCopyBox *pBox) 2057 2057 { … … 2367 2367 * @param pSurface The surface to create the texture for. 2368 2368 */ 2369 static intvmsvga3dBackCreateTexture(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext, uint32_t idAssociatedContext,2369 static DECLCALLBACK(int) vmsvga3dBackCreateTexture(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext, uint32_t idAssociatedContext, 2370 2370 PVMSVGA3DSURFACE pSurface) 2371 2371 { … … 2660 2660 * @param pContext The VMSVGA3d context (already current for OGL). 2661 2661 */ 2662 static intvmsvga3dBackSurfaceStretchBlt(PVGASTATE pThis, PVMSVGA3DSTATE pState,2662 static DECLCALLBACK(int) vmsvga3dBackSurfaceStretchBlt(PVGASTATE pThis, PVMSVGA3DSTATE pState, 2663 2663 PVMSVGA3DSURFACE pDstSurface, uint32_t uDstFace, uint32_t uDstMipmap, SVGA3dBox const *pDstBox, 2664 2664 PVMSVGA3DSURFACE pSrcSurface, uint32_t uSrcFace, uint32_t uSrcMipmap, SVGA3dBox const *pSrcBox, … … 2863 2863 * @param iBox The current box number (for Direct 3D). 2864 2864 */ 2865 static intvmsvga3dBackSurfaceDMACopyBox(PVGASTATE pThis, PVGASTATECC pThisCC, PVMSVGA3DSTATE pState, PVMSVGA3DSURFACE pSurface,2865 static DECLCALLBACK(int) vmsvga3dBackSurfaceDMACopyBox(PVGASTATE pThis, PVGASTATECC pThisCC, PVMSVGA3DSTATE pState, PVMSVGA3DSURFACE pSurface, 2866 2866 PVMSVGA3DMIPMAPLEVEL pMipLevel, uint32_t uHostFace, uint32_t uHostMipmap, 2867 2867 SVGAGuestPtr GuestPtr, uint32_t cbGuestPitch, SVGA3dTransferType transfer, … … 3149 3149 } 3150 3150 3151 static intvmsvga3dBackGenerateMipmaps(PVGASTATECC pThisCC, uint32_t sid, SVGA3dTextureFilter filter)3151 static DECLCALLBACK(int) vmsvga3dBackGenerateMipmaps(PVGASTATECC pThisCC, uint32_t sid, SVGA3dTextureFilter filter) 3152 3152 { 3153 3153 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 3741 3741 } while(0) 3742 3742 3743 static intvmsvga3dBackDefineScreen(PVGASTATE pThis, PVGASTATECC pThisCC, VMSVGASCREENOBJECT *pScreen)3743 static DECLCALLBACK(int) vmsvga3dBackDefineScreen(PVGASTATE pThis, PVGASTATECC pThisCC, VMSVGASCREENOBJECT *pScreen) 3744 3744 { 3745 3745 LogRel4(("VMSVGA: vmsvga3dBackDefineScreen: screen %u\n", pScreen->idScreen)); … … 3847 3847 } 3848 3848 3849 static intvmsvga3dBackDestroyScreen(PVGASTATECC pThisCC, VMSVGASCREENOBJECT *pScreen)3849 static DECLCALLBACK(int) vmsvga3dBackDestroyScreen(PVGASTATECC pThisCC, VMSVGASCREENOBJECT *pScreen) 3850 3850 { 3851 3851 LogRel4(("VMSVGA: vmsvga3dBackDestroyScreen: screen %u\n", pScreen->idScreen)); … … 3873 3873 3874 3874 /* Blit a surface to the GLX pixmap. */ 3875 static intvmsvga3dBackSurfaceBlitToScreen(PVGASTATECC pThisCC, VMSVGASCREENOBJECT *pScreen,3875 static DECLCALLBACK(int) vmsvga3dBackSurfaceBlitToScreen(PVGASTATECC pThisCC, VMSVGASCREENOBJECT *pScreen, 3876 3876 SVGASignedRect destRect, SVGA3dSurfaceImageId srcImage, 3877 3877 SVGASignedRect srcRect, uint32_t cRects, SVGASignedRect *paRects) … … 3966 3966 #else /* !RT_OS_LINUX */ 3967 3967 3968 static intvmsvga3dBackDefineScreen(PVGASTATE pThis, PVGASTATECC pThisCC, VMSVGASCREENOBJECT *pScreen)3968 static DECLCALLBACK(int) vmsvga3dBackDefineScreen(PVGASTATE pThis, PVGASTATECC pThisCC, VMSVGASCREENOBJECT *pScreen) 3969 3969 { 3970 3970 RT_NOREF(pThis, pThisCC, pScreen); … … 3972 3972 } 3973 3973 3974 static intvmsvga3dBackDestroyScreen(PVGASTATECC pThisCC, VMSVGASCREENOBJECT *pScreen)3974 static DECLCALLBACK(int) vmsvga3dBackDestroyScreen(PVGASTATECC pThisCC, VMSVGASCREENOBJECT *pScreen) 3975 3975 { 3976 3976 RT_NOREF(pThisCC, pScreen); … … 3978 3978 } 3979 3979 3980 static intvmsvga3dBackSurfaceBlitToScreen(PVGASTATECC pThisCC, VMSVGASCREENOBJECT *pScreen,3980 static DECLCALLBACK(int) vmsvga3dBackSurfaceBlitToScreen(PVGASTATECC pThisCC, VMSVGASCREENOBJECT *pScreen, 3981 3981 SVGASignedRect destRect, SVGA3dSurfaceImageId srcImage, 3982 3982 SVGASignedRect srcRect, uint32_t cRects, SVGASignedRect *paRects) … … 3994 3994 * @param cid Context id 3995 3995 */ 3996 static intvmsvga3dBackContextDefine(PVGASTATECC pThisCC, uint32_t cid)3996 static DECLCALLBACK(int) vmsvga3dBackContextDefine(PVGASTATECC pThisCC, uint32_t cid) 3997 3997 { 3998 3998 return vmsvga3dContextDefineOgl(pThisCC, cid, 0/*fFlags*/); … … 4104 4104 * @param cid Context id 4105 4105 */ 4106 static intvmsvga3dBackContextDestroy(PVGASTATECC pThisCC, uint32_t cid)4106 static DECLCALLBACK(int) vmsvga3dBackContextDestroy(PVGASTATECC pThisCC, uint32_t cid) 4107 4107 { 4108 4108 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 4133 4133 4134 4134 /* Handle resize */ 4135 static intvmsvga3dBackChangeMode(PVGASTATECC pThisCC)4135 static DECLCALLBACK(int) vmsvga3dBackChangeMode(PVGASTATECC pThisCC) 4136 4136 { 4137 4137 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 4154 4154 4155 4155 4156 static intvmsvga3dBackSetTransform(PVGASTATECC pThisCC, uint32_t cid, SVGA3dTransformType type, float matrix[16])4156 static DECLCALLBACK(int) vmsvga3dBackSetTransform(PVGASTATECC pThisCC, uint32_t cid, SVGA3dTransformType type, float matrix[16]) 4157 4157 { 4158 4158 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 4260 4260 } 4261 4261 4262 static intvmsvga3dBackSetZRange(PVGASTATECC pThisCC, uint32_t cid, SVGA3dZRange zRange)4262 static DECLCALLBACK(int) vmsvga3dBackSetZRange(PVGASTATECC pThisCC, uint32_t cid, SVGA3dZRange zRange) 4263 4263 { 4264 4264 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 4398 4398 } 4399 4399 4400 static intvmsvga3dBackSetRenderState(PVGASTATECC pThisCC, uint32_t cid, uint32_t cRenderStates, SVGA3dRenderState *pRenderState)4400 static DECLCALLBACK(int) vmsvga3dBackSetRenderState(PVGASTATECC pThisCC, uint32_t cid, uint32_t cRenderStates, SVGA3dRenderState *pRenderState) 4401 4401 { 4402 4402 uint32_t val = UINT32_MAX; /* Shut up MSC. */ … … 5261 5261 } 5262 5262 5263 static intvmsvga3dBackSetRenderTarget(PVGASTATECC pThisCC, uint32_t cid, SVGA3dRenderTargetType type, SVGA3dSurfaceImageId target)5263 static DECLCALLBACK(int) vmsvga3dBackSetRenderTarget(PVGASTATECC pThisCC, uint32_t cid, SVGA3dRenderTargetType type, SVGA3dSurfaceImageId target) 5264 5264 { 5265 5265 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 5593 5593 } 5594 5594 5595 static intvmsvga3dBackSetTextureState(PVGASTATECC pThisCC, uint32_t cid, uint32_t cTextureStates, SVGA3dTextureState *pTextureState)5595 static DECLCALLBACK(int) vmsvga3dBackSetTextureState(PVGASTATECC pThisCC, uint32_t cid, uint32_t cTextureStates, SVGA3dTextureState *pTextureState) 5596 5596 { 5597 5597 GLenum val = ~(GLenum)0; /* Shut up MSC. */ … … 5927 5927 } 5928 5928 5929 static intvmsvga3dBackSetMaterial(PVGASTATECC pThisCC, uint32_t cid, SVGA3dFace face, SVGA3dMaterial *pMaterial)5929 static DECLCALLBACK(int) vmsvga3dBackSetMaterial(PVGASTATECC pThisCC, uint32_t cid, SVGA3dFace face, SVGA3dMaterial *pMaterial) 5930 5930 { 5931 5931 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 5976 5976 5977 5977 /** @todo Move into separate library as we are using logic from Wine here. */ 5978 static intvmsvga3dBackSetLightData(PVGASTATECC pThisCC, uint32_t cid, uint32_t index, SVGA3dLightData *pData)5978 static DECLCALLBACK(int) vmsvga3dBackSetLightData(PVGASTATECC pThisCC, uint32_t cid, uint32_t index, SVGA3dLightData *pData) 5979 5979 { 5980 5980 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 6149 6149 } 6150 6150 6151 static intvmsvga3dBackSetLightEnabled(PVGASTATECC pThisCC, uint32_t cid, uint32_t index, uint32_t enabled)6151 static DECLCALLBACK(int) vmsvga3dBackSetLightEnabled(PVGASTATECC pThisCC, uint32_t cid, uint32_t index, uint32_t enabled) 6152 6152 { 6153 6153 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 6185 6185 } 6186 6186 6187 static intvmsvga3dBackSetViewPort(PVGASTATECC pThisCC, uint32_t cid, SVGA3dRect *pRect)6187 static DECLCALLBACK(int) vmsvga3dBackSetViewPort(PVGASTATECC pThisCC, uint32_t cid, SVGA3dRect *pRect) 6188 6188 { 6189 6189 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 6226 6226 } 6227 6227 6228 static intvmsvga3dBackSetClipPlane(PVGASTATECC pThisCC, uint32_t cid, uint32_t index, float plane[4])6228 static DECLCALLBACK(int) vmsvga3dBackSetClipPlane(PVGASTATECC pThisCC, uint32_t cid, uint32_t index, float plane[4]) 6229 6229 { 6230 6230 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 6257 6257 } 6258 6258 6259 static intvmsvga3dBackSetScissorRect(PVGASTATECC pThisCC, uint32_t cid, SVGA3dRect *pRect)6259 static DECLCALLBACK(int) vmsvga3dBackSetScissorRect(PVGASTATECC pThisCC, uint32_t cid, SVGA3dRect *pRect) 6260 6260 { 6261 6261 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 6289 6289 } 6290 6290 6291 static intvmsvga3dBackCommandClear(PVGASTATECC pThisCC, uint32_t cid, SVGA3dClearFlag clearFlag, uint32_t color, float depth, uint32_t stencil,6291 static DECLCALLBACK(int) vmsvga3dBackCommandClear(PVGASTATECC pThisCC, uint32_t cid, SVGA3dClearFlag clearFlag, uint32_t color, float depth, uint32_t stencil, 6292 6292 uint32_t cRects, SVGA3dRect *pRect) 6293 6293 { … … 7035 7035 } 7036 7036 7037 static intvmsvga3dBackDrawPrimitives(PVGASTATECC pThisCC, uint32_t cid, uint32_t numVertexDecls, SVGA3dVertexDecl *pVertexDecl,7037 static DECLCALLBACK(int) vmsvga3dBackDrawPrimitives(PVGASTATECC pThisCC, uint32_t cid, uint32_t numVertexDecls, SVGA3dVertexDecl *pVertexDecl, 7038 7038 uint32_t numRanges, SVGA3dPrimitiveRange *pRange, uint32_t cVertexDivisor, 7039 7039 SVGA3dVertexDivisor *pVertexDivisor) … … 7351 7351 7352 7352 7353 static intvmsvga3dBackShaderDefine(PVGASTATECC pThisCC, uint32_t cid, uint32_t shid, SVGA3dShaderType type, uint32_t cbData, uint32_t *pShaderData)7353 static DECLCALLBACK(int) vmsvga3dBackShaderDefine(PVGASTATECC pThisCC, uint32_t cid, uint32_t shid, SVGA3dShaderType type, uint32_t cbData, uint32_t *pShaderData) 7354 7354 { 7355 7355 PVMSVGA3DSHADER pShader; … … 7459 7459 } 7460 7460 7461 static intvmsvga3dBackShaderDestroy(PVGASTATECC pThisCC, uint32_t cid, uint32_t shid, SVGA3dShaderType type)7461 static DECLCALLBACK(int) vmsvga3dBackShaderDestroy(PVGASTATECC pThisCC, uint32_t cid, uint32_t shid, SVGA3dShaderType type) 7462 7462 { 7463 7463 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 7508 7508 } 7509 7509 7510 static intvmsvga3dBackShaderSet(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext, uint32_t cid, SVGA3dShaderType type, uint32_t shid)7510 static DECLCALLBACK(int) vmsvga3dBackShaderSet(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext, uint32_t cid, SVGA3dShaderType type, uint32_t shid) 7511 7511 { 7512 7512 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 7579 7579 } 7580 7580 7581 static intvmsvga3dBackShaderSetConst(PVGASTATECC pThisCC, uint32_t cid, uint32_t reg, SVGA3dShaderType type, SVGA3dShaderConstType ctype, uint32_t cRegisters, uint32_t *pValues)7581 static DECLCALLBACK(int) vmsvga3dBackShaderSetConst(PVGASTATECC pThisCC, uint32_t cid, uint32_t reg, SVGA3dShaderType type, SVGA3dShaderConstType ctype, uint32_t cRegisters, uint32_t *pValues) 7582 7582 { 7583 7583 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 7671 7671 } 7672 7672 7673 static intvmsvga3dBackOcclusionQueryCreate(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext)7673 static DECLCALLBACK(int) vmsvga3dBackOcclusionQueryCreate(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext) 7674 7674 { 7675 7675 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 7685 7685 } 7686 7686 7687 static intvmsvga3dBackOcclusionQueryDelete(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext)7687 static DECLCALLBACK(int) vmsvga3dBackOcclusionQueryDelete(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext) 7688 7688 { 7689 7689 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 7698 7698 } 7699 7699 7700 static intvmsvga3dBackOcclusionQueryBegin(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext)7700 static DECLCALLBACK(int) vmsvga3dBackOcclusionQueryBegin(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext) 7701 7701 { 7702 7702 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 7709 7709 } 7710 7710 7711 static intvmsvga3dBackOcclusionQueryEnd(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext)7711 static DECLCALLBACK(int) vmsvga3dBackOcclusionQueryEnd(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext) 7712 7712 { 7713 7713 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 7720 7720 } 7721 7721 7722 static intvmsvga3dBackOcclusionQueryGetData(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext, uint32_t *pu32Pixels)7722 static DECLCALLBACK(int) vmsvga3dBackOcclusionQueryGetData(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext, uint32_t *pu32Pixels) 7723 7723 { 7724 7724 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; -
trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win-dx.cpp
r89122 r89123 187 187 188 188 189 static voidvmsvga3dBackSurfaceDestroy(PVGASTATECC pThisCC, PVMSVGA3DSURFACE pSurface);189 static DECLCALLBACK(void) vmsvga3dBackSurfaceDestroy(PVGASTATECC pThisCC, PVMSVGA3DSURFACE pSurface); 190 190 191 191 … … 1764 1764 1765 1765 1766 static intvmsvga3dBackInit(PPDMDEVINS pDevIns, PVGASTATE pThis, PVGASTATECC pThisCC)1766 static DECLCALLBACK(int) vmsvga3dBackInit(PPDMDEVINS pDevIns, PVGASTATE pThis, PVGASTATECC pThisCC) 1767 1767 { 1768 1768 RT_NOREF(pDevIns, pThis); … … 1796 1796 1797 1797 1798 static intvmsvga3dBackPowerOn(PPDMDEVINS pDevIns, PVGASTATE pThis, PVGASTATECC pThisCC)1798 static DECLCALLBACK(int) vmsvga3dBackPowerOn(PPDMDEVINS pDevIns, PVGASTATE pThis, PVGASTATECC pThisCC) 1799 1799 { 1800 1800 RT_NOREF(pDevIns, pThis); … … 1811 1811 1812 1812 1813 static intvmsvga3dBackTerminate(PVGASTATECC pThisCC)1813 static DECLCALLBACK(int) vmsvga3dBackTerminate(PVGASTATECC pThisCC) 1814 1814 { 1815 1815 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 1828 1828 1829 1829 1830 static intvmsvga3dBackReset(PVGASTATECC pThisCC)1830 static DECLCALLBACK(int) vmsvga3dBackReset(PVGASTATECC pThisCC) 1831 1831 { 1832 1832 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 1975 1975 1976 1976 1977 static intvmsvga3dBackDefineScreen(PVGASTATE pThis, PVGASTATECC pThisCC, VMSVGASCREENOBJECT *pScreen)1977 static DECLCALLBACK(int) vmsvga3dBackDefineScreen(PVGASTATE pThis, PVGASTATECC pThisCC, VMSVGASCREENOBJECT *pScreen) 1978 1978 { 1979 1979 RT_NOREF(pThis, pThisCC, pScreen); … … 2019 2019 2020 2020 2021 static intvmsvga3dBackDestroyScreen(PVGASTATECC pThisCC, VMSVGASCREENOBJECT *pScreen)2021 static DECLCALLBACK(int) vmsvga3dBackDestroyScreen(PVGASTATECC pThisCC, VMSVGASCREENOBJECT *pScreen) 2022 2022 { 2023 2023 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 2037 2037 2038 2038 2039 static intvmsvga3dBackSurfaceBlitToScreen(PVGASTATECC pThisCC, VMSVGASCREENOBJECT *pScreen,2039 static DECLCALLBACK(int) vmsvga3dBackSurfaceBlitToScreen(PVGASTATECC pThisCC, VMSVGASCREENOBJECT *pScreen, 2040 2040 SVGASignedRect destRect, SVGA3dSurfaceImageId srcImage, 2041 2041 SVGASignedRect srcRect, uint32_t cRects, SVGASignedRect *paRects) … … 2510 2510 */ 2511 2511 2512 static intvmsvga3dBackQueryCaps(PVGASTATECC pThisCC, SVGA3dDevCapIndex idx3dCaps, uint32_t *pu32Val)2512 static DECLCALLBACK(int) vmsvga3dBackQueryCaps(PVGASTATECC pThisCC, SVGA3dDevCapIndex idx3dCaps, uint32_t *pu32Val) 2513 2513 { 2514 2514 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 3068 3068 3069 3069 3070 static intvmsvga3dBackChangeMode(PVGASTATECC pThisCC)3070 static DECLCALLBACK(int) vmsvga3dBackChangeMode(PVGASTATECC pThisCC) 3071 3071 { 3072 3072 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 3077 3077 3078 3078 3079 static intvmsvga3dBackSurfaceCopy(PVGASTATECC pThisCC, SVGA3dSurfaceImageId dest, SVGA3dSurfaceImageId src,3079 static DECLCALLBACK(int) vmsvga3dBackSurfaceCopy(PVGASTATECC pThisCC, SVGA3dSurfaceImageId dest, SVGA3dSurfaceImageId src, 3080 3080 uint32_t cCopyBoxes, SVGA3dCopyBox *pBox) 3081 3081 { … … 3090 3090 3091 3091 3092 static voidvmsvga3dBackUpdateHostScreenViewport(PVGASTATECC pThisCC, uint32_t idScreen, VMSVGAVIEWPORT const *pOldViewport)3092 static DECLCALLBACK(void) vmsvga3dBackUpdateHostScreenViewport(PVGASTATECC pThisCC, uint32_t idScreen, VMSVGAVIEWPORT const *pOldViewport) 3093 3093 { 3094 3094 RT_NOREF(pThisCC, idScreen, pOldViewport); … … 3103 3103 * @param cid Context id 3104 3104 */ 3105 static intvmsvga3dBackContextDefine(PVGASTATECC pThisCC, uint32_t cid)3105 static DECLCALLBACK(int) vmsvga3dBackContextDefine(PVGASTATECC pThisCC, uint32_t cid) 3106 3106 { 3107 3107 RT_NOREF(cid); … … 3122 3122 * @param cid Context id 3123 3123 */ 3124 static intvmsvga3dBackContextDestroy(PVGASTATECC pThisCC, uint32_t cid)3124 static DECLCALLBACK(int) vmsvga3dBackContextDestroy(PVGASTATECC pThisCC, uint32_t cid) 3125 3125 { 3126 3126 RT_NOREF(cid); … … 3134 3134 3135 3135 3136 static intvmsvga3dBackSetTransform(PVGASTATECC pThisCC, uint32_t cid, SVGA3dTransformType type, float matrix[16])3136 static DECLCALLBACK(int) vmsvga3dBackSetTransform(PVGASTATECC pThisCC, uint32_t cid, SVGA3dTransformType type, float matrix[16]) 3137 3137 { 3138 3138 RT_NOREF(cid, type, matrix); … … 3146 3146 3147 3147 3148 static intvmsvga3dBackSetZRange(PVGASTATECC pThisCC, uint32_t cid, SVGA3dZRange zRange)3148 static DECLCALLBACK(int) vmsvga3dBackSetZRange(PVGASTATECC pThisCC, uint32_t cid, SVGA3dZRange zRange) 3149 3149 { 3150 3150 RT_NOREF(cid, zRange); … … 3158 3158 3159 3159 3160 static intvmsvga3dBackSetRenderState(PVGASTATECC pThisCC, uint32_t cid, uint32_t cRenderStates, SVGA3dRenderState *pRenderState)3160 static DECLCALLBACK(int) vmsvga3dBackSetRenderState(PVGASTATECC pThisCC, uint32_t cid, uint32_t cRenderStates, SVGA3dRenderState *pRenderState) 3161 3161 { 3162 3162 RT_NOREF(cid, cRenderStates, pRenderState); … … 3170 3170 3171 3171 3172 static intvmsvga3dBackSetRenderTarget(PVGASTATECC pThisCC, uint32_t cid, SVGA3dRenderTargetType type, SVGA3dSurfaceImageId target)3172 static DECLCALLBACK(int) vmsvga3dBackSetRenderTarget(PVGASTATECC pThisCC, uint32_t cid, SVGA3dRenderTargetType type, SVGA3dSurfaceImageId target) 3173 3173 { 3174 3174 RT_NOREF(cid, type, target); … … 3182 3182 3183 3183 3184 static intvmsvga3dBackSetTextureState(PVGASTATECC pThisCC, uint32_t cid, uint32_t cTextureStates, SVGA3dTextureState *pTextureState)3184 static DECLCALLBACK(int) vmsvga3dBackSetTextureState(PVGASTATECC pThisCC, uint32_t cid, uint32_t cTextureStates, SVGA3dTextureState *pTextureState) 3185 3185 { 3186 3186 RT_NOREF(cid, cTextureStates, pTextureState); … … 3194 3194 3195 3195 3196 static intvmsvga3dBackSetMaterial(PVGASTATECC pThisCC, uint32_t cid, SVGA3dFace face, SVGA3dMaterial *pMaterial)3196 static DECLCALLBACK(int) vmsvga3dBackSetMaterial(PVGASTATECC pThisCC, uint32_t cid, SVGA3dFace face, SVGA3dMaterial *pMaterial) 3197 3197 { 3198 3198 RT_NOREF(cid, face, pMaterial); … … 3206 3206 3207 3207 3208 static intvmsvga3dBackSetLightData(PVGASTATECC pThisCC, uint32_t cid, uint32_t index, SVGA3dLightData *pData)3208 static DECLCALLBACK(int) vmsvga3dBackSetLightData(PVGASTATECC pThisCC, uint32_t cid, uint32_t index, SVGA3dLightData *pData) 3209 3209 { 3210 3210 RT_NOREF(cid, index, pData); … … 3218 3218 3219 3219 3220 static intvmsvga3dBackSetLightEnabled(PVGASTATECC pThisCC, uint32_t cid, uint32_t index, uint32_t enabled)3220 static DECLCALLBACK(int) vmsvga3dBackSetLightEnabled(PVGASTATECC pThisCC, uint32_t cid, uint32_t index, uint32_t enabled) 3221 3221 { 3222 3222 RT_NOREF(cid, index, enabled); … … 3230 3230 3231 3231 3232 static intvmsvga3dBackSetViewPort(PVGASTATECC pThisCC, uint32_t cid, SVGA3dRect *pRect)3232 static DECLCALLBACK(int) vmsvga3dBackSetViewPort(PVGASTATECC pThisCC, uint32_t cid, SVGA3dRect *pRect) 3233 3233 { 3234 3234 RT_NOREF(cid, pRect); … … 3242 3242 3243 3243 3244 static intvmsvga3dBackSetClipPlane(PVGASTATECC pThisCC, uint32_t cid, uint32_t index, float plane[4])3244 static DECLCALLBACK(int) vmsvga3dBackSetClipPlane(PVGASTATECC pThisCC, uint32_t cid, uint32_t index, float plane[4]) 3245 3245 { 3246 3246 RT_NOREF(cid, index, plane); … … 3254 3254 3255 3255 3256 static intvmsvga3dBackCommandClear(PVGASTATECC pThisCC, uint32_t cid, SVGA3dClearFlag clearFlag, uint32_t color, float depth,3256 static DECLCALLBACK(int) vmsvga3dBackCommandClear(PVGASTATECC pThisCC, uint32_t cid, SVGA3dClearFlag clearFlag, uint32_t color, float depth, 3257 3257 uint32_t stencil, uint32_t cRects, SVGA3dRect *pRect) 3258 3258 { … … 3275 3275 3276 3276 3277 static intvmsvga3dBackDrawPrimitives(PVGASTATECC pThisCC, uint32_t cid, uint32_t numVertexDecls, SVGA3dVertexDecl *pVertexDecl,3277 static DECLCALLBACK(int) vmsvga3dBackDrawPrimitives(PVGASTATECC pThisCC, uint32_t cid, uint32_t numVertexDecls, SVGA3dVertexDecl *pVertexDecl, 3278 3278 uint32_t numRanges, SVGA3dPrimitiveRange *pRange, 3279 3279 uint32_t cVertexDivisor, SVGA3dVertexDivisor *pVertexDivisor) … … 3289 3289 3290 3290 3291 static intvmsvga3dBackSetScissorRect(PVGASTATECC pThisCC, uint32_t cid, SVGA3dRect *pRect)3291 static DECLCALLBACK(int) vmsvga3dBackSetScissorRect(PVGASTATECC pThisCC, uint32_t cid, SVGA3dRect *pRect) 3292 3292 { 3293 3293 RT_NOREF(cid, pRect); … … 3301 3301 3302 3302 3303 static intvmsvga3dBackGenerateMipmaps(PVGASTATECC pThisCC, uint32_t sid, SVGA3dTextureFilter filter)3303 static DECLCALLBACK(int) vmsvga3dBackGenerateMipmaps(PVGASTATECC pThisCC, uint32_t sid, SVGA3dTextureFilter filter) 3304 3304 { 3305 3305 RT_NOREF(sid, filter); … … 3313 3313 3314 3314 3315 static intvmsvga3dBackShaderDefine(PVGASTATECC pThisCC, uint32_t cid, uint32_t shid, SVGA3dShaderType type,3315 static DECLCALLBACK(int) vmsvga3dBackShaderDefine(PVGASTATECC pThisCC, uint32_t cid, uint32_t shid, SVGA3dShaderType type, 3316 3316 uint32_t cbData, uint32_t *pShaderData) 3317 3317 { … … 3326 3326 3327 3327 3328 static intvmsvga3dBackShaderDestroy(PVGASTATECC pThisCC, uint32_t cid, uint32_t shid, SVGA3dShaderType type)3328 static DECLCALLBACK(int) vmsvga3dBackShaderDestroy(PVGASTATECC pThisCC, uint32_t cid, uint32_t shid, SVGA3dShaderType type) 3329 3329 { 3330 3330 RT_NOREF(cid, shid, type); … … 3338 3338 3339 3339 3340 static intvmsvga3dBackShaderSet(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext, uint32_t cid, SVGA3dShaderType type, uint32_t shid)3340 static DECLCALLBACK(int) vmsvga3dBackShaderSet(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext, uint32_t cid, SVGA3dShaderType type, uint32_t shid) 3341 3341 { 3342 3342 RT_NOREF(pContext, cid, type, shid); … … 3350 3350 3351 3351 3352 static intvmsvga3dBackShaderSetConst(PVGASTATECC pThisCC, uint32_t cid, uint32_t reg, SVGA3dShaderType type,3352 static DECLCALLBACK(int) vmsvga3dBackShaderSetConst(PVGASTATECC pThisCC, uint32_t cid, uint32_t reg, SVGA3dShaderType type, 3353 3353 SVGA3dShaderConstType ctype, uint32_t cRegisters, uint32_t *pValues) 3354 3354 { … … 3369 3369 * @param pSurface The surface being destroyed. 3370 3370 */ 3371 static voidvmsvga3dBackSurfaceDestroy(PVGASTATECC pThisCC, PVMSVGA3DSURFACE pSurface)3371 static DECLCALLBACK(void) vmsvga3dBackSurfaceDestroy(PVGASTATECC pThisCC, PVMSVGA3DSURFACE pSurface) 3372 3372 { 3373 3373 RT_NOREF(pThisCC); … … 3421 3421 * @param pContext The VMSVGA3d context (already current for OGL). 3422 3422 */ 3423 static intvmsvga3dBackSurfaceStretchBlt(PVGASTATE pThis, PVMSVGA3DSTATE pState,3423 static DECLCALLBACK(int) vmsvga3dBackSurfaceStretchBlt(PVGASTATE pThis, PVMSVGA3DSTATE pState, 3424 3424 PVMSVGA3DSURFACE pDstSurface, uint32_t uDstFace, uint32_t uDstMipmap, SVGA3dBox const *pDstBox, 3425 3425 PVMSVGA3DSURFACE pSrcSurface, uint32_t uSrcFace, uint32_t uSrcMipmap, SVGA3dBox const *pSrcBox, … … 3453 3453 * @param iBox The current box number (for Direct 3D). 3454 3454 */ 3455 static intvmsvga3dBackSurfaceDMACopyBox(PVGASTATE pThis, PVGASTATECC pThisCC, PVMSVGA3DSTATE pState, PVMSVGA3DSURFACE pSurface,3455 static DECLCALLBACK(int) vmsvga3dBackSurfaceDMACopyBox(PVGASTATE pThis, PVGASTATECC pThisCC, PVMSVGA3DSTATE pState, PVMSVGA3DSURFACE pSurface, 3456 3456 PVMSVGA3DMIPMAPLEVEL pMipLevel, uint32_t uHostFace, uint32_t uHostMipmap, 3457 3457 SVGAGuestPtr GuestPtr, uint32_t cbGuestPitch, SVGA3dTransferType transfer, … … 3626 3626 * @param pSurface The surface to create the texture for. 3627 3627 */ 3628 static intvmsvga3dBackCreateTexture(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext, uint32_t idAssociatedContext,3628 static DECLCALLBACK(int) vmsvga3dBackCreateTexture(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext, uint32_t idAssociatedContext, 3629 3629 PVMSVGA3DSURFACE pSurface) 3630 3630 … … 3637 3637 3638 3638 3639 static intvmsvga3dBackOcclusionQueryCreate(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext)3639 static DECLCALLBACK(int) vmsvga3dBackOcclusionQueryCreate(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext) 3640 3640 { 3641 3641 RT_NOREF(pThisCC, pContext); … … 3645 3645 3646 3646 3647 static intvmsvga3dBackOcclusionQueryBegin(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext)3647 static DECLCALLBACK(int) vmsvga3dBackOcclusionQueryBegin(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext) 3648 3648 { 3649 3649 RT_NOREF(pThisCC, pContext); … … 3653 3653 3654 3654 3655 static intvmsvga3dBackOcclusionQueryEnd(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext)3655 static DECLCALLBACK(int) vmsvga3dBackOcclusionQueryEnd(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext) 3656 3656 { 3657 3657 RT_NOREF(pThisCC, pContext); … … 3661 3661 3662 3662 3663 static intvmsvga3dBackOcclusionQueryGetData(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext, uint32_t *pu32Pixels)3663 static DECLCALLBACK(int) vmsvga3dBackOcclusionQueryGetData(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext, uint32_t *pu32Pixels) 3664 3664 { 3665 3665 RT_NOREF(pThisCC, pContext); … … 3670 3670 3671 3671 3672 static intvmsvga3dBackOcclusionQueryDelete(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext)3672 static DECLCALLBACK(int) vmsvga3dBackOcclusionQueryDelete(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext) 3673 3673 { 3674 3674 RT_NOREF(pThisCC, pContext); -
trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp
r89121 r89123 159 159 *********************************************************************************************************************************/ 160 160 static void vmsvgaDumpD3DCaps(D3DCAPS9 *pCaps, D3DADAPTER_IDENTIFIER9 const *pai9); 161 static intvmsvga3dBackContextDestroy(PVGASTATECC pThisCC, uint32_t cid);162 static intvmsvga3dBackSetRenderState(PVGASTATECC pThisCC, uint32_t cid, uint32_t cRenderStates, SVGA3dRenderState *pRenderState);163 static intvmsvga3dBackSetRenderTarget(PVGASTATECC pThisCC, uint32_t cid, SVGA3dRenderTargetType type, SVGA3dSurfaceImageId target);164 static intvmsvga3dBackSetTextureState(PVGASTATECC pThisCC, uint32_t cid, uint32_t cTextureStates, SVGA3dTextureState *pTextureState);165 static intvmsvga3dBackSetViewPort(PVGASTATECC pThisCC, uint32_t cid, SVGA3dRect *pRect);166 static intvmsvga3dBackSetScissorRect(PVGASTATECC pThisCC, uint32_t cid, SVGA3dRect *pRect);167 static intvmsvga3dBackShaderDestroy(PVGASTATECC pThisCC, uint32_t cid, uint32_t shid, SVGA3dShaderType type);168 static intvmsvga3dBackShaderSet(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext, uint32_t cid, SVGA3dShaderType type, uint32_t shid);169 static intvmsvga3dBackOcclusionQueryDelete(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext);170 static intvmsvga3dBackCreateTexture(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext, uint32_t idAssociatedContext, PVMSVGA3DSURFACE pSurface);171 172 173 static intvmsvga3dBackInit(PPDMDEVINS pDevIns, PVGASTATE pThis, PVGASTATECC pThisCC)161 static DECLCALLBACK(int) vmsvga3dBackContextDestroy(PVGASTATECC pThisCC, uint32_t cid); 162 static DECLCALLBACK(int) vmsvga3dBackSetRenderState(PVGASTATECC pThisCC, uint32_t cid, uint32_t cRenderStates, SVGA3dRenderState *pRenderState); 163 static DECLCALLBACK(int) vmsvga3dBackSetRenderTarget(PVGASTATECC pThisCC, uint32_t cid, SVGA3dRenderTargetType type, SVGA3dSurfaceImageId target); 164 static DECLCALLBACK(int) vmsvga3dBackSetTextureState(PVGASTATECC pThisCC, uint32_t cid, uint32_t cTextureStates, SVGA3dTextureState *pTextureState); 165 static DECLCALLBACK(int) vmsvga3dBackSetViewPort(PVGASTATECC pThisCC, uint32_t cid, SVGA3dRect *pRect); 166 static DECLCALLBACK(int) vmsvga3dBackSetScissorRect(PVGASTATECC pThisCC, uint32_t cid, SVGA3dRect *pRect); 167 static DECLCALLBACK(int) vmsvga3dBackShaderDestroy(PVGASTATECC pThisCC, uint32_t cid, uint32_t shid, SVGA3dShaderType type); 168 static DECLCALLBACK(int) vmsvga3dBackShaderSet(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext, uint32_t cid, SVGA3dShaderType type, uint32_t shid); 169 static DECLCALLBACK(int) vmsvga3dBackOcclusionQueryDelete(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext); 170 static DECLCALLBACK(int) vmsvga3dBackCreateTexture(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext, uint32_t idAssociatedContext, PVMSVGA3DSURFACE pSurface); 171 172 173 static DECLCALLBACK(int) vmsvga3dBackInit(PPDMDEVINS pDevIns, PVGASTATE pThis, PVGASTATECC pThisCC) 174 174 { 175 175 RT_NOREF(pDevIns, pThis); … … 198 198 } 199 199 200 static intvmsvga3dBackPowerOn(PPDMDEVINS pDevIns, PVGASTATE pThis, PVGASTATECC pThisCC)200 static DECLCALLBACK(int) vmsvga3dBackPowerOn(PPDMDEVINS pDevIns, PVGASTATE pThis, PVGASTATECC pThisCC) 201 201 { 202 202 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 287 287 } 288 288 289 static intvmsvga3dBackReset(PVGASTATECC pThisCC)289 static DECLCALLBACK(int) vmsvga3dBackReset(PVGASTATECC pThisCC) 290 290 { 291 291 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 308 308 } 309 309 310 static intvmsvga3dBackTerminate(PVGASTATECC pThisCC)310 static DECLCALLBACK(int) vmsvga3dBackTerminate(PVGASTATECC pThisCC) 311 311 { 312 312 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 327 327 } 328 328 329 static voidvmsvga3dBackUpdateHostScreenViewport(PVGASTATECC pThisCC, uint32_t idScreen, VMSVGAVIEWPORT const *pOldViewport)329 static DECLCALLBACK(void) vmsvga3dBackUpdateHostScreenViewport(PVGASTATECC pThisCC, uint32_t idScreen, VMSVGAVIEWPORT const *pOldViewport) 330 330 { 331 331 /** @todo Scroll the screen content without requiring the guest to redraw. */ … … 434 434 435 435 436 static intvmsvga3dBackQueryCaps(PVGASTATECC pThisCC, SVGA3dDevCapIndex idx3dCaps, uint32_t *pu32Val)436 static DECLCALLBACK(int) vmsvga3dBackQueryCaps(PVGASTATECC pThisCC, SVGA3dDevCapIndex idx3dCaps, uint32_t *pu32Val) 437 437 { 438 438 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 1110 1110 * @param pSurface The surface being destroyed. 1111 1111 */ 1112 static voidvmsvga3dBackSurfaceDestroy(PVGASTATECC pThisCC, PVMSVGA3DSURFACE pSurface)1112 static DECLCALLBACK(void) vmsvga3dBackSurfaceDestroy(PVGASTATECC pThisCC, PVMSVGA3DSURFACE pSurface) 1113 1113 { 1114 1114 RT_NOREF(pThisCC); … … 1488 1488 } 1489 1489 1490 static intvmsvga3dBackSurfaceCopy(PVGASTATECC pThisCC, SVGA3dSurfaceImageId dest, SVGA3dSurfaceImageId src,1490 static DECLCALLBACK(int) vmsvga3dBackSurfaceCopy(PVGASTATECC pThisCC, SVGA3dSurfaceImageId dest, SVGA3dSurfaceImageId src, 1491 1491 uint32_t cCopyBoxes, SVGA3dCopyBox *pBox) 1492 1492 { … … 1846 1846 * @param pSurface The surface to create the texture for. 1847 1847 */ 1848 static intvmsvga3dBackCreateTexture(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext, uint32_t idAssociatedContext,1848 static DECLCALLBACK(int) vmsvga3dBackCreateTexture(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext, uint32_t idAssociatedContext, 1849 1849 PVMSVGA3DSURFACE pSurface) 1850 1850 … … 2271 2271 * @param pContext The VMSVGA3d context (already current for OGL). 2272 2272 */ 2273 static intvmsvga3dBackSurfaceStretchBlt(PVGASTATE pThis, PVMSVGA3DSTATE pState,2273 static DECLCALLBACK(int) vmsvga3dBackSurfaceStretchBlt(PVGASTATE pThis, PVMSVGA3DSTATE pState, 2274 2274 PVMSVGA3DSURFACE pDstSurface, uint32_t uDstFace, uint32_t uDstMipmap, SVGA3dBox const *pDstBox, 2275 2275 PVMSVGA3DSURFACE pSrcSurface, uint32_t uSrcFace, uint32_t uSrcMipmap, SVGA3dBox const *pSrcBox, … … 2361 2361 * @param iBox The current box number (for Direct 3D). 2362 2362 */ 2363 static intvmsvga3dBackSurfaceDMACopyBox(PVGASTATE pThis, PVGASTATECC pThisCC, PVMSVGA3DSTATE pState, PVMSVGA3DSURFACE pSurface,2363 static DECLCALLBACK(int) vmsvga3dBackSurfaceDMACopyBox(PVGASTATE pThis, PVGASTATECC pThisCC, PVMSVGA3DSTATE pState, PVMSVGA3DSURFACE pSurface, 2364 2364 PVMSVGA3DMIPMAPLEVEL pMipLevel, uint32_t uHostFace, uint32_t uHostMipmap, 2365 2365 SVGAGuestPtr GuestPtr, uint32_t cbGuestPitch, SVGA3dTransferType transfer, … … 2525 2525 } 2526 2526 2527 static intvmsvga3dBackGenerateMipmaps(PVGASTATECC pThisCC, uint32_t sid, SVGA3dTextureFilter filter)2527 static DECLCALLBACK(int) vmsvga3dBackGenerateMipmaps(PVGASTATECC pThisCC, uint32_t sid, SVGA3dTextureFilter filter) 2528 2528 { 2529 2529 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 2579 2579 * @param cid Context id 2580 2580 */ 2581 static intvmsvga3dBackContextDefine(PVGASTATECC pThisCC, uint32_t cid)2581 static DECLCALLBACK(int) vmsvga3dBackContextDefine(PVGASTATECC pThisCC, uint32_t cid) 2582 2582 { 2583 2583 int rc; … … 2686 2686 * @param cid Context id 2687 2687 */ 2688 static intvmsvga3dBackContextDestroy(PVGASTATECC pThisCC, uint32_t cid)2688 static DECLCALLBACK(int) vmsvga3dBackContextDestroy(PVGASTATECC pThisCC, uint32_t cid) 2689 2689 { 2690 2690 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 2826 2826 } 2827 2827 2828 static intvmsvga3dBackDefineScreen(PVGASTATE pThis, PVGASTATECC pThisCC, VMSVGASCREENOBJECT *pScreen)2828 static DECLCALLBACK(int) vmsvga3dBackDefineScreen(PVGASTATE pThis, PVGASTATECC pThisCC, VMSVGASCREENOBJECT *pScreen) 2829 2829 { 2830 2830 RT_NOREF(pThis, pThisCC, pScreen); … … 2832 2832 } 2833 2833 2834 static intvmsvga3dBackDestroyScreen(PVGASTATECC pThisCC, VMSVGASCREENOBJECT *pScreen)2834 static DECLCALLBACK(int) vmsvga3dBackDestroyScreen(PVGASTATECC pThisCC, VMSVGASCREENOBJECT *pScreen) 2835 2835 { 2836 2836 RT_NOREF(pThisCC, pScreen); … … 2838 2838 } 2839 2839 2840 static intvmsvga3dBackSurfaceBlitToScreen(PVGASTATECC pThisCC, VMSVGASCREENOBJECT *pScreen,2840 static DECLCALLBACK(int) vmsvga3dBackSurfaceBlitToScreen(PVGASTATECC pThisCC, VMSVGASCREENOBJECT *pScreen, 2841 2841 SVGASignedRect destRect, SVGA3dSurfaceImageId srcImage, 2842 2842 SVGASignedRect srcRect, uint32_t cRects, SVGASignedRect *paRects) … … 2866 2866 2867 2867 /* Handle resize */ 2868 static intvmsvga3dBackChangeMode(PVGASTATECC pThisCC)2868 static DECLCALLBACK(int) vmsvga3dBackChangeMode(PVGASTATECC pThisCC) 2869 2869 { 2870 2870 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 3111 3111 3112 3112 3113 static intvmsvga3dBackSetTransform(PVGASTATECC pThisCC, uint32_t cid, SVGA3dTransformType type, float matrix[16])3113 static DECLCALLBACK(int) vmsvga3dBackSetTransform(PVGASTATECC pThisCC, uint32_t cid, SVGA3dTransformType type, float matrix[16]) 3114 3114 { 3115 3115 D3DTRANSFORMSTATETYPE d3dState; … … 3191 3191 } 3192 3192 3193 static intvmsvga3dBackSetZRange(PVGASTATECC pThisCC, uint32_t cid, SVGA3dZRange zRange)3193 static DECLCALLBACK(int) vmsvga3dBackSetZRange(PVGASTATECC pThisCC, uint32_t cid, SVGA3dZRange zRange) 3194 3194 { 3195 3195 D3DVIEWPORT9 viewport; … … 3264 3264 } 3265 3265 3266 static intvmsvga3dBackSetRenderState(PVGASTATECC pThisCC, uint32_t cid, uint32_t cRenderStates, SVGA3dRenderState *pRenderState)3266 static DECLCALLBACK(int) vmsvga3dBackSetRenderState(PVGASTATECC pThisCC, uint32_t cid, uint32_t cRenderStates, SVGA3dRenderState *pRenderState) 3267 3267 { 3268 3268 DWORD val = 0; /* Shut up MSC */ … … 3931 3931 } 3932 3932 3933 static intvmsvga3dBackSetRenderTarget(PVGASTATECC pThisCC, uint32_t cid, SVGA3dRenderTargetType type, SVGA3dSurfaceImageId target)3933 static DECLCALLBACK(int) vmsvga3dBackSetRenderTarget(PVGASTATECC pThisCC, uint32_t cid, SVGA3dRenderTargetType type, SVGA3dSurfaceImageId target) 3934 3934 { 3935 3935 HRESULT hr; … … 4357 4357 } 4358 4358 4359 static intvmsvga3dBackSetTextureState(PVGASTATECC pThisCC, uint32_t cid, uint32_t cTextureStates, SVGA3dTextureState *pTextureState)4359 static DECLCALLBACK(int) vmsvga3dBackSetTextureState(PVGASTATECC pThisCC, uint32_t cid, uint32_t cTextureStates, SVGA3dTextureState *pTextureState) 4360 4360 { 4361 4361 DWORD val = 0; /* Shut up MSC */ … … 4650 4650 } 4651 4651 4652 static intvmsvga3dBackSetMaterial(PVGASTATECC pThisCC, uint32_t cid, SVGA3dFace face, SVGA3dMaterial *pMaterial)4652 static DECLCALLBACK(int) vmsvga3dBackSetMaterial(PVGASTATECC pThisCC, uint32_t cid, SVGA3dFace face, SVGA3dMaterial *pMaterial) 4653 4653 { 4654 4654 HRESULT hr; … … 4701 4701 } 4702 4702 4703 static intvmsvga3dBackSetLightData(PVGASTATECC pThisCC, uint32_t cid, uint32_t index, SVGA3dLightData *pData)4703 static DECLCALLBACK(int) vmsvga3dBackSetLightData(PVGASTATECC pThisCC, uint32_t cid, uint32_t index, SVGA3dLightData *pData) 4704 4704 { 4705 4705 HRESULT hr; … … 4772 4772 } 4773 4773 4774 static intvmsvga3dBackSetLightEnabled(PVGASTATECC pThisCC, uint32_t cid, uint32_t index, uint32_t enabled)4774 static DECLCALLBACK(int) vmsvga3dBackSetLightEnabled(PVGASTATECC pThisCC, uint32_t cid, uint32_t index, uint32_t enabled) 4775 4775 { 4776 4776 HRESULT hr; … … 4795 4795 } 4796 4796 4797 static intvmsvga3dBackSetViewPort(PVGASTATECC pThisCC, uint32_t cid, SVGA3dRect *pRect)4797 static DECLCALLBACK(int) vmsvga3dBackSetViewPort(PVGASTATECC pThisCC, uint32_t cid, SVGA3dRect *pRect) 4798 4798 { 4799 4799 HRESULT hr; … … 4828 4828 } 4829 4829 4830 static intvmsvga3dBackSetClipPlane(PVGASTATECC pThisCC, uint32_t cid, uint32_t index, float plane[4])4830 static DECLCALLBACK(int) vmsvga3dBackSetClipPlane(PVGASTATECC pThisCC, uint32_t cid, uint32_t index, float plane[4]) 4831 4831 { 4832 4832 HRESULT hr; … … 4851 4851 } 4852 4852 4853 static intvmsvga3dBackCommandClear(PVGASTATECC pThisCC, uint32_t cid, SVGA3dClearFlag clearFlag, uint32_t color, float depth,4853 static DECLCALLBACK(int) vmsvga3dBackCommandClear(PVGASTATECC pThisCC, uint32_t cid, SVGA3dClearFlag clearFlag, uint32_t color, float depth, 4854 4854 uint32_t stencil, uint32_t cRects, SVGA3dRect *pRect) 4855 4855 { … … 5129 5129 } 5130 5130 5131 static intvmsvga3dBackDrawPrimitives(PVGASTATECC pThisCC, uint32_t cid, uint32_t numVertexDecls, SVGA3dVertexDecl *pVertexDecl,5131 static DECLCALLBACK(int) vmsvga3dBackDrawPrimitives(PVGASTATECC pThisCC, uint32_t cid, uint32_t numVertexDecls, SVGA3dVertexDecl *pVertexDecl, 5132 5132 uint32_t numRanges, SVGA3dPrimitiveRange *pRange, 5133 5133 uint32_t cVertexDivisor, SVGA3dVertexDivisor *pVertexDivisor) … … 5481 5481 5482 5482 5483 static intvmsvga3dBackSetScissorRect(PVGASTATECC pThisCC, uint32_t cid, SVGA3dRect *pRect)5483 static DECLCALLBACK(int) vmsvga3dBackSetScissorRect(PVGASTATECC pThisCC, uint32_t cid, SVGA3dRect *pRect) 5484 5484 { 5485 5485 HRESULT hr; … … 5511 5511 5512 5512 5513 static intvmsvga3dBackShaderDefine(PVGASTATECC pThisCC, uint32_t cid, uint32_t shid, SVGA3dShaderType type,5513 static DECLCALLBACK(int) vmsvga3dBackShaderDefine(PVGASTATECC pThisCC, uint32_t cid, uint32_t shid, SVGA3dShaderType type, 5514 5514 uint32_t cbData, uint32_t *pShaderData) 5515 5515 { … … 5620 5620 } 5621 5621 5622 static intvmsvga3dBackShaderDestroy(PVGASTATECC pThisCC, uint32_t cid, uint32_t shid, SVGA3dShaderType type)5622 static DECLCALLBACK(int) vmsvga3dBackShaderDestroy(PVGASTATECC pThisCC, uint32_t cid, uint32_t shid, SVGA3dShaderType type) 5623 5623 { 5624 5624 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 5666 5666 } 5667 5667 5668 static intvmsvga3dBackShaderSet(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext, uint32_t cid, SVGA3dShaderType type, uint32_t shid)5668 static DECLCALLBACK(int) vmsvga3dBackShaderSet(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext, uint32_t cid, SVGA3dShaderType type, uint32_t shid) 5669 5669 { 5670 5670 PVMSVGA3DSTATE pState = pThisCC->svga.p3dState; … … 5734 5734 } 5735 5735 5736 static intvmsvga3dBackShaderSetConst(PVGASTATECC pThisCC, uint32_t cid, uint32_t reg, SVGA3dShaderType type,5736 static DECLCALLBACK(int) vmsvga3dBackShaderSetConst(PVGASTATECC pThisCC, uint32_t cid, uint32_t reg, SVGA3dShaderType type, 5737 5737 SVGA3dShaderConstType ctype, uint32_t cRegisters, uint32_t *pValues) 5738 5738 { … … 5828 5828 } 5829 5829 5830 static intvmsvga3dBackOcclusionQueryCreate(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext)5830 static DECLCALLBACK(int) vmsvga3dBackOcclusionQueryCreate(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext) 5831 5831 { 5832 5832 RT_NOREF(pThisCC); … … 5836 5836 } 5837 5837 5838 static intvmsvga3dBackOcclusionQueryDelete(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext)5838 static DECLCALLBACK(int) vmsvga3dBackOcclusionQueryDelete(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext) 5839 5839 { 5840 5840 RT_NOREF(pThisCC); … … 5843 5843 } 5844 5844 5845 static intvmsvga3dBackOcclusionQueryBegin(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext)5845 static DECLCALLBACK(int) vmsvga3dBackOcclusionQueryBegin(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext) 5846 5846 { 5847 5847 RT_NOREF(pThisCC); … … 5852 5852 } 5853 5853 5854 static intvmsvga3dBackOcclusionQueryEnd(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext)5854 static DECLCALLBACK(int) vmsvga3dBackOcclusionQueryEnd(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext) 5855 5855 { 5856 5856 RT_NOREF(pThisCC); … … 5861 5861 } 5862 5862 5863 static intvmsvga3dBackOcclusionQueryGetData(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext, uint32_t *pu32Pixels)5863 static DECLCALLBACK(int) vmsvga3dBackOcclusionQueryGetData(PVGASTATECC pThisCC, PVMSVGA3DCONTEXT pContext, uint32_t *pu32Pixels) 5864 5864 { 5865 5865 RT_NOREF(pThisCC);
Note:
See TracChangeset
for help on using the changeset viewer.