Skip to content
Permalink
Browse files
build: Temporarily bump manifest to minSDK 21, GLES 3.1.
Try to relax these back to minSDK 7, GLES 2.0 as GlideN64 becomes
integrated.
  • Loading branch information
littleguy77 committed Apr 27, 2015
1 parent df18282 commit 9ad98633bbab6f19b486bf30078a7226e8fb23de
Showing 1 changed file with 2 additions and 2 deletions.
@@ -7,13 +7,13 @@
android:versionName="3.a.0 (debug)"
tools:ignore="UnusedAttribute" >

<uses-feature android:glEsVersion="0x00020000" />
<uses-feature android:glEsVersion="0x00030001" />
<uses-feature
android:name="android.hardware.touchscreen"
android:required="false" />

<uses-sdk
android:minSdkVersion="7"
android:minSdkVersion="21"
android:targetSdkVersion="21" />

<uses-permission android:name="android.permission.INTERNET" />

59 comments on commit 9ad9863

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 Apr 27, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@littleguy77 we should also modify the createGLContext method in NativeSDL.java in order to be able to initialize an GLES3.1 context.

@littleguy77
Copy link
Member Author

@littleguy77 littleguy77 commented on 9ad9863 Apr 27, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Gillou68310 Great point, you're right. Feel free to push the change, otherwise I can probably get to it tonight.

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 Apr 27, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok I'll check that. Could you send me Gliden64 source? I don't have access to paulscode.com at work (stupid minecraft reference!!!!)

@littleguy77
Copy link
Member Author

@littleguy77 littleguy77 commented on 9ad9863 Apr 27, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I actually can't build it yet, so it probably won't make a difference if you don't have it. Just comment out the new section of Android.mk while you debug the java part.

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 Apr 27, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What kind of errors do you get when trying to build it?

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 Apr 27, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On another subject I worked on an OpenSLES audio plugin. It's not finished yet but it would be great if you could test it on your devices just to see if it's running okay. Resampling is not implemented yet so changing speed factor won't have any effect and some games might run too fast or too slow depending on the requested output frequency.

https://github.com/mupen64plus-ae/mupen64plus-ae/tree/audio-sles

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 Apr 27, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Arf, Gonetz removed the link to gliden64 source on paulscode, don't hesitate to send me a copy so I can help fixing issues. ;-)

@littleguy77
Copy link
Member Author

@littleguy77 littleguy77 commented on 9ad9863 Apr 27, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Gillou68310 Since @gonetz took the link down, I would feel best if you obtained the source from him. Of course I trust you but it's not my code to hand out.

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 Apr 27, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think he's already okay to share the source with us as he posted it on paulscode.com, anyway I'll ask him then.

@gonetz
Copy link

@gonetz gonetz commented on 9ad9863 Apr 28, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I cleaned my google drive and accidentally removed the sources. Here the updated link:
https://drive.google.com/file/d/0B0YqMPjGo3B2R19Oa05wbjA3YjA/view?usp=sharing

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 Apr 28, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @gonetz I'll try to see if I can get it build today ;-)

@gonetz
Copy link

@gonetz gonetz commented on 9ad9863 Apr 28, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can build it, but that code is not functional yet.

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 Apr 28, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you already manage to build it or do you still have issues?

@gonetz
Copy link

@gonetz gonetz commented on 9ad9863 Apr 28, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have issues with PC build, so other questions will be solved later.

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 Apr 28, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. In the meantime I managed to build your source code (with some minor fixes to the code ;-)). For now I changed the OGLVideo::start() code in order to draw a triangle and everything goes well during the GLES3 context creation + drawing. So you're good to go from here ;-)

@gonetz
Copy link

@gonetz gonetz commented on 9ad9863 May 3, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Gillou68310 Could you give me the patch with your changes? I also want to see GLES3 context creation + drawing :)

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 May 3, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, but everything is on my office computer right now so I'll send it to you tomorrow.

@gonetz
Copy link

@gonetz gonetz commented on 9ad9863 May 3, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Office computer?! Where is your office? I want the job like that!

Tomorrow is ok. Thanks in advance!

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 May 3, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lol don't tell my boss :P

@gonetz
Copy link

@gonetz gonetz commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok :)

The code is not necessary: I got demo rom running on my tablet.

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work!!! I can't wait to test :P

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using gles3?

@gonetz
Copy link

@gonetz gonetz commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GLES 3.1

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which features of 3.1 are you using in your code?

@gonetz
Copy link

@gonetz gonetz commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lots of. I'll upload the sources. You may try to compile them with GLES2 and see how many things are not supported :)

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks ;-) BTW which gles version do you plan to support at the end? Gles2 only or gles2+gles3.x

@gonetz
Copy link

@gonetz gonetz commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gles2+gles3.x

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using preprocessor or runtime detection?

@gonetz
Copy link

@gonetz gonetz commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently it is preprocessor.

It's better discuss on the forum.

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have access to paulscode.com at work :-(

@gonetz
Copy link

@gonetz gonetz commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How long until your work end? I'm finishing with code fixing. Then I'll upload the sources, so you may test it.

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lol it just started!

@ptitSeb
Copy link
Contributor

@ptitSeb ptitSeb commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can try a Pandora build also, to see how it run with "just" GLES2

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok so if you're using preprocessor we have to build the library for all gles versions and load the appropriate one depending on the major gles version available on the device. The only drawback of this is that it will increase the size of the apk. For now I think we should allow the user to select which gles version he wants to use so we can test both gles2 and gles3.x versions on a gles3.x device.

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which features of 3.1 are you using in your code?

Actually I was more interested in the 3.0 vs 3.1 differences because my device is 3.0 only. ;-)

@ptitSeb that would be great, the more devices we test the plugin on the better it will be!

@ptitSeb
Copy link
Contributor

@ptitSeb ptitSeb commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm at work too, but I'll start tomorrow night.

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks ;-)

@gonetz
Copy link

@gonetz gonetz commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GLES3.1 compatible sources for gliden64-integration branch:
https://drive.google.com/file/d/0B0YqMPjGo3B2akh6NXlGZFVBM3c/view?usp=sharing

Works very slow atm, but seems to be fully functional. Very close to PC version capabilities.

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks I'll test it.

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hehe, first screenshots:

screenshot_2015-05-04-11-32-34
screenshot_2015-05-04-11-31-38

Like I said my device is GLES3.0 only so this might explain why it doesn't work as expected.

Here's the modified sources in order to build against GLES3:
https://dl.dropboxusercontent.com/u/27654797/mupen64plus-video-gliden64.zip

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gonetz what's the status on GLES2 support? Is it worth testing atm?

@gonetz
Copy link

@gonetz gonetz commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GLES2 status: incompatible. Lot's of work here.
As you see, GLES3 is far from perfect yet.
GLES3.1 is near perfect though, except for speed.

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok thanks for clarifying ;-) Just out of curiosity what device are you using for testing?

@gonetz
Copy link

@gonetz gonetz commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NVidia Shield. Gift from NVidia :)
I'll test GLES 3 on my Galaxy Note 3.

Thanks for modified sources btw. Some fixes are general and useful for PC version too.

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm testing on Galaxy Note 3 too ;-)

@gonetz
Copy link

@gonetz gonetz commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And I have Note 2 for GLES 2 testing.

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfect, but we can also test GLES2 on Note3 ;-)

@gonetz
Copy link

@gonetz gonetz commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My GLES3 screenshot looks better :P
Its from NVidia though.

screenshot_2015-05-04_17-59-07

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed!! Did you change something in the code?

@gonetz
Copy link

@gonetz gonetz commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nothing serious. It was not fair experiment. I'm trying to run it on my Note3, but it crashes.

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hum weird

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh yeah you have to change APP_PLATFORM := android-21 to match your phone platform

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 May 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mine is android-19

@ptitSeb
Copy link
Contributor

@ptitSeb ptitSeb commented on 9ad9863 May 5, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mmm, no way to compile with GLES2 only for now. In GLSLCombiner.h, the struct UniformBlockData is GLES3 only, with glGetUniformBlockIndex and friends.

@ptitSeb
Copy link
Contributor

@ptitSeb ptitSeb commented on 9ad9863 May 5, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is also a glBlitFramebuffer in DepthBuffer.cpp that is also not supported in GLES2.

@gonetz
Copy link

@gonetz gonetz commented on 9ad9863 May 6, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, GLES2 support requires serious code modifications due to absence of many GL features used by the plugin.

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 May 11, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gonetz I updated my note3 to lollipop in order to get the latest OpenGL ES 3.0 driver (V@84.0) and most texture issues are now gone. Also using framebuffer emulation doesn't rotate the screen anymore but it's still buggy:

screenshot_2015-05-11-16-03-48

@gonetz
Copy link

@gonetz gonetz commented on 9ad9863 May 11, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds great!

I updated my note3 to lollipop

Is it official firmware?

@Gillou68310
Copy link

@Gillou68310 Gillou68310 commented on 9ad9863 May 11, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it is ;-)

Please sign in to comment.