Browse Source

compile correctly for OpenGL ES

rdb 13 years ago
parent
commit
0e72e83f4e
1 changed files with 5 additions and 0 deletions
  1. 5 0
      panda/src/glstuff/glGraphicsStateGuardian_src.cxx

+ 5 - 0
panda/src/glstuff/glGraphicsStateGuardian_src.cxx

@@ -951,9 +951,11 @@ reset() {
 
 
 #ifdef OPENGLES_2
 #ifdef OPENGLES_2
   _supports_glsl = true;
   _supports_glsl = true;
+  _supports_tessellation_shaders = false;
 #else
 #else
   #ifdef OPENGLES_1
   #ifdef OPENGLES_1
     _supports_glsl = false;
     _supports_glsl = false;
+    _supports_tessellation_shaders = false;
   #else
   #else
     _supports_glsl = is_at_least_gl_version(2, 0) || has_extension("GL_ARB_shading_language_100");
     _supports_glsl = is_at_least_gl_version(2, 0) || has_extension("GL_ARB_shading_language_100");
     _supports_geometry_shaders = is_at_least_gl_version(3, 2) || has_extension("GL_ARB_geometry_shader4");
     _supports_geometry_shaders = is_at_least_gl_version(3, 2) || has_extension("GL_ARB_geometry_shader4");
@@ -3159,6 +3161,7 @@ draw_patches(const GeomPrimitivePipelineReader *reader, bool force) {
     return false;
     return false;
   }
   }
 
 
+#ifndef OPENGLES
   _glPatchParameteri(GL_PATCH_VERTICES, reader->get_object()->get_num_vertices_per_primitive());
   _glPatchParameteri(GL_PATCH_VERTICES, reader->get_object()->get_num_vertices_per_primitive());
 
 
 #ifdef SUPPORT_IMMEDIATE_MODE
 #ifdef SUPPORT_IMMEDIATE_MODE
@@ -3209,6 +3212,8 @@ draw_patches(const GeomPrimitivePipelineReader *reader, bool force) {
     }
     }
   }
   }
 
 
+#endif // OPENGLES
+
   report_my_gl_errors();
   report_my_gl_errors();
   return true;
   return true;
 }
 }