Merge lp:~thomir-deactivatedaccount/nux/lockrect-overloaded-method-hiding into lp:nux

[Thomi Richards]

Fixed a spot where a derived method was hiding a virtual method in the base class because the method signatures were different.

Problem:

IOpenGLVolumeTexture defined lockRect as:

int IOpenGLVolumeTexture::LockRect(
    int Slice,
    int Level,
    SURFACE_LOCKED_RECT *pLockedRect,
    const SURFACE_RECT *pRect)

but it's base class defined it as:

virtual int LockRect(
      int Level,
      SURFACE_LOCKED_RECT *pLockedRect,
      const SURFACE_RECT *pRect);

i.e.- missing the Slice parameter. This means that the derived method was hiding the virtual method form the case class.

Solution:

I've added the Slice parameter to the base class. I also had to update one place in the code where this was being called. The 'Level' parameter was being passed in as 0, so I passed the 'Slice' parameter in as 0 as well. I have no idea if this is the right thing to do or not, so someone who knows what this code does should look into this.

Tests:

There are no tests. This code may break something.

[Jay Taoko (jaytaoko)]

Is this a warning that we get in Unity right now? I couldn't see it. How can I reproduce?

* I think we need to had a comment to say that "the value of slice must be zero" that for IOpenGLBaseTexture::LockRect.
* IOpenGLTexture2D::LockRect and IOpenGLRectangleTexture::LockRect have to be changed accordingly

review: Needs Fixing

[Francis Ginther (fginther)]

Review was claimed by accident, please ignore.

review: Abstain

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:623
http://jenkins.qa.ubuntu.com/job/nux-ci/15/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-raring-amd64-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-raring-armhf-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-raring-i386-ci/15/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/nux-ci/15/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

623. By Thomi Richards on 2012-06-12

Updated code that calls it. apparently we can just pass 0's around.

622. By Thomi Richards on 2012-06-12

Fix a place where virtual methods had different signatures in different classes.

=== modified file 'NuxGraphics/IOpenGLAnimatedTexture.cpp'
--- NuxGraphics/IOpenGLAnimatedTexture.cpp	2011-10-22 06:17:42 +0000
+++ NuxGraphics/IOpenGLAnimatedTexture.cpp	2012-06-12 05:40:25 +0000
@@ -93,13 +93,13 @@
     SURFACE_LOCKED_RECT *pLockedRect,
     const SURFACE_RECT *pRect)
   {
-    return _FrameTextureArray[Frame]->LockRect(0, pLockedRect, pRect);
+    return _FrameTextureArray[Frame]->LockRect(0, 0, pLockedRect, pRect);
   }
 
   int IOpenGLAnimatedTexture::UnlockRect(
     int Frame)
   {
-    return _FrameTextureArray[Frame]->UnlockRect(0);
+    return _FrameTextureArray[Frame]->UnlockRect(0, 0);
   }
 
   void IOpenGLAnimatedTexture::PresentFirstFrame()
 
=== modified file 'NuxGraphics/IOpenGLBaseTexture.cpp'
--- NuxGraphics/IOpenGLBaseTexture.cpp	2012-01-17 03:57:31 +0000
+++ NuxGraphics/IOpenGLBaseTexture.cpp	2012-06-12 05:40:25 +0000
@@ -244,12 +244,12 @@
     return ObjectPtr<IOpenGLSurface> (0);
   }
 
-  int IOpenGLBaseTexture::LockRect(int Level, SURFACE_LOCKED_RECT *pLockedRect, const SURFACE_RECT *pRect)
+  int IOpenGLBaseTexture::LockRect(int Slice, int Level, SURFACE_LOCKED_RECT *pLockedRect, const SURFACE_RECT *pRect)
   {
     return 0;
   }
 
-  int IOpenGLBaseTexture::UnlockRect(int Level)
+  int IOpenGLBaseTexture::UnlockRect(int Slice, int Level)
   {
     return 0;
   }
 
=== modified file 'NuxGraphics/IOpenGLBaseTexture.h'
--- NuxGraphics/IOpenGLBaseTexture.h	2012-01-17 03:57:31 +0000
+++ NuxGraphics/IOpenGLBaseTexture.h	2012-06-12 05:40:25 +0000
@@ -132,11 +132,12 @@
     virtual void GetSurfaceLevel(int Level, ObjectPtr<IOpenGLSurface>& surface);
     virtual ObjectPtr<IOpenGLSurface> GetSurfaceLevel(int Level);
     virtual int LockRect(
+      int Slice,
       int Level,
       SURFACE_LOCKED_RECT *pLockedRect,
       const SURFACE_RECT *pRect);
 
-    virtual int UnlockRect(int Level);
+    virtual int UnlockRect(int Slice, int Level);
 
     //! Return a pointer to a mipmap level data.
     /*!