atria-soft/gale
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] Set android in openGL ES 3 limit at API 19(4.3)

Browse Source
This commit is contained in:
Edouard DUPIN 2017-06-28 08:21:56 +02:00
parent d91a26e294
commit ab2e72df38
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gale/renderer/openGL/openGL-include.hpp
View File

@ -22,7 +22,7 @@ extern "C" {
#undef glTranslatef #undef glTranslatef
#elif defined(__TARGET_OS__Android) #elif defined(__TARGET_OS__Android)
// Include openGL ES 2 // Include openGL ES 2
#include <GLES2/gl2.h> #include <GLES3/gl3.h>
#include <GLES2/gl2ext.h> #include <GLES2/gl2ext.h>
#elif defined(__TARGET_OS__Windows) #elif defined(__TARGET_OS__Windows)
// TO ENABLE THE SHADER api ... // TO ENABLE THE SHADER api ...

2
gale/renderer/openGL/openGL.cpp
View File

@ -655,7 +655,7 @@ void gale::openGL::drawElements8(enum renderMode _mode, const std::vector<uint8_
} }
void gale::openGL::useProgram(int32_t _id) { void gale::openGL::useProgram(int32_t _id) {
GALE_DEBUG("USE prog : " << _id); GALE_VERBOSE("USE prog : " << _id);
#if 1 #if 1
// note : In normal openGL case, the system might call with the program ID and at the end with 0, // note : In normal openGL case, the system might call with the program ID and at the end with 0,
// here, we wrap this use to prevent over call of glUseProgram == > then we set -1 when the // here, we wrap this use to prevent over call of glUseProgram == > then we set -1 when the

4
gale/resource/Manager.cpp
View File

@ -127,7 +127,7 @@ void gale::resource::Manager::updateContext() {
} }
if (resourceList.size() != 0) { if (resourceList.size() != 0) {
for (size_t jjj=0; jjj<MAX_RESOURCE_LEVEL; jjj++) { for (size_t jjj=0; jjj<MAX_RESOURCE_LEVEL; jjj++) {
GALE_INFO(" updateContext level (D) : " << jjj << "/" << (MAX_RESOURCE_LEVEL-1)); GALE_VERBOSE(" updateContext level (D) : " << jjj << "/" << (MAX_RESOURCE_LEVEL-1));
for (auto &it : resourceList) { for (auto &it : resourceList) {
ememory::SharedPtr<gale::Resource> tmpRessource = it.lock(); ememory::SharedPtr<gale::Resource> tmpRessource = it.lock();
if( tmpRessource != nullptr if( tmpRessource != nullptr
@ -152,7 +152,7 @@ void gale::resource::Manager::updateContext() {
} }
if (resourceListToUpdate.size() != 0) { if (resourceListToUpdate.size() != 0) {
for (size_t jjj=0; jjj<MAX_RESOURCE_LEVEL; jjj++) { for (size_t jjj=0; jjj<MAX_RESOURCE_LEVEL; jjj++) {
GALE_DEBUG(" updateContext level (U) : " << jjj << "/" << (MAX_RESOURCE_LEVEL-1)); GALE_VERBOSE(" updateContext level (U) : " << jjj << "/" << (MAX_RESOURCE_LEVEL-1));
for (auto &it : resourceListToUpdate) { for (auto &it : resourceListToUpdate) {
if ( it != nullptr if ( it != nullptr
&& jjj == it->getResourceLevel()) { && jjj == it->getResourceLevel()) {

2
lutin_gale.py
View File

@ -402,7 +402,7 @@ def tool_generate_main_java_class(target, module, package_name):
module.set_pkg("VERSION_CODE", "0") module.set_pkg("VERSION_CODE", "0")
tmpFile.write( ' android:versionCode="' + str(module.get_pkg("VERSION_CODE")) + '" \n') tmpFile.write( ' android:versionCode="' + str(module.get_pkg("VERSION_CODE")) + '" \n')
tmpFile.write( ' android:versionName="'+tools.version_to_string(module.get_pkg("VERSION"))+'"> \n') tmpFile.write( ' android:versionName="'+tools.version_to_string(module.get_pkg("VERSION"))+'"> \n')
tmpFile.write( ' <uses-feature android:glEsVersion="0x00020000" android:required="true" />\n') tmpFile.write( ' <uses-feature android:glEsVersion="0x00030000" android:required="true" />\n')
tmpFile.write( ' <uses-sdk android:minSdkVersion="' + str(target.board_id) + '" \n') tmpFile.write( ' <uses-sdk android:minSdkVersion="' + str(target.board_id) + '" \n')
tmpFile.write( ' android:targetSdkVersion="' + str(target.board_id) + '" /> \n') tmpFile.write( ' android:targetSdkVersion="' + str(target.board_id) + '" /> \n')
if module.get_pkg("ANDROID_APPL_TYPE")=="APPL": if module.get_pkg("ANDROID_APPL_TYPE")=="APPL":