Commit Graph

315 Commits

Author SHA1 Message Date
twinaphex
93f9316a9b (Xbox 1) Build fixes 2012-11-10 13:46:24 +01:00
twinaphex
de4648a127 (Android) Possible context fix 2012-11-09 22:33:54 +01:00
twinaphex
48b0bc7f2d (Android) Use eglGetError 2012-11-09 21:52:07 +01:00
twinaphex
acb4f63cfb (Android) Build fix 2012-11-09 21:20:55 +01:00
twinaphex
eb5bb55754 (Android) Need to know return val 2012-11-09 20:47:17 +01:00
twinaphex
8ba727ab30 (Android) Build fix 2012-11-09 17:05:03 +01:00
twinaphex
0b6bbe04a3 (Android) Add log error messages for Android EGL context for debugging 2012-11-09 09:43:16 +01:00
twinaphex
610b54e3b2 (Android) Some initial context restoring in EGL context 2012-11-03 19:23:52 +01:00
twinaphex
0dbcdb087d (Android) Rewrite of input code 2012-11-03 00:31:05 +01:00
twinaphex
02f81a38c2 (Android) Create input_state for Android app - can now signal that a window
was created, or that we want to shutdown
2012-11-02 22:27:22 +01:00
twinaphex
3837a503b7 (Android) Reimplement native glue code 2012-11-01 05:48:46 +01:00
OV2
eaa637aa4b win32: report correct monitor size for regular fullscreen in wgl 2012-10-31 21:36:17 +01:00
twinaphex
4d99d93df0 (Android) remove Android save state for now - unused and will
probably reimplement it later
2012-10-31 18:10:38 +01:00
twinaphex
cbcffbb5cf (Android) Get rid of unused width/height/animated in g_android struct 2012-10-31 17:12:45 +01:00
Themaister
dc4eaea7b4 Fix build derp. 2012-10-30 22:02:15 +01:00
Themaister
85b6437fdf Add multi-monitor to D3D9.
Untested as I don't have multiple monitors.
Refactored slightly in WGL to make the code more uniform.
The multi-monitor support should probably be refactored to w32_common or
something similar.
2012-10-30 11:49:40 +01:00
twinaphex
b204b55386 (Android) Remove unnecessary animating conditional block in gfx_ctx_check_window 2012-10-30 06:36:38 +01:00
twinaphex
1ff6175bd2 (Android) Move polling for events into Android input driver instead
of EGL context check_window function
2012-10-30 06:20:49 +01:00
Themaister
be35179ec6 Explicitly cast string literal to avoid warning. 2012-10-26 23:04:36 +02:00
Themaister
bda505c95b Set WM_CLASS in X11. 2012-10-26 23:01:32 +02:00
twinaphex
cfdfcd4b8e (Android) Speed optimization 2012-10-25 20:58:05 +02:00
Themaister
c2674328ec Fix broken CRLF, and minor fixes for VC12. 2012-10-24 17:19:37 +02:00
Twinaphex512
53868033b7 (MSVC 2012) Initial MSVC 2012 solution
Just need to sort out the linking errors - we'll need to create a
Direct3D driver that is not external for PC and do away with the
'external' one which is really an unacceptable extra dependency for such
a popular graphics API. Also, look if the WGL context file will even
work. Added some TODOs too.
2012-10-24 15:48:44 +02:00
Themaister
204a879380 Report if true fullscreen fails on X11. 2012-10-23 23:17:56 +02:00
OV2
a97acbddb1 win32: ignore f10 and alt key presses 2012-10-22 21:27:49 +02:00
twinaphex
9bc0f382ab (PS3/RMenu) refactored HAVE_CG_MENU out of existence - now
replaced with HAVE_RMENU - menu code has been moved over to
PS3 context file
2012-10-22 06:12:12 +02:00
twinaphex
f37095e994 (PS3) 16bit textures work correctly now - the 'blending' done
on consoles (PS3/Wii) for the ingame menu needs to be done in
software rendering - will also help with RMenu for PC
2012-10-22 03:56:28 +02:00
Themaister
a79ca54bc7 Fix CXX_BUILD. 2012-10-21 23:24:25 +02:00
twinaphex
84abbe110b Merge branch 'rgb565' of https://github.com/Themaister/RetroArch into rgb565 2012-10-21 22:11:30 +02:00
twinaphex
3342bd4ec6 (Android) Teardown more or less works correctly now - have to do
exit() at the end because of the way dynamic libraries stay in
memory and can't be purged - so static variables retain their
state (ie. previous values from the previous session) - see

https://groups.google.com/forum/?fromgroups=#!topic/android-ndk/XDO-Rar3ptY
http://comments.gmane.org/gmane.comp.handhelds.android.ndk/11500
2012-10-21 19:56:36 +02:00
twinaphex
702f99b80e (Android) Some teardown refinements 2012-10-21 17:38:47 +02:00
twinaphex
9b6425c1da (Android) Use DetachCurrentThread - first stab at setting up clean
deiniting
2012-10-21 17:30:02 +02:00
twinaphex
647fd0abf0 (Android) Not sure if we have to do this 'event loop' in gfx_ctx_check_window
- make it sample one frame of events and that is it - also comment out
accelerometer stuff for now
2012-10-21 16:37:15 +02:00
Themaister
b6576e91ca Merge branch 'master' of git://github.com/Themaister/RetroArch 2012-10-20 22:46:19 +01:00
Themaister
5a4caf1c51 Fix build on VC.
Conflicts:
	gfx/gl_common.h
2012-10-20 23:46:09 +02:00
Themaister
2145d1c4e2 Use RGB565 in VC context. 2012-10-20 21:55:58 +01:00
Themaister
283d17284b Do not use assert() as error handling. 2012-10-20 22:39:46 +02:00
Themaister
653cbf1baa Enforce static on globals that aren't used outside. 2012-10-20 22:36:43 +02:00
Toad King
c7dad59402 Add EGLImage support to GL driver.
On videocore, uploading image textures using OpenVG instead of OpenGL ES saves us about 4.5 milliseconds per frame.
2012-10-19 23:08:53 -04:00
Toad King
faf1b47d61 VideoCore EGLImage, still needs EGLImage support in GL driver 2012-10-19 21:24:28 -04:00
Toad King
301848e037 compile fix 2012-10-18 19:09:16 -04:00
Toad King
86fb0984d2 beginning framework for EGLImage support, added (untested) example to OpenVG 2012-10-18 19:00:25 -04:00
Themaister
8da0fd6f6d Drop another call to glClearColor. 2012-10-17 21:35:40 +02:00
twinaphex
90d5913faa (Android) Add optional fps logging 2012-10-16 17:18:10 +02:00
twinaphex
303c4968f2 (Android) Get rid of extra swap buffers call 2012-10-16 16:23:55 +02:00
twinaphex
3cf0e3c984 (Android) Cleanups in context file - do away with everything related
to RARCH_CONSOLE
2012-10-16 14:43:34 +02:00
twinaphex
5977ab5be1 (Android) Implement gfx_ctx_get_video_size 2012-10-16 14:31:18 +02:00
twinaphex
5e85906f94 (Android) Comment out accelerometer logging for now - so that we
don't spam the logger
2012-10-16 13:27:49 +02:00
twinaphex
7bdd81b0bb (Android) Seems to run now (with GLES 2 forced) - but just shows
black right now
2012-10-16 13:15:11 +02:00
twinaphex
ff914dd862 (Android) Set up RetroArch for real (Android is retarded in that it
only allows us to use dlopen on shared libs that are in the app's
'lib' folder - 'security' concerns and all
2012-10-16 12:49:56 +02:00
twinaphex
ee1194d19a (Android EGL) don't needlessly set up GL state after gfx_ctx_init 2012-10-15 19:37:18 +02:00
twinaphex
8ac8b16d34 (Android) Use EGL context file 2012-10-15 19:33:57 +02:00
twinaphex
d30d345d84 (Android) Cleanups - remove unneeded gfx_ctx_set_window/gfx_ctx_free_window 2012-10-15 19:15:09 +02:00
twinaphex
f52d7f462e (360) Build fixes 2012-10-15 07:22:20 +02:00
twinaphex
a7a7671ac0 (Xbox 1) Build fixes 2012-10-15 07:00:58 +02:00
twinaphex
174c7d9d98 (RARCH_CONSOLE) g_console struct removed now - console settings
now a part of g_extern and also compiled in for PC - will use
this for RMenu
2012-10-15 06:25:12 +02:00
twinaphex
96f5c78304 (Android) removed bifrost.c - made libretroarch.so now a native
activity
2012-10-14 03:37:08 +02:00
twinaphex
73194640a0 Revert "(Android) Renamed GUI to RetroArch Android - Phoenix will be Java-only,"
This reverts commit ad27bedcb4.
2012-10-14 01:49:15 +02:00
twinaphex
ad27bedcb4 (Android) Renamed GUI to RetroArch Android - Phoenix will be Java-only,
and the RetroArch program itself will be a native activity
2012-10-14 00:56:50 +02:00
Themaister
6fd1940741 Fix screensaver appearing in fullscreen. 2012-10-13 19:53:04 +02:00
Themaister
a0e6db636f Set window icon in X11. 2012-10-13 12:51:37 +02:00
Themaister
89cf228c30 Use monitor index setting. 2012-10-12 21:18:24 +02:00
Themaister
f223c62fc8 Merge git://github.com/OV2/RetroArch 2012-10-12 21:16:19 +02:00
Themaister
f6d8902462 Add monitor selection option. 2012-10-12 21:15:58 +02:00
Themaister
9208663c53 Add basic Xinerama support to X11. 2012-10-12 19:58:54 +02:00
OV2
1aef7faacb win32: selectable monitor in wgl context 2012-10-12 19:39:55 +02:00
Themaister
f605e8acf2 Fix compiler warnings. 2012-10-11 23:31:46 +02:00
OV2
e5fe88032a win32: specify device when restoring mode 2012-10-11 23:24:53 +02:00
OV2
0db21ccac1 win32: also use current monitor for regular fullscreen 2012-10-11 22:32:31 +02:00
Themaister
4474b18c8d Minor nit. 2012-10-11 00:21:08 +02:00
Themaister
b7174a229e Merge git://github.com/OV2/RetroArch
Conflicts:
	gfx/context/wgl_ctx.c
2012-10-11 00:18:21 +02:00
Themaister
cf37629d0d Add icon to WGL. 2012-10-11 00:09:24 +02:00
Themaister
6e1b2c6291 Slight adjustments to WGL. 2012-10-10 23:52:59 +02:00
OV2
691491ccdb win32: windowed fullscreen on current monitor 2012-10-10 22:08:22 +02:00
OV2
13fafd80ab win32: only hide cursor if in fullscreen 2012-10-10 21:44:29 +02:00
twinaphex
254239849a Revert "(Android) Cleanup - remove android java audio driver / remove android java video"
This reverts commit ba99f83aa5.
2012-10-08 22:55:31 +02:00
twinaphex
ba99f83aa5 (Android) Cleanup - remove android java audio driver / remove android java video
driver - do as much stuff natively
2012-10-07 18:20:11 +02:00
Themaister
716f37f8bf Add untested windowed fullscreen in WGL. 2012-10-07 00:21:39 +02:00
twinaphex
350b15b0f2 (Android) Add some initial funtions for setting native window 2012-10-06 06:51:42 +02:00
twinaphex
1fd32e0ae6 (Android) Implement gfx_ctx_set_swap_interval 2012-10-05 16:13:48 +02:00
Themaister
afc611131c Make fullscreen branch slightly clearer. 2012-10-05 15:17:25 +02:00
Themaister
6104ce2163 Add option for windowed fullscreen. 2012-10-05 14:15:54 +02:00
Themaister
45a5895abf Attempt to recover from true fullscreen failing. 2012-10-05 13:55:24 +02:00
twinaphex
286edce639 (Android) Clean up EGL context file - bring it more in line with the
others
2012-10-05 01:47:52 +02:00
twinaphex
de72779577 (Android) Add preliminary EGL context driver 2012-10-05 01:19:39 +02:00
Themaister
e351dcc59c Should allow fast path for PS3 on glTexImage2D. 2012-10-02 20:16:55 +02:00
twinaphex
6c5d6515ce (XDK) 360 and Xbox 1 now both use the same Direct3D driver 2012-10-01 03:35:38 +02:00
twinaphex
4ae233f1f0 (XDK) Reports screen resolution now at device init 2012-10-01 01:17:30 +02:00
twinaphex
011037eea2 (XDK Xbox 1) Refactor Xbox 1 code too 2012-10-01 00:41:06 +02:00
Themaister
b73243b521 Fix CXX_BUILD. 2012-10-01 00:12:07 +02:00
twinaphex
b954472295 (360) Move D3D init/destroy code to context file 2012-10-01 00:09:37 +02:00
twinaphex
4d80a71f7e (XDK) Refactorings - build fixes 2012-09-30 17:57:32 +02:00
twinaphex
71443385e9 (PS3/XDK - Context) Some refactorings 2012-09-30 17:51:48 +02:00
twinaphex
c1e3dcd00e (Xbox 1/360) XDK context file updated - fixes build 2012-09-30 17:10:04 +02:00
Themaister
8d8dce7d2b Don't display mouse. Set window title immediately. 2012-09-30 15:08:11 +02:00
Themaister
dd6d27c108 Add WGL context. 2012-09-30 14:41:58 +02:00
Themaister
5688f939a7 Use GL_BGRA_EXT on GLES. 2012-09-29 20:06:48 +02:00
Themaister
9747a594e8 Check for glXSwapInterval as well. 2012-09-29 12:35:26 +02:00
Themaister
e58bdc4811 Add GLX context. 2012-09-29 12:13:11 +02:00
Themaister
4669aee283 Kill null_ctx.
Doesn't serve any purpose with new context abstraction.
2012-09-29 11:14:02 +02:00
Themaister
f8de693eef Use true fullscreen in X/EGL. 2012-09-29 10:47:55 +02:00
Themaister
c6820af73e Fix CXX_BUILD. 2012-09-28 23:47:20 +02:00
Themaister
c655c1d4e5 Big refactor of joypad input. 2012-09-28 23:06:16 +02:00
Themaister
5936fbf463 Minor fixes in VC context. 2012-09-26 16:00:06 +02:00
Themaister
31b12d7d00 Refactor out common X11 code. 2012-09-26 15:52:25 +02:00
Themaister
f96d357017 Fix build on KMS. 2012-09-25 19:28:21 +02:00
Themaister
2674a67cdd Abstract away aspect ratio handling. 2012-09-25 13:51:44 +02:00
Themaister
9c24946ca5 Pick right visual attribs in EGL depending on API. 2012-09-25 13:25:03 +02:00
TwinAphex51224
e42f515e11 (PS3) Works on PS3 again 2012-09-25 03:49:51 +02:00
Toad King
eee9468900 fix GLES for VideoCore 2012-09-24 21:25:31 -04:00
Toad King
df77bbd0bd compile fixes
bind API before initializing context
2012-09-24 20:47:48 -04:00
Themaister
d0e220bbf1 Refactor all GL context handling code. 2012-09-25 01:37:23 +02:00
Themaister
a1999af4a7 Don't use projection abstraction in GL.
Makes no sense anymore as it's calculated with gfx/math/ ...
Keep abstraction for XBox.
2012-09-24 22:51:26 +02:00
Themaister
4107218a5f Should fix build on OSX (*shrug*). 2012-09-24 10:04:15 +02:00
Themaister
ae8ab33e81 Properly be able to reinit KMS. 2012-09-24 00:01:04 +02:00
Themaister
b1f5c83deb Make sure all page-flips are acknowledged. 2012-09-23 12:11:24 +02:00
Themaister
d9fce26801 Log DRM frame as well in KMS. 2012-09-20 19:55:25 +02:00
Themaister
e8666e4b4e Style nit. 2012-09-19 09:38:59 +02:00
Themaister
90a69ac33e Only define EGL attrib bits for GL if compiled in. 2012-09-19 09:09:46 +02:00
Toad King
8d5726a5ed add change to drm/x egl contexts for future OpenVG support 2012-09-18 22:59:51 -04:00
Toad King
66fd23d611 Fix VideoCore context for GLES2, video driver runs but texture is transparent 2012-09-18 22:16:43 -04:00
Toad King
012c7def7b big Raspberry Pi-related changes
* convert old rpi video driver into a generic OpenVG driver
* add VideoCore EGL context
* build GLES by default if VideoCore detected (currently does not run)
2012-09-18 19:42:17 -04:00
Themaister
580cf1c07e Report delta times for vblank misses.
For debugging purposes, report time from PageFlip is queued, till it
actually happens.
2012-09-19 00:44:50 +02:00
Themaister
620769fbeb Ifdef out custom scheduling for now.
Doesn't appear to help much.
2012-09-18 23:09:23 +02:00
Themaister
c309099e79 Attempt to use SCHED_FIFO in KMS.
This is mostly for testing purposes, to see how much scheduling affects
performance.
2012-09-18 21:51:50 +02:00
Themaister
f6af4fc122 Add performance metrics to KMS driver. 2012-09-18 20:36:16 +02:00
Themaister
1d2d09905b Allow using straight OpenGL API in KMS. 2012-09-18 12:16:27 +02:00
Themaister
bbcf7e5d86 Do not flicker when nonblock is applied in KMS. 2012-09-18 10:32:35 +02:00
Themaister
c0d6e5e70c Free first framebuffer correctly in KMS driver. 2012-09-18 00:17:23 +02:00
Themaister
0c805a200e Add dummy logs for page_flip_event. 2012-09-17 11:34:19 +02:00
Themaister
ceb7e08c24 Allow fast-forward in framebuffer mode. 2012-09-16 22:56:58 +02:00
Themaister
cc0fe7f8de KMS context can be restored after exit. 2012-09-16 22:39:29 +02:00
Themaister
de2f5ba4ba Add experimental KMS/GLES framebuffer driver. 2012-09-16 21:41:09 +02:00
Themaister
b9b9454c7d Report error if eglSwapInterval() fails. 2012-09-16 15:26:02 +02:00
Themaister
22aae7802a Remove misplaced comment. 2012-09-16 10:52:44 +02:00
Themaister
0487fdb0e8 Set g_has_focus to true when MapNotify hits. 2012-09-16 10:47:53 +02:00
Twinaphex
34ea7f18fc (PSL1GHT/PS3) Move more header includes/redefinitions to sdk_defines.h 2012-09-16 04:04:59 +02:00
Themaister
6d2c0cdb17 Only allow keyboard input when in focus int x_input. 2012-09-16 01:27:32 +02:00
Themaister
282346572d Fix font rendering in GLES. 2012-09-16 00:57:39 +02:00
Themaister
6052af0327 Don't segfault on fullscreen swapping. 2012-09-15 15:41:12 +02:00
Themaister
ff60bcb5e5 Add experimental X/EGL support. 2012-09-15 15:17:34 +02:00
Twinaphex
3c8b967008 (GL) Make EGL context file - have PSL1GHT build use eglGetProcAddress
- doesn't currently link
2012-09-14 11:07:50 +02:00
Twinaphex
455f74ea46 (PS3) Fix build - GL side is totally screwed up now though -
investigate
2012-09-13 06:52:47 +02:00
Themaister
a4262fd0d6 Purge SDL_MODERN.
SDL 2.0 differs far more than 1.3 did, and it makes no sense
to support both now.
2012-09-12 23:37:25 +02:00
Twinaphex
50d8520085 (Android) Use GLES v2 - codepath for GLES v1 is broken if
GL_CLAMP_TO_BORDER is not available
2012-09-12 15:21:25 +02:00
Themaister
e1fc6d7ab5 Do not use SDL_SYM_WRAP outside sdl_ctx.c. 2012-09-12 09:30:36 +02:00
Themaister
4c99652a60 Rework attribute and MVP passing in GL. 2012-09-11 23:32:00 +02:00
Twinaphex
201f5fd135 (PSL1GHT) More PSL1GHT work 2012-09-11 12:34:07 +02:00
Themaister
0cb232a171 Avoid possible warnings in null_ctx. 2012-09-10 09:39:30 +02:00
Twinaphex
e6303c9615 Add null_ctx.c and use this for Android for now 2012-09-10 02:00:06 +02:00