AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-11-24 20:40:15 +00:00
Code Issues Releases Wiki Activity

removing more #ifdef's related to adaptive tessellation ability

Browse Source 
fixes #111
This commit is contained in:
manuelk 2013-02-05 15:25:46 -08:00
parent 6f5d1e34be
commit e1f6486ce4
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/glViewer/viewer.cpp
View File

@ -1652,9 +1652,8 @@ initHUD()
g_hud.AddCheckBox("Patch Color (P)", true, 350, 110, callbackDisplayPatchColor, 0, 'p');
g_hud.AddCheckBox("Freeze (spc)", false, 350, 130, callbackFreeze, 0, ' ');
#if defined(GL_ARB_tessellation_shader) || defined(GL_VERSION_4_0)
g_hud.AddCheckBox("Adaptive (`)", true, 10, 150, callbackAdaptive, 0, '`');
#endif
if (OpenSubdiv::OsdGLDrawContext::SupportsAdaptiveTessellation())
g_hud.AddCheckBox("Adaptive (`)", g_adaptive, 10, 150, callbackAdaptive, 0, '`');
for (int i = 1; i < 11; ++i) {
char level[16];

21
examples/ptexViewer/viewer.cpp
View File

@ -206,7 +206,7 @@ int g_fullscreen=0,
g_running = 1;
float g_moveScale = 0.0f;
bool g_adaptive = true,
bool g_adaptive = 0,
g_displayPatchColor = false,
g_patchCull = true,
g_screenSpaceTess = true,
@ -1496,8 +1496,10 @@ callbackCheckBox(bool checked, int button)
switch(button) {
case HUD_CB_ADAPTIVE:
g_adaptive = checked;
rebuild = true;
if (OpenSubdiv::OsdGLDrawContext::SupportsAdaptiveTessellation()) {
g_adaptive = checked;
rebuild = true;
}
break;
case HUD_CB_DISPLAY_COLOR:
g_color = checked;
@ -1712,10 +1714,6 @@ int main(int argc, char ** argv) {
OsdSetErrorCallback(callbackError);
#if not (defined(GL_ARB_tessellation_shader) || defined(GL_VERSION_4_0))
g_adaptive = 0;
#endif
g_shaderSource = g_defaultShaderSource;
reloadShaderFile();
@ -1778,6 +1776,9 @@ int main(int argc, char ** argv) {
#endif
#endif
// activate feature adaptive tessellation if OSD supports it
g_adaptive = OpenSubdiv::OsdGLDrawContext::SupportsAdaptiveTessellation();
#ifdef OPENSUBDIV_HAS_OPENCL
// Initialize OpenCL
if (initCL(&g_clContext, &g_clQueue) == false) {
@ -1846,9 +1847,9 @@ int main(int argc, char ** argv) {
g_hud.AddCheckBox("Frustum Patch Culling (B)", g_patchCull,
450, 70, callbackCheckBox, HUD_CB_PATCH_CULL, 'b');
#if defined(GL_ARB_tessellation_shader) || defined(GL_VERSION_4_0)
g_hud.AddCheckBox("Adaptive (`)", g_adaptive, 10, 150, callbackCheckBox, HUD_CB_ADAPTIVE, '`');
#endif
if (OpenSubdiv::OsdGLDrawContext::SupportsAdaptiveTessellation())
g_hud.AddCheckBox("Adaptive (`)", g_adaptive, 10, 150, callbackCheckBox, HUD_CB_ADAPTIVE, '`');
for (int i = 1; i < 8; ++i) {
char level[16];