Changeset 19939

Timestamp:

04/10/07 10:28:57 (1 year ago)

Author:

patrick

Message:

MFT [rev 19933]: Updated for the change in how multisampling is configured.

Files:

• juggler/branches/2.0/modules/vrjuggler/vrj/Draw/Pf/PfDrawManager.cpp (modified) (6 diffs)

juggler/branches/2.0/modules/vrjuggler/vrj/Draw/Pf/PfDrawManager.cpp

@@ -926 +926 @@
-   // auxiliary buffers that meets or exceeds the requested count.
-   int num_aux_bufs(0);
-
+
+
+
-
-   jccl::ConfigElementPtr fb_element = disp->getGlFrameBufferConfig();
@@ -932 +934 @@
-   if ( fb_element.get() != NULL )
-   {
-2
+3
-      {
-         vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_WARNING_LVL)
-:") << "
+") << ":
-            << disp->getName() << "'" << std::endl;
-         vprDEBUG_NEXTnl(vrjDBG_DRAW_MGR, vprDBG_WARNING_LVL)
@@ -959 +961 @@
-      accum_blue_size  = fb_element->getProperty<int>("accum_blue_size");
-      accum_alpha_size = fb_element->getProperty<int>("accum_alpha_size");
-
+
+
+
+
-
-      if ( red_size < 0 )
@@ -1058 +1063 @@
-            << accum_alpha_size << ").  Setting to 1.\n" << vprDEBUG_FLUSH;
-         accum_alpha_size = 1;
+      }
+
+      if ( num_sample_bufs < 0 )
+      {
+         vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_WARNING_LVL)
+            << clrOutBOLD(clrYELLOW, "WARNING")
+            << ": Number of multisampling buffers was negative ("
+            << num_sample_bufs << ").  Setting to 1.\n" << vprDEBUG_FLUSH;
+         num_sample_bufs = 1;
+      }
+
+      if ( num_samples < 0 )
+      {
+         vprDEBUG(vrjDBG_DRAW_MGR, vprDBG_WARNING_LVL)
+            << clrOutBOLD(clrYELLOW, "WARNING")
+            << ": Number of samples for multisampling was negative ("
+            << num_samples << ").  Setting to 2.\n" << vprDEBUG_FLUSH;
+         num_samples = 2;
-      }
-   }
@@ -1118 +1141 @@
-      << std::setiosflags(std::ios::left) << std::setfill('.')
-      << indent_text << std::setw(pad_width_dot)
-
+
+
+
+
+
+
-      << std::endl;
-   vprDEBUG_CONTnl(vrjDBG_DRAW_MGR, vprDBG_CONFIG_LVL)
@@ -1134 +1162 @@
-   attrs.push_back(PFFB_ACCUM_BLUE_SIZE);  attrs.push_back(accum_blue_size);
-   attrs.push_back(PFFB_ACCUM_ALPHA_SIZE); attrs.push_back(accum_alpha_size);
-
-
-
-
+
+
+
+
+
-   }
-}