Do not rely on JNA types that are not available on Android.

This commit is contained in:
the_fiddler 2011-12-05 18:41:46 +00:00
parent 082fc8c422
commit ce55a9920e

View file

@ -1,11 +1,11 @@
# Normal types. # Normal types.
GLsizei, int GLsizei, int
GLsizeiptr, com.sun.jna.ptr.IntByReference GLsizeiptr, Integer
GLintptr, com.sun.jna.ptr.IntByReference GLintptr, Integer
# GLenum, int # GLenum, int
GLboolean, boolean # bool # int GLboolean, boolean # bool # int
GLbitfield, int GLbitfield, int
# GLvoid*, com.sun.jna.ptr.IntByReference # GLvoid*, Integer
# GLvoid, Void #Object # GLvoid, Void #Object
GLchar, char GLchar, char
GLbyte, byte GLbyte, byte
@ -23,8 +23,8 @@ GLstring, String
PixelInternalFormat, PixelInternalFormat PixelInternalFormat, PixelInternalFormat
# ARB and NV types. # ARB and NV types.
GLsizeiptrARB, com.sun.jna.ptr.IntByReference GLsizeiptrARB, Integer
GLintptrARB, com.sun.jna.ptr.IntByReference GLintptrARB, Integer
GLhandleARB, int GLhandleARB, int
GLhalfARB, Half GLhalfARB, Half
GLhalfNV, Half GLhalfNV, Half
@ -37,21 +37,21 @@ GLint64, long
GLuint64, long GLuint64, long
# ARB_sync (introduced in 3.2) # ARB_sync (introduced in 3.2)
sync, com.sun.jna.ptr.IntByReference sync, Integer
GLsync, com.sun.jna.ptr.IntByReference GLsync, Integer
# Wgl types. # Wgl types.
PROC, com.sun.jna.ptr.IntByReference PROC, Integer
LPCSTR, String LPCSTR, String
COLORREF, int COLORREF, int
BOOL, boolean BOOL, boolean
DWORD, int DWORD, int
FLOAT, float FLOAT, float
HANDLE, com.sun.jna.ptr.IntByReference HANDLE, Integer
HDC, com.sun.jna.ptr.IntByReference HDC, Integer
HGLRC, com.sun.jna.ptr.IntByReference HGLRC, Integer
HPBUFFERARB, com.sun.jna.ptr.IntByReference #HPBUFFERARB HPBUFFERARB, Integer #HPBUFFERARB
HPBUFFEREXT, com.sun.jna.ptr.IntByReference #HPBUFFEREXT HPBUFFEREXT, Integer #HPBUFFEREXT
INT32, int INT32, int
INT64, long INT64, long
LPVOID, void* LPVOID, void*
@ -65,13 +65,13 @@ int, int
#void, * #void, *
GLDEBUGPROCARB, DebugProcArb GLDEBUGPROCARB, DebugProcArb
GLDEBUGPROCAMD , DebugProcAmd GLDEBUGPROCAMD , DebugProcAmd
GLvdpauSurfaceNV, com.sun.jna.ptr.IntByReference GLvdpauSurfaceNV, Integer
# Glu types. # Glu types.
Float64 double Float64 double
Float64Pointer com.sun.jna.ptr.DoubleByReference Float64Pointer Double
Float32 float Float32 float
Float32Pointer com.sun.jna.ptr.SingleByReference Float32Pointer Float
# Glx types. # Glx types.
Void void Void void
@ -79,41 +79,41 @@ Bool boolean
int64_t long int64_t long
int32_t int int32_t int
Display com.sun.jna.ptr.IntByReference Display Integer
Window com.sun.jna.ptr.IntByReference Window Integer
Pixmap com.sun.jna.ptr.IntByReference Pixmap Integer
Colormap com.sun.jna.ptr.IntByReference Colormap Integer
GLXWindow com.sun.jna.ptr.IntByReference GLXWindow Integer
GLXContext com.sun.jna.ptr.IntByReference GLXContext Integer
GLXDrawable com.sun.jna.ptr.IntByReference GLXDrawable Integer
GLXPixmap com.sun.jna.ptr.IntByReference GLXPixmap Integer
__GLXextFuncPtr com.sun.jna.ptr.IntByReference __GLXextFuncPtr Integer
VLServer com.sun.jna.ptr.IntByReference VLServer Integer
VLPath com.sun.jna.ptr.IntByReference VLPath Integer
VLNode com.sun.jna.ptr.IntByReference VLNode Integer
# OpenGL|ES types. # OpenGL|ES types.
GLclampx, int GLclampx, int
GLfixed, int GLfixed, int
GLeglImageOES, com.sun.jna.ptr.IntByReference GLeglImageOES, Integer
# OpenCL types. # OpenCL types.
_cl_context, com.sun.jna.ptr.IntByReference _cl_context, Integer
_cl_event, com.sun.jna.ptr.IntByReference _cl_event, Integer
cl_command_queue, com.sun.jna.ptr.IntByReference cl_command_queue, Integer
cl_context, com.sun.jna.ptr.IntByReference cl_context, Integer
cl_device_id, com.sun.jna.ptr.IntByReference cl_device_id, Integer
cl_event, com.sun.jna.ptr.IntByReference cl_event, Integer
cl_kernel, com.sun.jna.ptr.IntByReference cl_kernel, Integer
cl_mem, com.sun.jna.ptr.IntByReference cl_mem, Integer
cl_platform_id, com.sun.jna.ptr.IntByReference cl_platform_id, Integer
cl_program, com.sun.jna.ptr.IntByReference cl_program, Integer
cl_sampler, com.sun.jna.ptr.IntByReference cl_sampler, Integer
size_t, com.sun.jna.NativeLong size_t, Integer # not exactly right, NativeLong is the correct one.
cl_bool, boolean cl_bool, boolean
cl_int, int cl_int, int
@ -124,7 +124,7 @@ cl_addressing_mode, AddressingMode
cl_command_queue_info, CommandQueueInfo cl_command_queue_info, CommandQueueInfo
cl_command_queue_properties, CommandQueueProperties cl_command_queue_properties, CommandQueueProperties
cl_context_info, ContextInfo cl_context_info, ContextInfo
cl_context_properties, com.sun.jna.ptr.IntByReference # ContextProperties cl_context_properties, Integer # ContextProperties
cl_device_info, DeviceInfo cl_device_info, DeviceInfo
cl_device_type, DeviceType cl_device_type, DeviceType
cl_event_info, EventInfo cl_event_info, EventInfo
@ -144,3 +144,6 @@ cl_program_build_info, ProgramBuildInfo
cl_program_info, ProgramInfo cl_program_info, ProgramInfo
cl_sampler_info, SamplerInfo cl_sampler_info, SamplerInfo
cl_work_group_info, WorkGroupInfo cl_work_group_info, WorkGroupInfo
# OpenTK-specific
IntPtr, Pointer # com.sun.jna