Commit Graph

924 Commits

Author SHA1 Message Date
Themaister
6d3c12b9bd Use HAVE_GLSL instead of HAVE_XML.
Replace where it makes sense.
2012-10-16 19:43:05 +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
be1abb6f38 (Android) Runs now - note - we might want to refactor HAVE_XML ifdefs
to HAVE_GLSL since I currently don't have HAVE_XML defined for
Android NDK
2012-10-16 15:38:25 +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
b8abf34785 Purge some now useless code.
Removes manual input rate adjustments.
Don't allow DSP plugs to resample as it would complicate things alot
with dynamic rate control.
Also purges optional ssnes_* symbols for external plugs.
2012-10-13 20:22:45 +02:00
Themaister
6fd1940741 Fix screensaver appearing in fullscreen. 2012-10-13 19:53:04 +02:00
Themaister
ba647047ce Remove some redundant code in xvideo. 2012-10-13 16:58:29 +02:00
Themaister
a0e6db636f Set window icon in X11. 2012-10-13 12:51:37 +02:00
Themaister
1968603451 Fix warning train on OSX. 2012-10-12 21:24:23 +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
9a38d021c2 Rename confusing 'driver' member to 'ctx_driver' in gl struct 2012-10-09 17:47:48 +02:00
twinaphex
8132f9fd8a (Android) Add Android context hooks 2012-10-09 00:11:11 +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
Themaister
0241b463fc Fix build against static FFmpeg. 2012-10-06 10:30:45 +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
74e4ae7286 Fix CXX_BUILD. 2012-10-04 09:09:04 +02:00
twinaphex
0a20857a44 (ARM) Add mrc ARM define for benchmark.c
- Some Android build fixes
- Removed doubly defined static inline function
2012-10-02 23:59:19 +02:00
Themaister
8dd51016dc Make sure LOAD_GL_SYM doesn't get double define. 2012-10-02 23:36:18 +02:00
Themaister
aa74c185f3 Use glMapBuffer to copy data to texref bufs. 2012-10-02 22:18:53 +02:00
Themaister
657c9ea3e8 Fix build on PS3. 2012-10-02 20:23:10 +02:00
Themaister
e351dcc59c Should allow fast path for PS3 on glTexImage2D. 2012-10-02 20:16:55 +02:00
Themaister
5b0525d2e2 Drop HAVE_PBO. Use custom conversion routines.
Measured custom 15->32 conversion to be up to 10x faster on my setup.
2012-10-02 01:04:47 +02:00
Themaister
018b97be72 Add logging code to gl_copy_frame. 2012-10-01 23:59:11 +02:00
Themaister
1bac5421ff Update benchmarks for GCC + x86.
Compile with make PERF_TEST=1 to enable performance logging.
2012-10-01 23:43:16 +02:00
Themaister
4db4d414a9 Should fix build on OSX. 2012-10-01 22:48:36 +02:00
twinaphex
666ed41234 (PS3) Build fix
(RMenu) Get rid of (now) unnecessary includes
2012-10-01 04:04:50 +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
c7f8535ecf (360) Shows amount of shaders that were loaded at init 2012-10-01 02:45:29 +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
Themaister
043bcfd1de Minor refactor. gl_set_shader_viewport(). 2012-09-30 19:55:33 +02:00
Themaister
66867c9b07 Remove breaking include of gl_common.h. 2012-09-30 19:28:36 +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
9a07e23ecb Simplify GLES ifdef. 2012-09-30 10:33:15 +02:00
twinaphex
e4399884d9 (PS3) Needs ifndef around querying of BGRA888 - PSGL only has GL_BGRA
defined and not GL_BGRA888_EXT
2012-09-30 04:47:35 +02:00
Themaister
fb78009e10 Remove "special" GLES2 paths in image.c. 2012-09-29 22:04:11 +02:00
Themaister
55573b4726 Some PC fixups in OpenVG (still shows black though). 2012-09-29 20:18:24 +02:00
Themaister
5688f939a7 Use GL_BGRA_EXT on GLES. 2012-09-29 20:06:48 +02:00
Themaister
5d4019f4ab Have the scale value make more sense in freetype. 2012-09-29 19:20:30 +02:00
twinaphex
66cc23af34 (Freetype) Should allow for setting adjustable font positioning (x/y)
and scaling
2012-09-29 14:19:14 +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
04e3fe185f Can build without SDL now (only RetroArch). 2012-09-28 23:34:19 +02:00
Themaister
c655c1d4e5 Big refactor of joypad input. 2012-09-28 23:06:16 +02:00
Themaister
ee8a93973f Drop redundant call to UNPACK_ROW_LENGTH. 2012-09-27 20:54:24 +02:00
TwinAphex51224
a8f255e357 Revert "(PS3) Use texture references for PSGL/RGL - NOTE: will form part"
This reverts commit 10605eabe3.
2012-09-27 20:24:05 +02:00
TwinAphex51224
5fad20121f (PS3) Add preliminary Freetype support for PS3 2012-09-27 18:16:06 +02:00
TwinAphex51224
fdd78b08d3 Use new define HAVE_CG_RUNTIME_COMPILER 2012-09-27 17:45:49 +02:00
TwinAphex51224
903ab0ccad Comment out RARCH_CG_DEBUG again 2012-09-27 17:30:28 +02:00
TwinAphex51224
10605eabe3 (PS3) Use texture references for PSGL/RGL - NOTE: will form part
of RGL now
2012-09-27 17:28:38 +02:00
Themaister
2e168157c1 Sanitize font rendering in xv and SDL.
Fixes old bug where big chunks of fonts would often be just left out.
2012-09-27 01:42:46 +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
704af0e0b7 x_input depends on HAVE_X11. 2012-09-25 15:14:56 +02:00
Themaister
d732aa4c2e Abstract aspect handling in vg.c. 2012-09-25 13:54:22 +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
Toad King
58a2ff9594 leave a note for the future ;) 2012-09-25 00:42:03 -04:00
TwinAphex51224
accbb57e10 (PS3) Set NO_GL_FF_VERTEX for PSGL-based builds 2012-09-25 04:07:36 +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
Toad King
c1948b7c5d remove VGU requirement from VG video driver
MESA's libOpenVG does not supply the utility functions
2012-09-24 19:30:24 -04: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
Toad King
b087a2cc76 rename oops 2012-09-24 15:31:46 -04:00
Toad King
500139f1b5 change video_rpi into a more generic video_vg 2012-09-24 15:19:07 -04:00
Toad King
60e255dd12 rename rpi.c to vg.c 2012-09-24 15:16:53 -04: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
9297f028a4 ifdef out extension logging. 2012-09-23 11:54:51 +02:00
Themaister
102d30473e Shader directory looks for Cg/Cgp shaders. 2012-09-21 21:20:30 +02:00
Themaister
52cde797c1 Should fix build on OSX 10.8. 2012-09-21 21:11:10 +02:00
Themaister
d9fce26801 Log DRM frame as well in KMS. 2012-09-20 19:55:25 +02:00
Toad King
dc57af26b7 remove debugging code accidentally left over in OpenVG driver 2012-09-19 21:06:32 -04: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
Themaister
dc385ad0c5 Fix ifdefs for eglBindAPI in gl.c.
HAVE_OPENGL_MODERN is only defined for PSL1GHT at the moment.
2012-09-19 09:07: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
Twinaphex
8ad585ad34 (Android) Compile with HAVE_DYLIB 2012-09-17 05:31:29 +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
b2316efe05 No GLES2 extensions are used. Drop header include. 2012-09-16 01:29:45 +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
5365087311 Fix LUT textures in GLES. 2012-09-15 23:59:52 +02:00
Themaister
759a4c811d Use GL_LUMINANCE_ALPHA for fonts. 2012-09-15 23:15:19 +02:00
Themaister
1ce547f277 Use 32-bit fonts to avoid tons of ifdeffing for GLES. 2012-09-15 16:03:20 +02:00
Themaister
dd2982b148 Force modern XML shaders for GLES2. 2012-09-15 15:46:02 +02:00