Fix for Android build.

glgraphics.mod/glgraphics.bmx

@@ -43,346 +43,22 @@ ModuleInfo "History: Added AppTitle support"
 ModuleInfo "History: 1.01 Release"
 ModuleInfo "History: Added graphics flags handling"
 
-Import BRL.Graphics
-Import BRL.Pixmap
-Import Pub.Glew
-Import Pub.OpenGL
-Import BRL.SystemDefault
-
 ?Win32
 Import "glgraphics.win32.c"
+Import "source.bmx"
 ?MacOS
 Import "glgraphics.macos.m"
+Import "source.bmx"
 ?Linuxx86
 Import "-lX11"
 Import "-lXxf86vm"
 Import "-lGL"
 Import "glgraphics.linux.c"
+Import "source.bmx"
 ?Linuxx64
 Import "-lX11"
 Import "-lXxf86vm"
 Import "-lGL"
 Import "glgraphics.linux.c"
-?
-
-?Not linuxarm
-Private
-
-Incbin "gldrawtextfont.bin"
-
-Extern
-	Function bbGLGraphicsShareContexts()
-	Function bbGLGraphicsGraphicsModes( buf:Byte Ptr,size )
-	Function bbGLGraphicsAttachGraphics:Byte Ptr( widget:Byte Ptr,flags )
-	Function bbGLGraphicsCreateGraphics:Byte Ptr( width,height,depth,hertz,flags )
-	Function bbGLGraphicsGetSettings( context:Byte Ptr,width Var,height Var,depth Var,hertz Var,flags Var )
-	Function bbGLGraphicsClose( context:Byte Ptr )	
-	Function bbGLGraphicsSetGraphics( context:Byte Ptr )
-	Function bbGLGraphicsFlip( sync )
-End Extern
-
-Public
-
-Type TGLGraphics Extends TGraphics
-
-	Method Driver:TGLGraphicsDriver()
-		Assert _context
-		Return GLGraphicsDriver()
-	End Method
-	
-	Method GetSettings( width Var,height Var,depth Var,hertz Var,flags Var )
-		Assert _context
-		Local w,h,d,r,f
-		bbGLGraphicsGetSettings _context,w,h,d,r,f
-		width=w
-		height=h
-		depth=d
-		hertz=r
-		flags=f
-	End Method
-	
-	Method Close()
-		If Not _context Return
-		bbGLGraphicsClose( _context )
-		_context=0
-	End Method
-	
-	Field _context:Byte Ptr
-	
-End Type
-
-Type TGLGraphicsDriver Extends TGraphicsDriver
-
-	Method GraphicsModes:TGraphicsMode[]()
-		Local buf[1024*4]
-		Local count=bbGLGraphicsGraphicsModes( buf,1024 )
-		Local modes:TGraphicsMode[count],p:Int Ptr=buf
-		For Local i=0 Until count
-			Local t:TGraphicsMode=New TGraphicsMode
-			t.width=p[0]
-			t.height=p[1]
-			t.depth=p[2]
-			t.hertz=p[3]
-			modes[i]=t
-			p:+4
-		Next
-		Return modes
-	End Method
-	
-	Method AttachGraphics:TGLGraphics( widget:Byte Ptr,flags )
-		Local t:TGLGraphics=New TGLGraphics
-		t._context=bbGLGraphicsAttachGraphics( widget,flags )
-		Return t
-	End Method
-	
-	Method CreateGraphics:TGLGraphics( width,height,depth,hertz,flags )
-		Local t:TGLGraphics=New TGLGraphics
-		t._context=bbGLGraphicsCreateGraphics( width,height,depth,hertz,flags )
-		Return t
-	End Method
-	
-	Method SetGraphics( g:TGraphics )
-		Local context:Byte Ptr
-		Local t:TGLGraphics=TGLGraphics( g )
-		If t context=t._context
-		bbGLGraphicsSetGraphics context
-	End Method
-	
-	Method Flip( sync )
-		bbGLGraphicsFlip sync
-	End Method
-	
-End Type
-
-Rem
-bbdoc: Get OpenGL graphics driver
-returns: An OpenGL graphics driver
-about:
-The returned driver can be used with #SetGraphicsDriver
-End Rem
-Function GLGraphicsDriver:TGLGraphicsDriver()
-	Global _driver:TGLGraphicsDriver=New TGLGraphicsDriver
-	Return _driver
-End Function
-
-Rem
-bbdoc: Create OpenGL graphics
-returns: An OpenGL graphics object
-about:
-This is a convenience function that allows you to easily create an OpenGL graphics context.
-End Rem
-Function GLGraphics:TGraphics( width,height,depth=0,hertz=60,flags=GRAPHICS_BACKBUFFER|GRAPHICS_DEPTHBUFFER )
-	SetGraphicsDriver GLGraphicsDriver()
-	Return Graphics( width,height,depth,hertz,flags )
-End Function
-	
-SetGraphicsDriver GLGraphicsDriver()
-
-'----- Helper Functions -----
-
-Private
-
-Global fontTex
-Global fontSeq
-
-Global ortho_mv![16],ortho_pj![16]
-
-Function BeginOrtho()
-	Local vp[4]
-	
-	glPushAttrib GL_ENABLE_BIT|GL_TEXTURE_BIT|GL_TRANSFORM_BIT
-	
-	glGetIntegerv GL_VIEWPORT,vp
-	glGetDoublev GL_MODELVIEW_MATRIX,ortho_mv
-	glGetDoublev GL_PROJECTION_MATRIX,ortho_pj
-	
-	glMatrixMode GL_MODELVIEW
-	glLoadIdentity
-	glMatrixMode GL_PROJECTION
-	glLoadIdentity
-	glOrtho 0,vp[2],vp[3],0,-1,1
-
-	glDisable GL_CULL_FACE
-	glDisable GL_ALPHA_TEST	
-	glDisable GL_DEPTH_TEST
-End Function
-
-Function EndOrtho()
-	glMatrixMode GL_PROJECTION
-	glLoadMatrixd ortho_pj
-	glMatrixMode GL_MODELVIEW
-	glLoadMatrixd ortho_mv
-	
-	glPopAttrib
-End Function
-
-Public
-
-Rem
-bbdoc: Helper function to calculate nearest valid texture size
-about: This functions rounds @width and @height up to the nearest valid texture size
-End Rem
-Function GLAdjustTexSize( width Var,height Var )
-	Function Pow2Size( n )
-		Local t=1
-		While t<n
-			t:*2
-		Wend
-		Return t
-	End Function
-	width=Pow2Size( width )
-	height=Pow2Size( height )
-	Repeat
-		Local t
-		glTexImage2D GL_PROXY_TEXTURE_2D,0,4,width,height,0,GL_RGBA,GL_UNSIGNED_BYTE,Null
-		glGetTexLevelParameteriv GL_PROXY_TEXTURE_2D,0,GL_TEXTURE_WIDTH,Varptr t
-		If t Return
-		If width=1 And height=1 RuntimeError "Unable to calculate tex size"
-		If width>1 width:/2
-		If height>1 height:/2
-	Forever
-End Function
-
-Rem
-bbdoc: Helper function to create a texture from a pixmap
-returns: Integer GL Texture name
-about: @pixmap is resized to a valid texture size before conversion.
-end rem
-Function GLTexFromPixmap( pixmap:TPixmap,mipmap=True )
-	If pixmap.format<>PF_RGBA8888 pixmap=pixmap.Convert( PF_RGBA8888 )
-	Local width=pixmap.width,height=pixmap.height
-	GLAdjustTexSize width,height
-	If width<>pixmap.width Or height<>pixmap.height pixmap=ResizePixmap( pixmap,width,height )
-	
-	Local old_name,old_row_len
-	glGetIntegerv GL_TEXTURE_BINDING_2D,Varptr old_name
-	glGetIntegerv GL_UNPACK_ROW_LENGTH,Varptr old_row_len
-
-	Local name
-	glGenTextures 1,Varptr name
-	glBindtexture GL_TEXTURE_2D,name
-	
-	Local mip_level
-	Repeat
-		glPixelStorei GL_UNPACK_ROW_LENGTH,pixmap.pitch/BytesPerPixel[pixmap.format]
-		glTexImage2D GL_TEXTURE_2D,mip_level,GL_RGBA8,width,height,0,GL_RGBA,GL_UNSIGNED_BYTE,pixmap.pixels
-		If Not mipmap Exit
-		If width=1 And height=1 Exit
-		If width>1 width:/2
-		If height>1 height:/2
-		pixmap=ResizePixmap( pixmap,width,height )
-		mip_level:+1
-	Forever
-	
-	glBindTexture GL_TEXTURE_2D,old_name
-	glPixelStorei GL_UNPACK_ROW_LENGTH,old_row_len
-
-	Return name
-End Function
-
-Rem
-bbdoc:Helper function to output a simple rectangle
-about:
-Draws a rectangle relative to top-left of current viewport.
-End Rem
-Function GLDrawRect( x,y,width,height )
-	BeginOrtho
-	glBegin GL_QUADS
-	glVertex2i x,y
-	glVertex2i x+width,y
-	glVertex2i x+width,y+height
-	glVertex2i x,y+height
-	glEnd
-	EndOrtho
-End Function
-
-Rem
-bbdoc: Helper function to output some simple 8x16 font text
-about:
-Draws text relative to top-left of current viewport.<br>
-<br>
-The font used is an internal fixed point 8x16 font.<br>
-<br>
-This function is intended for debugging purposes only - performance is unlikely to be stellar.
-End Rem
-Function GLDrawText( text$,x,y )
-'	If fontSeq<>graphicsSeq
-	If Not fontTex
-		Local pixmap:TPixmap=TPixmap.Create( 1024,16,PF_RGBA8888 )
-		Local p:Byte Ptr=IncbinPtr( "gldrawtextfont.bin" )
-		For Local y=0 Until 16
-			For Local x=0 Until 96
-				Local b=p[x]
-				For Local n=0 Until 8
-					If b & (1 Shl n) 
-						pixmap.WritePixel x*8+n,y,~0
-					Else
-						pixmap.WritePixel x*8+n,y,0
-					EndIf
-				Next
-			Next
-			p:+96
-		Next
-		fontTex=GLTexFromPixmap( pixmap )
-		fontSeq=graphicsSeq
-	EndIf
-	
-	BeginOrtho
-	
-	glEnable GL_TEXTURE_2D
-	glBindTexture GL_TEXTURE_2D,fontTex
-	
-	For Local i=0 Until text.length
-		Local c=text[i]-32
-		If c>=0 And c<96
-			Const adv#=8/1024.0
-			Local t#=c*adv;
-			glBegin GL_QUADS
-			glTexcoord2f t,0
-			glVertex2f x,y
-			glTexcoord2f t+adv,0
-			glVertex2f x+8,y
-			glTexcoord2f t+adv,1
-			glVertex2f x+8,y+16
-			glTexcoord2f t,1
-			glVertex2f x,y+16
-			glEnd
-		EndIf
-		x:+8
-	Next
-
-	EndOrtho
-End Function
-
-Rem
-bbdoc: Helper function to draw a pixmap to a gl context
-about:
-Draws the pixmap relative to top-left of current viewport.<br>
-<br>
-This function is intended for debugging purposes only - performance is unlikely to be stellar.
-End Rem
-Function GLDrawPixmap( pixmap:TPixmap,x,y )
-	BeginOrtho
-
-	Local t:TPixmap=YFlipPixmap(pixmap)
-	If t.format<>PF_RGBA8888 t=ConvertPixmap( t,PF_RGBA8888 )
-	glRasterPos2i 0,0
-	glBitmap 0,0,0,0,x,-y-t.height,Null
-	glDrawPixels t.width,t.height,GL_RGBA,GL_UNSIGNED_BYTE,t.pixels
-
-	EndOrtho
-End Function
-
-Rem
-bbdoc: Enable OpenGL context sharing
-about:
-Calling #GLShareContexts will cause all opengl graphics contexts created to
-shared displaylists, textures, shaders etc.
-
-This should be called before any opengl contexts are created.
-End Rem
-Function GLShareContexts()
-	bbGLGraphicsShareContexts
-End Function
-
+Import "source.bmx"
 ?

glgraphics.mod/source.bmx

@@ -0,0 +1,327 @@
+Strict
+
+Import BRL.Graphics
+Import BRL.Pixmap
+Import Pub.Glew
+Import Pub.OpenGL
+Import BRL.SystemDefault
+
+Private
+
+Incbin "gldrawtextfont.bin"
+
+Extern
+	Function bbGLGraphicsShareContexts()
+	Function bbGLGraphicsGraphicsModes( buf:Byte Ptr,size )
+	Function bbGLGraphicsAttachGraphics:Byte Ptr( widget:Byte Ptr,flags )
+	Function bbGLGraphicsCreateGraphics:Byte Ptr( width,height,depth,hertz,flags )
+	Function bbGLGraphicsGetSettings( context:Byte Ptr,width Var,height Var,depth Var,hertz Var,flags Var )
+	Function bbGLGraphicsClose( context:Byte Ptr )	
+	Function bbGLGraphicsSetGraphics( context:Byte Ptr )
+	Function bbGLGraphicsFlip( sync )
+End Extern
+
+Public
+
+Type TGLGraphics Extends TGraphics
+
+	Method Driver:TGLGraphicsDriver()
+		Assert _context
+		Return GLGraphicsDriver()
+	End Method
+	
+	Method GetSettings( width Var,height Var,depth Var,hertz Var,flags Var )
+		Assert _context
+		Local w,h,d,r,f
+		bbGLGraphicsGetSettings _context,w,h,d,r,f
+		width=w
+		height=h
+		depth=d
+		hertz=r
+		flags=f
+	End Method
+	
+	Method Close()
+		If Not _context Return
+		bbGLGraphicsClose( _context )
+		_context=0
+	End Method
+	
+	Field _context:Byte Ptr
+	
+End Type
+
+Type TGLGraphicsDriver Extends TGraphicsDriver
+
+	Method GraphicsModes:TGraphicsMode[]()
+		Local buf[1024*4]
+		Local count=bbGLGraphicsGraphicsModes( buf,1024 )
+		Local modes:TGraphicsMode[count],p:Int Ptr=buf
+		For Local i=0 Until count
+			Local t:TGraphicsMode=New TGraphicsMode
+			t.width=p[0]
+			t.height=p[1]
+			t.depth=p[2]
+			t.hertz=p[3]
+			modes[i]=t
+			p:+4
+		Next
+		Return modes
+	End Method
+	
+	Method AttachGraphics:TGLGraphics( widget:Byte Ptr,flags )
+		Local t:TGLGraphics=New TGLGraphics
+		t._context=bbGLGraphicsAttachGraphics( widget,flags )
+		Return t
+	End Method
+	
+	Method CreateGraphics:TGLGraphics( width,height,depth,hertz,flags )
+		Local t:TGLGraphics=New TGLGraphics
+		t._context=bbGLGraphicsCreateGraphics( width,height,depth,hertz,flags )
+		Return t
+	End Method
+	
+	Method SetGraphics( g:TGraphics )
+		Local context:Byte Ptr
+		Local t:TGLGraphics=TGLGraphics( g )
+		If t context=t._context
+		bbGLGraphicsSetGraphics context
+	End Method
+	
+	Method Flip( sync )
+		bbGLGraphicsFlip sync
+	End Method
+	
+End Type
+
+Rem
+bbdoc: Get OpenGL graphics driver
+returns: An OpenGL graphics driver
+about:
+The returned driver can be used with #SetGraphicsDriver
+End Rem
+Function GLGraphicsDriver:TGLGraphicsDriver()
+	Global _driver:TGLGraphicsDriver=New TGLGraphicsDriver
+	Return _driver
+End Function
+
+Rem
+bbdoc: Create OpenGL graphics
+returns: An OpenGL graphics object
+about:
+This is a convenience function that allows you to easily create an OpenGL graphics context.
+End Rem
+Function GLGraphics:TGraphics( width,height,depth=0,hertz=60,flags=GRAPHICS_BACKBUFFER|GRAPHICS_DEPTHBUFFER )
+	SetGraphicsDriver GLGraphicsDriver()
+	Return Graphics( width,height,depth,hertz,flags )
+End Function
+	
+SetGraphicsDriver GLGraphicsDriver()
+
+'----- Helper Functions -----
+
+Private
+
+Global fontTex
+Global fontSeq
+
+Global ortho_mv![16],ortho_pj![16]
+
+Function BeginOrtho()
+	Local vp[4]
+	
+	glPushAttrib GL_ENABLE_BIT|GL_TEXTURE_BIT|GL_TRANSFORM_BIT
+	
+	glGetIntegerv GL_VIEWPORT,vp
+	glGetDoublev GL_MODELVIEW_MATRIX,ortho_mv
+	glGetDoublev GL_PROJECTION_MATRIX,ortho_pj
+	
+	glMatrixMode GL_MODELVIEW
+	glLoadIdentity
+	glMatrixMode GL_PROJECTION
+	glLoadIdentity
+	glOrtho 0,vp[2],vp[3],0,-1,1
+
+	glDisable GL_CULL_FACE
+	glDisable GL_ALPHA_TEST	
+	glDisable GL_DEPTH_TEST
+End Function
+
+Function EndOrtho()
+	glMatrixMode GL_PROJECTION
+	glLoadMatrixd ortho_pj
+	glMatrixMode GL_MODELVIEW
+	glLoadMatrixd ortho_mv
+	
+	glPopAttrib
+End Function
+
+Public
+
+Rem
+bbdoc: Helper function to calculate nearest valid texture size
+about: This functions rounds @width and @height up to the nearest valid texture size
+End Rem
+Function GLAdjustTexSize( width Var,height Var )
+	Function Pow2Size( n )
+		Local t=1
+		While t<n
+			t:*2
+		Wend
+		Return t
+	End Function
+	width=Pow2Size( width )
+	height=Pow2Size( height )
+	Repeat
+		Local t
+		glTexImage2D GL_PROXY_TEXTURE_2D,0,4,width,height,0,GL_RGBA,GL_UNSIGNED_BYTE,Null
+		glGetTexLevelParameteriv GL_PROXY_TEXTURE_2D,0,GL_TEXTURE_WIDTH,Varptr t
+		If t Return
+		If width=1 And height=1 RuntimeError "Unable to calculate tex size"
+		If width>1 width:/2
+		If height>1 height:/2
+	Forever
+End Function
+
+Rem
+bbdoc: Helper function to create a texture from a pixmap
+returns: Integer GL Texture name
+about: @pixmap is resized to a valid texture size before conversion.
+end rem
+Function GLTexFromPixmap( pixmap:TPixmap,mipmap=True )
+	If pixmap.format<>PF_RGBA8888 pixmap=pixmap.Convert( PF_RGBA8888 )
+	Local width=pixmap.width,height=pixmap.height
+	GLAdjustTexSize width,height
+	If width<>pixmap.width Or height<>pixmap.height pixmap=ResizePixmap( pixmap,width,height )
+	
+	Local old_name,old_row_len
+	glGetIntegerv GL_TEXTURE_BINDING_2D,Varptr old_name
+	glGetIntegerv GL_UNPACK_ROW_LENGTH,Varptr old_row_len
+
+	Local name
+	glGenTextures 1,Varptr name
+	glBindtexture GL_TEXTURE_2D,name
+	
+	Local mip_level
+	Repeat
+		glPixelStorei GL_UNPACK_ROW_LENGTH,pixmap.pitch/BytesPerPixel[pixmap.format]
+		glTexImage2D GL_TEXTURE_2D,mip_level,GL_RGBA8,width,height,0,GL_RGBA,GL_UNSIGNED_BYTE,pixmap.pixels
+		If Not mipmap Exit
+		If width=1 And height=1 Exit
+		If width>1 width:/2
+		If height>1 height:/2
+		pixmap=ResizePixmap( pixmap,width,height )
+		mip_level:+1
+	Forever
+	
+	glBindTexture GL_TEXTURE_2D,old_name
+	glPixelStorei GL_UNPACK_ROW_LENGTH,old_row_len
+
+	Return name
+End Function
+
+Rem
+bbdoc:Helper function to output a simple rectangle
+about:
+Draws a rectangle relative to top-left of current viewport.
+End Rem
+Function GLDrawRect( x,y,width,height )
+	BeginOrtho
+	glBegin GL_QUADS
+	glVertex2i x,y
+	glVertex2i x+width,y
+	glVertex2i x+width,y+height
+	glVertex2i x,y+height
+	glEnd
+	EndOrtho
+End Function
+
+Rem
+bbdoc: Helper function to output some simple 8x16 font text
+about:
+Draws text relative to top-left of current viewport.<br>
+<br>
+The font used is an internal fixed point 8x16 font.<br>
+<br>
+This function is intended for debugging purposes only - performance is unlikely to be stellar.
+End Rem
+Function GLDrawText( text$,x,y )
+'	If fontSeq<>graphicsSeq
+	If Not fontTex
+		Local pixmap:TPixmap=TPixmap.Create( 1024,16,PF_RGBA8888 )
+		Local p:Byte Ptr=IncbinPtr( "gldrawtextfont.bin" )
+		For Local y=0 Until 16
+			For Local x=0 Until 96
+				Local b=p[x]
+				For Local n=0 Until 8
+					If b & (1 Shl n) 
+						pixmap.WritePixel x*8+n,y,~0
+					Else
+						pixmap.WritePixel x*8+n,y,0
+					EndIf
+				Next
+			Next
+			p:+96
+		Next
+		fontTex=GLTexFromPixmap( pixmap )
+		fontSeq=graphicsSeq
+	EndIf
+	
+	BeginOrtho
+	
+	glEnable GL_TEXTURE_2D
+	glBindTexture GL_TEXTURE_2D,fontTex
+	
+	For Local i=0 Until text.length
+		Local c=text[i]-32
+		If c>=0 And c<96
+			Const adv#=8/1024.0
+			Local t#=c*adv;
+			glBegin GL_QUADS
+			glTexcoord2f t,0
+			glVertex2f x,y
+			glTexcoord2f t+adv,0
+			glVertex2f x+8,y
+			glTexcoord2f t+adv,1
+			glVertex2f x+8,y+16
+			glTexcoord2f t,1
+			glVertex2f x,y+16
+			glEnd
+		EndIf
+		x:+8
+	Next
+
+	EndOrtho
+End Function
+
+Rem
+bbdoc: Helper function to draw a pixmap to a gl context
+about:
+Draws the pixmap relative to top-left of current viewport.<br>
+<br>
+This function is intended for debugging purposes only - performance is unlikely to be stellar.
+End Rem
+Function GLDrawPixmap( pixmap:TPixmap,x,y )
+	BeginOrtho
+
+	Local t:TPixmap=YFlipPixmap(pixmap)
+	If t.format<>PF_RGBA8888 t=ConvertPixmap( t,PF_RGBA8888 )
+	glRasterPos2i 0,0
+	glBitmap 0,0,0,0,x,-y-t.height,Null
+	glDrawPixels t.width,t.height,GL_RGBA,GL_UNSIGNED_BYTE,t.pixels
+
+	EndOrtho
+End Function
+
+Rem
+bbdoc: Enable OpenGL context sharing
+about:
+Calling #GLShareContexts will cause all opengl graphics contexts created to
+shared displaylists, textures, shaders etc.
+
+This should be called before any opengl contexts are created.
+End Rem
+Function GLShareContexts()
+	bbGLGraphicsShareContexts
+End Function
+

systemdefault.mod/system.linux.bmx

@@ -1,6 +1,9 @@
-
 Strict
 
+?Not android
+
+Import "-lX11"
+
 Import BRL.System
 Import "system.linux.c"
 
@@ -119,3 +122,7 @@ Type TLinuxSystemDriver Extends TSystemDriver
 	End Method
 
 End Type
+
+Driver=New TLinuxSystemDriver
+
+?

systemdefault.mod/systemdefault.bmx

@@ -72,7 +72,9 @@ Import BRL.System
 Import BRL.KeyCodes
 Import BRL.Hook
 
+?Not android
 Import "system.c"
+?
 
 ?MacOS
 Import "system.macos.bmx"
@@ -82,7 +84,5 @@ Import "system.win32.bmx"
 Import "-lcomdlg32"
 Driver=New TWin32SystemDriver
 ?Linux
-Import "-lX11"
 Import "system.linux.bmx"
-Driver=New TLinuxSystemDriver
 ?