Changeset 657 for OGRE/trunk/ogre_changes/RenderSystems/Direct3D9/src/OgreD3D9RenderWindow.cpp

Timestamp:

02/20/06 19:06:03 (18 years ago)

Author:

mattausch

Message:

added ogre dependencies and patched ogre sources

File:

• OGRE/trunk/ogre_changes/RenderSystems/Direct3D9/src/OgreD3D9RenderWindow.cpp (modified) (5 diffs)

OGRE/trunk/ogre_changes/RenderSystems/Direct3D9/src/OgreD3D9RenderWindow.cpp

@@ -110 +110 @@
         D3D9RenderWindow::~D3D9RenderWindow()
         {
-                // access and update device through driver, realse only primary
-                if (!mIsSwapChain) 
-                {
-                        LPDIRECT3DDEVICE9 mpD3DDevice = mDriver->getD3DDevice();
-                        SAFE_RELEASE( mpD3DDevice );
-                        mDriver->setD3DDevice( NULL );
-                }
+                destroyD3DResources();
         }
 
@@ -342 +336 @@
                 md3dpp.BackBufferHeight                 = mHeight;
 
-#ifdef GTP_VISIBILITY_MODIFIED_OGRE
-        //md3dpp.Flags |= D3DPRESENTFLAG_LOCKABLE_BACKBUFFER;
-#endif
                 if (mVSync)
                         md3dpp.PresentationInterval = D3DPRESENT_INTERVAL_ONE;
@@ -493 +484 @@
                         // ignore depth buffer, access device through driver
                         mpRenderZBuffer = 0;
-                        LPDIRECT3DDEVICE9 mpD3DDevice = mDriver->getD3DDevice();
-                        SAFE_RELEASE(mpD3DDevice);
-                        mDriver->setD3DDevice(NULL);
                 }
         }
@@ -727 +715 @@
                 }
 
-                if (!mIsFullScreen)
-                {
-                        POINT pt={0, 0};
+                D3DLOCKED_RECT lockedRect;
+                if(mIsFullScreen)
+                {
+                        if (FAILED(hr = pTempSurf->LockRect(&lockedRect, NULL, 
+                        D3DLOCK_READONLY | D3DLOCK_NOSYSLOCK)))
+                        {
+                                OGRE_EXCEPT(hr, "can't lock rect!", "D3D9RenderWindow::writeContentsToFile");
+                        } 
+                }
+                else
+                {
                         RECT srcRect;
                         GetWindowRect(mHWnd, &srcRect);
@@ -735 +731 @@
                         desc.Width = srcRect.right - srcRect.left;
                         desc.Height = srcRect.bottom - srcRect.top;
-                        desc.Format = D3DFMT_A8R8G8B8;         // this is what we get from the screen, so stick with it
-
-                        // NB we can't lock the back buffer direct because it's no created that way
-                        // and to do so hits performance, so copy to another surface
-                        // Must be the same format as the source surface
-                        if (FAILED(hr = mpD3DDevice->CreateOffscreenPlainSurface(
-                                                        desc.Width, 
-                                                        desc.Height, 
-                                                        desc.Format, 
-                                                        D3DPOOL_DEFAULT, 
-                                                        &pSurf,
-                                                        NULL)))
-                        {
-                                SAFE_RELEASE(pSurf);
-                                OGRE_EXCEPT(hr, "Cannot create offscreen buffer 2!", "D3D9RenderWindow::writeContentsToFile");
-                        }
-
-                        // Copy
-                        if (FAILED(hr = mpD3DDevice->UpdateSurface(pTempSurf, &srcRect, pSurf, &pt)))
-                        {
-                                SAFE_RELEASE(pTempSurf);
-                                SAFE_RELEASE(pSurf);
-                                OGRE_EXCEPT(hr, "Cannot update surface!", "D3D9RenderWindow::writeContentsToFile");
-                        }
-
-                        SAFE_RELEASE(pTempSurf);
-                        pTempSurf = pSurf;
-                        pSurf = NULL;
-                }
-
-                D3DLOCKED_RECT lockedRect;
-                if (FAILED(hr = pTempSurf->LockRect(&lockedRect, NULL, 
+
+                        if (FAILED(hr = pTempSurf->LockRect(&lockedRect, &srcRect, 
+
                         D3DLOCK_READONLY | D3DLOCK_NOSYSLOCK)))
                 {
                         OGRE_EXCEPT(hr, "can't lock rect!", "D3D9RenderWindow::writeContentsToFile");
                 } 
+                }
 
         ImageCodec::ImageData *imgData = new ImageCodec::ImageData();