Browse Source

Improve error message when Cg support is not enabled

rdb 10 years ago
parent
commit
672a191d2a
1 changed files with 5 additions and 1 deletions
  1. 5 1
      panda/src/glstuff/glGraphicsStateGuardian_src.cxx

+ 5 - 1
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";