<div dir="ltr"><div><div><div>Hi Jason, Sergey, Campbell,<br><br></div>I think I agree with Sergey that the scope of what you are trying to achieve is really huge. It is a cool project though and in my opinion very very needed as many cool future things depend on it and getting to the latest features on all platforms (especially Apple) is being made harder when needing legacy GL.<br>
</div>One thing that is not really super clear to me is what subset of OpenGL features we are targeting for this. I would guess that the intersection of OpenGL ES 2.0 / OpenGL 3.2 core context is the feature level would make a good lowest common denominator to have blender's GL work.<br>
<br></div>I have no experience with porting large scale projects like blender form using legacy OpenGL to something slightly more modern but generally speaking I would say that trying to do a compatibility layer just sort of moves the problem around. <br>
And I would think the newer way of handling GL calls is here to stay so we might just bite the bullet and move over to it. It will not be easy and most likely some people will cry about it but I really think it is unavoidable in the long run. <br>
<br>And if that makes your project easier and therefore more likely to succeed that is a good thing.<br><br><span class=""><font color="#888888">-- <br><div><span style="color:rgb(102,102,102)">With best regards, Martijn Berger<br>
</span></div></font></span></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Sat, May 31, 2014 at 12:27 PM, Sergey Sharybin <span dir="ltr"><<a href="mailto:sergey.vfx@gmail.com" target="_blank">sergey.vfx@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">I'm not sure why to blame merges. We couldn't postpone everything actually. Not even sure why it might be an issue for the project. You might easily ignore them for now.<div>
<br></div><div>Looks like you're trying to put all the legacy code onto the compatibility layer and bring it to live all together, which is rather a huge project and which didn't work two times already. What is the point of compatibility layer anyway?</div>
<div><br></div><div>Would really suggest making smaller steps in order to make stuff mergeable to master:</div><div><br></div><div>- Put all the stuff needed from GHOST side and all the mathutils stuff and other utility functions to master. This should work just fine with the legacy OpenGL we're using.</div>
<div>- In the branch start porting areas one-by-one into new GL. Starting with window draw and interface elements. And by porting i mean port to new GL calls, not some compatibility layer. It should even be possible to have interface using newer GL and viewport using legacy code.</div>
<div>- Then port all the rest areas to new GL. Something like: port them, test them, merge them.</div></div><div class="gmail_extra"><div><div class="h5"><br><br><div class="gmail_quote">On Sat, May 31, 2014 at 4:12 PM, Campbell Barton <span dir="ltr"><<a href="mailto:ideasman42@gmail.com" target="_blank">ideasman42@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Recommend meld:<br>
<a href="http://meldmerge.org" target="_blank">http://meldmerge.org</a><br>
<br>
It can be set as git's mergetool and handles 3way merges pretty nice.<br>
<br>
Although I never tried other tools (probably vimdiff is good too if you use vim)<br>
<div><div><br>
On Sat, May 31, 2014 at 3:28 PM, Jason Wilkins<br>
<<a href="mailto:jason.a.wilkins@gmail.com" target="_blank">jason.a.wilkins@gmail.com</a>> wrote:<br>
> Last year took a few weeks to gain momentum due to fixing up the code after<br>
> merging, so I should have realized I might be in the same boat this year.<br>
><br>
> Luckily, I seem to have learned a thing or two about how to manage this so I<br>
> should have things working again by the end of the weekend. It helps that I<br>
> merged things back in March, but some recent changes to the rendering code<br>
> (loop normals?) caused a lot of pain.<br>
><br>
> The switch to git also helps a lot.<br>
><br>
> This week I've started to contact users about helping me develop and run a<br>
> set of regression and performance tests. There is a thread on Blender<br>
> Artists here:<br>
><br>
> <a href="http://blenderartists.org/forum/showthread.php?338377-Viewport-FX-III" target="_blank">http://blenderartists.org/forum/showthread.php?338377-Viewport-FX-III</a><br>
><br>
> Next week I'll be putting up for review the changes to GHOST that separates<br>
> the window system from the opengl context. I had hoped to have this ready<br>
> to go before gsoc started, but I ended up having to meet some other<br>
> deadlines :(<br>
><br>
> I'm also going to pull some other things out like additional math functions<br>
> and the replacement for the OpenGL matrix stack. While I want to mainly<br>
> focus on getting things that could/can cause lots of conflicts reviewed<br>
> first, I think some modules like a CPU based matrix stack might be useful<br>
> libraries for others to be able to use.<br>
><br>
> Although my branch currently compiles on Windows, it is broken, and does not<br>
> draw properly due to the merge. As I review the diff in order to find<br>
> patches to submit I'm also going to be trying to fix that. grr..<br>
><br>
> No major questions right now.<br>
><br>
> I might venture to ask for people's opinion. I currently use kdiff3 as my<br>
> merge tool. I've found it really helps compared to the tool that comes with<br>
> Tortoise, but really those are the only two tools I've ever used. So, my<br>
> question would be, does anybody have a tool that runs on Windows or MacOS<br>
> that they think is better than kdiff3? I would be open to learning a new<br>
> tool if it would speed merging further, since I have gotten a lot of<br>
> practice at that lately...<br>
><br>
</div></div>> _______________________________________________<br>
> Soc-2014-dev mailing list<br>
> <a href="mailto:Soc-2014-dev@blender.org" target="_blank">Soc-2014-dev@blender.org</a><br>
> <a href="http://lists.blender.org/mailman/listinfo/soc-2014-dev" target="_blank">http://lists.blender.org/mailman/listinfo/soc-2014-dev</a><br>
><br>
<span><font color="#888888"><br>
<br>
<br>
--<br>
- Campbell<br>
_______________________________________________<br>
Soc-2014-dev mailing list<br>
<a href="mailto:Soc-2014-dev@blender.org" target="_blank">Soc-2014-dev@blender.org</a><br>
<a href="http://lists.blender.org/mailman/listinfo/soc-2014-dev" target="_blank">http://lists.blender.org/mailman/listinfo/soc-2014-dev</a><br>
</font></span></blockquote></div><br><br clear="all"><div><br></div></div></div><span class="HOEnZb"><font color="#888888">-- <br><div><span style="color:rgb(102,102,102)">With best regards, Sergey Sharybin</span></div>
</font></span></div>
<br>_______________________________________________<br>
Soc-2014-dev mailing list<br>
<a href="mailto:Soc-2014-dev@blender.org">Soc-2014-dev@blender.org</a><br>
<a href="http://lists.blender.org/mailman/listinfo/soc-2014-dev" target="_blank">http://lists.blender.org/mailman/listinfo/soc-2014-dev</a><br>
<br></blockquote></div><br></div>