Commit Graph

406 Commits

Author SHA1 Message Date
twinaphex 6b94b53bfc (XDK1) Reduced size of menu panel PNG - SFA3 now fits into RAM 2013-04-13 14:55:11 +02:00
Themaister e389220df8 Refactor frame_counter.
Graphics drivers get the task of updating this.
If threaded driver is used, main thread cannot update the counter
due to race conditions.
2013-04-13 14:28:12 +02:00
twinaphex c51347c532 Drop MODE_VIDEO_SCREENSHOTS_ENABLE 2013-04-13 09:09:56 +02:00
ToadKing 4782522dbd (WII) fix RGUI controls
(CONSOLES) fix logging
2013-04-12 09:19:02 -04:00
twinaphex 0ef62f24c4 (360 RMenu XUI) Cleanups 2013-04-12 15:03:31 +02:00
twinaphex d53d92967c (360 RMenu XUI) Works now with refactored filebrowser
code
2013-04-12 14:23:25 +02:00
twinaphex 2b3334fc23 (RMenu) use memcpy/memset to copy over/flush from one struct to another
(for pop_menu_stack/push_menu_stack purposes)
2013-04-12 12:41:49 +02:00
twinaphex f8a040e286 (Filebrowser) Refactor filebrowser - get rid of second filebrowser
instance in rmenu.c
2013-04-12 12:25:36 +02:00
twinaphex 345a9c77e8 (Filebrowser) Don't expose filebrowser_get_current_path function 2013-04-12 10:33:55 +02:00
twinaphex 54ec513e7e (Filebrowser) Cleanup to directory_parse 2013-04-12 10:07:47 +02:00
twinaphex 8d8abcbdc5 (RMenu XUI) Move to new filebrowser dir popping logic 2013-04-12 09:58:16 +02:00
twinaphex 4e188a0e00 (Wii/RGUI) Take out QUIT_KEY button combo shortcuts - current
RGUI works such that it goes directly into the ingame menu
after pressing menu toggle and you can quit from there.
2013-04-12 09:28:12 +02:00
Themaister 97095852f0 Should fix Wii and shader manager. 2013-04-12 09:08:07 +02:00
ToadKing ded105746c fix RGUI file browser 2013-04-11 21:00:13 -04:00
twinaphex e75ed86fde (Filebrowser) Cleanups 2013-04-12 00:27:00 +02:00
twinaphex 459a371982 (RMenu) Slimmer filebrowser dir popping 2013-04-12 00:16:23 +02:00
twinaphex 9d53311e33 (Filebrowser) Get rid of unnecessary filebrowser_init 2013-04-11 23:00:01 +02:00
twinaphex 30e190bdae Remove superfluous wcstombs / mbstowcs wrappers 2013-04-11 17:18:23 +02:00
twinaphex 74edbf7339 (RMenu XUI / 360) Made RMenu XUI independent of MODE_MENU_DRAW - MODE_MENU_DRAW
removed
2013-04-11 16:38:41 +02:00
Themaister 91c8fea8e9 Fix crash in shader browser. 2013-04-11 16:15:09 +02:00
Themaister aebb2cb52e Add initial GLSL loading in RGUI. 2013-04-11 16:15:09 +02:00
twinaphex a49fe27d21 (GX) Make Wii/Gamecube gx_video no longer depend on MODE_MENU_DRAW 2013-04-11 16:10:09 +02:00
twinaphex 7bb9f0d288 (RMenu) No longer rely on MODE_MENU_DRAW 2013-04-11 15:29:43 +02:00
twinaphex ea969282f4 (XDK1 RMenu) Don't call texture_image_render for panel anymore in rmenu.c 2013-04-11 15:05:42 +02:00
twinaphex 0f60833cac (RMenu) Do video rendering in RMenu after input - same as RGUI - will also
avoid having to 'skip' video swap when doing the render cached
frame call
2013-04-11 15:00:58 +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
Themaister acd3b481be Let RGUI CGP be used across driver reinit. 2013-04-10 21:04:28 +02:00
twinaphex 2c29884d7d (RMenu) Don't break menu stack when shortcut exiting from screenshot mode 2013-04-10 19:12:25 +02:00
twinaphex 37b90574ac (PS3 RMenu) Fullblown shader manager support - still unsure whether
I'm setting FBO values right though - maister - please code review
the FBO scaling incrementing/decrementing logic
2013-04-10 15:57:36 +02:00
twinaphex adbfa4af90 (RMenu) Get rid of checks for main_is_init (for load/save CGP) 2013-04-10 13:24:56 +02:00
twinaphex 872c0a8133 (RMenu XDK1) Build fix 2013-04-10 13:24:27 +02:00
twinaphex ad31643b51 (PS3 RMenu) Add initial options to Shader Manager - Load CGP function
works
2013-04-10 13:17:01 +02:00
twinaphex c52530d03e (RMenu) Stub Shader Manager menu in - now to fill it in 2013-04-10 11:20:28 +02:00
twinaphex 4c0da898ae (RMenu) Simplify some more lengthy strings that won't fit on 640x480
screen
2013-04-10 10:20:27 +02:00
twinaphex 65bc6850d5 (RMenu) shorter descriptions so that they fit on Xbox 1 resolution 2013-04-10 10:15:03 +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 de31ccef3e Revert "(XDK1 RMenu) Free up tmpBrowser for every switch between game and menu as well"
This reverts commit 4fa02a1952.
2013-04-10 09:57:13 +02:00
twinaphex 4fa02a1952 (XDK1 RMenu) Free up tmpBrowser for every switch between game and menu as well 2013-04-10 09:49:04 +02:00
twinaphex c0f9c0dc6f (RMenu) Get casts working for C99 as well - argh 2013-04-10 09:48:56 +02:00
twinaphex 9cabedca58 (RMenu) C++98 compatibility casts 2013-04-10 09:46:52 +02:00
twinaphex 5f24e5daf4 (RMenu) Put menu_texture and menu_panel textures on heap - free
them for Xbox 1 after going out of the menu and into the game
2013-04-10 09:34:46 +02:00
twinaphex 22ce22ca14 (360) Take out obsolete resampler type option 2013-04-10 07:55:59 +02:00
twinaphex 87d0843b13 (360) RMenu XUI now goes through the same RGUI functions for
rendering
2013-04-10 07:47:11 +02:00
twinaphex 9d6f4590e8 (RMenu XDK1) Updated RMenu for Xbox 1 to use new
RGUI/RMenu rendering funtions
2013-04-10 06:54:16 +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 7cf75e5eb4 SETTING_EMU_SKIN action was mistakenly inside a HAVE_SHADER_MANAGER
ifdef
2013-04-10 04:57:49 +02:00
twinaphex af5dcd106a (XDK1 RMenu) Show panel again even in low RAM mode 2013-04-10 04:54:22 +02:00
twinaphex 80390d8143 (XDK1 RMenu) Build fixes 2013-04-10 04:51:36 +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
twinaphex 7728e80e0f (RMenu) Get rid of messy set_default_pos functions 2013-04-10 01:34:40 +02:00
twinaphex 6a87900f1a (RMenu) Use HAVE_SHADER_MANAGER define for RMenu now as well 2013-04-10 00:47:14 +02:00
Themaister 37a276af9b Load RGUI CGP on startup. 2013-04-09 21:48:03 +02:00
Themaister d2f9eb300b Clarify error message. 2013-04-09 21:41:38 +02:00
Themaister a8f2317400 Can apply shaders in RGUI.
Kinda hoky, but basics seem to be down now.
2013-04-09 21:39:02 +02:00
Themaister fc353f0582 Pop menu stack correctly after picking shader. 2013-04-09 21:23:34 +02:00
Themaister 16b8bff6a7 Can browse for shader files.
Directory stack is not popped correctly however.
Pathnames are not correctly truncated in browser either. Looks kinda
ugly atm.
2013-04-09 21:01:43 +02:00
Themaister fdf7a443ad More work on shader manager.
Mostly missing filebrowser for shaders now.
2013-04-09 19:43:24 +02:00
twinaphex b91527749e (RMenu) Some RMenu fixes - deal with overflow on 'pressed up'
state in core options menu along with some other things
2013-04-09 09:58:26 +02:00
twinaphex 6a845dec64 (RMenu) Fix - Pops menu stack for a submenu - hack - needs a cleaner implementation 2013-04-09 09:16:23 +02:00
twinaphex 56de3696d0 (RMenu) Initial core options working - only FBA core currently shows
'extra garbage' characters when updating a specific option -
"CPU Speed Overclock; 100%|110%|120%|130%|140%" etc - doesn't
happen in RGUI - could be the percentage sign
2013-04-09 08:55:54 +02:00
twinaphex 99945f43a6 (RGUI) Fix RGUI 'Core' setting 2013-04-08 01:51:39 +02:00
twinaphex 035e9d2624 (RGUI) Fix RGUI actions 2013-04-07 23:43:07 +02:00
twinaphex c57b8f26a6 (RGUI) Fix 'Change Game' in RGUI 2013-04-07 23:39:52 +02:00
twinaphex 6f7b38221e (RGUI) Compile in Shader Manager as well for GLSL and HLSL 2013-04-07 23:24:24 +02:00
twinaphex b02e9f374c (RMenu) Further implement ingame_menu_core_options 2013-04-07 19:21:20 +02:00
Themaister b62a2b602a More work on RGUI shader manager.
Still a long way to go, but shows most of the intended interface.
2013-04-07 16:45:05 +02:00
Themaister 651e088deb Start adding skeleton for shader manager. 2013-04-07 15:46:36 +02:00
Themaister a5722aef3a Fix RGUI rewind setting. 2013-04-07 15:15:16 +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
twinaphex 3b82e779fe (RMenu) Implement stub Core Options menu - real implementation
tomorrow
2013-04-07 08:30:30 +02:00
twinaphex b430ded254 (RMenu/Xbox 1) Hardcode some positioning values 2013-04-07 05:20:19 +02:00
twinaphex 4102d1cfb8 Make sinc resampler the default and remove Hermite - audio
quality at high samplerates was too bad to be of any use
2013-04-07 03:41:06 +02:00
twinaphex 229891db59 (360) Build fix 2013-04-07 03:00:08 +02:00
twinaphex 15eba51b22 (PS3) Get it at least compiling 2013-04-07 02:34:41 +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 69c460bbec (RMenu) Set 'selected' to FIRST_VIDEO_SETTING after selecting 'Change Game'
in Ingame Menu
2013-04-07 00:31:12 +02:00
twinaphex 81896840f0 (RMenu) Remove ingame_menu function / make it part of select_setting 2013-04-06 23:49:28 +02:00
twinaphex 2ab049fd05 (Xbox 1) Addendum to 'always load panel' prior commit 2013-04-06 23:17:50 +02:00
twinaphex ff19ff671d (Xbox 1) Panel should always be loaded regardless of low RAM mode 2013-04-06 23:13:35 +02:00
twinaphex bb0821b514 Remove screenshots_dir and cgp_dir from default_paths - cgp_dir
is now the same as shaders_dir
2013-04-06 22:37:07 +02:00
twinaphex bcbac5aac7 (RARCH_CONSOLE) Remove shader_dir from default_paths struct 2013-04-06 22:16:12 +02:00
twinaphex cc05981455 (PS3/360) Now uses embedded shaders instead of stock shader from
common-shaders
2013-04-06 21:53:03 +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 a2d9129782 Kill off set_fbo_state and get_fbo_state function pointers 2013-04-06 06:21:11 +02:00
twinaphex f94ddb2eab (RMenu) Remove now redundant enum ID 2013-04-06 05:58:26 +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 4f1cd6a5ee Revert "(PS3) Remove fixed shader slots"
This reverts commit f58a038a5f.
2013-04-06 03:54:57 +02:00
twinaphex cbb300f863 Revert "(RMenu XUI) Take out fixed second pass shader slot"
This reverts commit a61437c3db.
2013-04-06 03:54:47 +02:00
twinaphex cbfe5ff111 Revert "More scrubbing - no more render_to_texture, fbo_scale_x / fbo_scale_y,"
This reverts commit 7155dd9ca9.
2013-04-06 03:53:57 +02:00
twinaphex 09c123859d Revert "(RMenu) take out no longer used HAVE_FBO ifdef"
This reverts commit 5f6601ac7e.
2013-04-06 03:53:18 +02:00
twinaphex 5f6601ac7e (RMenu) take out no longer used HAVE_FBO ifdef 2013-04-06 00:24:11 +02:00
twinaphex 7155dd9ca9 More scrubbing - no more render_to_texture, fbo_scale_x / fbo_scale_y,
etc
2013-04-06 00:16:10 +02:00
twinaphex a61437c3db (RMenu XUI) Take out fixed second pass shader slot 2013-04-06 00:03:09 +02:00
twinaphex f58a038a5f (PS3) Remove fixed shader slots 2013-04-05 23:58:30 +02:00
Themaister cf92211254 Update overlay when in RGUI. 2013-04-04 23:10:38 +02:00
Themaister 7c3e4ef12d Fix unsigned bug in RGUI. 2013-04-04 22:27:16 +02:00
Themaister d7797f8497 Core options work in RGUI. 2013-04-04 22:08:23 +02:00
Themaister 435eec44f0 Start adding core options to RGUI.
Broken atm.
2013-04-04 21:48:09 +02:00