Revision: 75433
http://sourceforge.net/p/brlcad/code/75433
Author: starseeker
Date: 2020-04-17 13:24:03 +0000 (Fri, 17 Apr 2020)
Log Message:
-----------
Stub in hooks for the geometry_request and internal_var functions that were put
temporarily in dm-generic
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c
brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c
brlcad/branches/dm-fb-merge/src/libdm/include/calltable.h
brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.c
brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp
brlcad/branches/dm-fb-merge/src/libdm/plot/dm-plot.c
brlcad/branches/dm-fb-merge/src/libdm/postscript/dm-ps.c
brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp
brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c
brlcad/branches/dm-fb-merge/src/libdm/txt/dm-txt.c
brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c
Modified: brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c 2020-04-17 13:12:00 UTC
(rev 75432)
+++ brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c 2020-04-17 13:24:03 UTC
(rev 75433)
@@ -1756,6 +1756,8 @@
X_openFb,
NULL,
NULL,
+ NULL,
+ NULL,
0,
0, /* no displaylist */
0, /* no stereo */
Modified: brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c 2020-04-17 13:12:00 UTC
(rev 75432)
+++ brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c 2020-04-17 13:24:03 UTC
(rev 75433)
@@ -2624,6 +2624,8 @@
ogl_openFb,
ogl_get_internal,
ogl_put_internal,
+ NULL,
+ NULL,
0,
1, /* has displaylist */
0, /* no stereo by default */
Modified: brlcad/branches/dm-fb-merge/src/libdm/include/calltable.h
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/include/calltable.h 2020-04-17
13:12:00 UTC (rev 75432)
+++ brlcad/branches/dm-fb-merge/src/libdm/include/calltable.h 2020-04-17
13:24:03 UTC (rev 75433)
@@ -92,6 +92,8 @@
int (*dm_openFb)(struct dm *dmp);
int (*dm_get_internal)(struct dm *dmp);
int (*dm_put_internal)(struct dm *dmp);
+ int (*dm_geometry_request)(struct dm *dmp, int width, int height);
+ int (*dm_internal_var)(struct bu_vls *result, struct dm *dmp, const char
*key);
unsigned long dm_id; /**< @brief window id */
int dm_displaylist; /**< @brief !0 means device has
displaylist */
int dm_stereo; /**< @brief stereo flag */
Modified: brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.c 2020-04-17
13:12:00 UTC (rev 75432)
+++ brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.c 2020-04-17
13:24:03 UTC (rev 75433)
@@ -324,6 +324,8 @@
null_openFb,
NULL,
NULL,
+ NULL,
+ NULL,
0,
0, /* no displaylist */
0, /* no stereo */
Modified: brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp 2020-04-17
13:12:00 UTC (rev 75432)
+++ brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp 2020-04-17
13:24:03 UTC (rev 75433)
@@ -2522,6 +2522,8 @@
osgl_openFb,
osgl_get_internal,
osgl_put_internal,
+ NULL,
+ NULL,
0,
1, /* has displaylist */
0, /* no stereo by default */
Modified: brlcad/branches/dm-fb-merge/src/libdm/plot/dm-plot.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/plot/dm-plot.c 2020-04-17
13:12:00 UTC (rev 75432)
+++ brlcad/branches/dm-fb-merge/src/libdm/plot/dm-plot.c 2020-04-17
13:24:03 UTC (rev 75433)
@@ -569,6 +569,8 @@
null_openFb,
NULL,
NULL,
+ NULL,
+ NULL,
0,
0, /* no displaylist */
0, /* no stereo */
Modified: brlcad/branches/dm-fb-merge/src/libdm/postscript/dm-ps.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/postscript/dm-ps.c 2020-04-17
13:12:00 UTC (rev 75432)
+++ brlcad/branches/dm-fb-merge/src/libdm/postscript/dm-ps.c 2020-04-17
13:24:03 UTC (rev 75433)
@@ -539,6 +539,8 @@
null_openFb,
NULL,
NULL,
+ NULL,
+ NULL,
0,
0, /* no displaylist */
0, /* no stereo */
Modified: brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp 2020-04-17 13:12:00 UTC
(rev 75432)
+++ brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp 2020-04-17 13:24:03 UTC
(rev 75433)
@@ -1027,6 +1027,8 @@
qt_openFb,
NULL,
NULL,
+ NULL,
+ NULL,
0,
0, /* no displaylist */
0, /* no stereo */
Modified: brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c 2020-04-17 13:12:00 UTC
(rev 75432)
+++ brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c 2020-04-17 13:24:03 UTC
(rev 75433)
@@ -892,6 +892,8 @@
null_openFb,
NULL,
NULL,
+ NULL,
+ NULL,
0,
0, /* no displaylist */
0, /* no stereo */
Modified: brlcad/branches/dm-fb-merge/src/libdm/txt/dm-txt.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/txt/dm-txt.c 2020-04-17 13:12:00 UTC
(rev 75432)
+++ brlcad/branches/dm-fb-merge/src/libdm/txt/dm-txt.c 2020-04-17 13:24:03 UTC
(rev 75433)
@@ -380,6 +380,8 @@
txt_openFb,
NULL,
NULL,
+ NULL,
+ NULL,
0,
0, /* no displaylist */
0, /* no stereo */
Modified: brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c 2020-04-17 13:12:00 UTC
(rev 75432)
+++ brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c 2020-04-17 13:24:03 UTC
(rev 75433)
@@ -2167,6 +2167,8 @@
wgl_openFb,
wgl_get_internal,
wgl_put_internal,
+ NULL,
+ NULL,
0,
1, /* has displaylist */
0, /* no stereo by default */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
