Renamed SetLinkedDepthBuffer() -> SetLinkedDepthStencil().

Docs/ScriptAPI.dox

@@ -1389,7 +1389,7 @@ Properties:<br>
 - TextureUsage usage (readonly)
 - Viewport& viewport
 - RenderSurface@ linkedRenderTarget
-- RenderSurface@ linkedDepthBuffer
+- RenderSurface@ linkedDepthStencil
 
 
 Texture2D

Engine/Engine/GraphicsAPI.cpp

@@ -239,8 +239,8 @@ static void RegisterTextures(asIScriptEngine* engine)
     engine->RegisterObjectMethod("RenderSurface", "const Viewport& get_viewport() const", asMETHOD(RenderSurface, GetViewport), asCALL_THISCALL);
     engine->RegisterObjectMethod("RenderSurface", "void set_linkedRenderTarget(RenderSurface@+)", asMETHOD(RenderSurface, SetLinkedRenderTarget), asCALL_THISCALL);
     engine->RegisterObjectMethod("RenderSurface", "RenderSurface@+ get_linkedRenderTarget() const", asMETHOD(RenderSurface, GetLinkedRenderTarget), asCALL_THISCALL);
-    engine->RegisterObjectMethod("RenderSurface", "void set_linkedDepthBuffer(RenderSurface@+)", asMETHOD(RenderSurface, SetLinkedDepthBuffer), asCALL_THISCALL);
-    engine->RegisterObjectMethod("RenderSurface", "RenderSurface@+ get_linkedDepthBuffer() const", asMETHOD(RenderSurface, GetLinkedDepthBuffer), asCALL_THISCALL);
+    engine->RegisterObjectMethod("RenderSurface", "void set_linkedDepthStencil(RenderSurface@+)", asMETHOD(RenderSurface, SetLinkedDepthStencil), asCALL_THISCALL);
+    engine->RegisterObjectMethod("RenderSurface", "RenderSurface@+ get_linkedDepthStencil() const", asMETHOD(RenderSurface, GetLinkedDepthStencil), asCALL_THISCALL);
     
     RegisterTexture<Texture2D>(engine, "Texture2D");
     engine->RegisterObjectMethod("Texture2D", "void SetSize(int, int, uint, TextureUsage usage = TEXTURE_STATIC)", asMETHOD(Texture2D, SetSize), asCALL_THISCALL);

Engine/Graphics/Direct3D9/D3D9RenderSurface.cpp

@@ -69,16 +69,14 @@ void RenderSurface::SetViewport(const Viewport& viewport)
 
 void RenderSurface::SetLinkedRenderTarget(RenderSurface* renderTarget)
 {
-    if (renderTarget == this)
-        return;
-    linkedRenderTarget_ = renderTarget;
+    if (renderTarget != this)
+        linkedRenderTarget_ = renderTarget;
 }
 
-void RenderSurface::SetLinkedDepthBuffer(RenderSurface* depthBuffer)
+void RenderSurface::SetLinkedDepthStencil(RenderSurface* depthStencil)
 {
-    if (depthBuffer == this)
-        return;
-    linkedDepthBuffer_ = depthBuffer;
+    if (depthStencil != this)
+        linkedDepthStencil_ = depthStencil;
 }
 
 void RenderSurface::Release()

Engine/Graphics/Direct3D9/D3D9RenderSurface.h

@@ -63,10 +63,10 @@ public:
     
     /// %Set viewport for auxiliary view rendering.
     void SetViewport(const Viewport& viewport);
-    /// %Set linked color buffer.
+    /// %Set linked color rendertarget.
     void SetLinkedRenderTarget(RenderSurface* renderTarget);
-    /// %Set linked depth buffer.
-    void SetLinkedDepthBuffer(RenderSurface* depthBuffer);
+    /// %Set linked depth-stencil surface.
+    void SetLinkedDepthStencil(RenderSurface* depthStencil);
     /// Release surface.
     void Release();
     
@@ -82,10 +82,10 @@ public:
     TextureUsage GetUsage() const;
     /// Return auxiliary view rendering viewport.
     const Viewport& GetViewport() const { return viewport_; }
-    /// Return linked color buffer.
+    /// Return linked color rendertarget.
     RenderSurface* GetLinkedRenderTarget() const { return linkedRenderTarget_; }
-    /// Return linked depth buffer.
-    RenderSurface* GetLinkedDepthBuffer() const { return linkedDepthBuffer_; }
+    /// Return linked depth-stencil surface.
+    RenderSurface* GetLinkedDepthStencil() const { return linkedDepthStencil_; }
     
 private:
     /// Parent texture.
@@ -97,5 +97,5 @@ private:
     /// Linked color buffer.
     WeakPtr<RenderSurface> linkedRenderTarget_;
     /// Linked depth buffer.
-    WeakPtr<RenderSurface> linkedDepthBuffer_;
+    WeakPtr<RenderSurface> linkedDepthStencil_;
 };

Engine/Graphics/OpenGL/OGLRenderSurface.cpp

@@ -70,16 +70,14 @@ void RenderSurface::SetViewport(const Viewport& viewport)
 
 void RenderSurface::SetLinkedRenderTarget(RenderSurface* renderTarget)
 {
-    if (renderTarget == this)
-        return;
-    linkedRenderTarget_ = renderTarget;
+    if (renderTarget != this)
+        linkedRenderTarget_ = renderTarget;
 }
 
-void RenderSurface::SetLinkedDepthBuffer(RenderSurface* depthBuffer)
+void RenderSurface::SetLinkedDepthStencil(RenderSurface* depthStencil)
 {
-    if (depthBuffer == this)
-        return;
-    linkedDepthBuffer_ = depthBuffer;
+    if (depthStencil != this)
+        linkedDepthStencil_ = depthStencil;
 }
 
 bool RenderSurface::CreateRenderBuffer(unsigned width, unsigned height, unsigned format)

Engine/Graphics/OpenGL/OGLRenderSurface.h

@@ -63,10 +63,10 @@ public:
     
     /// Set viewport for auxiliary view rendering.
     void SetViewport(const Viewport& viewport);
-    /// Set linked color buffer.
+    /// Set linked color rendertarget.
     void SetLinkedRenderTarget(RenderSurface* renderTarget);
-    /// Set linked depth buffer.
-    void SetLinkedDepthBuffer(RenderSurface* depthBuffer);
+    /// Set linked depth-stencil surface.
+    void SetLinkedDepthStencil(RenderSurface* depthStencil);
     /// Create a renderbuffer. Return true if successful.
     bool CreateRenderBuffer(unsigned width, unsigned height, unsigned format);
     /// Release renderbuffer if any.
@@ -89,7 +89,7 @@ public:
     /// Return linked color buffer.
     RenderSurface* GetLinkedRenderTarget() const { return linkedRenderTarget_; }
     /// Return linked depth buffer.
-    RenderSurface* GetLinkedDepthBuffer() const { return linkedDepthBuffer_; }
+    RenderSurface* GetLinkedDepthStencil() const { return linkedDepthStencil_; }
     
 private:
     /// Parent texture.
@@ -103,5 +103,5 @@ private:
     /// Linked color buffer.
     WeakPtr<RenderSurface> linkedRenderTarget_;
     /// Linked depth buffer.
-    WeakPtr<RenderSurface> linkedDepthBuffer_;
+    WeakPtr<RenderSurface> linkedDepthStencil_;
 };

Engine/Graphics/Renderer.cpp

@@ -951,7 +951,7 @@ Texture2D* Renderer::GetShadowMap(Light* light, Camera* camera, unsigned viewWid
                     shadowDepthStencil_ = new Texture2D(context_);
                 if (shadowDepthStencil_->GetWidth() < width || shadowDepthStencil_->GetHeight() < height)
                     shadowDepthStencil_->SetSize(width, height, D3DFMT_D16, TEXTURE_DEPTHSTENCIL);
-                newShadowMap->GetRenderSurface()->SetLinkedDepthBuffer(shadowDepthStencil_->GetRenderSurface());
+                newShadowMap->GetRenderSurface()->SetLinkedDepthStencil(shadowDepthStencil_->GetRenderSurface());
             }
             break;
         }

Engine/Graphics/View.cpp

@@ -202,7 +202,7 @@ bool View::Define(RenderSurface* renderTarget, const Viewport& viewport)
     if (!renderTarget)
         depthStencil_ = 0;
     else
-        depthStencil_ = renderTarget->GetLinkedDepthBuffer();
+        depthStencil_ = renderTarget->GetLinkedDepthStencil();
     
     // Validate the rect and calculate size. If zero rect, use whole rendertarget size
     int rtWidth = renderTarget ? renderTarget->GetWidth() : graphics_->GetWidth();
@@ -2289,7 +2289,7 @@ void View::RenderShadowMap(const LightBatchQueue& queue)
     {
         graphics_->SetColorWrite(true);
         graphics_->SetRenderTarget(0, shadowMap->GetRenderSurface());
-        graphics_->SetDepthStencil(shadowMap->GetRenderSurface()->GetLinkedDepthBuffer());
+        graphics_->SetDepthStencil(shadowMap->GetRenderSurface()->GetLinkedDepthStencil());
         graphics_->Clear(CLEAR_COLOR | CLEAR_DEPTH, Color::WHITE);
     }