Revision: 75440
http://sourceforge.net/p/brlcad/code/75440
Author: starseeker
Date: 2020-04-17 18:15:00 +0000 (Fri, 17 Apr 2020)
Log Message:
-----------
Stub in a couple more function callbacks
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/include/dm.h
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/include/dm.h
===================================================================
--- brlcad/branches/dm-fb-merge/include/dm.h 2020-04-17 17:24:33 UTC (rev
75439)
+++ brlcad/branches/dm-fb-merge/include/dm.h 2020-04-17 18:15:00 UTC (rev
75440)
@@ -294,6 +294,9 @@
// dmo_png_cmd behind the call table, so only provides PNG...
DM_EXPORT extern int dm_write_image(struct bu_vls *msgs, FILE *fp, struct dm
*dmp);
+DM_EXPORT extern void dm_flush(struct dm *dmp);
+DM_EXPORT extern void dm_sync(struct dm *dmp);
+
/* TODO - dm_vp is supposed to go away, but until we figure it out
* expose it here to allow dm hiding */
DM_EXPORT extern fastf_t *dm_get_vp(struct dm *dmp);
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 17:24:33 UTC
(rev 75439)
+++ brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c 2020-04-17 18:15:00 UTC
(rev 75440)
@@ -2056,6 +2056,8 @@
X_geometry_request,
X_internal_var,
X_write_image,
+ 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 17:24:33 UTC
(rev 75439)
+++ brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c 2020-04-17 18:15:00 UTC
(rev 75440)
@@ -2927,6 +2927,8 @@
ogl_geometry_request,
ogl_internal_var,
ogl_write_image,
+ 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
17:24:33 UTC (rev 75439)
+++ brlcad/branches/dm-fb-merge/src/libdm/include/calltable.h 2020-04-17
18:15:00 UTC (rev 75440)
@@ -97,6 +97,8 @@
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);
int (*dm_write_image)(struct bu_vls *msgs, FILE *fp, struct dm *dmp);
+ void (*dm_flush)(struct dm *dmp);
+ void (*dm_sync)(struct dm *dmp);
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
17:24:33 UTC (rev 75439)
+++ brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.c 2020-04-17
18:15:00 UTC (rev 75440)
@@ -327,6 +327,8 @@
NULL,
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
17:24:33 UTC (rev 75439)
+++ brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp 2020-04-17
18:15:00 UTC (rev 75440)
@@ -2561,6 +2561,8 @@
osgl_geometry_request,
osgl_internal_var,
NULL,
+ 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
17:24:33 UTC (rev 75439)
+++ brlcad/branches/dm-fb-merge/src/libdm/plot/dm-plot.c 2020-04-17
18:15:00 UTC (rev 75440)
@@ -572,6 +572,8 @@
NULL,
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
17:24:33 UTC (rev 75439)
+++ brlcad/branches/dm-fb-merge/src/libdm/postscript/dm-ps.c 2020-04-17
18:15:00 UTC (rev 75440)
@@ -542,6 +542,8 @@
NULL,
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 17:24:33 UTC
(rev 75439)
+++ brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp 2020-04-17 18:15:00 UTC
(rev 75440)
@@ -1068,6 +1068,8 @@
qt_geometry_request,
qt_internal_var,
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 17:24:33 UTC
(rev 75439)
+++ brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c 2020-04-17 18:15:00 UTC
(rev 75440)
@@ -932,6 +932,8 @@
tk_geometry_request,
tk_internal_var,
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 17:24:33 UTC
(rev 75439)
+++ brlcad/branches/dm-fb-merge/src/libdm/txt/dm-txt.c 2020-04-17 18:15:00 UTC
(rev 75440)
@@ -383,6 +383,8 @@
NULL,
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 17:24:33 UTC
(rev 75439)
+++ brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c 2020-04-17 18:15:00 UTC
(rev 75440)
@@ -2209,6 +2209,8 @@
wgl_geometry_request,
wgl_internal_var,
NULL,
+ 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
