ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/rt/preload.c

Comparing ray/src/rt/preload.c (file contents):
Revision 2.11 by greg, Fri Feb 18 02:41:55 2011 UTC vs.
Revision 2.18 by greg, Wed Aug 21 20:42:20 2024 UTC

#	Line 19 | Line 19 | static const char      RCSid[] = "$Id$";
19		#include "func.h"
20		#include "bsdf.h"
21
22	+	char    *shm_boundary = NULL;           /* boundary of shared memory */
23
24	+
25		/* KEEP THIS ROUTINE CONSISTENT WITH THE DIFFERENT OBJECT FUNCTIONS! */
26
27
28	<	extern int
28	>	int
29		load_os(                        /* load associated data for object */
30	<	register OBJREC *op
30	>	OBJREC  *op
31		)
32		{
33	<	DATARRAY  *dp;
34	<	SDData  *sd;
33	>	DATARRAY        *dp;
34	>	SDData          *sd;
35
36	+	SDretainSet = SDretainAll;
37	+
38		switch (op->otype) {
39		case OBJ_FACE:          /* polygon */
40		getface(op);
#	Line 55 | Line 59 | load_os(                       /* load associated data for object */
59		getfunc(op, 4, 0x3<<5, 0);
60		return(1);
61		case PAT_CDATA:         /* color data */
62	+	if (op->oargs.nsargs < 4)
63	+	goto sargerr;
64		dp = getdata(op->oargs.sarg[3]);
65		getdata(op->oargs.sarg[4]);
66		getdata(op->oargs.sarg[5]);
#	Line 72 | Line 78 | load_os(                       /* load associated data for object */
78		case PAT_CFUNC:         /* color function */
79		getfunc(op, 3, 0x7, 0);
80		return(1);
81	+	case PAT_SPECFUNC:      /* spectral function */
82	+	getfunc(op, 1, 0, 0);
83	+	return(1);
84	+	case PAT_SPECFILE:      /* spectrum file */
85	+	if (op->oargs.nsargs < 1)
86	+	goto sargerr;
87	+	getdata(op->oargs.sarg[0]);
88	+	return(1);
89	+	case PAT_SPECDATA:      /* spectral data file */
90	+	if (op->oargs.nsargs < 2)
91	+	goto sargerr;
92	+	dp = getdata(op->oargs.sarg[1]);
93	+	getfunc(op, 2, ((1<<(dp->nd-1)) - 1)<<3, 0);
94	+	return(1);
95	+	case PAT_SPECPICT:      /* spectral picture */
96	+	if (op->oargs.nsargs < 2)
97	+	goto sargerr;
98	+	getspec(op->oargs.sarg[1]);
99	+	getfunc(op, 2, 0x3<<3, 0);
100	+	return(1);
101		case TEX_DATA:          /* texture data */
102		if (op->oargs.nsargs < 6)
103		goto sargerr;
#	Line 105 | Line 131 | load_os(                       /* load associated data for object */
131		if (op->oargs.nsargs < 6)
132		goto sargerr;
133		getfunc(op, 5, 0x1d, 1);
134	<	loadBSDF(op->oargs.sarg[1]);
134	>	sd = loadBSDF(op->oargs.sarg[1]);
135	>	if (sd != NULL) SDfreeCache(sd);
136		return(1);
137	+	case MAT_ABSDF:         /* aBSDF material */
138	+	if (op->oargs.nsargs < 5)
139	+	goto sargerr;
140	+	getfunc(op, 4, 0xe, 1);
141	+	sd = loadBSDF(op->oargs.sarg[0]);
142	+	if (sd != NULL) SDfreeCache(sd);
143	+	return(1);
144		case MAT_PDATA:         /* plastic BRDF data */
145		case MAT_MDATA:         /* metal BRDF data */
146		case MAT_TDATA:         /* trans BRDF data */
#	Line 135 | Line 169 | sargerr:
169		}
170
171
172	<	extern void
172	>	void
173		preload_objs(void)              /* preload object data structures */
174		{
175	<	register OBJECT on;
175	>	OBJECT on;
176		/* note that nobjects may change during loop */
177		for (on = 0; on < nobjects; on++)
178		load_os(objptr(on));
179	+	}
180	+
181	+
182	+	void
183	+	cow_memshare(void)              /* set up copy-on-write memory sharing */
184	+	{
185	+	if (shm_boundary != NULL)
186	+	return;                 /* assume we're good */
187	+
188	+	preload_objs();                 /* preload auxiliary data */
189	+	/* set shared memory boundary */
190	+	shm_boundary = (char *)malloc(16);
191	+	strcpy(shm_boundary, "SHM_BOUNDARY");
192	+	}
193	+
194	+
195	+	void
196	+	cow_doneshare(void)             /* clear memory sharing boundary */
197	+	{
198	+	if (shm_boundary == NULL)
199	+	return;
200	+	/* clear shared memory boundary */
201	+	free((void *)shm_boundary);
202	+	shm_boundary = NULL;
203		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)