From a560122c4bfafd38131584f1be526af684f8cd0b Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 28 Aug 2015 12:46:23 +0200 Subject: OpenSubdiv: Remove some dead code --- intern/opensubdiv/opensubdiv_capi.cc | 2 -- intern/opensubdiv/opensubdiv_gpu_capi.cc | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'intern/opensubdiv') diff --git a/intern/opensubdiv/opensubdiv_capi.cc b/intern/opensubdiv/opensubdiv_capi.cc index 115020c88d8..28d1c259246 100644 --- a/intern/opensubdiv/opensubdiv_capi.cc +++ b/intern/opensubdiv/opensubdiv_capi.cc @@ -158,8 +158,6 @@ struct OpenSubdiv_GLMesh *openSubdiv_createOsdGLMeshFromTopologyRefiner( bits.set(OpenSubdiv::Osd::MeshInterleaveVarying, 1); bits.set(OpenSubdiv::Osd::MeshFVarData, 1); bits.set(OpenSubdiv::Osd::MeshEndCapBSplineBasis, 1); - // bits.set(Osd::MeshEndCapGregoryBasis, 1); - // bits.set(Osd::MeshEndCapLegacyGregory, 1); const int num_vertex_elements = 3; const int num_varying_elements = 3; diff --git a/intern/opensubdiv/opensubdiv_gpu_capi.cc b/intern/opensubdiv/opensubdiv_gpu_capi.cc index f21a8a523e6..f80ecce00a8 100644 --- a/intern/opensubdiv/opensubdiv_gpu_capi.cc +++ b/intern/opensubdiv/opensubdiv_gpu_capi.cc @@ -47,7 +47,6 @@ #include #include -//using OpenSubdiv::FarPatchTables; using OpenSubdiv::Osd::GLMeshInterface; extern "C" char datatoc_gpu_shader_opensubd_display_glsl[]; @@ -544,13 +543,11 @@ static void perform_drawElements(GLuint program, int num_elements, int start_element) { - int mode = GL_QUADS; if (program) { glUniform1i(glGetUniformLocation(program, "PrimitiveIdBase"), patch_index); } - mode = GL_LINES_ADJACENCY; - glDrawElements(mode, + glDrawElements(GL_LINES_ADJACENCY, num_elements, GL_UNSIGNED_INT, (void *)(start_element * sizeof(unsigned int))); -- cgit v1.2.3