[haiku-commits] Re: r37293 - in haiku/trunk: headers/os/opengl src/kits/opengl

  • From: Wim van der Meer <wpjvandermeer@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Mon, 28 Jun 2010 22:17:06 +0900

On Mon, Jun 28, 2010 at 9:54 PM, Karsten Heimrich <host.haiku@xxxxxx> wrote:
> Hi Wim,
>
> Am 28.06.2010 14:46, schrieb Wim van der Meer:
>>
>> On Mon, Jun 28, 2010 at 9:05 PM, Axel Dörfler<axeld@xxxxxxxxxxxxxxxx>
>>  wrote:
>>>
>>> wpjvandermeer@xxxxxxxxx wrote:
>>>>
>>>> Log:
>>>> Reverting r37289 because it breaks the build.
>>>
>>> Unfortunately, you still break BeOS compatibility, though, since you
>>> obviously removed the wrong version -- or are you planning on adding
>>> that now as I suggested?
>>>
>>> Bye,
>>>   Axel.
>>
>> Yes, I actually am working on that now. It will take a little time
>> though, maybe until next weekend, depending on how much time I can
>> spend on it and how soon I understand what I need to do. I might
>> prepare a patch first for review.
>
> wouldn't it be enough to put the old ctor into the private class section as
> Axel proposed? AFAIK gcc does not mangle the scope into the signature. So
> any old binary should be able to call the then private ctor.
>
> -- Karsten
>
>

If that's all thats needed I can do that now. I can't test it now
(doing a clean build right now), but if this patch is good, I can
commit it:



Index: src/kits/opengl/GLView.cpp
===================================================================
--- src/kits/opengl/GLView.cpp  (revision 37293)
+++ src/kits/opengl/GLView.cpp  (working copy)
@@ -461,6 +461,25 @@
 // #pragma mark -


+// BeOS compatibility
+BGLView::BGLView(BRect rect, char* name, ulong resizingMode, ulong mode,
+       ulong options)
+       :
+       BView(rect, name, B_FOLLOW_ALL_SIDES, mode | B_WILL_DRAW | 
B_FRAME_EVENTS),
+       fGc(NULL),
+       fOptions(options),
+       fDitherCount(0),
+       fDrawLock("BGLView draw lock"),
+       fDisplayLock("BGLView display lock"),
+       fClipInfo(NULL),
+       fRenderer(NULL),
+       fRoster(NULL),
+       fDitherMap(NULL)
+{
+       fRoster = new GLRendererRoster(this, options);
+}
+
+
 #if 0


Index: headers/os/opengl/GLView.h
===================================================================
--- headers/os/opengl/GLView.h  (revision 37293)
+++ headers/os/opengl/GLView.h  (working copy)
@@ -118,6 +118,13 @@
                
                void    _LockDraw();
                void    _UnlockDraw();
+               
+// BeOS compatibility
+private:
+                                       BGLView(BRect rect, char* name,
+                                               ulong resizingMode, ulong mode,
+                                               ulong options);
+
 };




-- 
Wim van der Meer
\/\///\/\

Other related posts: