projects
/
org.ibex.core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2004/01/14 05:18:34
[org.ibex.core.git]
/
src
/
org
/
xwt
/
plat
/
Darwin.java
diff --git
a/src/org/xwt/plat/Darwin.java
b/src/org/xwt/plat/Darwin.java
index
14bdecb
..
7743441
100644
(file)
--- a/
src/org/xwt/plat/Darwin.java
+++ b/
src/org/xwt/plat/Darwin.java
@@
-1,10
+1,11
@@
-// Copyright 2003 Adam Megacz, see the COPYING file for licensing [LGPL]
+// Copyright 2004 Adam Megacz, see the COPYING file for licensing [LGPL]
// Authors: Brian Alliet and Evan Jones
package org.xwt.plat;
import gnu.gcj.RawData;
import org.xwt.util.*;
// Authors: Brian Alliet and Evan Jones
package org.xwt.plat;
import gnu.gcj.RawData;
import org.xwt.util.*;
+import org.xwt.js.*;
import org.xwt.*;
import java.util.*;
import org.xwt.*;
import java.util.*;
@@
-83,7
+84,7
@@
public class Darwin extends POSIX {
openGL = new CarbonOpenGL();
openGL.init();
} catch(OpenGL.NotSupportedException e) {
openGL = new CarbonOpenGL();
openGL.init();
} catch(OpenGL.NotSupportedException e) {
- Log.log(this,"WARNING: OpenGL support not available: " + e);
+ Log.info(this,"WARNING: OpenGL support not available: " + e);
// FEATURE: fall back to quartz 2d
throw new Error("No OpenGL support");
}
// FEATURE: fall back to quartz 2d
throw new Error("No OpenGL support");
}
@@
-100,20
+101,20
@@
public class Darwin extends POSIX {
private final class CarbonOpenGL extends OpenGL {
public RawData rawPixelFormat;
private final class CarbonOpenGL extends OpenGL {
public RawData rawPixelFormat;
- public RawData rawSharedInterpreter;
+ public RawData rawSharedContext;
public int maxAglSurfaceTexSize;
public int maxSurfaceWidth;
public int maxSurfaceHeight;
private native boolean initPixelFormat();
public int maxAglSurfaceTexSize;
public int maxSurfaceWidth;
public int maxSurfaceHeight;
private native boolean initPixelFormat();
- private native void initSharedInterpreter();
+ private native void initSharedContext();
public CarbonOpenGL() throws NotSupportedException {
if(!jaguar)
throw new NotSupportedException("OpenGL requires Mac OS X 10.2 or greater");
if(!initPixelFormat())
throw new NotSupportedException("Couldn't get an acceptable pixel format");
public CarbonOpenGL() throws NotSupportedException {
if(!jaguar)
throw new NotSupportedException("OpenGL requires Mac OS X 10.2 or greater");
if(!initPixelFormat())
throw new NotSupportedException("Couldn't get an acceptable pixel format");
- initSharedInterpreter();
+ initSharedContext();
}
public void init() throws NotSupportedException {
}
public void init() throws NotSupportedException {
@@
-121,11
+122,11
@@
public class Darwin extends POSIX {
maxAglSurfaceTexSize = rectangularTextures ? maxRectTexSize : maxTexSize;
if(renderer.startsWith("ATI Radeon 7500")) {
maxAglSurfaceTexSize = Math.min(rectangularTextures ? 1600 : 1024,maxAglSurfaceTexSize);
maxAglSurfaceTexSize = rectangularTextures ? maxRectTexSize : maxTexSize;
if(renderer.startsWith("ATI Radeon 7500")) {
maxAglSurfaceTexSize = Math.min(rectangularTextures ? 1600 : 1024,maxAglSurfaceTexSize);
- Log.log(this,"Working around Radeon 7500 bug: maxAglSurfaceTexSize: " + maxAglSurfaceTexSize);
+ Log.info(this,"Working around Radeon 7500 bug: maxAglSurfaceTexSize: " + maxAglSurfaceTexSize);
}
maxSurfaceWidth = maxSurfaceHeight = maxAglSurfaceTexSize;
}
}
maxSurfaceWidth = maxSurfaceHeight = maxAglSurfaceTexSize;
}
- protected native void activateSharedInterpreter();
+ protected native void activateSharedContext();
}
static abstract class CarbonSurface extends Surface.DoubleBufferedSurface {
}
static abstract class CarbonSurface extends Surface.DoubleBufferedSurface {
@@
-218,7
+219,7
@@
public class Darwin extends POSIX {
CarbonMessage.add(new CarbonMessage() { public void perform() { GLCarbonPixelBuffer.this.natInit(); sem.release(); } });
sem.block();
}
CarbonMessage.add(new CarbonMessage() { public void perform() { GLCarbonPixelBuffer.this.natInit(); sem.release(); } });
sem.block();
}
- public native void activateInterpreter();
+ public native void activateContext();
protected void finalize() {
CarbonMessage.add(new CarbonMessage() { public void perform() { natCleanup(rawWindowRef,rawCTX); } });
gl.deleteTexture(textureName);
protected void finalize() {
CarbonMessage.add(new CarbonMessage() { public void perform() { natCleanup(rawWindowRef,rawCTX); } });
gl.deleteTexture(textureName);
@@
-259,7
+260,7
@@
public class Darwin extends POSIX {
// The blit_lock ensures the window size does not change through the entire blit operation.
// The blit_lock ensures the window size does not change through the entire blit operation.
- public void render_() {
+ public void render() {
blitLock();
while(pendingResize) blitWait();
if(needsReshape) {
blitLock();
while(pendingResize) blitWait();
if(needsReshape) {
@@
-270,7
+271,7
@@
public class Darwin extends POSIX {
Dirty(0,0,winWidth,winHeight);
//Dirty(0,0,getWidth(),getHeight());
}
Dirty(0,0,winWidth,winHeight);
//Dirty(0,0,getWidth(),getHeight());
}
- super.render_();
+ super.render();
flush();
blitUnlock();
}
flush();
blitUnlock();
}
@@
-319,9
+320,9
@@
public class Darwin extends POSIX {
else
return /*new QZCarbonSufrace(b,framed)*/ null;
}
else
return /*new QZCarbonSufrace(b,framed)*/ null;
}
- protected Picture _createPicture() {
+ protected Picture _createPicture(JS r) {
if(openGL != null)
if(openGL != null)
- return openGL._createPicture(true);
+ return openGL._createPicture(r, true);
else
return /*new QZCarbonPicture(data,w,h);*/ null;
}
else
return /*new QZCarbonPicture(data,w,h);*/ null;
}