From 672a191d2a8e4a0d66ff6e88091238c2e83a5ef5 Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 19 Jul 2015 21:23:46 +0200 Subject: [PATCH] Improve error message when Cg support is not enabled --- panda/src/glstuff/glGraphicsStateGuardian_src.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx index db342f423a..e05e1e2d8e 100644 --- a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx +++ b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx @@ -4828,8 +4828,8 @@ prepare_shader(Shader *se) { return NULL; } -#if defined(HAVE_CG) && !defined(OPENGLES) case Shader::SL_Cg: +#if defined(HAVE_CG) && !defined(OPENGLES) if (_supports_basic_shaders) { result = new CLP(CgShaderContext)(this, se); break; @@ -4838,6 +4838,10 @@ prepare_shader(Shader *se) { << "Tried to load Cg shader, but basic shaders not supported.\n"; return NULL; } +#elif defined(OPENGLES) + GLCAT.error() + << "Tried to load Cg shader, but Cg support is not available for OpenGL ES.\n"; + return NULL; #else GLCAT.error() << "Tried to load Cg shader, but Cg support not compiled in.\n";