Struct, Interface and param updates.

d3d9sdlgraphics.mod/d3d9sdlgraphics.bmx

@@ -31,12 +31,12 @@ Global _autoRelease:TList
 Global _d3dOccQuery:IDirect3DQuery9
 
 Type TD3D9AutoRelease
-	Field unk:IUnknown
+	Field unk:IUnknown_
 End Type
 
 Function OpenD3DDevice:Int( hwnd:Byte Ptr,width:Int,height:Int,depth:Int,hertz:Int,flags:Int)
 	If _d3dDevRefs
-		If Not _presentParams.GetWindowed() Return False
+		If Not _presentParams.Windowed Return False
 		If depth<>0 Return False
 		_d3dDevRefs:+1
 		Return True
@@ -45,22 +45,22 @@ Function OpenD3DDevice:Int( hwnd:Byte Ptr,width:Int,height:Int,depth:Int,hertz:I
 	Local windowed:Int=(depth=0)
 	Local fullscreen:Int=(depth<>0)	
 
-	Local pp:D3DPRESENT_PARAMETERS=New D3DPRESENT_PARAMETERS
-	pp.SetBackBufferWidth(width)
-	pp.SetBackBufferHeight(height)
-	pp.SetBackBufferCount(1)
-	pp.SetBackBufferFormat((D3DFMT_X8R8G8B8 * fullscreen) + (D3DFMT_UNKNOWN * windowed))
-	pp.SetMultiSampleType(D3DMULTISAMPLE_NONE)
-	pp.SetSwapEffect((D3DSWAPEFFECT_DISCARD * fullscreen) + (D3DSWAPEFFECT_COPY * windowed))
-	pp.SethDeviceWindow(hwnd)
-	pp.SetWindowed(windowed)
-	pp.SetFlags(D3DPRESENTFLAG_LOCKABLE_BACKBUFFER)
-	pp.SetFullScreen_RefreshRateInHz(hertz * fullscreen)
-	pp.SetPresentationInterval(D3DPRESENT_INTERVAL_ONE)	'IMMEDIATE
+	Local pp:D3DPRESENT_PARAMETERS
+	pp.BackBufferWidth = width
+	pp.BackBufferHeight = height
+	pp.BackBufferCount = 1
+	pp.BackBufferFormat = (D3DFMT_X8R8G8B8 * fullscreen) + (D3DFMT_UNKNOWN * windowed)
+	pp.MultiSampleType = D3DMULTISAMPLE_NONE
+	pp.SwapEffect = (D3DSWAPEFFECT_DISCARD * fullscreen) + (D3DSWAPEFFECT_COPY * windowed)
+	pp.hDeviceWindow = hwnd
+	pp.Windowed = windowed
+	pp.Flags = D3DPRESENTFLAG_LOCKABLE_BACKBUFFER
+	pp.FullScreen_RefreshRateInHz = hertz * fullscreen
+	pp.PresentationInterval = D3DPRESENT_INTERVAL_ONE	'IMMEDIATE
 	
 	Local cflags:Int=D3DCREATE_FPU_PRESERVE
 	
-	_d3dDev = New IDirect3DDevice9
+	'_d3dDev = New IDirect3DDevice9
 	
 	'OK, try hardware vertex processing...
 	Local tflags:Int=D3DCREATE_PUREDEVICE|D3DCREATE_HARDWARE_VERTEXPROCESSING|cflags
@@ -89,7 +89,7 @@ Function OpenD3DDevice:Int( hwnd:Byte Ptr,width:Int,height:Int,depth:Int,hertz:I
 
 	'Occlusion Query
 	If Not _d3dOccQuery
-		_d3dOccQuery = New IDirect3DQuery9
+		'_d3dOccQuery = New IDirect3DQuery9
 		If _d3ddev.CreateQuery(9,_d3dOccQuery)<0 '9 hardcoded for D3DQUERYTYPE_OCCLUSION
 			DebugLog "Cannot create Occlussion Query!"
 			_d3dOccQuery = Null
@@ -114,7 +114,7 @@ Function CloseD3DDevice()
 
 		_d3dDev.Release_
 		_d3dDev=Null
-		_presentParams=Null
+		'_presentParams=Null
 	EndIf
 End Function
 
@@ -122,10 +122,10 @@ Function ResetD3DDevice()
 	If _d3dOccQuery
 		_d3dOccQuery.Release_
 	Else
-		_d3dOccQuery = New IDirect3DQuery9
+		'_d3dOccQuery = New IDirect3DQuery9
 	End If
 	
-	If _d3dDev.Reset( _presentParams )<0
+	If _d3dDev.Reset( _presentParams)<0
 		Throw "_d3dDev.Reset failed"
 	EndIf
 
@@ -199,9 +199,9 @@ Type TD3D9SDLGraphics Extends TGraphics
 			GetClientRect _hwnd,rect
 			_width=rect[2]-rect[0]
 			_height=rect[3]-rect[1]
-			If _width>_presentParams.GetBackBufferWidth() Or _height>_presentParams.GetBackBufferHeight()
-				_presentParams.SetBackBufferWidth(Max( _width,_presentParams.GetBackBufferWidth()) )
-				_presentParams.SetBackBufferHeight(Max( _height,_presentParams.GetBackbufferHeight()) )
+			If _width>_presentParams.BackBufferWidth Or _height>_presentParams.BackBufferHeight
+				_presentParams.BackBufferWidth = Max( _width,_presentParams.BackBufferWidth) 
+				_presentParams.BackBufferHeight = Max( _height,_presentParams.BackbufferHeight)
 				ResetD3DDevice
 			EndIf
 		EndIf
@@ -213,8 +213,8 @@ Type TD3D9SDLGraphics Extends TGraphics
 		Local reset:Int
 
 		If sync sync=D3DPRESENT_INTERVAL_ONE Else sync=D3DPRESENT_INTERVAL_IMMEDIATE
-		If sync<>_presentParams.GetPresentationInterval()
-			_presentParams.SetPresentationInterval(sync)
+		If sync<>_presentParams.PresentationInterval
+			_presentParams.PresentationInterval = sync
 			reset=True
 		EndIf
 		
@@ -265,13 +265,13 @@ Type TD3D9SDLGraphics Extends TGraphics
 		_hwnd=0
 	End Method
 
-	Method AutoRelease( unk:IUnknown )
+	Method AutoRelease( unk:IUnknown_ )
 		Local t:TD3D9AutoRelease=New TD3D9AutoRelease
 		t.unk=unk
 		_autoRelease.AddLast t
 	End Method
 	
-	Method ReleaseNow( unk:IUnknown )
+	Method ReleaseNow( unk:IUnknown_ )
 		For Local t:TD3D9AutoRelease=EachIn _autoRelease
 			If t.unk=unk
 				unk.Release_
@@ -306,7 +306,7 @@ Type TD3D9SDLGraphicsDriver Extends TGraphicsDriver
 		If Not _d3d Return Null
 
 		'get caps
-		_d3dCaps=New D3DCAPS9
+		'_d3dCaps=New D3DCAPS9
 		If _d3d.GetDeviceCaps( D3DADAPTER_DEFAULT,D3DDEVTYPE_HAL,_d3dCaps )<0
 			_d3d.Release_
 			_d3d=Null
@@ -317,16 +317,16 @@ Type TD3D9SDLGraphicsDriver Extends TGraphicsDriver
 		Local n:Int=_d3d.GetAdapterModeCount( D3DADAPTER_DEFAULT,D3DFMT_X8R8G8B8 )
 		_modes=New TGraphicsMode[n]
 		Local j:Int
-		Local d3dmode:D3DDISPLAYMODE = New D3DDISPLAYMODE
+		Local d3dmode:D3DDISPLAYMODE' = New D3DDISPLAYMODE
 		For Local i:Int=0 Until n
 			If _d3d.EnumAdapterModes( D3DADAPTER_DEFAULT,D3DFMT_X8R8G8B8,i,d3dmode )<0
 				Continue
 			EndIf
 			
 			Local Mode:TGraphicsMode=New TGraphicsMode
-			Mode.width=d3dmode.GetWidth()
-			Mode.height=d3dmode.GetHeight()
-			Mode.hertz=d3dmode.GetRefreshRate()
+			Mode.width=d3dmode.Width
+			Mode.height=d3dmode.Height
+			Mode.hertz=d3dmode.RefreshRate
 			Mode.depth=32
 			_modes[j]=Mode
 			j:+1

d3d9sdlmax2d.mod/d3d9sdlmax2d.bmx

@@ -105,7 +105,7 @@ Type TD3D9ImageFrame Extends TImageFrame
 		Local usage=0
 		Local pool=D3DPOOL_MANAGED
 		
-		_texture = New IDirect3DTexture9
+		'_texture = New IDirect3DTexture9
 		If _d3dDev.CreateTexture( pow2width,pow2height,levels,usage,format,pool,_texture,Null )<0
 			d3derr "Unable to create texture~n"
 			_texture = Null
@@ -115,7 +115,7 @@ Type TD3D9ImageFrame Extends TImageFrame
 		_d3d9Graphics.AutoRelease _texture
 
 		Local level
-		Local dstsurf:IDirect3DSurface9 = New IDirect3DSurface9
+		Local dstsurf:IDirect3DSurface9' = New IDirect3DSurface9
 		Repeat
 			If _texture.GetSurfaceLevel( level,dstsurf )<0
 				If level=0
@@ -320,13 +320,13 @@ Type TD3D9SDLMax2DDriver Extends TMax2dDriver
 		_d3d9graphics.ValidateSize
 		_d3d9graphics.GetSettings _gw,_gh,_gd,_gr,_gf
 	
-		Local viewport:D3DVIEWPORT9=New D3DVIEWPORT9
-		viewport.SetX(0)
-		viewport.SetY(0)
-		viewport.SetWidth(_gw)
-		viewport.SetHeight(_gh)
-		viewport.SetMinZ(0.0)
-		viewport.SetMaxZ(1.0)
+		Local viewport:D3DVIEWPORT9
+		viewport.X = 0
+		viewport.Y = 0
+		viewport.Width = _gw
+		viewport.Height = _gh
+		viewport.MinZ = 0.0
+		viewport.MaxZ = 1.0
 		_d3dDev.SetViewport viewport
 
 		_d3dDev.SetRenderState D3DRS_ALPHAREF,$80
@@ -546,13 +546,13 @@ Type TD3D9SDLMax2DDriver Extends TMax2dDriver
 	Method DrawPixmap( pixmap:TPixmap,x,y )
 		Local width=pixmap.width,height=pixmap.height
 	
-		Local dstsurf:IDirect3DSurface9 = New IDirect3DSurface9
+		Local dstsurf:IDirect3DSurface9' = New IDirect3DSurface9
 		If _d3dDev.GetRenderTarget( 0,dstsurf )<0
 			d3derr "GetRenderTarget failed~n"
 			Return
 		EndIf
 		
-		Local desc:D3DSURFACE_DESC=New D3DSURFACE_DESC
+		Local desc:D3DSURFACE_DESC
 		If dstsurf.GetDesc( desc )<0
 			d3derr "GetDesc failed~n"
 		EndIf