Commit Graph

1521 Commits

Author SHA1 Message Date
twinaphex 9e09ba8a0a (PS3) Don't spam cellDbgFontDraw - do it once per frame and
instead just increase the buffer
2013-04-11 14:10:24 +02:00
twinaphex 8c777110f7 (RMenu) Run glClear or equivalent function at start of driver_frame function
so that we can use rarch_render_cached_frame for menu purposes at
all times (instead of doing explicit clearing in our menu loops
beforehand for low-RAM modes where no menu texture is being drawn
but we don't want ghosting in the picture)
2013-04-11 13:42:02 +02:00
twinaphex 1171b7576a Get rid of set_blend callback - the rgui draw texture function is
now in charge of making sure texture is properly blended - note
to OV2/maister - test if this breaks D3D9 PC driver and if so
fix accordingly
2013-04-11 13:13:37 +02:00
twinaphex 717621ac0d (PS3) Move cellSysUtilCheckCallback to gfx_ctx_swap_buffers 2013-04-11 09:13:28 +02:00
CatalystG fdcc6e2087 (BlackBerry) Fix PlayBook crash after selecting a game from RGUI 2013-04-10 20:27:49 -04:00
Themaister 1e9e703375 Add support for CGP/GLSL.
Serves to unify shader support across the board
on platforms which cannot use Cg (EGL, GLES).
Spec is exactly the same as CGP except that extension is
.glslp. Expected extension on individual shaders are .glsl.
2013-04-10 22:38:45 +02:00
Themaister c8fa2483bb Fix rotation when using Apply Shader.
load_preset() duped prg[0] too early, before
prg[0].mvp was set. This caused MVP to not be set correctly,
not allowing rotation to work correctly when using pass-through
last shader.
2013-04-10 20:55:48 +02:00
Themaister 49e4020437 Move forced IOS viewport logic further up.
If using multipass, the forced viewport update
will ruin the viewport.
2013-04-10 20:43:32 +02:00
Themaister 7de7c3d743 Fix RGUI in gl.c.
RGUI sets MODE_MENU_DRAW causing
context_swap_func to be skipped entirely.
Tried removing MODE_MENU_DRAW in rgui, but gx_video still seems to rely
on MODE_MENU_DRAW being set, so I didn't fix it in RGUI. Someone needs
to fix gx_video to not depend on lifecycle.
2013-04-10 20:15:51 +02:00
twinaphex 6aadc5f2c2 (Cg) Remove Cg menu shader 2013-04-10 11:28:44 +02:00
twinaphex 2dba4c9359 Move texture_image_render to xdk_d3d.cpp 2013-04-10 10:06:15 +02:00
twinaphex a871b6da54 (XDK) Remove texture_image_free - will have to manually do freeing
memory management without a public function for Xbox
2013-04-10 09:59:29 +02:00
twinaphex d313e9b8f9 (PS3 RMenu) RMenu now renders background texture the same way
as RGUI
2013-04-10 06:22:37 +02:00
twinaphex 3a131cf5b8 (PS3) Compile in HAVE_OVERLAY 2013-04-10 04:39:27 +02:00
twinaphex 43c9195a77 Get rid of rarch_position_t structure and move RMenu texture to
rmenu.c instead of somewhere in g_extern global
2013-04-10 04:26:18 +02:00
CatalystG e2c6a5d3a8 (BlackBerry) Build fix 2013-04-08 21:36:28 -04:00
CatalystG 21e45e3de6 (BlackBerry) Add Gamepad support for BlackBerry 10 devices 2013-04-08 19:55:09 -04:00
Themaister b09237e190 Remove unused variables. 2013-04-08 09:21:14 +02:00
meancoot fb2abbbebf (iOS) Update ioseagl_ctx.c 2013-04-07 21:36:41 -04:00
meancoot c33c634dc4 (iOS) Fix aspect ratio of duped frames 2013-04-07 19:08:23 -04:00
twinaphex d403a844e3 (PC) Fix main build - would no longer compile 2013-04-07 23:22:12 +02:00
OV2 549fe7f5b8 win32: add preliminary rgui support to d3d 2013-04-07 19:45:02 +02:00
twinaphex db0ff2a212 (RARCH_CONSOLE) Build fixes 2013-04-07 18:03:25 +02:00
Themaister 0971cad635 Fix crash when using rotation with threaded driver. 2013-04-07 15:51:00 +02:00
Themaister 4cdfcf30d5 Refactor set_rgui_texture.
More generic and avoids poking directly into RGUI state.
2013-04-07 14:07:45 +02:00
Themaister f3ca37cb2b Always use NULL shader is shader_enable is false.
RARCH_CONSOLE sets true as default. Update the config
if shader_enable is false.
2013-04-07 13:11:27 +02:00
Themaister f88ea04c28 Remove fixed shader index in set_shader. 2013-04-07 13:00:21 +02:00
Themaister 0d1c3097e3 Drop glsl_modern global. 2013-04-07 12:51:26 +02:00
Themaister 50c184042e Rewrite XML shader loading.
Use gfx_shader abstraction.
2013-04-07 12:41:05 +02:00
Themaister fea6d5b55d Don't split twice. 2013-04-07 10:27:58 +02:00
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
twinaphex db71eaf083 (Android context file) Add HAVE_EGL ifdefs 2013-04-07 03:13:47 +02:00
twinaphex 229891db59 (360) Build fix 2013-04-07 03:00:08 +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 0c0a9b4ddb Fix Win32 build. 2013-04-07 02:02:41 +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
OV2 20d1fba464 win32: use shader_parse for d3d 2013-04-07 01:14:05 +02:00
twinaphex c56f4ddb92 (wgl_ctx) Remove HAVE_EGL code portions 2013-04-06 23:29:05 +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 7111558359 wgl_ctx.c - ifdef HAVE_EGL portions of code 2013-04-06 19:28:19 +02:00
twinaphex a57f03e682 (PS3/XDK) Remove stub EGL image functions 2013-04-06 19:17:39 +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 ec0e3e6087 (RMenu) Remove RMenu screenshot_dump function pointer - implement
screenshot_dump instead for XDK1
2013-04-06 18:14:06 +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 bd550ce53c Remove glsl in shader_parse.
It'll be done slightly different later.
2013-04-06 14:10:09 +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 8396f71004 Revert "Don't dump frame_count_mod unless needed."
This reverts commit eeddfea425.
2013-04-06 04:37:05 +02:00
twinaphex 881e7a299d Revert "Don't compile in debug dump."
This reverts commit a5dfbb8a85.
2013-04-06 04:36:54 +02:00
twinaphex 2484c4e526 Revert "(Cg) Take out second_pass_shader / FBO functionality - everything"
This reverts commit deeaf981f7.
2013-04-06 03:55:17 +02:00
twinaphex 1c87c26e72 Revert "(HLSL Xbox 360) Take out second_pass_shader/fbo"
This reverts commit 5172168143.
2013-04-06 03:55:07 +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
twinaphex c083efb5a4 Revert "Remove obsolete struct."
This reverts commit 7ea61067ec.
2013-04-06 03:53:44 +02:00
twinaphex 820fcbaa07 Revert "Don't set prg[2] with load_plain()."
This reverts commit a19d1e9776.
2013-04-06 03:53:27 +02:00
twinaphex e889f5c548 Revert "Remove redundant line."
This reverts commit 2a09f52cc8.
2013-04-06 03:53:07 +02:00
Themaister 2a09f52cc8 Remove redundant line. 2013-04-06 00:26:14 +02:00
Themaister a19d1e9776 Don't set prg[2] with load_plain(). 2013-04-06 00:22:27 +02:00
Themaister 7ea61067ec Remove obsolete struct. 2013-04-06 00:18: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
twinaphex 5172168143 (HLSL Xbox 360) Take out second_pass_shader/fbo 2013-04-05 23:51:33 +02:00
twinaphex deeaf981f7 (Cg) Take out second_pass_shader / FBO functionality - everything
will go through CGP files from now on
2013-04-05 23:48:18 +02:00
OV2 a49f0ef576 win32: fix x/y scale types 2013-04-04 23:23:16 +02:00
OV2 2b1082df63 derp 2013-04-04 21:23:00 +02:00
OV2 7924e06732 win32: respect last float_framebuffer if applicable 2013-04-04 21:15:35 +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
OV2 d1b384ccaf win32: d3d9 float_fbo fix 2013-04-04 01:01:06 +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 248e3ddfe6 Deprecate "ruby" prefix and legacy XML shaders. 2013-04-02 23:14:14 +02:00
Themaister 3b392dfcd6 Rename bsnes_shader_path to xml_shader_path. 2013-04-02 22:40:26 +02:00
Themaister a5dfbb8a85 Don't compile in debug dump. 2013-04-01 15:41:01 +02:00
Themaister eeddfea425 Don't dump frame_count_mod unless needed. 2013-04-01 15:40:11 +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
OV2 0c3b1a7514 style 2013-03-30 14:37:29 +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
OV2 144fb0de43 win32: set stock shaders after last pass, destroy cg programs on deinit 2013-03-30 14:20:40 +01:00
OV2 c9f4db8dcc win32: add float_framebuffer and frame_count_mod to d3d9 2013-03-30 14:20:34 +01:00
twinaphex 76ddce84a3 (RGL PS3) Cleanups - we don't need string/enum reporting 2013-03-29 18:58:50 +01:00
Themaister 292bc36b43 Basic mouse grabbing for X11. 2013-03-29 18:55:54 +01:00
Hans-Kristian Arntzen 8c81133688 Merge pull request #168 from OV2/d3d9-overlay
D3D9 overlay support
2013-03-29 08:16:44 -07:00
OV2 88d457baab win32: style, remove left over opacity shader 2013-03-29 15:36:48 +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
OV2 29fa71b664 style 2013-03-29 11:50:05 +01:00
OV2 34b2a3b210 win32: use stock shader and color for overlay opacity 2013-03-29 11:48:33 +01:00
OV2 a00858a6be win32: use color in d3d stock shader, pass valid color values 2013-03-29 11:46:56 +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
twinaphex 426b3a255d Revert "(PS3) Add third-pass shaders (ifdeffed for PS3 for now - could" -
going to do this better

This reverts commit 8b4e6bed93.
2013-03-29 01:55:08 +01:00
meancoot a8eaeece3d (OSX) Build fix for gfx/gl.c 2013-03-28 20:23:30 -04:00
twinaphex 8b4e6bed93 (PS3) Add third-pass shaders (ifdeffed for PS3 for now - could
be added to PC as well)
2013-03-28 20:59:49 +01:00
OV2 f250cc14ab style 2013-03-28 15:33:50 +01:00
OV2 15f6026c86 win32: fix compile without HAVE_OVERLAY 2013-03-28 14:55:42 +01:00
OV2 66b4b45f5c win32: add opacity shader to overlay 2013-03-28 14:30:39 +01:00
OV2 b782ec2d33 win32: specify vertex declaration for overlay 2013-03-28 14:30:39 +01:00
OV2 a61afbde52 win32: add overlay to d3d9 2013-03-28 14:30:32 +01: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
twinaphex 986806ca78 (RMenu) RMenu cleanups pt. 2 2013-03-25 18:36:15 +01:00
Themaister 773c511179 Add floating point FBO support. 2013-03-25 16:42:41 +01:00
Themaister e326db8fb5 Drop debugging log. 2013-03-25 15:08:12 +01:00
Themaister a8dd5da5bb Add frame_count_mod to XML and Cg shaders.
Allows frame count shaders to avoid floating point inaccuracies
when frame count gets large. Avoids having to mod manually in shader.
2013-03-25 14:47:33 +01:00
Themaister 714a4aa3f7 Fix build for drivers. 2013-03-24 02:24:53 +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
CatalystG f6c2c2c57d (BlackBerry) Add initial in-game RGUI support. 2013-03-23 12:21:30 -04:00
twinaphex fefb65b84a (Blackberry) Move libscreen initialization to Blackberry graphics
context driver
2013-03-22 16:30:10 +01:00
CatalystG 1c32975717 Add proper input handling for PlayBook/BB10 2013-03-19 19:27:15 -04:00
twinaphex 15215c47f1 (Grifin) Move griffin to root (to indicate it's no longer console-specific 2013-03-18 05:46:19 +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
Themaister e0f9feb903 Fix 16:15 aspect lut. 2013-03-16 14:14:28 +01:00
twinaphex 3bc487be87 Merge branch 'ios' of git://github.com/meancoot/RetroArch 2013-03-15 20:05:15 +01:00
Themaister eeba16d0e8 Fix CXX_BUILD. 2013-03-15 09:21:47 +01:00
Themaister 1ea2a45441 Fix FBO in thread_wrapper. 2013-03-12 12:12:16 +01:00
twinaphex 441d4a0698 (Xbox 1) Initial RGUI code - incomplete 2013-03-12 02:43:02 +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 2e12f34932 (360) Build fix 2013-03-11 23:50:31 +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 275eef09c1 (Xbox 1) Wrap some lines around HAVE_RMENU 2013-03-10 23:09:47 +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
twinaphex 7be75b29dc (PS3/XDK) Remove gfx_ctx_set_overscan 2013-03-10 20:13:06 +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