Menu
▾
▴
squeak-commits — CVS Commits
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
(27) |
Apr
(11) |
May
(112) |
Jun
(8) |
Jul
(10) |
Aug
(68) |
Sep
(12) |
Oct
(3) |
Nov
(19) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(6) |
Feb
(15) |
Mar
(20) |
Apr
(22) |
May
(131) |
Jun
(27) |
Jul
(19) |
Aug
(207) |
Sep
(61) |
Oct
(27) |
Nov
(28) |
Dec
(21) |
| 2004 |
Jan
(7) |
Feb
(25) |
Mar
(14) |
Apr
(55) |
May
(15) |
Jun
(2) |
Jul
(14) |
Aug
(28) |
Sep
(29) |
Oct
|
Nov
|
Dec
|
|
From: Andreas R. <and...@us...> - 2002-05-11 00:27:52
|
Update of /cvsroot/squeak/squeak/platforms/win32/plugins/SocketPlugin
In directory usw-pr-cvs1:/tmp/cvs-serv4145
Modified Files:
sqWin32NewNet.c
Log Message:
fixed resolver problem reported by mdr
Index: sqWin32NewNet.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/plugins/SocketPlugin/sqWin32NewNet.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sqWin32NewNet.c 4 May 2002 23:20:28 -0000 1.2
--- sqWin32NewNet.c 11 May 2002 00:27:50 -0000 1.3
***************
*** 1498,1502 ****
if(asyncLookupHandle) return; /* lookup in progress */
len = nameSize < MAXHOSTNAMELEN ? nameSize : MAXHOSTNAMELEN;
! if((strlen(lastName) == len) && (strncmp(hostName, lastName, len) == 0)) {
/* same as last, no point in looking it up */
signalSemaphoreWithIndex(resolverSemaphoreIndex);
--- 1498,1504 ----
if(asyncLookupHandle) return; /* lookup in progress */
len = nameSize < MAXHOSTNAMELEN ? nameSize : MAXHOSTNAMELEN;
! if((lastError == 0) &&
! (strlen(lastName) == len) &&
! (strncmp(hostName, lastName, len) == 0)) {
/* same as last, no point in looking it up */
signalSemaphoreWithIndex(resolverSemaphoreIndex);
***************
*** 1554,1557 ****
--- 1556,1560 ----
strcpy(lastName,he->h_name);
lastAddr = ntohl(*(long*)(he->h_addr_list[0]));
+ lastError = 0;
}
else
***************
*** 1575,1578 ****
--- 1578,1582 ----
strcpy(lastName,he->h_name);
lastAddr = ntohl(*(long*)(he->h_addr_list[0]));
+ lastError = 0;
}
else
|
|
From: Lex S. <lex...@us...> - 2002-05-10 16:40:46
|
Update of /cvsroot/squeak/squeak/platforms/unix/misc/debian
In directory usw-pr-cvs1:/tmp/cvs-serv3148
Modified Files:
rules
Log Message:
*** empty log message ***
Index: rules
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/unix/misc/debian/rules,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** rules 4 Mar 2002 02:32:56 -0000 1.8
--- rules 10 May 2002 16:40:43 -0000 1.9
***************
*** 127,131 ****
# build a new orig.tar.gz file
origtgz: clean
! cd ..; tar cfvz squeak_$(version).orig.tar.gz squeak-$(shell echo $(version) | tr - . )/{platforms/unix,platforms/Cross,src,debian}
--- 127,131 ----
# build a new orig.tar.gz file
origtgz: clean
! cd ..; tar cfvz squeak_$(version).orig.tar.gz squeak-$(shell echo $(version) | tr - . )/{platforms/unix,platforms/Cross,src,debian} --exclude=CVS
|
|
From: John M M. <jo...@us...> - 2002-05-09 19:28:07
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm
In directory usw-pr-cvs1:/tmp/cvs-serv30712/squeak/platforms/Mac OS/vm
Modified Files:
sqPlatformSpecific.h
Log Message:
3.2.7b4 Add def for building as a PLUGIN (Netscape plugin)
Index: sqPlatformSpecific.h
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqPlatformSpecific.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** sqPlatformSpecific.h 27 Apr 2002 19:04:21 -0000 1.8
--- sqPlatformSpecific.h 9 May 2002 19:28:04 -0000 1.9
***************
*** 10,13 ****
--- 10,14 ----
*
* Jan 22nd 2002, JMM type for squeak file offset
+ * May 5th, 2002, JMM added define for PLUGIN for CW
*
How to use this file:
***************
*** 19,26 ****
the other header files generic across platforms. To override a definition or
macro from sq.h, you must first #undef it, then provide the new definition.
*/
#ifdef macintoshSqueak
!
/* replace the image file manipulation macros with functions */
#undef sqImageFile
--- 20,29 ----
the other header files generic across platforms. To override a definition or
macro from sq.h, you must first #undef it, then provide the new definition.
+
+ Define PLUGIN for Netscape Plugin building, needed for CodeWarrior
*/
#ifdef macintoshSqueak
! //#define PLUGIN
/* replace the image file manipulation macros with functions */
#undef sqImageFile
|
|
From: John M M. <jo...@us...> - 2002-05-09 19:26:08
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm In directory usw-pr-cvs1:/tmp/cvs-serv30214/squeak/platforms/Mac OS/vm Modified Files: sqMacWindow.h Log Message: 3.2.7b4 Build as NS plugin Index: sqMacWindow.h =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacWindow.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sqMacWindow.h 23 Feb 2002 10:48:21 -0000 1.1 --- sqMacWindow.h 9 May 2002 19:26:05 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- * NOTES: * Feb 22nd, 2002, JMM moved code into 10 other files, see sqMacMain.c for comments + * May 5th, 2002, JMM build as NS plugin ****************************************************************************/ *************** *** 22,23 **** --- 23,25 ---- void SetUpWindow(void); void SetUpPixmap(void); + void FreePixmap(void); |
|
From: John M M. <jo...@us...> - 2002-05-09 19:25:12
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm In directory usw-pr-cvs1:/tmp/cvs-serv29970/squeak/platforms/Mac OS/vm Modified Files: sqMacWindow.c Log Message: 3.2.7b4 Build as NS plugin Index: sqMacWindow.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacWindow.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** sqMacWindow.c 27 Apr 2002 19:05:10 -0000 1.17 --- sqMacWindow.c 9 May 2002 19:25:09 -0000 1.18 *************** *** 13,16 **** --- 13,17 ---- * Feb 26th, 2002, JMM - use carbon get dominate device * Apr 17th, 2002, JMM Use accessors for VM variables. + * May 5th, 2002, JMM cleanup for building as NS plugin *****************************************************************************/ *************** *** 44,48 **** /*** Functions ***/ - void FreePixmap(void); void SetColorEntry(int index, int red, int green, int blue); GDHandle getDominateDevice(WindowPtr theWindow,Rect *windRect); --- 45,48 ---- |
|
From: John M M. <jo...@us...> - 2002-05-09 19:24:11
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm
In directory usw-pr-cvs1:/tmp/cvs-serv29731/squeak/platforms/Mac OS/vm
Modified Files:
sqMacNSPlugin.c
Log Message:
3.2.7b4 Fixes to build this plugin again. Last version was a few years old, time to update the source.
Index: sqMacNSPlugin.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacNSPlugin.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sqMacNSPlugin.c 1 Mar 2002 00:22:59 -0000 1.4
--- sqMacNSPlugin.c 9 May 2002 19:24:09 -0000 1.5
***************
*** 63,69 ****
May 27th 2001 JMM 3.0.22, fix bug in mailto: string size, added logic to deal with back behavior in IE to avoid crashes.
Jun 2001 JMM 3.0.23, added seteventhook logic to enable HW acceleration plugin to get notification of events
! Aug 2001 JMM 3.0.24 rework of security logic, remove explicit call **********/
#include "sq.h"
#include "FilePlugin.h"
#include "npapi.h"
--- 63,73 ----
May 27th 2001 JMM 3.0.22, fix bug in mailto: string size, added logic to deal with back behavior in IE to avoid crashes.
Jun 2001 JMM 3.0.23, added seteventhook logic to enable HW acceleration plugin to get notification of events
! Aug 2001 JMM 3.0.24 rework of security logic, remove explicit call
! May 2002 JMM 3.2.7b1 Ok lets see if the sucker will compile again
! **********/
#include "sq.h"
+ #include "sqMacUIEvents.h"
+ #include "sqMacFileLogic.h"
#include "FilePlugin.h"
#include "npapi.h"
***************
*** 145,154 ****
/*** Imported Variables ***/
- extern int interruptKeycode;
extern unsigned char *memory;
extern WindowPtr stWindow;
- extern int fullScreenFlag;
- extern int successFlag;
extern int gButtonIsDown;
extern char documentName[]; /* full path to document file */
--- 149,158 ----
/*** Imported Variables ***/
extern unsigned char *memory;
extern WindowPtr stWindow;
extern int gButtonIsDown;
+ extern int getFullScreenFlag();
+ extern int setInterruptKeycode(int value);
+ extern int setFullScreenFlag(int value);
extern char documentName[]; /* full path to document file */
***************
*** 198,204 ****
/*** Functions Imported from sqMacWindow ***/
- int recordKeystroke(EventRecord *theEvent);
- int recordModifierButtons(EventRecord *theEvent);
- int recordMouseDown(EventRecord *theEvent);
void ioSetFullScreenRestore();
--- 202,205 ----
***************
*** 242,246 ****
int AbortIfFileURL(char *url);
int URLPostCreate(char *url, char *buffer, char * window,int semaIndex);
- WindowPtr getSTWindow(void);
NP_Port *getNP_Port(void);
--- 243,246 ----
***************
*** 666,670 ****
}
if (needsUpdate && (netscapeWindow != nil) && (memory)) {
! if (fullScreenFlag) {
BeginUpdate((WindowPtr) eventPtr->message);
}
--- 666,670 ----
}
if (needsUpdate && (netscapeWindow != nil) && (memory)) {
! if (getFullScreenFlag()) {
BeginUpdate((WindowPtr) eventPtr->message);
}
***************
*** 672,676 ****
fullDisplayUpdate(); /* ask VM to call ioShowDisplay */
! if (fullScreenFlag) {
EndUpdate((WindowPtr) eventPtr->message);
}
--- 672,676 ----
fullDisplayUpdate(); /* ask VM to call ioShowDisplay */
! if (getFullScreenFlag()) {
EndUpdate((WindowPtr) eventPtr->message);
}
***************
*** 680,693 ****
if(postMessageHook) postMessageHook(eventPtr);
! if (ignoreFirstEvent && fullScreenFlag) {
ignoreFirstEvent = false;
return true;
}
! if (fullScreenFlag) {
ok = WaitNextEvent(everyEvent, &theEvent,0,null);
eventPtr = &theEvent;
SqueakYieldToAnyThread();
}
! } while (fullScreenFlag);
return true;
}
--- 680,693 ----
if(postMessageHook) postMessageHook(eventPtr);
! if (ignoreFirstEvent && getFullScreenFlag()) {
ignoreFirstEvent = false;
return true;
}
! if (getFullScreenFlag()) {
ok = WaitNextEvent(everyEvent, &theEvent,0,null);
eventPtr = &theEvent;
SqueakYieldToAnyThread();
}
! } while (getFullScreenFlag());
return true;
}
***************
*** 840,845 ****
readImageFromFileHeapSizeStartingAt(f, squeakHeapMBytes, 0);
sqImageFileClose(f);
! interruptKeycode = 515; /* ctrl-C, since Netscape blocks cmd-. */
! fullScreenFlag=false; //Note image can be saved with true
}
--- 840,845 ----
readImageFromFileHeapSizeStartingAt(f, squeakHeapMBytes, 0);
sqImageFileClose(f);
! setInterruptKeycode(515); /* ctrl-C, since Netscape blocks cmd-. */
! setFullScreenFlag(false); //Note image can be saved with true
}
***************
*** 1054,1058 ****
if (fullScreen) {
! if (fullScreenFlag) return;
desiredWidth = 0;
desiredHeight = 0;
--- 1054,1058 ----
if (fullScreen) {
! if (getFullScreenFlag()) return;
desiredWidth = 0;
desiredHeight = 0;
***************
*** 1062,1066 ****
GetWindowGreatestAreaDevice(stWindow,kWindowContentRgn,&dominantGDevice,&windRect);
#else
! dominantGDevice = getDominateDevice(stWindow,&windRect)
#endif
BeginFullScreen (&gRestorableStateForScreen,dominantGDevice,
--- 1062,1066 ----
GetWindowGreatestAreaDevice(stWindow,kWindowContentRgn,&dominantGDevice,&windRect);
#else
! dominantGDevice = getDominateDevice(stWindow,&windRect);
#endif
BeginFullScreen (&gRestorableStateForScreen,dominantGDevice,
***************
*** 1070,1074 ****
nil,
fullScreenAllowEvents);
! fullScreenFlag = true;
stWindow = gAFullscreenWindow;
gFullScreenNPPort.port = GetWindowPort(gAFullscreenWindow);
--- 1070,1074 ----
nil,
fullScreenAllowEvents);
! setFullScreenFlag(true);
stWindow = gAFullscreenWindow;
gFullScreenNPPort.port = GetWindowPort(gAFullscreenWindow);
***************
*** 1088,1093 ****
ignoreFirstEvent = true;
} else {
! if (!fullScreenFlag) return;
! fullScreenFlag = false;
ioSetFullScreenRestore();
}
--- 1088,1093 ----
ignoreFirstEvent = true;
} else {
! if (!getFullScreenFlag()) return;
! setFullScreenFlag(false);
ioSetFullScreenRestore();
}
|
|
From: John M M. <jo...@us...> - 2002-05-09 19:22:56
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm
In directory usw-pr-cvs1:/tmp/cvs-serv29344/squeak/platforms/Mac OS/vm
Modified Files:
sqMacMemory.c
Log Message:
3.2.7b4 Changes for building the netscape plugin. Fix problems with #def code for that build type
Index: sqMacMemory.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacMemory.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** sqMacMemory.c 15 Mar 2002 01:45:21 -0000 1.7
--- sqMacMemory.c 9 May 2002 19:22:53 -0000 1.8
***************
*** 106,114 ****
return NewPtr(*desiredHeapSize);
#else
! pointer = NewPtr(*desiredHeapSize);
! if (pointer == null)
return NewPtrSys(*desiredHeapSize);
else
! return pointer;
#endif
#endif
--- 106,114 ----
return NewPtr(*desiredHeapSize);
#else
! debug = NewPtr(*desiredHeapSize);
! if (debug == null)
return NewPtrSys(*desiredHeapSize);
else
! return debug;
#endif
#endif
|
|
From: John M M. <jo...@us...> - 2002-05-09 19:21:08
|
Update of /cvsroot/squeak/squeak/platforms/Cross/plugins/SoundCodecPrims
In directory usw-pr-cvs1:/tmp/cvs-serv28824/squeak/platforms/Cross/plugins/SoundCodecPrims
Modified Files:
sqSoundCodecPluginBasicPrims.c
Log Message:
Change some variables to volatile that are used to count down interations. This solves a compiler issue (bad code generation) for CodeWarrior Pro 5 users. For VM between 2.9? and 3.2.7b3 this bug results in a computer crash. Earlier VM, or earlier external plugins were not compiled with compiler optimization on (due to other bugs) thus they did not exhibit the problem.
Index: sqSoundCodecPluginBasicPrims.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Cross/plugins/SoundCodecPrims/sqSoundCodecPluginBasicPrims.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** sqSoundCodecPluginBasicPrims.c 24 Oct 2001 23:12:22 -0000 1.1.1.1
--- sqSoundCodecPluginBasicPrims.c 9 May 2002 19:21:05 -0000 1.2
***************
*** 579,583 ****
longword L_denum = denum;
word div = 0;
! int k = 15;
/* The parameter num sometimes becomes zero.
--- 579,583 ----
longword L_denum = denum;
word div = 0;
! volatile int k = 15;
/* The parameter num sometimes becomes zero.
***************
*** 2835,2839 ****
ulongword utmp; /* for L_ADD */
! register int k = 160;
while (k--) {
--- 2835,2839 ----
ulongword utmp; /* for L_ADD */
! volatile int k = 160;
while (k--) {
***************
*** 3280,3284 ****
*/
{
! int i = 13;
assert(0 <= Mc && Mc <= 3);
--- 3280,3284 ----
*/
{
! volatile int i = 13;
assert(0 <= Mc && Mc <= 3);
|
|
From: Tim R. <row...@us...> - 2002-05-09 01:36:53
|
Update of /cvsroot/squeak/squeak/platforms/unix/vm
In directory usw-pr-cvs1:/tmp/cvs-serv29610/platforms/unix/vm
Modified Files:
zlib.c zlib.h
Log Message:
remove obsolete platform.exports file
Index: zlib.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/unix/vm/zlib.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** zlib.c 24 Oct 2001 23:14:21 -0000 1.1.1.1
--- zlib.c 9 May 2002 01:36:51 -0000 1.2
***************
*** 654,658 ****
--- 654,660 ----
* protects it. -- Cort
*/
+ #if 0
local uInt protect_mask[] = {0, 0, 0, 0, 0, 0, 0, 0, 0 ,0 ,0 ,0};
+ #endif
/* And'ing with mask[n] masks the lower n bits */
local uInt inflate_mask[] = {
Index: zlib.h
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/unix/vm/zlib.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
|
|
From: Tim R. <row...@us...> - 2002-05-09 01:36:53
|
Update of /cvsroot/squeak/squeak/platforms/RiscOS/vm/platform In directory usw-pr-cvs1:/tmp/cvs-serv29610/platforms/RiscOS/vm/platform Removed Files: exports Log Message: remove obsolete platform.exports file --- exports DELETED --- |
|
From: Tim R. <row...@us...> - 2002-05-09 01:36:53
|
Update of /cvsroot/squeak/squeak/platforms/Cross/vm
In directory usw-pr-cvs1:/tmp/cvs-serv29610/platforms/Cross/vm
Modified Files:
sqNamedPrims.c
Log Message:
remove obsolete platform.exports file
Index: sqNamedPrims.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Cross/vm/sqNamedPrims.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** sqNamedPrims.c 24 Oct 2001 23:13:24 -0000 1.1.1.1
--- sqNamedPrims.c 9 May 2002 01:36:50 -0000 1.2
***************
*** 13,16 ****
--- 13,24 ----
*****************************************************************************/
#include "sq.h"
+
+
+ typedef struct {
+ char *pluginName;
+ char *primitiveName;
+ void *primitiveAddress;
+ } sqExport;
+
#include "sqNamedPrims.h"
***************
*** 89,93 ****
void *result;
! dprintf(("Looking (externally) for %s ... ", functionName));
if(module->handle)
result = (void*) ioFindExternalFunctionIn(functionName, (int) module->handle);
--- 97,101 ----
void *result;
! dprintf(("Looking (externally) for %s in %s... ", functionName,module->name));
if(module->handle)
result = (void*) ioFindExternalFunctionIn(functionName, (int) module->handle);
***************
*** 106,142 ****
static void *findInternalFunctionIn(char *functionName, char *pluginName)
{
! char *function, *plugin;
! int index;
!
! dprintf(("Looking (internally) for %s in %s ... ", functionName, (pluginName ? pluginName : "<intrinsic>")));
!
! /* canonicalize functionName and pluginName to be NULL if not specified */
! if(functionName && !functionName[0]) functionName = NULL;
! if(pluginName && !pluginName[0]) pluginName = NULL;
!
! for(index=0;;index++) {
! plugin = internalPrimitiveNames[index][0];
! function = internalPrimitiveNames[index][1];
! /* canonicalize plugin and function to be NULL if not specified */
! if(plugin && !plugin[0]) plugin = NULL;
! if(function && !function[0]) function = NULL;
! if(!plugin && !function) {/* At end of table. */
! dprintf(("not found\n"));
! return NULL;
! }
! /* check for module name match */
! if((pluginName == NULL) != (plugin == NULL)) continue; /* one is missing */
! if(plugin && strcmp(pluginName, plugin)) continue; /* name mismatch */
! /* check for function name match */
! if((functionName == NULL) != (function == NULL)) continue; /* one is missing */
! if(function && strcmp(functionName, function)) continue; /* name mismatch */
- /* match */
- dprintf(("found\n"));
- return internalPrimitiveAddresses[index];
- }
}
--- 114,151 ----
static void *findInternalFunctionIn(char *functionName, char *pluginName)
{
! char *function, *plugin;
! int listIndex, index;
! sqExport *exports;
! dprintf(("Looking (internally) for %s in %s ... ", functionName, (pluginName ? pluginName : "<intrinsic>")));
! /* canonicalize functionName and pluginName to be NULL if not specified */
! if(functionName && !functionName[0]) functionName = NULL;
! if(pluginName && !pluginName[0]) pluginName = NULL;
! for(listIndex=0;; listIndex++) {
! exports = pluginExports[listIndex];
! if(!exports) break;
! for(index=0;; index++) {
! plugin = exports[index].pluginName;
! function = exports[index].primitiveName;
! /* canonicalize plugin and function to be NULL if not specified */
! if(plugin && !plugin[0]) plugin = NULL;
! if(function && !function[0]) function = NULL;
! if(!plugin && !function) break; /* At end of table. */
! /* check for module name match */
! if((pluginName == NULL) != (plugin == NULL)) continue; /* one is missing */
! if(plugin && strcmp(pluginName, plugin)) continue; /* name mismatch */
! /* check for function name match */
! if((functionName == NULL) != (function == NULL)) continue; /* one is missing */
! if(function && strcmp(functionName, function)) continue; /* name mismatch */
! /* match */
! dprintf(("found\n"));
! return exports[index].primitiveAddress;
! }
! }
! dprintf(("not found\n"));
! return NULL;
}
***************
*** 407,415 ****
}
/* Notify all interested parties about the fact */
- /* Lookup moduleUnloaded: from the vm core */
- {
- void *fn = findFunctionIn("moduleUnloaded", squeakModule);
- if(fn) {/* call it */ ((int (*) (char *))fn)(entry->name);}
- }
temp = firstModule;
while(temp) {
--- 416,419 ----
***************
*** 453,480 ****
char *ioListBuiltinModule(int moduleIndex)
{
! int index;
! char *function;
! char *plugin;
! for(index=0;;index++) {
! plugin = internalPrimitiveNames[index][0];
! function = internalPrimitiveNames[index][1];
! if(!function && !plugin) return NULL; /* no more plugins */
! if(strcmp(function,"setInterpreter") == 0) {
! /* new module */
! if(--moduleIndex == 0) {
! char *moduleName;
! void * init0;
!
! init0 = findInternalFunctionIn("getModuleName", plugin);
! if(init0) {
! /* Check the compiled name of the module */
! moduleName = ((char* (*) (void))init0)();
! if(moduleName) { return moduleName;}
! }
! return plugin;
! }
! }
}
}
--- 457,489 ----
char *ioListBuiltinModule(int moduleIndex)
{
! int index, listIndex;
! char *function;
! char *plugin;
! sqExport *exports;
! for(listIndex=0;; listIndex++) {
! exports = pluginExports[listIndex];
! if(!exports) break;
! for(index=0;; index++) {
! plugin = exports[index].pluginName;
! function = exports[index].primitiveName;
! if(!function && !plugin) break; /* no more plugins */
! if(strcmp(function,"setInterpreter") == 0) {
! /* new module */
! if(--moduleIndex == 0) {
! char *moduleName;
! void * init0;
! init0 = findInternalFunctionIn("getModuleName", plugin);
! if(init0) {
! /* Check the compiled name of the module */
! moduleName = ((char* (*) (void))init0)();
! if(moduleName) { return moduleName;}
! }
! return plugin;
}
+ }
+ }
+ }
+ return NULL;
}
|
|
From: Tim R. <row...@us...> - 2002-05-09 01:36:53
|
Update of /cvsroot/squeak/squeak/platforms/Cross/plugins/SurfacePlugin
In directory usw-pr-cvs1:/tmp/cvs-serv29610/platforms/Cross/plugins/SurfacePlugin
Modified Files:
SurfacePlugin.c
Log Message:
remove obsolete platform.exports file
Index: SurfacePlugin.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Cross/plugins/SurfacePlugin/SurfacePlugin.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** SurfacePlugin.c 24 Oct 2001 23:12:24 -0000 1.1.1.1
--- SurfacePlugin.c 9 May 2002 01:36:50 -0000 1.2
***************
*** 25,35 ****
#include "sqPlatformSpecific.h"
#include "SurfacePlugin.h"
- #include "SurfacePluginConf.h"
! /* The definition of SurfacePluginINTERNAL is obtained from SurfacePluginConf.h, which is generated by the VMMaker */
! #if SurfacePluginINTERNAL
! # define XNAME(string) string
! #else
! # define XNAME(string) SurfacePlugin_##string
#endif
--- 25,33 ----
#include "sqPlatformSpecific.h"
#include "SurfacePlugin.h"
! /* internal plugin support */
! #ifdef SQUEAK_BUILTIN_PLUGIN
! #undef EXPORT
! #define EXPORT(returnType) static returnType
#endif
***************
*** 49,69 ****
#pragma export on
/* module initialization/shutdown */
! EXPORT(int) XNAME(setInterpreter)(struct VirtualMachine *interpreterProxy);
! EXPORT(const char*) XNAME(getModuleName)(void);
! EXPORT(int) XNAME(initialiseModule)(void);
! EXPORT(int) XNAME(shutdownModule)(void);
/* critical FXBlt entry points */
! EXPORT(int) XNAME(ioGetSurfaceFormat) (int surfaceID, int* width, int* height, int* depth, int* isMSB);
! EXPORT(int) XNAME(ioLockSurface) (int surfaceID, int *pitch, int x, int y, int w, int h);
! EXPORT(int) XNAME(ioUnlockSurface)(int surfaceID, int x, int y, int w, int h);
/* interpreter entry point */
! EXPORT(int) XNAME(ioShowSurface)(int surfaceID, int x, int y, int w, int h);
/* client entry points */
! EXPORT(int) XNAME(ioRegisterSurface)(int surfaceHandle, sqSurfaceDispatch *fn, int *surfaceID);
! EXPORT(int) XNAME(ioUnregisterSurface)(int surfaceID);
! EXPORT(int) XNAME(ioFindSurface)(int surfaceID, sqSurfaceDispatch *fn, int *surfaceHandle);
#pragma export off
--- 47,67 ----
#pragma export on
/* module initialization/shutdown */
! EXPORT(int) setInterpreter(struct VirtualMachine *interpreterProxy);
! EXPORT(const char*) getModuleName(void);
! EXPORT(int) initialiseModule(void);
! EXPORT(int) shutdownModule(void);
/* critical FXBlt entry points */
! EXPORT(int) ioGetSurfaceFormat (int surfaceID, int* width, int* height, int* depth, int* isMSB);
! EXPORT(int) ioLockSurface (int surfaceID, int *pitch, int x, int y, int w, int h);
! EXPORT(int) ioUnlockSurface(int surfaceID, int x, int y, int w, int h);
/* interpreter entry point */
! EXPORT(int) ioShowSurface(int surfaceID, int x, int y, int w, int h);
/* client entry points */
! EXPORT(int) ioRegisterSurface(int surfaceHandle, sqSurfaceDispatch *fn, int *surfaceID);
! EXPORT(int) ioUnregisterSurface(int surfaceID);
! EXPORT(int) ioFindSurface(int surfaceID, sqSurfaceDispatch *fn, int *surfaceHandle);
#pragma export off
***************
*** 71,75 ****
Return information describing the given surface.
Return true if successful, false otherwise. */
! EXPORT(int) XNAME(ioGetSurfaceFormat) (int surfaceID, int* width, int* height, int* depth, int* isMSB)
{
SqueakSurface *surface;
--- 69,73 ----
Return information describing the given surface.
Return true if successful, false otherwise. */
! EXPORT(int) ioGetSurfaceFormat (int surfaceID, int* width, int* height, int* depth, int* isMSB)
{
SqueakSurface *surface;
***************
*** 85,89 ****
Return a pointer to the actual surface bits,
or NULL on failure. */
! EXPORT(int) XNAME(ioLockSurface) (int surfaceID, int *pitch, int x, int y, int w, int h)
{
SqueakSurface *surface;
--- 83,87 ----
Return a pointer to the actual surface bits,
or NULL on failure. */
! EXPORT(int) ioLockSurface (int surfaceID, int *pitch, int x, int y, int w, int h)
{
SqueakSurface *surface;
***************
*** 98,102 ****
Unlock the bits of the surface.
The return value is ignored. */
! EXPORT(int) XNAME(ioUnlockSurface)(int surfaceID, int x, int y, int w, int h)
{
SqueakSurface *surface;
--- 96,100 ----
Unlock the bits of the surface.
The return value is ignored. */
! EXPORT(int) ioUnlockSurface(int surfaceID, int x, int y, int w, int h)
{
SqueakSurface *surface;
***************
*** 110,114 ****
/* ioShowSurface:
Transfer the bits of a surface to the screen. */
! EXPORT(int) XNAME(ioShowSurface)(int surfaceID, int x, int y, int w, int h)
{
SqueakSurface *surface;
--- 108,112 ----
/* ioShowSurface:
Transfer the bits of a surface to the screen. */
! EXPORT(int) ioShowSurface(int surfaceID, int x, int y, int w, int h)
{
SqueakSurface *surface;
***************
*** 125,129 ****
in surfaceID. Returns true if successful, false
otherwise. */
! EXPORT(int) XNAME(ioRegisterSurface)(int surfaceHandle, sqSurfaceDispatch *fn, int *surfaceID)
{
int index;
--- 123,127 ----
in surfaceID. Returns true if successful, false
otherwise. */
! EXPORT(int) ioRegisterSurface(int surfaceHandle, sqSurfaceDispatch *fn, int *surfaceID)
{
int index;
***************
*** 155,159 ****
Unregister the surface with the given handle.
Returns true if successful, false otherwise. */
! EXPORT(int) XNAME(ioUnregisterSurface)(int surfaceID)
{
SqueakSurface *surface;
--- 153,157 ----
Unregister the surface with the given handle.
Returns true if successful, false otherwise. */
! EXPORT(int) ioUnregisterSurface(int surfaceID)
{
SqueakSurface *surface;
***************
*** 172,176 ****
is returned in surfaceHandle. Return true if successful
(e.g., the surface has been found), false otherwise. */
! EXPORT(int) XNAME(ioFindSurface)(int surfaceID, sqSurfaceDispatch *fn, int *surfaceHandle)
{
SqueakSurface *surface;
--- 170,174 ----
is returned in surfaceHandle. Return true if successful
(e.g., the surface has been found), false otherwise. */
! EXPORT(int) ioFindSurface(int surfaceID, sqSurfaceDispatch *fn, int *surfaceHandle)
{
SqueakSurface *surface;
***************
*** 183,187 ****
}
! EXPORT(int) XNAME(setInterpreter)(struct VirtualMachine* anInterpreter) {
int ok;
--- 181,185 ----
}
! EXPORT(int) setInterpreter(struct VirtualMachine* anInterpreter) {
int ok;
***************
*** 194,202 ****
return ok;
}
! EXPORT(const char*) XNAME(getModuleName)(void) {
return moduleName;
}
! EXPORT(int) XNAME(initialiseModule)() {
surfaceArray = NULL;
numSurfaces = 0;
--- 192,200 ----
return ok;
}
! EXPORT(const char*) getModuleName(void) {
return moduleName;
}
! EXPORT(int) initialiseModule() {
surfaceArray = NULL;
numSurfaces = 0;
***************
*** 205,209 ****
}
! EXPORT(int) XNAME(shutdownModule)() {
/* This module can only be shut down if no surfaces are registered */
if(numSurfaces != 0) return 0;
--- 203,207 ----
}
! EXPORT(int) shutdownModule() {
/* This module can only be shut down if no surfaces are registered */
if(numSurfaces != 0) return 0;
***************
*** 211,212 ****
--- 209,228 ----
return 1;
}
+
+ #ifdef SQUEAK_BUILTIN_PLUGIN
+ void* SurfacePlugin_exports[][3] = {
+ {"SurfacePlugin", "setInterpreter", (void*)setInterpreter},
+ {"SurfacePlugin", "getModuleName", (void*)getModuleName},
+ {"SurfacePlugin", "initialiseModule", (void*)initialiseModule},
+ {"SurfacePlugin", "shutdownModule", (void*)shutdownModule},
+ {"SurfacePlugin", "ioGetSurfaceFormat", (void*)ioGetSurfaceFormat},
+ {"SurfacePlugin", "ioLockSurface", (void*)ioLockSurface},
+ {"SurfacePlugin", "ioUnlockSurface", (void*)ioUnlockSurface},
+ {"SurfacePlugin", "ioShowSurface", (void*)ioShowSurface},
+ {"SurfacePlugin", "ioRegisterSurface", (void*)ioRegisterSurface},
+ {"SurfacePlugin", "ioUnregisterSurface", (void*)ioUnregisterSurface},
+ {"SurfacePlugin", "ioFindSurface", (void*)ioFindSurface},
+ {NULL, NULL, NULL}
+ };
+ #endif /* ifdef SQ_BUILTIN_PLUGIN */
+
|
|
From: Tim R. <row...@us...> - 2002-05-08 23:20:48
|
Update of /cvsroot/squeak/squeak/platforms/RiscOS/vm In directory usw-pr-cvs1:/tmp/cvs-serv25517 Removed Files: block.dsc Log Message: move block.dsc into dsc directory --- block.dsc DELETED --- |
|
From: Tim R. <row...@us...> - 2002-05-08 23:20:48
|
Update of /cvsroot/squeak/squeak/platforms/RiscOS/vm/dsc In directory usw-pr-cvs1:/tmp/cvs-serv25517/dsc Added Files: block,fff Log Message: move block.dsc into dsc directory ***** Bogus filespec: block,fff,NONE,1.1 |
|
From: Tim R. <row...@us...> - 2002-05-08 23:19:15
|
Update of /cvsroot/squeak/squeak/platforms/RiscOS/vm/dsc In directory usw-pr-cvs1:/tmp/cvs-serv24816/dsc Log Message: Directory /cvsroot/squeak/squeak/platforms/RiscOS/vm/dsc added to the repository |
|
From: Tim R. <row...@us...> - 2002-05-08 23:17:52
|
Update of /cvsroot/squeak/squeak/platforms/RiscOS/misc/ToCopy/!Squeak In directory usw-pr-cvs1:/tmp/cvs-serv24436/ToCopy/!Squeak Added Files: !Help,fff !Sprites,ff9 !boot,feb !run,feb Templates,fec Log Message: add new copies of makefiles and resources in ne ToCopy directory ***** Bogus filespec: !Help,fff,NONE,1.1 ***** Bogus filespec: !Sprites,ff9,NONE,1.1 ***** Bogus filespec: !boot,feb,NONE,1.1 ***** Bogus filespec: !run,feb,NONE,1.1 ***** Bogus filespec: Templates,fec,NONE,1.1 |
|
From: Tim R. <row...@us...> - 2002-05-08 23:17:52
|
Update of /cvsroot/squeak/squeak/platforms/RiscOS/misc/ToCopy In directory usw-pr-cvs1:/tmp/cvs-serv24436/ToCopy Added Files: MakePlug,fe1 MakePlugins,fe1 Log Message: add new copies of makefiles and resources in ne ToCopy directory ***** Bogus filespec: MakePlug,fe1,NONE,1.1 ***** Bogus filespec: MakePlugins,fe1,NONE,1.1 |
|
From: Tim R. <row...@us...> - 2002-05-08 23:15:36
|
Update of /cvsroot/squeak/squeak/platforms/RiscOS/misc/ToCopy/!Squeak In directory usw-pr-cvs1:/tmp/cvs-serv23870/!Squeak Log Message: Directory /cvsroot/squeak/squeak/platforms/RiscOS/misc/ToCopy/!Squeak added to the repository |
|
From: Tim R. <row...@us...> - 2002-05-08 23:13:58
|
Update of /cvsroot/squeak/squeak/platforms/RiscOS/misc/ToCopy In directory usw-pr-cvs1:/tmp/cvs-serv23433/ToCopy Log Message: Directory /cvsroot/squeak/squeak/platforms/RiscOS/misc/ToCopy added to the repository |
|
From: Tim R. <row...@us...> - 2002-05-08 23:11:01
|
Update of /cvsroot/squeak/squeak/platforms/RiscOS/misc In directory usw-pr-cvs1:/tmp/cvs-serv22704/misc Removed Files: MakePlug,fe1 MakePlugins,fe1 Log Message: remove old copies of makefiles & resources before adding new ones in new place ***** Bogus filespec: MakePlug,fe1,1.2,NONE ***** Bogus filespec: MakePlugins,fe1,1.3,NONE |
|
From: Tim R. <row...@us...> - 2002-05-08 23:11:00
|
Update of /cvsroot/squeak/squeak/platforms/RiscOS/misc/!Squeak In directory usw-pr-cvs1:/tmp/cvs-serv22704/misc/!Squeak Removed Files: !Help !Sprites,ff9 !boot,feb !run,feb Templates,fec Log Message: remove old copies of makefiles & resources before adding new ones in new place --- !Help DELETED --- ***** Bogus filespec: !Sprites,ff9,1.1.1.1,NONE ***** Bogus filespec: !boot,feb,1.1.1.1,NONE ***** Bogus filespec: !run,feb,1.1.1.1,NONE ***** Bogus filespec: Templates,fec,1.1.1.1,NONE |
|
From: Andreas R. <and...@us...> - 2002-05-06 22:15:59
|
Update of /cvsroot/squeak/squeak/platforms/win32/plugins/AsyncFilePlugin In directory usw-pr-cvs1:/tmp/cvs-serv20274 Removed Files: sqWin32AsyncFilePrims.c Log Message: removed obsolete asyncfileprims file --- sqWin32AsyncFilePrims.c DELETED --- |
|
From: Andreas R. <and...@us...> - 2002-05-06 11:03:08
|
Update of /cvsroot/squeak/squeak/platforms/win32/plugins/B3DAcceleratorPlugin
In directory usw-pr-cvs1:/tmp/cvs-serv27246
Added Files:
sqWin32DualB3DX.c
Log Message:
D3D and OpenGL support
--- NEW FILE: sqWin32DualB3DX.c ---
#include "sqVirtualMachine.h"
#include "B3DAcceleratorPlugin.h"
extern struct VirtualMachine *interpreterProxy;
int glMode = 0; /* default to D3D */
int b3dxInitialize(void) {
int *ptr;
ptr = (int*)interpreterProxy->ioLoadFunctionFrom("fUseOpenGL","");
if(ptr) {
glMode = *ptr;
}
if(glMode)
return glInitialize();
else
return d3dInitialize();
}
|
|
From: Andreas R. <and...@us...> - 2002-05-06 11:01:04
|
Update of /cvsroot/squeak/squeak/platforms/Cross/plugins/B3DAcceleratorPlugin In directory usw-pr-cvs1:/tmp/cvs-serv26507 Modified Files: B3DAcceleratorPlugin.h Log Message: added dual interface for OpenGL and D3D on Win32 Index: B3DAcceleratorPlugin.h =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Cross/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** B3DAcceleratorPlugin.h 24 Oct 2001 23:11:50 -0000 1.1.1.1 --- B3DAcceleratorPlugin.h 6 May 2002 11:01:01 -0000 1.2 *************** *** 58,64 **** } B3DPrimitiveLight; ! /* Win32 defaults to D3D everyone else to OpenGL */ ! #if defined(WIN32) && !defined(WIN32_NO_D3D) ! #define B3DX_D3D #else #define B3DX_GL --- 58,83 ---- } B3DPrimitiveLight; ! #ifdef TEA ! #warning "**************************************************************" ! #warning "**************************************************************" ! #warning "**************************************************************" ! #warning ! #warning "TEA: D3D disabled" ! #warning ! #warning "**************************************************************" ! #warning "**************************************************************" ! #warning "**************************************************************" ! # define WIN32_PURE_D3D ! #endif ! ! /* Win32 defaults to DUAL D3D/GL interface everyone else to OpenGL */ ! #if defined(WIN32) ! # if defined(WIN32_PURE_D3D) ! # define B3DX_D3D ! # elif defined(WIN32_PURE_GL) ! # define B3DX_GL ! # else ! # define B3DX_DUAL ! # endif #else #define B3DX_GL *************** *** 185,187 **** --- 204,288 ---- int b3dxSetVerboseLevel(int level); int b3dxSetFog(int handle, int fogType, double density, double rangeStart, double rangeEnd, int rgba); + + #if defined(B3DX_DUAL) + extern int glMode; + + #if 0 /* initializer is special since it decides what to use */ + #define b3dxInitialize() \ + (glMode ? glInitialize() : d3dInitialize()) + #endif + + #define b3dxShutdown() \ + (glMode ? glShutdown() : d3dShutdown()) + #define b3dxAllocateTexture(r,w,h,d) \ + (glMode ? glAllocateTexture(r,w,h,d) : d3dAllocateTexture(r,w,h,d)) + #define b3dxDestroyTexture(r,h) \ + (glMode ? glDestroyTexture(r,h) : d3dAllocateTexture(r,h)) + #define b3dxActualTextureDepth(r,h) \ + (glMode ? glActualTextureDepth(r,h) : d3dActualTextureDepth(r,h)) + #define b3dxTextureColorMasks(r,h,m) \ + (glMode ? glTextureColorMasks(r,h,m) : d3dTextureColorMasks(r,h,m)) + #define b3dxUploadTexture(r,hh,w,h,d,b) \ + (glMode ? glUploadTexture(r,hh,w,h,d,b) : d3dUploadTexture(r,hh,w,h,d,b)) + #define b3dxTextureByteSex(r,h) \ + (glMode ? glTextureByteSex(r,h) : d3dTextureByteSex(r,h)) + #define b3dxTextureSurfaceHandle(r,h) \ + (glMode ? glTextureSurfaceHandle(r,h) : d3dTextureSurfaceHandle(r,h)) + #define b3dxCompositeTexture(r,hh,x,y,w,h,t) \ + (glMode ? glCompositeTexture(r,hh,x,y,w,h,t) : d3dCompositeTexture(r,hh,x,y,w,h,t)) + #define b3dxCreateRenderer(sw,hw,x,y,w,h) \ + (glMode ? glCreateRenderer(sw,hw,x,y,w,h) : d3dCreateRenderer(sw,hw,x,y,w,h)) + #define b3dxDestroyRenderer(h) \ + (glMode ? glDestroyRenderer(h) : d3dDestroyRenderer(h)) + #define b3dxIsOverlayRenderer(h) \ + (glMode ? glIsOverlayRenderer(h) : d3dIsOverlayRenderer(h)) + #define b3dxSetBufferRect(hh,x,y,w,h) \ + (glMode ? glSetBufferRect(hh, x, y, w, h) : d3dSetBufferRect(hh,x,y,w,h)) + #define b3dxGetRendererSurfaceHandle(h) \ + (glMode ? glGetRendererSurfaceHandle(h) : d3dGetRendererSurfaceHandle(h)) + #define b3dxGetRendererSurfaceWidth(h) \ + (glMode ? glGetRendererSurfaceWidth(h) : d3dGetRendererSurfaceWidth(h)) + #define b3dxGetRendererSurfaceHeight(h) \ + (glMode ? glGetRendererSurfaceHeight(h) : d3dGetRendererSurfaceHeight(h)) + #define b3dxGetRendererSurfaceDepth(h) \ + (glMode ? glGetRendererSurfaceDepth(h) : d3dGetRendererSurfaceDepth(h)) + #define b3dxGetRendererColorMasks(h,m) \ + (glMode ? glGetRendererColorMasks(h,m) : d3dGetRendererColorMasks(h,m)) + + #define b3dxSetViewport(hh,x,y,w,h) \ + (glMode ? glSetViewport(hh,x,y,w,h) : d3dSetViewport(hh,x,y,w,h)) + #define b3dxClearDepthBuffer(h) \ + (glMode ? glClearDepthBuffer(h) : d3dClearDepthBuffer(h)) + #define b3dxClearViewport(h,rgba,pv) \ + (glMode ? glClearViewport(h,rgba, pv) : d3dClearViewport(h,rgba,pv)) + + #define b3dxSetTransform(h,mv,p) \ + (glMode ? glSetTransform(h,mv,p) : d3dSetTransform(h,mv,p)) + #define b3dxDisableLights(h) \ + (glMode ? glDisableLights(h) : d3dDisableLights(h)) + #define b3dxLoadLight(h,i,l) \ + (glMode ? glLoadLight(h,i,l) : d3dLoadLight(h,i,l)) + #define b3dxLoadMaterial(h,m) \ + (glMode ? glLoadMaterial(h,m) : d3dLoadMaterial(h,m)) + #define b3dxRenderVertexBuffer(h,p,f,t,va,vs,ia,is) \ + (glMode ? glRenderVertexBuffer(h,p,f,t,va,vs,ia,is) : d3dRenderVertexBuffer(h,p,f,t,va,vs,ia,is)) + #define b3dxFlushRenderer(h) \ + (glMode ? glFlushRenderer(h) : d3dFlushRenderer(h)) + #define b3dxFinishRenderer(h) \ + (glMode ? glFinishRenderer(h) : d3dFinishRenderer(h)) + #define b3dxSwapRendererBuffers(h) \ + (glMode ? glSwapRendererBuffers(h) : d3dSwapRendererBuffers(h)) + #define b3dxGetIntProperty(h,p) \ + (glMode ? glGetIntProperty(h,p) : d3dGetIntProperty(h,p)) + #define b3dxSetIntProperty(h,p,v) \ + (glMode ? glSetIntProperty(h,p,v) : d3dSetIntProperty(h,p,v)) + #define b3dxSetVerboseLevel(l) \ + (glMode ? glSetVerboseLevel(l) : d3dSetVerboseLevel(l)) + #define b3dxSetFog(h,t,d,s,e,rgba) \ + (glMode ? glSetFog(h,t,d,s,e,rgba) : d3dSetFog(h,t,d,s,e,rgba)) + + #define B3DX_GL + #define B3DX_D3D + + #endif |
|
From: Andreas R. <and...@us...> - 2002-05-06 10:36:28
|
Update of /cvsroot/squeak/squeak/platforms/win32/plugins/B3DAcceleratorPlugin
In directory usw-pr-cvs1:/tmp/cvs-serv21185/plugins/B3DAcceleratorPlugin
Modified Files:
sqWin32D3D.c sqWin32OpenGL.c
Log Message:
unified D3D and OpenGL support
Index: sqWin32D3D.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/plugins/B3DAcceleratorPlugin/sqWin32D3D.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sqWin32D3D.c 4 May 2002 23:20:27 -0000 1.4
--- sqWin32D3D.c 6 May 2002 10:36:25 -0000 1.5
***************
*** 54,58 ****
--- 54,62 ----
10 - print information about each vertex and face
*/
+ #ifndef B3DX_GL
int verboseLevel = 1;
+ #else
+ extern int verboseLevel;
+ #endif
#define ERROR_CHECK if(FAILED(hRes)) { DPRINTF(2, (fp, "Error (%x) in %s, line %d\n", hRes, __FILE__, __LINE__))}
***************
*** 137,142 ****
#define MAX_RENDERER 16
! d3dRenderer *current = NULL;
! d3dRenderer allRenderer[MAX_RENDERER];
#define RELEASE(lp) if(lp) { lp->lpVtbl->Release(lp); lp = NULL; }
--- 141,146 ----
#define MAX_RENDERER 16
! static d3dRenderer *current = NULL;
! static d3dRenderer allRenderer[MAX_RENDERER];
#define RELEASE(lp) if(lp) { lp->lpVtbl->Release(lp); lp = NULL; }
Index: sqWin32OpenGL.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/plugins/B3DAcceleratorPlugin/sqWin32OpenGL.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sqWin32OpenGL.c 4 May 2002 23:20:27 -0000 1.3
--- sqWin32OpenGL.c 6 May 2002 10:36:25 -0000 1.4
***************
*** 44,49 ****
static HWND *theSTWindow = NULL; /* a reference to Squeak's main window */
! glRenderer *current = NULL;
! glRenderer allRenderer[MAX_RENDERER];
static float blackLight[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
--- 44,49 ----
static HWND *theSTWindow = NULL; /* a reference to Squeak's main window */
! static glRenderer *current = NULL;
! static glRenderer allRenderer[MAX_RENDERER];
static float blackLight[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
|
