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 with 2 additions and 2 deletions.
  1. +2 −2 AndroidManifest.xml
View
@@ -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

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 Apr 27, 2015

Contributor

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

Contributor

Gillou68310 replied Apr 27, 2015

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

@littleguy77

This comment has been minimized.

Show comment
Hide comment
@littleguy77

littleguy77 Apr 27, 2015

Member

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

Member

littleguy77 replied Apr 27, 2015

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

@Gillou68310

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 Apr 27, 2015

Contributor

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

Contributor

Gillou68310 replied Apr 27, 2015

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

This comment has been minimized.

Show comment
Hide comment
@littleguy77

littleguy77 Apr 27, 2015

Member

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.

Member

littleguy77 replied Apr 27, 2015

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

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 Apr 27, 2015

Contributor

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

Contributor

Gillou68310 replied Apr 27, 2015

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

@Gillou68310

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 Apr 27, 2015

Contributor

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

Contributor

Gillou68310 replied Apr 27, 2015

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

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 Apr 27, 2015

Contributor

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

Contributor

Gillou68310 replied Apr 27, 2015

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

This comment has been minimized.

Show comment
Hide comment
@littleguy77

littleguy77 Apr 27, 2015

Member

@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.

Member

littleguy77 replied Apr 27, 2015

@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

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 Apr 27, 2015

Contributor

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.

Contributor

Gillou68310 replied Apr 27, 2015

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

This comment has been minimized.

Show comment
Hide comment
@gonetz

gonetz Apr 28, 2015

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

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

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 Apr 28, 2015

Contributor

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

Contributor

Gillou68310 replied Apr 28, 2015

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

@gonetz

This comment has been minimized.

Show comment
Hide comment
@gonetz

gonetz Apr 28, 2015

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

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

@Gillou68310

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 Apr 28, 2015

Contributor

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

Contributor

Gillou68310 replied Apr 28, 2015

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

@gonetz

This comment has been minimized.

Show comment
Hide comment
@gonetz

gonetz Apr 28, 2015

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

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

@Gillou68310

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 Apr 28, 2015

Contributor

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 ;-)

Contributor

Gillou68310 replied Apr 28, 2015

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

This comment has been minimized.

Show comment
Hide comment
@gonetz

gonetz May 3, 2015

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

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

@Gillou68310

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 May 3, 2015

Contributor

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

Contributor

Gillou68310 replied May 3, 2015

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

@gonetz

This comment has been minimized.

Show comment
Hide comment
@gonetz

gonetz May 3, 2015

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

Tomorrow is ok. Thanks in advance!

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

Tomorrow is ok. Thanks in advance!

@Gillou68310

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 May 3, 2015

Contributor

Lol don't tell my boss :P

Contributor

Gillou68310 replied May 3, 2015

Lol don't tell my boss :P

@gonetz

This comment has been minimized.

Show comment
Hide comment
@gonetz

gonetz May 4, 2015

Ok :)

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

Ok :)

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

@Gillou68310

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 May 4, 2015

Contributor

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

Contributor

Gillou68310 replied May 4, 2015

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

@Gillou68310

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 May 4, 2015

Contributor

Using gles3?

Contributor

Gillou68310 replied May 4, 2015

Using gles3?

@gonetz

This comment has been minimized.

Show comment
Hide comment
@gonetz

gonetz May 4, 2015

GLES 3.1

GLES 3.1

@Gillou68310

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 May 4, 2015

Contributor

Which features of 3.1 are you using in your code?

Contributor

Gillou68310 replied May 4, 2015

Which features of 3.1 are you using in your code?

@gonetz

This comment has been minimized.

Show comment
Hide comment
@gonetz

gonetz May 4, 2015

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

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

@Gillou68310

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 May 4, 2015

Contributor

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

Contributor

Gillou68310 replied May 4, 2015

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

@gonetz

This comment has been minimized.

Show comment
Hide comment
@gonetz

gonetz May 4, 2015

gles2+gles3.x

gles2+gles3.x

@Gillou68310

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 May 4, 2015

Contributor

Using preprocessor or runtime detection?

Contributor

Gillou68310 replied May 4, 2015

Using preprocessor or runtime detection?

@gonetz

This comment has been minimized.

Show comment
Hide comment
@gonetz

gonetz May 4, 2015

Currently it is preprocessor.

It's better discuss on the forum.

Currently it is preprocessor.

It's better discuss on the forum.

@Gillou68310

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 May 4, 2015

Contributor

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

Contributor

Gillou68310 replied May 4, 2015

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

@gonetz

This comment has been minimized.

Show comment
Hide comment
@gonetz

gonetz May 4, 2015

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

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

@Gillou68310

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 May 4, 2015

Contributor

Lol it just started!

Contributor

Gillou68310 replied May 4, 2015

Lol it just started!

@ptitSeb

This comment has been minimized.

Show comment
Hide comment
@ptitSeb

ptitSeb May 4, 2015

Contributor

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

Contributor

ptitSeb replied May 4, 2015

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

@Gillou68310

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 May 4, 2015

Contributor

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.

Contributor

Gillou68310 replied May 4, 2015

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

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 May 4, 2015

Contributor

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!

Contributor

Gillou68310 replied May 4, 2015

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

This comment has been minimized.

Show comment
Hide comment
@ptitSeb

ptitSeb May 4, 2015

Contributor

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

Contributor

ptitSeb replied May 4, 2015

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

@Gillou68310

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 May 4, 2015

Contributor

Thanks ;-)

Contributor

Gillou68310 replied May 4, 2015

Thanks ;-)

@gonetz

This comment has been minimized.

Show comment
Hide comment
@gonetz

gonetz May 4, 2015

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.

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

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 May 4, 2015

Contributor

Thanks I'll test it.

Contributor

Gillou68310 replied May 4, 2015

Thanks I'll test it.

@Gillou68310

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 May 4, 2015

Contributor

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

Contributor

Gillou68310 replied May 4, 2015

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

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 May 4, 2015

Contributor

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

Contributor

Gillou68310 replied May 4, 2015

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

@gonetz

This comment has been minimized.

Show comment
Hide comment
@gonetz

gonetz May 4, 2015

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.

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

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 May 4, 2015

Contributor

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

Contributor

Gillou68310 replied May 4, 2015

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

@gonetz

This comment has been minimized.

Show comment
Hide comment
@gonetz

gonetz May 4, 2015

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.

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

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 May 4, 2015

Contributor

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

Contributor

Gillou68310 replied May 4, 2015

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

@gonetz

This comment has been minimized.

Show comment
Hide comment
@gonetz

gonetz May 4, 2015

And I have Note 2 for GLES 2 testing.

And I have Note 2 for GLES 2 testing.

@Gillou68310

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 May 4, 2015

Contributor

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

Contributor

Gillou68310 replied May 4, 2015

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

@gonetz

This comment has been minimized.

Show comment
Hide comment
@gonetz

gonetz May 4, 2015

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

screenshot_2015-05-04_17-59-07

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

screenshot_2015-05-04_17-59-07

@Gillou68310

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 May 4, 2015

Contributor

Indeed!! Did you change something in the code?

Contributor

Gillou68310 replied May 4, 2015

Indeed!! Did you change something in the code?

@gonetz

This comment has been minimized.

Show comment
Hide comment
@gonetz

gonetz May 4, 2015

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

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

@Gillou68310

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 May 4, 2015

Contributor

Hum weird

Contributor

Gillou68310 replied May 4, 2015

Hum weird

@Gillou68310

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 May 4, 2015

Contributor

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

Contributor

Gillou68310 replied May 4, 2015

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

@Gillou68310

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 May 4, 2015

Contributor

mine is android-19

Contributor

Gillou68310 replied May 4, 2015

mine is android-19

@ptitSeb

This comment has been minimized.

Show comment
Hide comment
@ptitSeb

ptitSeb May 5, 2015

Contributor

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

Contributor

ptitSeb replied May 5, 2015

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

@ptitSeb

This comment has been minimized.

Show comment
Hide comment
@ptitSeb

ptitSeb May 5, 2015

Contributor

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

Contributor

ptitSeb replied May 5, 2015

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

@gonetz

This comment has been minimized.

Show comment
Hide comment
@gonetz

gonetz May 6, 2015

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

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

@Gillou68310

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 May 11, 2015

Contributor

@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

Contributor

Gillou68310 replied May 11, 2015

@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

This comment has been minimized.

Show comment
Hide comment
@gonetz

gonetz May 11, 2015

Sounds great!

I updated my note3 to lollipop

Is it official firmware?

Sounds great!

I updated my note3 to lollipop

Is it official firmware?

@Gillou68310

This comment has been minimized.

Show comment
Hide comment
@Gillou68310

Gillou68310 May 11, 2015

Contributor

Yes it is ;-)

Contributor

Gillou68310 replied May 11, 2015

Yes it is ;-)

Please sign in to comment.