diff options
author | Sven Gothel <[email protected]> | 2008-06-28 14:30:26 +0000 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2008-06-28 14:30:26 +0000 |
commit | d96486967efcfb6f43226da9fa60cbc3d68ab323 (patch) | |
tree | adbda7e1a8fce8f3300c46dbba398783e4039a1e /src/classes/com/sun/opengl/impl/glu/mipmap/Mipmap.java | |
parent | 8d00556b137564705a4ae8b963804d0adab078fb (diff) |
3rd round cdcfp - compile clean.
Re-adding cdcfp:
com/sun/opengl/impl/glu/mipmap/*
com/sun/opengl/impl/GLPbufferImpl.java
Using 'BufferUtil.nativeOrder(ByteBuffer)'
to set up the native byte order.
'BufferUtil.nativeOrder' is now public.
GLDrawableFactory:
- removed 'hardcoded' awt attribute.
Cleanup NEWT's AWT wrapping implementation.
- NativeWindowFactory incooperates with the wrapping property.
Bugs on X11/NEWT/AWT:
- no events
- deadlock at shutdown
- deadlock if EGLDrawable with AWT get's locked
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1700 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'src/classes/com/sun/opengl/impl/glu/mipmap/Mipmap.java')
-rw-r--r-- | src/classes/com/sun/opengl/impl/glu/mipmap/Mipmap.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/classes/com/sun/opengl/impl/glu/mipmap/Mipmap.java b/src/classes/com/sun/opengl/impl/glu/mipmap/Mipmap.java index 6f247940d..b048bf1f5 100644 --- a/src/classes/com/sun/opengl/impl/glu/mipmap/Mipmap.java +++ b/src/classes/com/sun/opengl/impl/glu/mipmap/Mipmap.java @@ -47,6 +47,7 @@ package com.sun.opengl.impl.glu.mipmap; import javax.media.opengl.GL; import javax.media.opengl.GL2; import javax.media.opengl.glu.GLU; +import javax.media.opengl.util.BufferUtil; import javax.media.opengl.GLException; import java.nio.*; @@ -573,8 +574,8 @@ public class Mipmap { if( !isLegalFormatForPackedPixelType( format, typeout ) ) { return( GLU.GLU_INVALID_OPERATION ); } - beforeimage = ByteBuffer.allocateDirect( image_size( widthin, heightin, format, GL2.GL_UNSIGNED_SHORT ) ).order( ByteOrder.nativeOrder() ); - afterimage = ByteBuffer.allocateDirect( image_size( widthout, heightout, format, GL2.GL_UNSIGNED_SHORT ) ).order( ByteOrder.nativeOrder() ); + beforeimage = BufferUtil.nativeOrder(ByteBuffer.allocateDirect( image_size( widthin, heightin, format, GL2.GL_UNSIGNED_SHORT ) )); + afterimage = BufferUtil.nativeOrder(ByteBuffer.allocateDirect( image_size( widthout, heightout, format, GL2.GL_UNSIGNED_SHORT ) )); if( beforeimage == null || afterimage == null ) { return( GLU.GLU_OUT_OF_MEMORY ); } |