Revision: 75456
http://sourceforge.net/p/brlcad/code/75456
Author: starseeker
Date: 2020-04-18 02:18:49 +0000 (Sat, 18 Apr 2020)
Log Message:
-----------
Hid the backend specific fog calls
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c
brlcad/branches/dm-fb-merge/src/libdm/dm-generic.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-18 02:12:27 UTC
(rev 75455)
+++ brlcad/branches/dm-fb-merge/src/libdm/X/dm-X.c 2020-04-18 02:18:49 UTC
(rev 75456)
@@ -2093,6 +2093,7 @@
X_flush,
X_sync,
X_event_cmp,
+ NULL,
0,
0, /* no displaylist */
0, /* no stereo */
Modified: brlcad/branches/dm-fb-merge/src/libdm/dm-generic.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/dm-generic.c 2020-04-18 02:12:27 UTC
(rev 75455)
+++ brlcad/branches/dm-fb-merge/src/libdm/dm-generic.c 2020-04-18 02:18:49 UTC
(rev 75456)
@@ -396,18 +396,9 @@
return;
}
-#if defined(DM_OGL) && defined(HAVE_TK)
- if (BU_STR_EQUIV(dmp->i->dm_name, "ogl")) {
- ogl_fogHint(dmp, fastfog);
- return;
+ if (dmp->i->dm_fogHint) {
+ dmp->i->dm_fogHint(dmp, fastfog);
}
-#endif
-#ifdef DM_WGL
- if (BU_STR_EQUIV(dmp->i->dm_name, "wgl")) {
- wgl_fogHint(dmp, fastfog);
- return;
- }
-#endif
}
int
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-18 02:12:27 UTC
(rev 75455)
+++ brlcad/branches/dm-fb-merge/src/libdm/glx/dm-ogl.c 2020-04-18 02:18:49 UTC
(rev 75456)
@@ -2945,6 +2945,7 @@
NULL,
NULL,
ogl_event_cmp,
+ ogl_fogHint,
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-18
02:12:27 UTC (rev 75455)
+++ brlcad/branches/dm-fb-merge/src/libdm/include/calltable.h 2020-04-18
02:18:49 UTC (rev 75456)
@@ -100,6 +100,7 @@
void (*dm_flush)(struct dm *dmp);
void (*dm_sync)(struct dm *dmp);
int (*dm_event_cmp)(struct dm *dmp, dm_event_t type, int event);
+ void (*dm_fogHint)(struct dm *dmp, int fastfog);
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-18
02:12:27 UTC (rev 75455)
+++ brlcad/branches/dm-fb-merge/src/libdm/null/dm-Null.c 2020-04-18
02:18:49 UTC (rev 75456)
@@ -330,6 +330,7 @@
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-18
02:12:27 UTC (rev 75455)
+++ brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp 2020-04-18
02:18:49 UTC (rev 75456)
@@ -2584,6 +2584,7 @@
NULL,
NULL,
osgl_event_cmp,
+ 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-18
02:12:27 UTC (rev 75455)
+++ brlcad/branches/dm-fb-merge/src/libdm/plot/dm-plot.c 2020-04-18
02:18:49 UTC (rev 75456)
@@ -575,6 +575,7 @@
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-18
02:12:27 UTC (rev 75455)
+++ brlcad/branches/dm-fb-merge/src/libdm/postscript/dm-ps.c 2020-04-18
02:18:49 UTC (rev 75456)
@@ -545,6 +545,7 @@
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-18 02:12:27 UTC
(rev 75455)
+++ brlcad/branches/dm-fb-merge/src/libdm/qt/dm-qt.cpp 2020-04-18 02:18:49 UTC
(rev 75456)
@@ -1091,6 +1091,7 @@
NULL,
NULL,
qt_event_cmp,
+ 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-18 02:12:27 UTC
(rev 75455)
+++ brlcad/branches/dm-fb-merge/src/libdm/tk/dm-tk.c 2020-04-18 02:18:49 UTC
(rev 75456)
@@ -954,6 +954,7 @@
NULL,
NULL,
tk_event_cmp,
+ 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-18 02:12:27 UTC
(rev 75455)
+++ brlcad/branches/dm-fb-merge/src/libdm/txt/dm-txt.c 2020-04-18 02:18:49 UTC
(rev 75456)
@@ -386,6 +386,7 @@
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-18 02:12:27 UTC
(rev 75455)
+++ brlcad/branches/dm-fb-merge/src/libdm/wgl/dm-wgl.c 2020-04-18 02:18:49 UTC
(rev 75456)
@@ -2232,6 +2232,7 @@
NULL,
NULL,
wgl_event_cmp,
+ wgl_fogHint,
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
