Changeset 657 for OGRE/trunk/ogre_changes/RenderSystems/Direct3D7

Timestamp:

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

Author:

mattausch

Message:

added ogre dependencies and patched ogre sources

Location:

OGRE/trunk/ogre_changes/RenderSystems/Direct3D7

Files:

• include/OgreD3D7RenderWindow.h (modified) (2 diffs)
• include/OgreD3D7Texture.h (modified) (3 diffs)
• src/OgreD3D7RenderWindow.cpp (modified) (9 diffs)

OGRE/trunk/ogre_changes/RenderSystems/Direct3D7/include/OgreD3D7RenderWindow.h

@@ -119 +119 @@
         */
         void writeContentsToFile(const String& filename);
-
+        // DirectDraw Methods
+                void createDDSurfaces(void);
+                void releaseDDSurfaces(void);
+                void restoreDDSurfaces(void);
+                void createDepthBuffer(void);
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
                 uchar *getBufferContents(int &dimx, int &dimy);
@@ -159 +163 @@
         LPDIRECT3DDEVICE7 mlpD3DDevice;
 
-        // DirectDraw Methods
-        void createDDSurfaces(void);
-        void releaseDDSurfaces(void);
-        void restoreDDSurfaces(void);
-        void createDepthBuffer(void);
 
         // Method for dealing with resize / move & 3d library

OGRE/trunk/ogre_changes/RenderSystems/Direct3D7/include/OgreD3D7Texture.h

@@ -53 +53 @@
         LPDIRECTDRAWSURFACE7 getDDSurface(void);
 
-        /// @copydoc Texture::createInternalResources
-        void createInternalResources(void);
-
                 /// @copydoc Texture::getBuffer
                 HardwarePixelBufferSharedPtr getBuffer(size_t face, size_t mipmap);
@@ -63 +60 @@
                 static PixelFormat closestD3DXFormat( PixelFormat format );
                 static bool OgreFormat_to_DDPixelFormat( PixelFormat format, DDPIXELFORMAT & out );
+
+                /// Restore this texture from a lost device
+                void restoreFromLostDevice(void);
+
     protected:
         IDirect3DDevice7 * mD3DDevice;       ///< A pointer to the Direct3D device.
@@ -71 +72 @@
                 typedef std::vector<HardwarePixelBufferSharedPtr> SurfaceList;
                 SurfaceList                                             mSurfaceList;
+                /// Are we restoring from a lost device?
+                bool mRestoring;
+
         
 
         /// @copydoc Resource::loadImpl
         void loadImpl(void);
-        /// @copydoc Resource::unloadImpl
-        void unloadImpl(void);
+                /// @copydoc Texture::createInternalResourcesImpl
+                void createInternalResourcesImpl(void);
+        /// @copydoc Resource::freeInternalResourcesImpl
+        void freeInternalResourcesImpl(void);
                 
                 void createSurface2D(void);

OGRE/trunk/ogre_changes/RenderSystems/Direct3D7/src/OgreD3D7RenderWindow.cpp

@@ -96 +96 @@
                 break;
 
-            case WM_MOVE:
-                // Move messages need to be tracked to update the screen rects
-                // used for blitting the backbuffer to the primary.
-                if(win->mActive && win->mReady)
-                    win->windowMovedOrResized();
-                break;
-
             case WM_ENTERSIZEMOVE:
                 // Prevent rendering while moving / sizing
@@ -113 +106 @@
                 break;
 
+            case WM_MOVE:
             case WM_SIZE:
                 // Check to see if we are losing or gaining our window. Set the
@@ -391 +385 @@
     void D3D7RenderWindow::swapBuffers(bool waitForVSync)
     {
+                if (!mlpDDSFront)
+                        return;
+
         HRESULT hr;
         DWORD flags;
@@ -423 +420 @@
             {
                 // Restore surfaces
-                restoreDDSurfaces();
+                //restoreDDSurfaces();
             }
             else if (FAILED(hr))
@@ -539 +536 @@
         ddscaps.dwCaps = DDSCAPS_ZBUFFER;
 
+                if (!mlpDDSBack->IsLost())
+                {
         LPDIRECTDRAWSURFACE7 zBufSurface;
 
@@ -546 +545 @@
         zBufSurface->Release();
         zBufSurface->Release();
+                }
 
         // Release std buffers
@@ -563 +563 @@
 
             if( FAILED( hr ) )
+                        {
+                                if (hr == DDERR_WRONGMODE)
+                                {
+                                        // Fullscreen exclusive mode problem
+                                        // Need to release & recreate
+                                        releaseDDSurfaces();
+                                        createDDSurfaces();
+                                        createDepthBuffer();
+                                        return;
+                                }
+                                else
+                                {
+                                        char szBuffer[512];
+                                        D3DXGetErrorString( hr, 512, szBuffer );
                 OGRE_EXCEPT( 
                     Exception::ERR_INTERNAL_ERROR, 
-                    "Error restoring lost primary surface.", 
+                                                "Error restoring lost primary surface." + String(szBuffer), 
                     "D3D7RenderWindow - restoreDDSurfaces" );
         }
+                        }
+        }
 
         if( mlpDDSBack->IsLost() )
@@ -574 +590 @@
 
             if( FAILED( hr ) )
+                        {
+                                char szBuffer[512];
+                                D3DXGetErrorString( hr, 512, szBuffer );
                 OGRE_EXCEPT( 
                     Exception::ERR_INTERNAL_ERROR, 
-                    "Error restoring lost back buffer surface.", 
+                    "Error restoring lost back buffer surface." + String(szBuffer), 
                     "D3D7RenderWindow - restoreDDSurfaces" );
         }
+    }
     }
 
@@ -592 +612 @@
         ClientToScreen( mHWnd, (POINT*)&rcCheck.left );
         ClientToScreen( mHWnd, (POINT*)&rcCheck.right );
+
+                if ((rcCheck.right - rcCheck.left) == 0 ||
+                        (rcCheck.bottom - rcCheck.top) == 0)
+                {
+                        return;
+                }
 
         // Has the window resized? If so, we need to recreate surfaces