diff --git a/bazaar/SurfaceCtrl/Shader.h b/bazaar/SurfaceCtrl/Shader.h index db62169b2..5d2506a5d 100644 --- a/bazaar/SurfaceCtrl/Shader.h +++ b/bazaar/SurfaceCtrl/Shader.h @@ -15,7 +15,27 @@ class OpenGLShader{ glGetShaderiv(ID, GL_COMPILE_STATUS, &success); if (!success){ glGetShaderInfoLog(ID, 512, NULL, infoLog); - LOG("ERROR::SHADER::VERTEX::COMPILATION_FAILED\n" + String(infoLog)); + String type; + switch(shaderType){ + case GL_VERTEX_SHADER: + type= "VERTEX"; + break; + case GL_FRAGMENT_SHADER: + type= "FRAGMENT"; + break; + case GL_TESS_CONTROL_SHADER: + type= "TESSELATION_CONTROL"; + break; + case GL_TESS_EVALUATION_SHADER: + type= "TESSELATION_EVALUATION"; + break; + case GL_GEOMETRY_SHADER: + type= "GEOMETRY"; + break; + default: + type= "UNKNOW"; + }; + LOG("ERROR::SHADER::" + type + "::" + AsString(ID) + "::COMPILATION_FAILED\n" + String(infoLog)); return false; } return true; diff --git a/bazaar/SurfaceCtrl/SurfaceCtrl.cpp b/bazaar/SurfaceCtrl/SurfaceCtrl.cpp index 96866d7d2..b8da22e94 100644 --- a/bazaar/SurfaceCtrl/SurfaceCtrl.cpp +++ b/bazaar/SurfaceCtrl/SurfaceCtrl.cpp @@ -20,11 +20,7 @@ void SurfaceCtrl::Init()noexcept{ SetDefaultShader(Axis); CameraFocus = objProvider.Begin(GL_TRIANGLE_FAN).AddCube(0.0f,0.0f,0.0f,1,LtYellow()).End(); SetDefaultShader(CameraFocus); - - #ifdef flagSKYBOX - skybox.Init(); - #endif - + WhenBegin(); loaded = true; });