Changeset 657 for OGRE/trunk/ogre_changes/RenderSystems/GL/src

Timestamp:

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

Author:

mattausch

Message:

added ogre dependencies and patched ogre sources

Location:

OGRE/trunk/ogre_changes/RenderSystems/GL/src

Files:

• OgreGLHardwareOcclusionQuery.cpp (modified) (2 diffs)
• OgreGLRenderSystem.cpp (modified) (18 diffs)
• OgreGLTexture.cpp (modified) (7 diffs)
• OgreWin32Window.cpp (modified) (2 diffs)

OGRE/trunk/ogre_changes/RenderSystems/GL/src/OgreGLHardwareOcclusionQuery.cpp

@@ -38 +38 @@
   * Updated on 12/7/2004 by Chris McGuirk
   * - Implemented ARB_occlusion_query
+  * Updated on 4/8/2005 by Tuan Kuranes email: tuan.kuranes@free.fr
   */
 
@@ -154 +155 @@
 #endif // GTP_VIBILITY_MODIFIED_OGRE
 }
+
+

OGRE/trunk/ogre_changes/RenderSystems/GL/src/OgreGLRenderSystem.cpp

@@ -257 +257 @@
             delete mTextureManager;
 
-        delete mCapabilities;
         delete mGLSupport;
     }
@@ -894 +893 @@
             case Light::LT_SPOTLIGHT:
                 glLightf( gl_index, GL_SPOT_CUTOFF, 0.5f * lt->getSpotlightOuterAngle().valueDegrees() );
+                glLightf(gl_index, GL_SPOT_EXPONENT, lt->getSpotlightFalloff());
                 break;
             default:
@@ -1090 +1090 @@
                         if(!tex.isNull())
                                 glBindTexture( mTextureTypes[stage], tex->getGLID() );
-
+                        else
+                                glBindTexture( mTextureTypes[stage], static_cast<GLTextureManager*>(mTextureManager)->getWarningTextureID() );
         }
         else
@@ -1238 +1239 @@
 
             // Set scale and translation matrix for projective textures
-            projectionBias = Matrix4::ZERO;
-            projectionBias[0][0] = 0.5; projectionBias[1][1] = -0.5; 
-            projectionBias[2][2] = 1.0; projectionBias[0][3] = 0.5; 
-            projectionBias[1][3] = 0.5; projectionBias[3][3] = 1.0;
+            projectionBias = Matrix4::CLIPSPACE2DTOIMAGESPACE;
 
             projectionBias = projectionBias * frustum->getProjectionMatrix();
@@ -1260 +1258 @@
         switch(tam)
         {
+        default:
         case TextureUnitState::TAM_WRAP:
             type = GL_REPEAT;
@@ -1295 +1294 @@
                         mat[12] = mat[8];
                         mat[13] = mat[9];
+            mat[8] = 0;
+            mat[9] = 0;
                 }
 //        mat[14] = mat[10];
@@ -1312 +1313 @@
         glMatrixMode(GL_TEXTURE);
 
+        // Load this matrix in
+        glLoadMatrixf(mat);
+
         if (mUseAutoTextureMatrix)
         {
-            // Load auto matrix in
-            glLoadMatrixf(mAutoTextureMatrix);
-            // Concat new matrix
-            glMultMatrixf(mat);
-
-        }
-        else
-        {
-            // Just load this matrix
-            glLoadMatrixf(mat);
+            // Concat auto matrix
+            glMultMatrixf(mAutoTextureMatrix);
         }
 
@@ -1403 +1399 @@
               h = vp->getActualHeight();
               x = vp->getActualLeft();
-              y = target->getHeight() - vp->getActualTop() - h;
-  
+              y = vp->getActualTop();
+              if (!target->requiresTextureFlipping())
+              {
+                  // Convert "upper-left" corner to "lower-left"
+                  y = target->getHeight() - h - y;
+              }
               glViewport(x, y, w, h);
   
@@ -2344 +2344 @@
             glDisableVertexAttribArrayARB_ptr(1); // disable weights
         }
-
+        glColor4f(1,1,1,1);
         glSecondaryColor3fEXT_ptr(0.0f, 0.0f, 0.0f);
 
@@ -2415 +2415 @@
             const Plane& plane = clipPlanes[i];
 
-            if (i >= GL_MAX_CLIP_PLANES)
+            if (i >= 6/*GL_MAX_CLIP_PLANES*/)
             {
                 OGRE_EXCEPT(0, "Unable to set clip plane", 
@@ -2424 +2424 @@
             clipPlane[1] = plane.normal.y;
             clipPlane[2] = plane.normal.z;
-            clipPlane[3] = -plane.d;
+            clipPlane[3] = plane.d;
 
             glClipPlane(clipPlaneId, clipPlane);
@@ -2440 +2440 @@
         size_t top, size_t right, size_t bottom)
     {
+        // If request texture flipping, use "upper-left", otherwise use "lower-left"
+        bool flipping = mActiveRenderTarget->requiresTextureFlipping();
         //  GL measures from the bottom, not the top
         size_t targetHeight = mActiveRenderTarget->getHeight();
@@ -2450 +2452 @@
             // NB GL uses width / height rather than right / bottom
             x = left;
+            if (flipping)
+                y = top;
+            else
             y = targetHeight - bottom;
             w = right - left;
@@ -2462 +2467 @@
             h = mActiveViewport->getActualHeight();
             x = mActiveViewport->getActualLeft();
+            if (flipping)
+                y = mActiveViewport->getActualTop();
+            else
             y = targetHeight - mActiveViewport->getActualTop() - h;
             glScissor(x, y, w, h);
@@ -2575 +2583 @@
     HardwareOcclusionQuery* GLRenderSystem::createHardwareOcclusionQuery(void)
     {
-        return new GLHardwareOcclusionQuery(); 
+        GLHardwareOcclusionQuery* ret = new GLHardwareOcclusionQuery(); 
+                mHwOcclusionQueries.push_back(ret);
+                return ret;
     }
     //---------------------------------------------------------------------
@@ -2639 +2649 @@
     }
     //---------------------------------------------------------------------
+    void GLRenderSystem::_switchContext(GLContext *context)
+    {
+        // Unbind GPU programs and rebind to new context later, because
+        // scene manager treat render system as ONE 'context' ONLY, and it
+        // cached the GPU programs using state.
+        if (mCurrentVertexProgram)
+            mCurrentVertexProgram->unbindProgram();
+        if (mCurrentFragmentProgram)
+            mCurrentFragmentProgram->unbindProgram();
+
+        // It's ready to switching
+            mCurrentContext->endCurrent();
+        mCurrentContext = context;
+        mCurrentContext->setCurrent();
+        
+            // Check if the context has already done one-time initialisation
+        if(!mCurrentContext->getInitialized()) 
+        {
+               _oneTimeContextInitialization();
+               mCurrentContext->setInitialized();
+            }
+
+        // Rebind GPU programs to new context
+        if (mCurrentVertexProgram)
+            mCurrentVertexProgram->bindProgram();
+        if (mCurrentFragmentProgram)
+            mCurrentFragmentProgram->bindProgram();
+
+        // Must reset depth/colour write mask to according with user desired, otherwise,
+        // clearFrameBuffer would be wrong because the value we are recorded may be
+        // difference with the really state stored in GL context.
+        glDepthMask(mDepthWrite);
+        glColorMask(mColourWrite[0], mColourWrite[1], mColourWrite[2], mColourWrite[3]);
+
+    }
+    //---------------------------------------------------------------------
     void GLRenderSystem::_setRenderTarget(RenderTarget *target)
     {
@@ -2645 +2691 @@
         ContextMap::iterator i = mContextMap.find(target);
         if(i != mContextMap.end() && mCurrentContext != i->second) {
-            mCurrentContext->endCurrent();
-            mCurrentContext = i->second;
-            // Check if the context has already done one-time initialisation
-            if(!mCurrentContext->getInitialized()) {
-               _oneTimeContextInitialization();
-               mCurrentContext->setInitialized();
-            }
-            mCurrentContext->setCurrent();
+            _switchContext(i->second);
         }
     }
@@ -2669 +2708 @@
             // we set the main context to 0.
             if(mCurrentContext != mMainContext) {
-                mCurrentContext->endCurrent();
-                mCurrentContext = mMainContext;
-                mCurrentContext->setCurrent();
+                _switchContext(mMainContext);
             } else {
                 mMainContext = 0;

OGRE/trunk/ogre_changes/RenderSystems/GL/src/OgreGLTexture.cpp

@@ -69 +69 @@
         // have to call this here reather than in Resource destructor
         // since calling virtual methods in base destructors causes crash
+                if (mIsLoaded)
+                {
         unload(); 
+    }
+                else
+                {
+                        freeInternalResources();
+                }
     }
 
@@ -90 +97 @@
 
         //* Creation / loading methods ********************************************
-        void GLTexture::createInternalResources(void)
+        void GLTexture::createInternalResourcesImpl(void)
     {
                 // Adjust requested parameters to capabilities
@@ -131 +138 @@
                 // Zero means create mip levels until 1x1
                 size_t maxMips = GLPixelUtil::getMaxMipmaps(mWidth, mHeight, mDepth, mFormat);
+                mNumMipmaps = mNumRequestedMipmaps;
                 if(mNumMipmaps>maxMips)
                         mNumMipmaps = maxMips;
@@ -144 +152 @@
                 
                 // If we can do automip generation and the user desires this, do so
+                mMipmapsHardwareGenerated = 
+                        Root::getSingleton().getRenderSystem()->getCapabilities()->hasCapability(RSC_AUTOMIPMAP);
                 if((mUsage & TU_AUTOMIPMAP) &&
-                    mNumMipmaps &&
-                        Root::getSingleton().getRenderSystem()->getCapabilities()->hasCapability(RSC_AUTOMIPMAP))
+                    mNumRequestedMipmaps && mMipmapsHardwareGenerated)
         {
             glTexParameteri( getGLTextureTarget(), GL_GENERATE_MIPMAP, GL_TRUE );
@@ -242 +251 @@
                 // Get final internal format
                 mFormat = getBuffer(0,0)->getFormat();
-                mIsLoaded = true;
         }
         
@@ -326 +334 @@
         //*************************************************************************
     
-    void GLTexture::unloadImpl()
+    void GLTexture::freeInternalResourcesImpl()
     {
                 mSurfaceList.clear();
@@ -337 +345 @@
         {
                 mSurfaceList.clear();
-                // Make our understanding of the number of mips matches the GL one
-                glBindTexture( getGLTextureTarget(), mTextureID );
-                GLint value;
-                glGetTexParameteriv( getGLTextureTarget(), GL_TEXTURE_MAX_LEVEL, &value );
-                mNumMipmaps = value;
                 
                 // For all faces and mipmaps, store surfaces as HardwarePixelBufferSharedPtr
                 bool wantGeneratedMips = (mUsage & TU_AUTOMIPMAP)!=0;
-                bool canMip = Root::getSingleton().getRenderSystem()->getCapabilities()->hasCapability(RSC_AUTOMIPMAP);
                 
                 // Do mipmapping in software? (uses GLU) For some cards, this is still needed. Of course,
                 // only when mipmap generation is desired.
-                bool doSoftware = wantGeneratedMips && !canMip && getNumMipmaps(); 
+                bool doSoftware = wantGeneratedMips && !mMipmapsHardwareGenerated && getNumMipmaps(); 
                 
                 for(int face=0; face<getNumFaces(); face++)

OGRE/trunk/ogre_changes/RenderSystems/GL/src/OgreWin32Window.cpp

@@ -226 +226 @@
                     }
 
+                HDC old_hdc = wglGetCurrentDC();
+                HGLRC old_context = wglGetCurrentContext();
+
                         RECT rc;
                 // top and left represent outer window position
@@ -255 +258 @@
                 
                 wglSwapIntervalEXT(vsync? 1 : 0);
+
+        if (old_context)
+        {
+            // Restore old context
+                    if (!wglMakeCurrent(old_hdc, old_context))
+                            OGRE_EXCEPT(0, "wglMakeCurrent() failed", "Win32Window::create");
+
+            // Share lists with old context
+                    if (!wglShareLists(old_context, mGlrc))
+                            OGRE_EXCEPT(0, "wglShareLists() failed", " Win32Window::create");
+        }
 
         // Create RenderSystem context