From 8cd122bf5ab94ccafc3f7cba685e6f58fd349304 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Thu, 27 Jan 2005 14:48:35 +0000
Subject: [PATCH] new RenderModeAttrib::Mode values

---
 panda/src/dxgsg7/dxGraphicsStateGuardian7.cxx |  5 +++++
 panda/src/dxgsg8/dxGraphicsStateGuardian8.cxx |  5 +++++
 panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx |  5 +++++
 panda/src/testbed/pview.cxx                   | 15 +++++++++++++++
 4 files changed, 30 insertions(+)

diff --git a/panda/src/dxgsg7/dxGraphicsStateGuardian7.cxx b/panda/src/dxgsg7/dxGraphicsStateGuardian7.cxx
index 252e69fd52..830bddc6b1 100644
--- a/panda/src/dxgsg7/dxGraphicsStateGuardian7.cxx
+++ b/panda/src/dxgsg7/dxGraphicsStateGuardian7.cxx
@@ -3838,6 +3838,7 @@ issue_render_mode(const RenderModeAttrib *attrib) {
   RenderModeAttrib::Mode mode = attrib->get_mode();
 
   switch (mode) {
+  case RenderModeAttrib::M_unchanged:
   case RenderModeAttrib::M_filled:
     _pScrn->pD3DDevice->SetRenderState(D3DRENDERSTATE_FILLMODE, D3DFILL_SOLID);
     break;
@@ -3846,6 +3847,10 @@ issue_render_mode(const RenderModeAttrib *attrib) {
     _pScrn->pD3DDevice->SetRenderState(D3DRENDERSTATE_FILLMODE, D3DFILL_WIREFRAME);
     break;
 
+  case RenderModeAttrib::M_point:
+    _pScrn->pD3DDevice->SetRenderState(D3DRENDERSTATE_FILLMODE, D3DFILL_POINT);
+    break;
+
   default:
     dxgsg7_cat.error()
       << "Unknown render mode " << (int)mode << endl;
diff --git a/panda/src/dxgsg8/dxGraphicsStateGuardian8.cxx b/panda/src/dxgsg8/dxGraphicsStateGuardian8.cxx
index 7600ab9e8d..e0c26572d5 100644
--- a/panda/src/dxgsg8/dxGraphicsStateGuardian8.cxx
+++ b/panda/src/dxgsg8/dxGraphicsStateGuardian8.cxx
@@ -3280,6 +3280,7 @@ issue_render_mode(const RenderModeAttrib *attrib) {
   RenderModeAttrib::Mode mode = attrib->get_mode();
 
   switch (mode) {
+  case RenderModeAttrib::M_unchanged:
   case RenderModeAttrib::M_filled:
     _pD3DDevice->SetRenderState(D3DRS_FILLMODE, D3DFILL_SOLID);
     break;
@@ -3288,6 +3289,10 @@ issue_render_mode(const RenderModeAttrib *attrib) {
     _pD3DDevice->SetRenderState(D3DRS_FILLMODE, D3DFILL_WIREFRAME);
     break;
 
+  case RenderModeAttrib::M_point:
+    _pD3DDevice->SetRenderState(D3DRS_FILLMODE, D3DFILL_POINT);
+    break;
+
   default:
     dxgsg8_cat.error()
       << "Unknown render mode " << (int)mode << endl;
diff --git a/panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx b/panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx
index 9d5f6c7980..817589bc8c 100755
--- a/panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx
+++ b/panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx
@@ -3268,6 +3268,7 @@ issue_render_mode(const RenderModeAttrib *attrib) {
   RenderModeAttrib::Mode mode = attrib->get_mode();
 
   switch (mode) {
+  case RenderModeAttrib::M_unchanged:
   case RenderModeAttrib::M_filled:
     _pD3DDevice->SetRenderState(D3DRS_FILLMODE, D3DFILL_SOLID);
     break;
@@ -3276,6 +3277,10 @@ issue_render_mode(const RenderModeAttrib *attrib) {
     _pD3DDevice->SetRenderState(D3DRS_FILLMODE, D3DFILL_WIREFRAME);
     break;
 
+  case RenderModeAttrib::M_point:
+    _pD3DDevice->SetRenderState(D3DRS_FILLMODE, D3DFILL_POINT);
+    break;
+
   default:
     dxgsg9_cat.error()
       << "Unknown render mode " << (int)mode << endl;
diff --git a/panda/src/testbed/pview.cxx b/panda/src/testbed/pview.cxx
index adea064609..1caacf5650 100644
--- a/panda/src/testbed/pview.cxx
+++ b/panda/src/testbed/pview.cxx
@@ -192,8 +192,23 @@ help() {
     "      Display this help text.\n\n";
 }
 
+void dofoo(int foo[2]) {
+}
+
+void dofoo2(int foo[][2]) {
+}
+
 int
 main(int argc, char *argv[]) {
+  int foo[3][2] = { { 0, 1 }, { 2, 3 }, { 4, 5 } };
+  int *xfoo = (int *)foo;
+  for (int i = 0; i < 6; i++) {
+    cerr << xfoo[i] << " ";
+  }
+  cerr << "\n";
+  dofoo(foo[0]);
+  dofoo2(foo);
+
   framework.open_framework(argc, argv);
   framework.set_window_title("Panda Viewer");