Skip to content

Commit

Permalink
Do not rely on JNA types that are not available on Android.
Browse files Browse the repository at this point in the history
git-svn-id: https://opentk.svn.sourceforge.net/svnroot/opentk/trunk@3106 ebc5dd9b-fb1d-0410-b6f8-d24c324e9604
  • Loading branch information
the_fiddler committed Dec 5, 2011
1 parent 770d00d commit afb75d8
Showing 1 changed file with 45 additions and 42 deletions.
87 changes: 45 additions & 42 deletions Source/Bind/Specifications/java.tm
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Normal types.
GLsizei, int
GLsizeiptr, com.sun.jna.ptr.IntByReference
GLintptr, com.sun.jna.ptr.IntByReference
GLsizeiptr, Integer
GLintptr, Integer
# GLenum, int
GLboolean, boolean # bool # int
GLbitfield, int
# GLvoid*, com.sun.jna.ptr.IntByReference
# GLvoid*, Integer
# GLvoid, Void #Object
GLchar, char
GLbyte, byte
Expand All @@ -23,8 +23,8 @@ GLstring, String
PixelInternalFormat, PixelInternalFormat

# ARB and NV types.
GLsizeiptrARB, com.sun.jna.ptr.IntByReference
GLintptrARB, com.sun.jna.ptr.IntByReference
GLsizeiptrARB, Integer
GLintptrARB, Integer
GLhandleARB, int
GLhalfARB, Half
GLhalfNV, Half
Expand All @@ -37,21 +37,21 @@ GLint64, long
GLuint64, long

# ARB_sync (introduced in 3.2)
sync, com.sun.jna.ptr.IntByReference
GLsync, com.sun.jna.ptr.IntByReference
sync, Integer
GLsync, Integer

# Wgl types.
PROC, com.sun.jna.ptr.IntByReference
PROC, Integer
LPCSTR, String
COLORREF, int
BOOL, boolean
DWORD, int
FLOAT, float
HANDLE, com.sun.jna.ptr.IntByReference
HDC, com.sun.jna.ptr.IntByReference
HGLRC, com.sun.jna.ptr.IntByReference
HPBUFFERARB, com.sun.jna.ptr.IntByReference #HPBUFFERARB
HPBUFFEREXT, com.sun.jna.ptr.IntByReference #HPBUFFEREXT
HANDLE, Integer
HDC, Integer
HGLRC, Integer
HPBUFFERARB, Integer #HPBUFFERARB
HPBUFFEREXT, Integer #HPBUFFEREXT
INT32, int
INT64, long
LPVOID, void*
Expand All @@ -65,55 +65,55 @@ int, int
#void, *
GLDEBUGPROCARB, DebugProcArb
GLDEBUGPROCAMD , DebugProcAmd
GLvdpauSurfaceNV, com.sun.jna.ptr.IntByReference
GLvdpauSurfaceNV, Integer

# Glu types.
Float64 double
Float64Pointer com.sun.jna.ptr.DoubleByReference
Float64Pointer Double
Float32 float
Float32Pointer com.sun.jna.ptr.SingleByReference
Float32Pointer Float

# Glx types.
Void void
Bool boolean
int64_t long
int32_t int

Display com.sun.jna.ptr.IntByReference
Window com.sun.jna.ptr.IntByReference
Pixmap com.sun.jna.ptr.IntByReference
Colormap com.sun.jna.ptr.IntByReference
Display Integer
Window Integer
Pixmap Integer
Colormap Integer

GLXWindow com.sun.jna.ptr.IntByReference
GLXContext com.sun.jna.ptr.IntByReference
GLXDrawable com.sun.jna.ptr.IntByReference
GLXPixmap com.sun.jna.ptr.IntByReference
__GLXextFuncPtr com.sun.jna.ptr.IntByReference
GLXWindow Integer
GLXContext Integer
GLXDrawable Integer
GLXPixmap Integer
__GLXextFuncPtr Integer

VLServer com.sun.jna.ptr.IntByReference
VLPath com.sun.jna.ptr.IntByReference
VLNode com.sun.jna.ptr.IntByReference
VLServer Integer
VLPath Integer
VLNode Integer


# OpenGL|ES types.
GLclampx, int
GLfixed, int
GLeglImageOES, com.sun.jna.ptr.IntByReference
GLeglImageOES, Integer


# OpenCL types.
_cl_context, com.sun.jna.ptr.IntByReference
_cl_event, com.sun.jna.ptr.IntByReference
cl_command_queue, com.sun.jna.ptr.IntByReference
cl_context, com.sun.jna.ptr.IntByReference
cl_device_id, com.sun.jna.ptr.IntByReference
cl_event, com.sun.jna.ptr.IntByReference
cl_kernel, com.sun.jna.ptr.IntByReference
cl_mem, com.sun.jna.ptr.IntByReference
cl_platform_id, com.sun.jna.ptr.IntByReference
cl_program, com.sun.jna.ptr.IntByReference
cl_sampler, com.sun.jna.ptr.IntByReference
size_t, com.sun.jna.NativeLong
_cl_context, Integer
_cl_event, Integer
cl_command_queue, Integer
cl_context, Integer
cl_device_id, Integer
cl_event, Integer
cl_kernel, Integer
cl_mem, Integer
cl_platform_id, Integer
cl_program, Integer
cl_sampler, Integer
size_t, Integer # not exactly right, NativeLong is the correct one.

cl_bool, boolean
cl_int, int
Expand All @@ -124,7 +124,7 @@ cl_addressing_mode, AddressingMode
cl_command_queue_info, CommandQueueInfo
cl_command_queue_properties, CommandQueueProperties
cl_context_info, ContextInfo
cl_context_properties, com.sun.jna.ptr.IntByReference # ContextProperties
cl_context_properties, Integer # ContextProperties
cl_device_info, DeviceInfo
cl_device_type, DeviceType
cl_event_info, EventInfo
Expand All @@ -144,3 +144,6 @@ cl_program_build_info, ProgramBuildInfo
cl_program_info, ProgramInfo
cl_sampler_info, SamplerInfo
cl_work_group_info, WorkGroupInfo

# OpenTK-specific
IntPtr, Pointer # com.sun.jna

0 comments on commit afb75d8

Please sign in to comment.