Revision: 76671
http://sourceforge.net/p/brlcad/code/76671
Author: starseeker
Date: 2020-08-06 17:10:08 +0000 (Thu, 06 Aug 2020)
Log Message:
-----------
Put DM specific definitions in the local headers
Modified Paths:
--------------
brlcad/trunk/src/libdm/X/dm-X.h
brlcad/trunk/src/libdm/glx/dm-ogl.h
brlcad/trunk/src/libdm/include/private.h
brlcad/trunk/src/libdm/wgl/dm-wgl.h
Modified: brlcad/trunk/src/libdm/X/dm-X.h
===================================================================
--- brlcad/trunk/src/libdm/X/dm-X.h 2020-08-06 17:05:45 UTC (rev 76670)
+++ brlcad/trunk/src/libdm/X/dm-X.h 2020-08-06 17:10:08 UTC (rev 76671)
@@ -41,6 +41,24 @@
#define INIT_XCOLOR(c) memset((c), 0, sizeof(XColor))
+#define DM_REVERSE_COLOR_BYTE_ORDER(_shift, _mask) { \
+ _shift = 24 - _shift; \
+ switch (_shift) { \
+ case 0: \
+ _mask >>= 24; \
+ break; \
+ case 8: \
+ _mask >>= 8; \
+ break; \
+ case 16: \
+ _mask <<= 8; \
+ break; \
+ case 24: \
+ _mask <<= 24; \
+ break; \
+ } \
+ }
+
struct x_vars {
GC gc;
Pixmap pix;
Modified: brlcad/trunk/src/libdm/glx/dm-ogl.h
===================================================================
--- brlcad/trunk/src/libdm/glx/dm-ogl.h 2020-08-06 17:05:45 UTC (rev 76670)
+++ brlcad/trunk/src/libdm/glx/dm-ogl.h 2020-08-06 17:10:08 UTC (rev 76671)
@@ -48,7 +48,45 @@
/* Map +/-2048 GED space into -1.0..+1.0 :: x/2048*/
#define GED2IRIS(x) (((float)(x))*0.00048828125)
+#define DM_REVERSE_COLOR_BYTE_ORDER(_shift, _mask) { \
+ _shift = 24 - _shift; \
+ switch (_shift) { \
+ case 0: \
+ _mask >>= 24; \
+ break; \
+ case 8: \
+ _mask >>= 8; \
+ break; \
+ case 16: \
+ _mask <<= 8; \
+ break; \
+ case 24: \
+ _mask <<= 24; \
+ break; \
+ } \
+ }
+#define Ogl_MV_O(_m) offsetof(struct modifiable_ogl_vars, _m)
+
+struct modifiable_ogl_vars {
+ struct dm *this_dm;
+ int cueing_on;
+ int zclipping_on;
+ int zbuffer_on;
+ int lighting_on;
+ int transparency_on;
+ int fastfog;
+ double fogdensity;
+ int zbuf;
+ int rgb;
+ int doublebuffer;
+ int depth;
+ int debug;
+ struct bu_vls log;
+ double bound;
+ int boundFlag;
+};
+
struct ogl_vars {
GLXContext glxc;
GLdouble faceplate_mat[16];
Modified: brlcad/trunk/src/libdm/include/private.h
===================================================================
--- brlcad/trunk/src/libdm/include/private.h 2020-08-06 17:05:45 UTC (rev
76670)
+++ brlcad/trunk/src/libdm/include/private.h 2020-08-06 17:10:08 UTC (rev
76671)
@@ -107,55 +107,7 @@
(_dr) == (_sr) &&\
(_dg) == (_sg) &&\
(_db) == (_sb))
-#if defined(DM_X) || defined(DM_OGL)
-#define DM_REVERSE_COLOR_BYTE_ORDER(_shift, _mask) { \
- _shift = 24 - _shift; \
- switch (_shift) { \
- case 0: \
- _mask >>= 24; \
- break; \
- case 8: \
- _mask >>= 8; \
- break; \
- case 16: \
- _mask <<= 8; \
- break; \
- case 24: \
- _mask <<= 24; \
- break; \
- } \
- }
-#else
-/* Do nothing */
-#define DM_REVERSE_COLOR_BYTE_ORDER(_shift, _mask)
-#endif
-
-
-#if defined(DM_OGL) || defined(DM_WGL)
-#define Ogl_MV_O(_m) offsetof(struct modifiable_ogl_vars, _m)
-
-struct modifiable_ogl_vars {
- struct dm *this_dm;
- int cueing_on;
- int zclipping_on;
- int zbuffer_on;
- int lighting_on;
- int transparency_on;
- int fastfog;
- double fogdensity;
- int zbuf;
- int rgb;
- int doublebuffer;
- int depth;
- int debug;
- struct bu_vls log;
- double bound;
- int boundFlag;
-};
-#endif
-
-
__BEGIN_DECLS
int
Modified: brlcad/trunk/src/libdm/wgl/dm-wgl.h
===================================================================
--- brlcad/trunk/src/libdm/wgl/dm-wgl.h 2020-08-06 17:05:45 UTC (rev 76670)
+++ brlcad/trunk/src/libdm/wgl/dm-wgl.h 2020-08-06 17:10:08 UTC (rev 76671)
@@ -46,6 +46,27 @@
/* Map +/-2048 GED space into -1.0..+1.0 :: x/2048*/
#define GED2IRIS(x) (((float)(x))*0.00048828125)
+#define Ogl_MV_O(_m) offsetof(struct modifiable_ogl_vars, _m)
+
+struct modifiable_ogl_vars {
+ struct dm *this_dm;
+ int cueing_on;
+ int zclipping_on;
+ int zbuffer_on;
+ int lighting_on;
+ int transparency_on;
+ int fastfog;
+ double fogdensity;
+ int zbuf;
+ int rgb;
+ int doublebuffer;
+ int depth;
+ int debug;
+ struct bu_vls log;
+ double bound;
+ int boundFlag;
+};
+
struct dm_wglvars {
Display *dpy;
Window win;
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
