[DEV] remove some logs
This commit is contained in:
parent
b9433d2cb7
commit
3d0e63f5a6
2
external/ege
vendored
2
external/ege
vendored
@ -1 +1 @@
|
||||
Subproject commit c838fc6e3e6bb6e0419d7e45a8cd15a1794e617c
|
||||
Subproject commit 2ffa87dd73f54e2e431c2735d9145c280a57646f
|
||||
@ -13,19 +13,27 @@
|
||||
#include <mutex>
|
||||
//#define DIRECT_MODE
|
||||
|
||||
#define CHECK_ERROR_OPENGL
|
||||
|
||||
static void checkGlError(const char* _op, int32_t _localLine) {
|
||||
bool isPresent = false;
|
||||
#ifdef CHECK_ERROR_OPENGL
|
||||
bool hasError = false;
|
||||
for (GLint error = glGetError(); error; error = glGetError()) {
|
||||
EWOL_ERROR("after " << _op << "():" << _localLine << " glError(" << error << ")");
|
||||
isPresent = true;
|
||||
hasError = true;
|
||||
}
|
||||
if (isPresent == true) {
|
||||
if (hasError == true) {
|
||||
EWOL_CRITICAL("plop");
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
#define OPENGL_ERROR(data) do { } while (false)
|
||||
//#define OPENGL_ERROR(data) EWOL_ERROR(data)
|
||||
#define OPENGL_WARNING(data) do { } while (false)
|
||||
//#define OPENGL_WARNING(data) EWOL_WARNING(data)
|
||||
#define OPENGL_INFO(data) do { } while (false)
|
||||
//#define OPENGL_INFO(data) EWOL_INFO(data)
|
||||
|
||||
|
||||
/**
|
||||
@ -129,9 +137,9 @@ void ewol::openGL::flush() {
|
||||
l_programId = -1;
|
||||
l_textureflags = 0;
|
||||
glFlush();
|
||||
EWOL_ERROR("========================" );
|
||||
EWOL_ERROR("== FLUSH OPEN GL ==" );
|
||||
EWOL_ERROR("========================");
|
||||
OPENGL_INFO("========================" );
|
||||
OPENGL_INFO("== FLUSH OPEN GL ==" );
|
||||
OPENGL_INFO("========================");
|
||||
}
|
||||
|
||||
void ewol::openGL::swap() {
|
||||
@ -314,7 +322,7 @@ void ewol::openGL::reset() {
|
||||
}
|
||||
|
||||
void ewol::openGL::enable(enum ewol::openGL::openGlFlags _flagID) {
|
||||
//EWOL_INFO("Enable : " << _flagID);
|
||||
//EWOL_INFO("Enable : " <EWOL_ERROR< _flagID);
|
||||
#ifdef DIRECT_MODE
|
||||
for (int32_t iii=0; iii<basicFlagCount ; iii++) {
|
||||
if ( basicFlag[iii].curentFlag == (uint32_t)_flagID ) {
|
||||
@ -349,19 +357,19 @@ void ewol::openGL::updateAllFlags() {
|
||||
#endif
|
||||
// check if fhags has change :
|
||||
if (l_flagsMustBeSet == l_flagsCurrent ) {
|
||||
EWOL_INFO("OGL: current flag : " << (enum openGL::openGlFlags)l_flagsMustBeSet);
|
||||
OPENGL_INFO("OGL: current flag : " << (enum openGL::openGlFlags)l_flagsMustBeSet);
|
||||
return;
|
||||
}
|
||||
EWOL_INFO("OGL: set new flag : " << (enum openGL::openGlFlags)l_flagsMustBeSet);
|
||||
OPENGL_INFO("OGL: set new flag : " << (enum openGL::openGlFlags)l_flagsMustBeSet);
|
||||
for (int32_t iii=0; iii<basicFlagCount ; iii++) {
|
||||
uint32_t CurrentFlag = basicFlag[iii].curentFlag;
|
||||
if ( (l_flagsMustBeSet&CurrentFlag)!=(l_flagsCurrent&CurrentFlag) ) {
|
||||
if ( (l_flagsMustBeSet&CurrentFlag) != 0) {
|
||||
glEnable(basicFlag[iii].OGlFlag);
|
||||
EWOL_INFO(" enable : " << (enum openGL::openGlFlags)basicFlag[iii].curentFlag);
|
||||
OPENGL_INFO(" enable : " << (enum openGL::openGlFlags)basicFlag[iii].curentFlag);
|
||||
} else {
|
||||
glDisable(basicFlag[iii].OGlFlag);
|
||||
EWOL_INFO(" disable : " << (enum openGL::openGlFlags)basicFlag[iii].curentFlag);
|
||||
OPENGL_INFO(" disable : " << (enum openGL::openGlFlags)basicFlag[iii].curentFlag);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -442,7 +450,7 @@ bool ewol::openGL::genBuffers(std::vector<GLuint>& _buffers) {
|
||||
EWOL_WARNING("try to generate vector buffer with size 0");
|
||||
return true;
|
||||
}
|
||||
EWOL_VERBOSE("Create N=" << _buffers.size() << " Buffer");
|
||||
OPENGL_INFO("Create N=" << _buffers.size() << " Buffer");
|
||||
glGenBuffers(_buffers.size(), &_buffers[0]);
|
||||
checkGlError("glGenBuffers", __LINE__);
|
||||
bool hasError = false;
|
||||
|
||||
@ -42,7 +42,7 @@ void ewol::resource::Program::init(const std::string& _filename) {
|
||||
tmpFilename.erase(tmpFilename.size()-4, 4);
|
||||
std::shared_ptr<ewol::resource::Shader> tmpShader = ewol::resource::Shader::create(tmpFilename+"vert");
|
||||
if (nullptr == tmpShader) {
|
||||
EWOL_CRITICAL("Error while getting a specific shader filename : " << tmpFilename);
|
||||
EWOL_ERROR("Error while getting a specific shader filename : " << tmpFilename);
|
||||
return;
|
||||
} else {
|
||||
EWOL_DEBUG("Add shader on program : "<< tmpFilename << "vert");
|
||||
@ -50,7 +50,7 @@ void ewol::resource::Program::init(const std::string& _filename) {
|
||||
}
|
||||
tmpShader = ewol::resource::Shader::create(tmpFilename+"frag");
|
||||
if (nullptr == tmpShader) {
|
||||
EWOL_CRITICAL("Error while getting a specific shader filename : " << tmpFilename);
|
||||
EWOL_ERROR("Error while getting a specific shader filename : " << tmpFilename);
|
||||
return;
|
||||
} else {
|
||||
EWOL_DEBUG("Add shader on program : "<< tmpFilename << "frag");
|
||||
@ -86,7 +86,7 @@ void ewol::resource::Program::init(const std::string& _filename) {
|
||||
std::string tmpFilename = file.getRelativeFolder() + tmpData;
|
||||
std::shared_ptr<ewol::resource::Shader> tmpShader = ewol::resource::Shader::create(tmpFilename);
|
||||
if (nullptr == tmpShader) {
|
||||
EWOL_CRITICAL("Error while getting a specific shader filename : " << tmpFilename);
|
||||
EWOL_ERROR("Error while getting a specific shader filename : " << tmpFilename);
|
||||
} else {
|
||||
EWOL_DEBUG("Add shader on program : "<< tmpFilename);
|
||||
m_shaderList.push_back(tmpShader);
|
||||
@ -353,7 +353,7 @@ void ewol::resource::Program::sendAttribute(int32_t _idElem,
|
||||
if (m_elementList[_idElem].m_isLinked == false) {
|
||||
return;
|
||||
}
|
||||
EWOL_ERROR("[" << m_elementList[_idElem].m_name << "] send " << _nbElement << " element");
|
||||
//EWOL_ERROR("[" << m_elementList[_idElem].m_name << "] send " << _nbElement << " element");
|
||||
glVertexAttribPointer(m_elementList[_idElem].m_elementId, // attribute ID of openGL
|
||||
_nbElement, // number of elements per vertex, here (r,g,b,a)
|
||||
GL_FLOAT, // the type of each element
|
||||
@ -380,14 +380,15 @@ void ewol::resource::Program::sendAttributePointer(int32_t _idElem,
|
||||
if (false == m_elementList[_idElem].m_isLinked) {
|
||||
return;
|
||||
}
|
||||
EWOL_INFO(m_elementList);
|
||||
EWOL_ERROR("[" << m_elementList[_idElem].m_name << "] send " << _vbo->getElementSize(_index) << " element on oglID=" << _vbo->getGL_ID(_index) << " VBOindex=" << _index);
|
||||
//EWOL_ERROR("[" << m_elementList[_idElem].m_name << "] send " << _vbo->getElementSize(_index) << " element on oglID=" << _vbo->getGL_ID(_index) << " VBOindex=" << _index);
|
||||
glBindBuffer(GL_ARRAY_BUFFER, _vbo->getGL_ID(_index));
|
||||
checkGlError("glBindBuffer", __LINE__);
|
||||
/*
|
||||
EWOL_ERROR(" id=" << m_elementList[_idElem].m_elementId);
|
||||
EWOL_ERROR(" eleme size=" << _vbo->getElementSize(_index));
|
||||
EWOL_ERROR(" jump sample=" << _jumpBetweenSample);
|
||||
EWOL_ERROR(" offset=" << _offset);
|
||||
*/
|
||||
glVertexAttribPointer(m_elementList[_idElem].m_elementId, // attribute ID of openGL
|
||||
_vbo->getElementSize(_index), // number of elements per vertex, here (r,g,b,a)
|
||||
GL_FLOAT, // the type of each element
|
||||
@ -412,12 +413,11 @@ void ewol::resource::Program::uniformMatrix(int32_t _idElem, const mat4& _matrix
|
||||
if (false == m_elementList[_idElem].m_isLinked) {
|
||||
return;
|
||||
}
|
||||
EWOL_ERROR("[" << m_elementList[_idElem].m_name << "] send 1 matrix");
|
||||
//EWOL_ERROR("[" << m_elementList[_idElem].m_name << "] send 1 matrix");
|
||||
// note : Android des not supported the transposition of the matrix, then we will done it oursef:
|
||||
if (true == _transpose) {
|
||||
mat4 tmp = _matrix;
|
||||
tmp.transpose();
|
||||
EWOL_ERROR("matrix:" << tmp);
|
||||
glUniformMatrix4fv(m_elementList[_idElem].m_elementId, 1, GL_FALSE, tmp.m_mat);
|
||||
} else {
|
||||
glUniformMatrix4fv(m_elementList[_idElem].m_elementId, 1, GL_FALSE, _matrix.m_mat);
|
||||
@ -610,7 +610,7 @@ void ewol::resource::Program::uniform3fv(int32_t _idElem, int32_t _nbElement, co
|
||||
EWOL_ERROR("nullptr Input pointer to send at open GL ...");
|
||||
return;
|
||||
}
|
||||
EWOL_ERROR("[" << m_elementList[_idElem].m_name << "] send " << _nbElement << " vec3");
|
||||
EWOL_VERBOSE("[" << m_elementList[_idElem].m_name << "] send " << _nbElement << " vec3");
|
||||
glUniform3fv(m_elementList[_idElem].m_elementId, _nbElement, _value);
|
||||
//checkGlError("glUniform3fv", __LINE__);
|
||||
}
|
||||
@ -633,7 +633,7 @@ void ewol::resource::Program::uniform4fv(int32_t _idElem, int32_t _nbElement, co
|
||||
EWOL_ERROR("nullptr Input pointer to send at open GL ...");
|
||||
return;
|
||||
}
|
||||
EWOL_ERROR("[" << m_elementList[_idElem].m_name << "] send " << _nbElement << " vec4");
|
||||
EWOL_VERBOSE("[" << m_elementList[_idElem].m_name << "] send " << _nbElement << " vec4");
|
||||
glUniform4fv(m_elementList[_idElem].m_elementId, _nbElement, _value);
|
||||
//checkGlError("glUniform4fv", __LINE__);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user