Commit Graph

553 Commits

Author SHA1 Message Date
Themaister
f525d83711 Fix derp. Removed too much. 2013-04-07 10:27:38 +02:00
twinaphex
d4e8a3c682 (Android) Build fix 2013-04-07 04:17:44 +02:00
Themaister
cde994f80f Remove obsolete #ifdefs. 2013-04-07 02:39:27 +02:00
Themaister
444b94e089 Should fix PS3 shader loading. 2013-04-07 02:37:49 +02:00
Themaister
ec5c12f3f9 Add logging to shader_init. 2013-04-07 02:18:59 +02:00
Themaister
59fd1fe22a Fix typo. 2013-04-07 02:07:01 +02:00
Themaister
4a8b3599bc Refactor out cg_shader_path, xml_shader_path.
Make shader paths uniform in shader_path.
2013-04-07 01:46:06 +02:00
twinaphex
909122122d Take out obsolete console-style overscan options - just use
Resize Mode instead
2013-04-07 01:23:10 +02:00
twinaphex
142c6335c9 (Cg/PS3) Embed menu shader 2013-04-06 21:05:30 +02:00
Themaister
7a20cfa79c Don't crash if Cg is init with NULL. 2013-04-06 20:50:22 +02:00
twinaphex
fde1ea7193 (PS3 PSGL) No longer ifndef float FBOs - also no longer have
separate copies of gl_copy_frame for PSGL etc.
2013-04-06 18:40:50 +02:00
twinaphex
1c5144f9bd (RMenu) Move RMenu logic out of graphics driver context files 2013-04-06 17:44:07 +02:00
twinaphex
9a4ddfd2e0 Forgot a conditional check in shader_cg.c before doing freeing of
menu_cg_program - some other cleanups to do with setting stock
shaders in Cg
2013-04-06 16:29:00 +02:00
Themaister
e649db253c Reintroduce CGP refactor.
Fix several issues that caused crashes.
2013-04-06 12:00:10 +02:00
Themaister
c3ac3028b5 Reuse gl_disable_client_arrays. 2013-04-06 11:26:06 +02:00
twinaphex
a2d9129782 Kill off set_fbo_state and get_fbo_state function pointers 2013-04-06 06:21:11 +02:00
twinaphex
eb0feac9e3 (PS3/All) Purge fixed-style shaders again - this time avoiding
breakage on PS3. Maister -you will need to redo shader_parse.c
again though - and this time I need to test it on PS3 to avoid
a regression that happened two pages prior again
2013-04-06 05:46:09 +02:00
twinaphex
0340f2043c Revert "Major refactor to CGP parsing."
This reverts commit 211e17250c.
2013-04-06 04:37:17 +02:00
twinaphex
58b6de008b Revert "Purge fixed-style second_pass_shader."
This reverts commit 160bbf0218.
2013-04-06 03:54:38 +02:00
twinaphex
83ffe437b3 Revert "Fix Win32 build."
This reverts commit cf655355d7.
2013-04-06 03:54:18 +02:00
Themaister
cf655355d7 Fix Win32 build. 2013-04-06 00:06:51 +02:00
Themaister
160bbf0218 Purge fixed-style second_pass_shader. 2013-04-06 00:03:28 +02:00
Themaister
262b867ae0 Update MSVC2010 build.
Add RGUI, add folder query for Windows, fix GL HW render bug.
2013-04-04 20:25:41 +02:00
Themaister
bae11ddc24 Fix CXX_BUILD. 2013-04-04 14:36:24 +02:00
Themaister
d550a263ae Merge branch 'cgp-refactor' of github.com:Themaister/RetroArch into cgp-refactor 2013-04-03 21:09:03 +02:00
Themaister
52edca883e Drop stencil for now in HW render context.
Doesn't seem to work reliably anyways.
2013-04-02 23:29:26 +02:00
Themaister
3b392dfcd6 Rename bsnes_shader_path to xml_shader_path. 2013-04-02 22:40:26 +02:00
Themaister
211e17250c Major refactor to CGP parsing.
Adds saving functionality for CGPs.
2013-04-01 15:34:02 +02:00
Themaister
73df40fe8e Use better scope on RGL ifdef. 2013-03-30 15:40:53 +01:00
twinaphex
454c329746 (PS3) If HAVE_RGL is defined, GL render subsystem will not be
built in
2013-03-30 15:39:00 +01:00
Hans-Kristian Arntzen
ebd7dcf721 Merge pull request #169 from Themaister/gl-render
HW GL render for libretro.
2013-03-30 06:33:53 -07:00
Themaister
292bc36b43 Basic mouse grabbing for X11. 2013-03-29 18:55:54 +01:00
Themaister
063a2e091c Be more explicit about GLES2 or GL context. 2013-03-29 15:26:47 +01:00
Themaister
0604f8e7ee Drop ALPHA_TEST. It is legacy GL. 2013-03-29 14:12:51 +01:00
Themaister
403a3faea2 Clean out some more GL state. 2013-03-29 14:11:53 +01:00
Themaister
5d81093481 Merge branch 'master' into gl-render 2013-03-29 14:10:28 +01:00
Themaister
5e755671da Add show_mouse() context callback. 2013-03-29 13:46:11 +01:00
Themaister
067e00b3dd Remove post_render context callback.
Was supposed to be used for overlay, but is useless now.
2013-03-29 13:26:07 +01:00
Themaister
d844dfce00 Merge branch 'master' into gl-render 2013-03-29 02:53:27 +01:00
Themaister
50af927de6 Add depth/stencil buffers to HW GL. 2013-03-29 02:50:42 +01:00
Themaister
f4e9547e68 Fix Win32 HW render. 2013-03-29 02:12:08 +01:00
meancoot
a8eaeece3d (OSX) Build fix for gfx/gl.c 2013-03-28 20:23:30 -04:00
Themaister
8783cbb010 Handle GL state more carefully. 2013-03-28 12:13:41 +01:00
Themaister
77861f5a59 Render something in motion. 2013-03-28 01:19:48 +01:00
Themaister
1cececac18 Add get_proc_address.
Render something "real" in GL.
2013-03-28 01:11:32 +01:00
Themaister
f7cab36188 Fix viewport when rendering to FBO. 2013-03-27 16:22:56 +01:00
Themaister
af40f3e9b8 Add initial GL direct rendering test. 2013-03-27 16:15:15 +01:00
Themaister
0db8fee69d Add floating point FBO support to GLES. 2013-03-26 15:11:44 +01:00
Themaister
773c511179 Add floating point FBO support. 2013-03-25 16:42:41 +01:00
twinaphex
82329cf097 (Blackberry) Starts up in RGUI mode now - should (hopefully) allow
for dynamic changing of libretro core and selection of ROM instead
of hardcoded paths.
2013-03-24 01:00:00 +01:00
Themaister
51b5a2df5c Refactor aspect_ratio member.
Mutate in g_extern.system.aspect_ratio to avoid
getting wrong aspect ratio on reentrancy.
2013-03-17 22:05:15 +01:00
twinaphex
3bc487be87 Merge branch 'ios' of git://github.com/meancoot/RetroArch 2013-03-15 20:05:15 +01:00
twinaphex
af02acbdd4 (RGUI/GL) Create gl_init_rgui_texture (avoids duplication of code) 2013-03-12 01:36:42 +01:00
twinaphex
c638728917 (GL) Don't needlessly compile in FBO functions if HAVE_FBO isn't
defined
2013-03-12 00:00:42 +01:00
twinaphex
b4108eb343 Add set_osd_msg to video_poke 2013-03-11 21:42:02 +01:00
twinaphex
63883a1131 Combine render_msg and render_msg_place with params argument 2013-03-11 20:05:05 +01:00
twinaphex
d9c3a99d0b Update some credits 2013-03-11 07:13:11 +01:00
twinaphex
e7287d19e5 Add HAVE_FBO ifdefs for gl and gx_video as well 2013-03-10 20:25:47 +01:00
Themaister
0e75731685 Add get_fbo_state(). 2013-03-10 20:13:04 +01:00
Themaister
0b67cd7e84 Add apply_state_changes. 2013-03-10 19:49:26 +01:00
Themaister
63d946c69f Add set_rgui_texture interface to video_poke. 2013-03-10 19:14:28 +01:00
twinaphex
e741cc77c6 start/stop/restart ifdeffed for RARCH_CONSOLE instead of
HAVE_RMENU - transfer of control bypasses initialization of variables
in RGUI - issues fixed
2013-03-10 17:40:34 +01:00
twinaphex
59ff094b3b Add set_blend to video_poke interface 2013-03-10 03:53:42 +01:00
twinaphex
91e3355268 (RMenu) Use video_poke interface for RMenu as well 2013-03-10 02:58:55 +01:00
meancoot
9fadca2a54 Merge branch 'master' of https://github.com/Themaister/RetroArch into ios 2013-03-09 20:09:32 -05:00
Themaister
68494d0547 Set poke interface for HAVE_RMENU. 2013-03-10 01:58:31 +01:00
Themaister
1f37491cbf More HAVE_FBO fixes. 2013-03-10 01:49:06 +01:00
Themaister
c13868d2fa Add required HAVE_FBO define. 2013-03-10 01:47:57 +01:00
Themaister
2681f14032 Add video_poke_interface_t. 2013-03-10 01:17:17 +01:00
twinaphex
d04d13d895 (RGUI/GL) No hardcoded border_type 2013-03-09 18:38:07 +01:00
twinaphex
66e7606b25 HAVE_RGUI and HAVE_RMENU are now mutually exclusive - no longer
have to be defined both for (say) the Android port
2013-03-09 17:42:19 +01:00
twinaphex
34515fd7f5 (RARCH_CONSOLE) Integrate rarch-console_video into gfx_common 2013-03-09 03:20:59 +01:00
twinaphex
0b7baf9f9c (PS3) Return to glMapBuffer/glUnmapBuffer version of gl_copy_frame -
seems to work without garbage frames when using GL_READ_WRITE instead
of GL_WRITE_ONLY
2013-03-07 21:58:38 +01:00
ToadKing
809ae0ab06 get messages working again on android 2013-03-06 12:19:56 -05:00
twinaphex
5c16cff2e7 Merge branch 'android-rgui' of https://github.com/Themaister/RetroArch into android-rgui
Conflicts:
	android/native/jni/input_android.c
2013-03-04 17:00:43 +01:00
meancoot
e8e822ffc3 Merge branch 'master' of https://github.com/Themaister/RetroArch into ios
Conflicts:
	gfx/gfx_context.c
	gfx/gfx_context.h
	retroarch.c
2013-03-03 21:36:47 -05:00
ToadKing
a4b33a9a95 get touch navigation working
fix colors for GL
make seperate option list for non-consoles
2013-03-03 15:45:29 -05:00
Themaister
07b9598be4 Set texture filtering for RGUI texture. 2013-03-02 17:46:36 +01:00
twinaphex
b3d971f490 (PS3) Clean up unneeded code in gl_copy_frame 2013-03-02 14:35:27 +01:00
twinaphex
eb4fe88d96 (PS3) Usage of glMapBuffer + texture references (while slightly
faster) appeared to produce garbage in frames. Possible PSGL bug.
Revert to glBufferSubData approach for now
2013-03-02 14:29:22 +01:00
ToadKing
6778267016 change some logs around
detect menu key from any "controller"
2013-02-28 11:04:11 -05:00
ToadKing
83878b05e7 commit makefile changes 2013-02-28 10:20:29 -05:00
ToadKing
d28cb94717 start of RGUI port to Android
currently detects menu button to bring up RGUI, but GL does not draw it
yet and you cannot exit from the (invisible) RGUI menu yet
2013-02-27 20:20:29 -05:00
Themaister
eb0476ffab Add configurable GL context. 2013-02-23 14:50:18 +01:00
meancoot
06bb6b7840 Merge branch 'master' of https://github.com/Themaister/RetroArch into ios 2013-02-21 22:18:14 -05:00
Themaister
a4bfc2d47a Merge branch 'master' into thread_video 2013-02-17 01:36:04 +01:00
Themaister
20af7b858a Update filters on shader reload. 2013-02-17 01:35:19 +01:00
Themaister
843d079002 Begin adding threaded video driver wrapper. 2013-02-16 02:48:08 +01:00
meancoot
19fb2fe8f4 Merge branch 'master' of https://github.com/Themaister/RetroArch into ios 2013-02-11 17:13:31 -05:00
meancoot
7096b0ac5e ios: Reset the opengl viewport every frame, seems the GL driver resets it... 2013-02-11 06:12:43 -05:00
twinaphex
7713754d26 (PS3) Setting FBO mode ON (from initial OFF state) no longer requires
a restart
2013-02-10 23:33:27 +01:00
meancoot
23a3fe63bf ios: Apply a small patch to gfx/gl.c to allow HAVE_FBO to work. 2013-02-08 15:50:55 -05:00
meancoot
675468e9d6 ios: Enable the android portrait mode hack for ios too. 2013-02-07 19:10:46 -05:00
Themaister
f74467c81b Set alpha default more explicitly. 2013-01-29 21:53:03 +01:00
Themaister
eb979732b4 Add alpha modulation to overlays. 2013-01-29 21:51:15 +01:00
Themaister
61707d2783 Add integer scale options. 2013-01-29 19:28:33 +01:00
Themaister
e92441f5b8 Check aspect lower than 1. 2013-01-25 00:20:55 +01:00
ToadKing
47e950e9d8 (Android) detect portrait orientation by aspect ratio 2013-01-24 18:17:25 -05:00
Themaister
947e49fbe2 Avoid ugly android viewport hack. 2013-01-24 07:31:02 +01:00
ToadKing
1c4f52ce47 (Android) put the viewport at the top of the screen in portrait mode
FIXME: have to fix that ugly hack
2013-01-23 17:05:48 -05:00