Author Topic: Rice source code  (Read 6191 times)

Offline Paul

  • Administrator
  • double
  • *****
  • Posts: 3495
  • Developer
    • View Profile
    • PaulsCode.Com
Re: Rice source code
« Reply #15 on: February 28, 2013, 09:54:29 AM »
All good points.  Early communication is important rather than ruing in silence, so that problems can be addresses before they get blown out of proportion.

Littleguy did a good job with the rewind, and the changes are on separate branches now.  Hopefully everyone's concerns have been satisfied.  If not, be sure to speak up.
Device: Samsung Galaxy Nexus i515
CPU: TI OMAP4460, 1.2 GHz (dual core, ARM Cortex-A9)
GPU: PowerVR SGX540, 307 MHz
RAM: 1 GB
Resolution: 720 x 1280
Rom: omni-4.4.4-20141014-toro-FML KitKat 4.4.4, rooted

Device: Eee PC 1015PEM
CPU: Intel Atom N550, 1.5 GHz (dual core, x86)
GPU: Intel GMA 3150, 200 MHz (dual core)
RAM: 2GB
Resolution: 1024 x 600
Rom: android-x86-4.3-20130725 Jelly Bean 4.3, rooted

Pau

  • Guest
Re: Rice source code
« Reply #16 on: February 28, 2013, 10:40:59 AM »
I don't really understand the animosity I'm perceiving here, considering feedback is essential for improving how the project develops - the same applies to the devs themselves. How do I know what to improve upon in regards to myself if I don't actually get feedback or criticism like this?


https://github.com/paulscode/mupen64plus-ae/commit/a051bfb6ae709f5977871e64bf38e348943742eb#commitcomment-2646026
http://www.paulscode.com/forum/index.php?topic=919.msg8779#msg8779
http://www.paulscode.com/forum/index.php?topic=529.msg6460#msg6460
http://www.paulscode.com/forum/index.php?topic=632.msg6593#msg6593
...

Offline Paul

  • Administrator
  • double
  • *****
  • Posts: 3495
  • Developer
    • View Profile
    • PaulsCode.Com
Re: Rice source code
« Reply #17 on: February 28, 2013, 12:11:36 PM »
For the record, those last two links are related to concerns that have since been resolved.  As with the current concerns with Rice, I would have preferred to have those changes done on a separate branch (and that should be the procedure moving forward), but in the end it all worked out.

I think ecsv/video-rice is the last piece left to resolve here (correct me if I'm wrong).  I'd like to see it merged into master, but not sure I have the "git-fu" to do it without distroying history (I'll probably leave this one for Sven to do, since he is the git/hg master  ;D)  The altered version is in Lioncash's branch, so none of his previous work will be lost.  And we can merge back in any beneficial updates down the road after testing.
« Last Edit: February 28, 2013, 12:13:33 PM by Paul »
Device: Samsung Galaxy Nexus i515
CPU: TI OMAP4460, 1.2 GHz (dual core, ARM Cortex-A9)
GPU: PowerVR SGX540, 307 MHz
RAM: 1 GB
Resolution: 720 x 1280
Rom: omni-4.4.4-20141014-toro-FML KitKat 4.4.4, rooted

Device: Eee PC 1015PEM
CPU: Intel Atom N550, 1.5 GHz (dual core, x86)
GPU: Intel GMA 3150, 200 MHz (dual core)
RAM: 2GB
Resolution: 1024 x 600
Rom: android-x86-4.3-20130725 Jelly Bean 4.3, rooted

Offline littleguy

  • Moderator
  • double
  • *****
  • Posts: 1945
    • View Profile
Re: Rice source code
« Reply #18 on: February 28, 2013, 12:31:27 PM »
Merging Sven's branch is straight-forward.  With a gui like Git Extensions it's just a click or two.  From the command line I believe it would be
Code: [Select]
git checkout master
git pull
git fetch --all
git merge origin/ecsv/video-rice

Take a look at it, try building it, and then push when you're satisfied.  You won't have any conflicts (I already tested it).
« Last Edit: February 28, 2013, 12:38:03 PM by littleguy »
2012 Nexus 7, rooted stock Lollipop
Samsung Galaxy Victory, rooted stock Jelly Bean
Xperia PLAY, stock Gingerbread
OUYA, retail version

Offline Paul

  • Administrator
  • double
  • *****
  • Posts: 3495
  • Developer
    • View Profile
    • PaulsCode.Com
Re: Rice source code
« Reply #19 on: February 28, 2013, 12:33:19 PM »
Ok, great.  I figured there would be conflicts, but I guess rice wasn't really changed since then (the conflicts would have been there before the rewind)
Device: Samsung Galaxy Nexus i515
CPU: TI OMAP4460, 1.2 GHz (dual core, ARM Cortex-A9)
GPU: PowerVR SGX540, 307 MHz
RAM: 1 GB
Resolution: 720 x 1280
Rom: omni-4.4.4-20141014-toro-FML KitKat 4.4.4, rooted

Device: Eee PC 1015PEM
CPU: Intel Atom N550, 1.5 GHz (dual core, x86)
GPU: Intel GMA 3150, 200 MHz (dual core)
RAM: 2GB
Resolution: 1024 x 600
Rom: android-x86-4.3-20130725 Jelly Bean 4.3, rooted

Offline Lioncash

  • Developer
  • byte
  • *****
  • Posts: 29
    • View Profile
Re: Rice source code
« Reply #20 on: February 28, 2013, 01:09:25 PM »
« Last Edit: February 28, 2013, 01:20:37 PM by Lioncash »

Offline littleguy

  • Moderator
  • double
  • *****
  • Posts: 1945
    • View Profile
Re: Rice source code
« Reply #21 on: February 28, 2013, 01:23:47 PM »
Thanks guys.  I will just go ahead and merge Sven's branch now so that we can push on.

While I'm at it I'll split and rebase Lioncash's commits into lioncash/gles2rice and lioncash/gles2n64.  (When I did the rewind I didn't notice that many of his commits were for gles2n64, not rice.)
« Last Edit: February 28, 2013, 01:29:07 PM by littleguy »
2012 Nexus 7, rooted stock Lollipop
Samsung Galaxy Victory, rooted stock Jelly Bean
Xperia PLAY, stock Gingerbread
OUYA, retail version

Offline littleguy

  • Moderator
  • double
  • *****
  • Posts: 1945
    • View Profile
Re: Rice source code
« Reply #22 on: February 28, 2013, 02:27:01 PM »
Ok, I'm done rewriting history.  Enjoy your new world view.
2012 Nexus 7, rooted stock Lollipop
Samsung Galaxy Victory, rooted stock Jelly Bean
Xperia PLAY, stock Gingerbread
OUYA, retail version

Offline littleguy

  • Moderator
  • double
  • *****
  • Posts: 1945
    • View Profile
Re: Rice source code
« Reply #23 on: February 28, 2013, 03:24:39 PM »
I posted some guidelines on the wiki to avoid confusion next time.  Feel free to revise or add to them.  Discussion welcome, I don't consider myself an expert on these matters.
https://github.com/paulscode/mupen64plus-ae/wiki
2012 Nexus 7, rooted stock Lollipop
Samsung Galaxy Victory, rooted stock Jelly Bean
Xperia PLAY, stock Gingerbread
OUYA, retail version