Commit Graph

763 Commits

Author SHA1 Message Date
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
twinaphex 04cacb5e30 Upgrade lifecycle_menu_state to 64bit variable lifecycle_mode_state 2013-01-12 03:13:03 +01:00
twinaphex cc43b84ff2 (RARCH_CONSOLE) Refactor more state variables 2013-01-11 19:44:34 +01:00
Themaister 312980ee30 Add support for full-screen overlays. 2013-01-11 16:23:04 +01:00
twinaphex ca3be92255 (RARCH_CONSOLE) Refactor msg_fps variable 2013-01-11 06:56:05 +01:00
twinaphex 5bf022fd99 (RARCH_CONSOLE) Use local variable copy of g_extern.lifecycle_menu_state in frame
functions - more state functionality will be moved here (for console ports)
2013-01-11 06:32:35 +01:00
twinaphex 3c8bb7333e (RMenu) Refactor g_extern.draw_menu 2013-01-10 19:43:00 +01:00
Themaister d9ee3e54ec Fix segfault when set_shader() fails. 2013-01-08 04:36:39 +01:00
Themaister 551a464978 Rework index parameter to set_shader(). 2013-01-08 04:08:15 +01:00
twinaphex 1c39f6f630 (GLSL) Fixes PC build - added TODO note 2013-01-07 23:33:54 +01:00
twinaphex 0120b1e18e Rename bSNES XML shaders to GLSL XML shader in comments 2013-01-07 17:07:21 +01:00
twinaphex b56b645366 Rename RARCH_SHADER_BSNES to RARCH_SHADER_GLSL 2013-01-07 17:03:10 +01:00
twinaphex 3a5d056b95 Expand functionality of set_shader callback function 2013-01-07 16:46:26 +01:00
twinaphex a6f89670c9 (PS3) No longer needlessly loads RMenu background image three
times in a row
2013-01-06 07:03:17 +01:00
Themaister bccfd9f013 Only init font rendering in GL if enabled. 2013-01-05 23:58:28 +01:00
twinaphex caa0cebbbb (GL) Cleanups 2013-01-05 09:06:17 +01:00
Themaister 3f8bfa1484 Enable FBO support for Android.
GLES2 supports FBOs natively.
2013-01-04 20:54:33 +01:00
twinaphex d6dca4c3d0 (PS3) Should fix resolution switching issues 2013-01-03 04:47:12 +01:00
twinaphex 08afcbfa3d (RARCH_CONSOLE) Use void* for param passing type 2013-01-03 03:02:52 +01:00
Themaister e9cfb95900 Add fallback path for RGBA.
This is necessary for GLES devices which do not support BGRA_EXT.
2013-01-03 01:20:35 +01:00
Themaister 276b588217 Add custom xml parser. Use as fallback. 2013-01-02 15:18:42 +01:00
Themaister 0b4cf2d053 Update license headers to 2013. 2013-01-01 01:41:15 +01:00
Themaister 3d9bacd536 Don't log viewport calls. 2012-12-28 00:14:19 +01:00
Themaister 9fbd888566 Handle orientation without explict calls.
Appears to fix some kind of "race condition" in EGL.
2012-12-28 00:12:18 +01:00
Themaister 4786f6dd94 Fix useless code. 2012-12-27 12:33:23 +01:00
Themaister 7458f7888f Set up multitouch querying. 2012-12-27 12:26:13 +01:00
Themaister d74c49f4cd Style nit. 2012-12-26 09:56:54 +01:00
twinaphex 60f6727034 Fix GL build - gl_set_nonblock_state and gl_focus use a local
pointer to video data in their wrapper macro functions
2012-12-26 09:32:15 +01:00
twinaphex 0c3f9a854a (Android) Remove HAVE_RMENU code from Android EGL context file -
we aren't going to use RMenu after all
2012-12-26 07:20:31 +01:00
notaz b1e8c84f55 (Android) Enable and fix warnings. 2012-12-26 03:11:33 +02:00
Themaister 4c27922ab7 Don't rotate overlay if game is rotated. 2012-12-24 00:21:42 +01:00
Themaister 35bf5c82c1 Make OVERLAY optional. 2012-12-23 18:39:01 +01:00
Themaister 1250fae7f1 Basic overlay POC works.
Add support for X11.
2012-12-20 12:24:49 +01:00
Themaister b4cd58afe7 Rework overlays as a video driver interface. 2012-12-20 11:16:22 +01:00
twinaphex c981cb77f8 Make overlay fullscreen 2012-12-20 04:37:52 +01:00
twinaphex 318078157d Commented out overlay hacks 2012-12-20 03:49:55 +01:00
twinaphex 447fbf1c59 Add quickmenu overlay 2012-12-20 03:44:09 +01:00
Themaister 5eb7432fff Add overlay rendering to GL.
This allows e.g. Android to render a keypad overlay for touch.
2012-12-19 13:26:11 +01:00
twinaphex 34951c121b (PS3) Use g_extern.draw_menu instead of block_swap 2012-12-18 08:20:44 +01:00
twinaphex dacab094f0 (RMenu) menu_loop renamed into rmenu_iterate - iterates menu code for one frame 2012-12-15 16:40:02 +01:00
twinaphex 799a9c35fb gfx_common.c - make gfx_get_fps into the main public function -
and remove the two public wrapper functions
2012-12-15 07:03:33 +01:00
twinaphex a7a901962f (PS3) Works again on PS3 2012-12-15 00:17:43 +01:00
Themaister beca1c44f3 Move all font stuff to gfx/fonts.
Rename stuff so griffin doesn't break.
2012-12-15 00:27:30 +01:00
Themaister b239785038 Context-ize GL font rendering. 2012-12-15 00:07:31 +01:00
twinaphex dbb962e946 Streamline frame_count usage
(Android/Griffin) Fix build
2012-12-14 20:33:36 +01:00
twinaphex 707bcd483f (Android) Some patches for RMenu compatibility 2012-12-14 01:29:01 +01:00
Themaister 31ba3e251e Use correct PREV semantics. 2012-12-10 13:19:22 +01:00
Themaister 5424e06a09 Only increment to next frame if frame is non-NULL. 2012-12-10 13:05:56 +01:00
Themaister bf4ffe714f Clarify use of gl->conv_buffer. 2012-12-08 13:38:48 +01:00
Themaister be0223b501 Use gl->conv_buffer instead of extra buffer. 2012-12-08 12:35:10 +01:00
meancoot a3ebec7f07 Style fix 2012-12-07 02:17:34 -05:00
meancoot 95fa37b178 (OpenGL ES) Pack texture rows manually instead of making multiple calls to glTexSubImage2D. 2012-12-07 02:03:17 -05:00
twinaphex 6a7e03aadb (Android) Fix sound - don't fix samplerate at 44Khz 2012-12-03 03:21:10 +01:00
twinaphex 3f50384a3b (Android/GL) Avoid some function pointers 2012-12-02 03:30:46 +01:00
Toad King c6111a3259 [CONSOLE] Make separate timers for holding scroll and menu/exit button delay.
Fixes issues with exit/menu button combo not working on GC controllers occasionally
2012-11-28 19:55:08 -05:00
Themaister aae7bf60e2 Fix build if FFmpeg is not compiled in. 2012-11-23 10:28:22 +01:00
Themaister bce5e78f34 Fix wrong use of enum. 2012-11-22 23:11:21 +01:00
Themaister 7445e891a8 Use INT_8_8_8_8_REV for readbacks.
Allows use of scaler_ctx, also a lot faster on Intel chips, possibly
others as well.
2012-11-21 22:12:56 +01:00
Themaister b58fdce36a Readback after swap buffers. 2012-11-21 22:52:58 +01:00
Themaister 6d4d1f8796 Use asynchronous PBO readbacks when recording.
This *greatly* optimizes GPU recording performance
by making readbacks asynchronous in GL.
This is only enabled for desktop GL and when recording is enabled.
2012-11-21 16:24:28 +01:00
Themaister a25dcf337c read_viewport can return false during video record. 2012-11-21 10:24:35 +01:00
Themaister 28bb46483c Drop video_force_16bit.
This option is silly now.
2012-11-20 23:23:18 +01:00
Themaister 958886bdd5 Performance log gl_read_viewport. 2012-11-20 18:05:33 +01:00
twinaphex 1f66496c67 (GL) small reactor of RMenu init function 2012-11-19 21:07:08 +01:00
twinaphex f0ebecfc32 (RMenu) Remove RMenu context files and use Gfx context files
instead
2012-11-19 04:09:16 +01:00
Themaister d7e5e77daa Remove redundant call to gl_set_viewport. 2012-11-18 22:20:00 +01:00
twinaphex 8f821dd1d7 (PS3) Going to get rid of redundant apply fbo changes function -
non-FBO mode still broken
2012-11-18 22:02:29 +01:00
twinaphex 7445d15f53 (PS3) Remove FBO init hack even when FBO mode is disabled -
non-FBO mode is still broken though
2012-11-18 21:56:16 +01:00
twinaphex ce1de27b5a (GL/PS3) Refactor FBO setting 2012-11-18 21:50:27 +01:00
Themaister f898709b1c Remove useless variable. 2012-11-18 21:34:34 +01:00
twinaphex 6e5cfa433d (GL) Get rid of unnecessary conditional for gl_start_frame_fbo 2012-11-18 21:31:25 +01:00
Themaister 99326a332d Use correct internal format on PS3. 2012-11-18 18:23:20 +01:00
Themaister 325ba8f3d2 Also reinit texref buffer on reinit. 2012-11-18 15:39:29 +01:00
Themaister 3065b6740b Only reinit FBO if strictly necessary. 2012-11-18 15:22:32 +01:00
Themaister 77d2c04e26 Check if GL error is set after texture reinit. 2012-11-18 15:06:33 +01:00
Themaister be05eb67d2 Log if FBO targets fail to initialize. 2012-11-18 15:04:42 +01:00
Themaister f195e1f153 Refactor texture init slightly. 2012-11-18 14:21:47 +01:00
Themaister 2db883baa0 Reinit textures and FBO in reinit_textures(). 2012-11-15 23:25:13 +01:00
Themaister 1fb2d20779 Shut up compiler warning. 2012-11-15 22:29:02 +01:00
Themaister ed8433bd73 Add gfx_fps_title. 2012-11-15 17:30:31 +01:00
Themaister 4057b054b1 Minor cleanup in set_coords. 2012-11-15 17:17:55 +01:00
twinaphex 9e2ae7c500 (PS3) Fix FPS counter - note to maister - don't change this back
again - FPS message will not appear correctly if this variable
is not static
2012-11-15 15:07:34 +01:00
Themaister 0e729bcaa0 Style nits. 2012-11-15 09:40:31 +01:00
Themaister de925367e6 Fixup build for slim build. 2012-11-14 23:11:48 +01:00
Themaister 3e77039a42 Rewrite how gl.c interfaces with shader backends. 2012-11-14 22:51:08 +01:00
Themaister 539d8123ed Merge git://github.com/OV2/RetroArch 2012-11-14 22:07:05 +01:00
Themaister 0cfb166625 Nits. 2012-11-14 22:03:17 +01:00
twinaphex fdcc5cb569 (XDK - Xbox 1) Improve FPS logging
(PS3) Add FPS logging
2012-11-14 21:51:56 +01:00
OV2 54d39dff74 win32: make d3d9 compile in msvc, add linker pragmas to source files 2012-11-14 21:07:06 +01:00
Themaister 1681741554 Reinit textures if pixel format changes in GL. 2012-11-10 23:56:04 +01:00
twinaphex a3c14626a4 (GL) Use macro defines for context functions - will override this for
Griffin targets in order to avoid function pinter
2012-11-03 09:18:31 +01:00
twinaphex b240cfbc7e (RARCH_PERF) Rename benchmark.c to perforance.c
(MSVC2010) Rename incorrectly named MSVC2012 solution which was
really an MSVC 2010 solution
2012-11-01 06:21:18 +01:00
Themaister fbfbf1ed6a Log performance counters at the end. 2012-10-30 23:28:54 +01:00
twinaphex eb17f80cfa (Android) Don't do FPS reporting - might be more costly than it's worth
for regular usage
2012-10-30 20:17:30 +01:00
twinaphex aefb3ee3af (GL) Fix build for HAVE_OPENGLES target
(Android) Input - add device ID per joypad
2012-10-28 03:14:50 +01:00
Themaister 1908a81e1c Add RETRO_DEVICE_POINTER.
Implemented only for X11 so far.

Also clears up viewport_size call.
Changed to viewport_info to also grab X/Y info.
2012-10-28 00:38:31 +02:00
Themaister e53dd431b4 Begin merging D3D9 driver. 2012-10-26 22:18:26 +02:00
Themaister 01569ab8ec Make GLES screenshots clearer. 2012-10-23 08:37:51 +02:00
Themaister 12f1eb926d Add warning when FBO textures are resized. 2012-10-23 08:28:02 +02:00
ToadKing 077317d94e Don't generate FBO textures too large for the platform 2012-10-22 22:03:00 -04:00
ToadKing 409a482dc5 Add viewport screenshot support to GLES 2012-10-22 19:03:57 -04:00
Themaister f59cb836d4 Fix warning. 2012-10-22 09:24:33 +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 a2839001f7 Fix warning. 2012-10-21 12:20:53 +02:00
Themaister 2145d1c4e2 Use RGB565 in VC context. 2012-10-20 21:55:58 +01:00
Themaister cc4e41dafb Merge branch 'master' into rgb565
Conflicts:
	gfx/gl.c
2012-10-20 11:31:38 +02:00
Themaister dd21ae58d7 Don't initialize globals to NULL. 2012-10-20 10:58:02 +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
Themaister 93078889cc Begin reworking RGB565 as default pixel format. 2012-10-20 01:12:02 +02:00
twinaphex 6bf7c3cb06 Update credits for collaborated files 2012-10-18 06:06:55 +02:00
Themaister b00194e52f Drop calling glClearColor. 2012-10-17 21:28:21 +02:00
twinaphex 6856a6651e (RGL) Ifndef glClearColor (if default clear color is always black, then
we should remove this)
2012-10-17 19:43:17 +02:00
Themaister 6d3c12b9bd Use HAVE_GLSL instead of HAVE_XML.
Replace where it makes sense.
2012-10-16 19:43:05 +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 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 9a38d021c2 Rename confusing 'driver' member to 'ctx_driver' in gl struct 2012-10-09 17:47:48 +02:00
Themaister 74e4ae7286 Fix CXX_BUILD. 2012-10-04 09:09:04 +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 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
twinaphex 666ed41234 (PS3) Build fix
(RMenu) Get rid of (now) unnecessary includes
2012-10-01 04:04:50 +02:00
Themaister 043bcfd1de Minor refactor. gl_set_shader_viewport(). 2012-09-30 19:55:33 +02:00
twinaphex 71443385e9 (PS3/XDK - Context) Some refactorings 2012-09-30 17:51:48 +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 5688f939a7 Use GL_BGRA_EXT on GLES. 2012-09-29 20:06:48 +02:00
Themaister c655c1d4e5 Big refactor of joypad input. 2012-09-28 23:06:16 +02:00
Themaister 2674a67cdd Abstract away aspect ratio handling. 2012-09-25 13:51:44 +02:00
Toad King 58a2ff9594 leave a note for the future ;) 2012-09-25 00:42:03 -04: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
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 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 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 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 de2f5ba4ba Add experimental KMS/GLES framebuffer driver. 2012-09-16 21:41:09 +02:00
Themaister 6d2c0cdb17 Only allow keyboard input when in focus int x_input. 2012-09-16 01:27:32 +02:00
Themaister 759a4c811d Use GL_LUMINANCE_ALPHA for fonts. 2012-09-15 23:15:19 +02:00
Themaister b9f605cc9d Fall back to default shader in GLES2. 2012-09-15 15:37:08 +02:00
Themaister ff60bcb5e5 Add experimental X/EGL support. 2012-09-15 15:17:34 +02:00
Themaister d3b1780a66 Ifdef out CLAMP_TO_BORDER on Android specifically. 2012-09-15 11:43:47 +02:00
Themaister 5a4c51a5cb Drop redundant branching in GL.
Pointers are always set.
2012-09-14 21:35:32 +02:00
Twinaphex cfcd80328a (PSL1GHT) Avoid warnings in gl.c 2012-09-14 04:53:55 +02:00
Themaister 46cde06f55 Just use straight GL_TRIANGLE_STRIP. 2012-09-13 20:47:49 +02:00
Twinaphex 440d731a53 (PS3) RGL can use GL_TRIANGLESTRIP now - get rid of messy
GL_QUAD hack in gl.c
2012-09-13 20:35:06 +02:00
Themaister df69517d79 Fixup build for PC. 2012-09-13 19:41:41 +02:00
Twinaphex 655006984e Reworked some code - PC-side still broken 2012-09-13 17:48:17 +02:00
Twinaphex df5089eb52 (PS3) Dirty hack to set GL_QUADS again - will probably change
RGL to use GL_TRIANGLE_STRIP and remove this hack later on
2012-09-13 17:27:14 +02:00
Twinaphex 713b309e3d (PS3) Works again but we can't have GL_TRIANGLE_STRIP for PS3
RGL
2012-09-13 17:19:13 +02:00
Themaister 4f82d237c3 Rework workaround ifdefs into something more sane. 2012-09-13 17:11:30 +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
Themaister dcdb405267 Should fix build on GLES1. 2012-09-12 20:28:51 +02:00
Themaister 250fb340c7 Fixup some more ... 2012-09-12 20:26:59 +02:00
Themaister bb526ad3cd Fixup win32 build. 2012-09-12 20:24:57 +02:00
Themaister 4c99652a60 Rework attribute and MVP passing in GL. 2012-09-11 23:32:00 +02:00
Twinaphex 91cb9dd305 (PSL1GHT/GL) Don't compile in certain code for PSL1GHT 2012-09-11 12:38:54 +02:00
Themaister f67fe439bf Fix CXX_BUILD=1. 2012-09-11 12:40:10 +02:00
Themaister 6f28393c11 Refactor extension handling slightly. Allow a path without GL_UNPACK_ROW_LENGTH. 2012-09-11 12:34:20 +02:00
Twinaphex 3d93b6a052 Add additional note 2012-09-11 10:21:22 +02:00
Twinaphex 0b7a022d75 Change HAVE_OPENGLES11 define to HAVE_OPENGLES1 2012-09-11 10:12:08 +02:00
Twinaphex 74ccee0d54 (PS3) Builds again - GL changes 2012-09-11 10:07:38 +02:00
Twinaphex 6206320e45 Stub paths for HAVE_OPENGLES || HAVE_OPENGL_MODERN 2012-09-11 10:01:23 +02:00
Twinaphex b6d2b0f3bf (GL) Use HAVE_OPENGL_MODERN ifdef in some places where it's needed 2012-09-11 09:57:53 +02:00
Twinaphex 079585d428 (GL) Clean up ifdefs - cut down on them (PS3 now uses HAVE_PSGL,
PSL1GHT now uses HAVE_OPENGL_MODERN)
2012-09-11 09:55:03 +02:00
Themaister ddcc3119a9 Fix Win32 build. 2012-09-10 23:19:02 +02:00
Themaister 756f8fb3db Cleanup PBO handling. Makes it optional via ./configure. 2012-09-10 23:17:48 +02:00
Themaister 2bf3514316 Properly use GL_UNPACK_ROW_WIDTH for FF GL. 2012-09-10 19:00:41 +02:00
Hans-Kristian Arntzen afb4474a64 Don't #ifdef for HAVE_OPENGLES in cellos. 2012-09-10 17:55:41 +03:00
Themaister 7b8d412a16 Should fix build on PS3. 2012-09-10 11:19:54 +02:00
Themaister 9871b8d56f Add preliminary PBO mode for GL. (GLES). 2012-09-10 11:15:48 +02:00
Themaister cfae6196a6 Cleanups in GL. Use GL_TRIANGLE_STRIP instead of GL_QUADS. 2012-09-10 10:29:50 +02:00
Themaister 3f84fc3263 Fix breakage of screenshots. 2012-09-10 09:52:34 +02:00
Twinaphex 61b0811501 (Android/GLES) Add HAVE_OPENGLES defines to gl.c - remaining stuff todo -
GL_QUADS not supported on GLES - GL_UNPACK_ROW_LENGTH/GL_PACK_ROW_LENGTH
not supported on GLES without extensions - all client state array
stuff unsupported -
- Query extensions and see if GL_UNPACK_ROW_LENGTH and GL_PACK_ROW_LENGTH
are available (on Tegra SOCs they should)
2012-09-10 00:39:26 +02:00
Twinaphex 9a0d6a0c33 (PS3) Bug fix - menu now starts up properly if 'Custom Scaling/Dual
Shaders' is set to 'OFF'
2012-08-22 00:01:59 +02:00
Twinaphex 969a92ac17 (RARCH_CONSOLE) Add apply_state_changes to video driver 2012-08-20 12:41:10 +02:00
Themaister 8198927260 Fixup build on Win32. 2012-08-16 10:09:44 +02:00
Themaister 447412c6df Abstract all use of *Pointer() functions to one point. 2012-08-14 23:32:55 +02:00
Themaister 1794aa6dff Do not call set_nonblock_state for FF buttons if vsync isn't activated. 2012-08-12 09:36:15 +02:00
Twinaphex 28eb3604f9 (PS3/Gl) refactored stuff 2012-08-10 06:50:41 +02:00
Themaister a283a54bee Use calculated MVP directly in shader params. 2012-08-09 23:21:59 +02:00
Themaister 450b59262b Avoid redundant FF GL calls. 2012-08-09 22:06:57 +02:00
Twinaphex 17780cb5a8 (Rmenu/fonts) no longer use gl_render_msg_post 2012-08-04 02:28:38 +02:00
Twinaphex 0e6e563b08 (PS3/360/Xbox 1) Create and use default_paths struct 2012-07-23 18:17:50 +02:00
Twinaphex 34bcb938b8 (PS3) Use HAVE_OPENGLES11 for PS3 RGL/PSGL driver 2012-07-01 22:31:44 +02:00
Themaister 9f60e48a98 Redefine behavior of NULL in video_frame(). 2012-06-23 18:01:01 +02:00
Themaister a0b9e6b55e Fix screenshot crashes. 2012-06-10 11:10:14 +02:00
Themaister e32f879179 Fix C++ build. 2012-06-10 10:44:08 +02:00
Themaister 553b1d640a Ifdef for HAVE_RGL. 2012-06-09 00:24:43 +02:00
Themaister 19f0c04021 Add screenshot support from backbuffer. 2012-06-08 22:39:18 +02:00
Twinaphex ec63eb6434 Refactored some code - added 5x scale 2012-06-05 18:11:42 +02:00
Twinaphex 3e6a10ffb6 (PS3) Add some Griffin overrides 2012-05-30 17:03:23 +02:00
Twinaphex 27aa887fcb (PS3) gl_restart works properly now 2012-05-29 17:20:23 +02:00
Twinaphex b995f8da9f (gl.c) Turned some functions inline 2012-05-29 04:53:42 +02:00
Twinaphex 663268be24 (Wii) Remove some obsolete functions 2012-05-28 04:47:29 +02:00
TwinAphex51224 463fdd9bdf (360) Add 360 context file and use it 2012-05-28 02:29:51 +02:00
Themaister 5989fa0405 Nit. 2012-05-28 00:21:51 +02:00
Twinaphex ef0ab68c4b (PS3) Applies overscan / aspect ratio / rotation in non-FBO
mode now
2012-05-28 00:06:18 +02:00
Themaister 2d3fed35e7 Avoid ugly #undefs. 2012-05-27 23:33:52 +02:00
Themaister 4e9a5a5360 DOS retardations creep in. 2012-05-27 23:30:00 +02:00
Themaister 6aa621a8f8 Minor refactor. 2012-05-27 23:21:30 +02:00
Themaister 4ffecbb058 Minor initializer fixup. 2012-05-27 23:16:22 +02:00
Themaister 72310b6661 Style nit party. 2012-05-27 23:15:02 +02:00
Twinaphex e88318e886 Fixed up initializer for gl driver 2012-05-27 22:50:03 +02:00
Twinaphex 15e16728f2 PC fix build 2012-05-27 22:45:00 +02:00
Twinaphex b6131dfcd7 (PS3) PS3 now uses gl.c - ps3_video_psgl.c removed 2012-05-27 22:39:29 +02:00
Twinaphex 1c2c2e1a37 Rename to gfx_ctx_set_projection 2012-05-27 20:55:11 +02:00
Twinaphex 6ff8154d19 (PS3) Abstracted rotation code to allow for different implementations 2012-05-27 20:50:06 +02:00
Themaister 1b01a00e3e Fix trigger happy warnings. 2012-05-27 18:40:07 +02:00
Twinaphex f32bc9e017 (PS3) Implemented gfx_ctx_init, gfx_ctx_destroy and other
functions
2012-05-27 17:46:47 +02:00
Themaister 9aaf878908 Init gl handle early. 2012-05-27 15:04:43 +02:00
Themaister 86295bf057 Re-add gl_render_msg_post(). 2012-05-27 14:27:17 +02:00
Themaister e1a3bf48fd Use correlating ifdef. 2012-05-27 12:38:07 +02:00
Themaister 8e17f8695e Remove unneeded pre/post calls. 2012-05-27 12:26:43 +02:00
Twinaphex 7f13257d1b Move remaining FREETYPE/font code from gl.c to font files 2012-05-27 04:21:54 +02:00
Twinaphex 503f01867a (PS3) Use new font abstraction code 2012-05-27 04:02:07 +02:00
Themaister ca0a5b9f76 Move font stuff to gfx/fonts. 2012-05-27 02:04:50 +02:00
Twinaphex e53db23031 (PS3) Change HAVE_OPENGL_PBO to HAVE_OPENGL_TEXREF 2012-05-27 01:00:05 +02:00
Themaister 5d70568003 Micronit. 2012-05-27 01:03:58 +02:00
Twinaphex 42bcc8ea59 (PS3) Add HAVE_OPENGL_PBO and HAVE_CG_MENU defines 2012-05-27 00:51:02 +02:00
Themaister 9e50b0a8bb Make GL texture types more generic. 2012-05-26 16:29:22 +02:00
Themaister f873960224 init_textures for ps3. 2012-05-26 16:01:59 +02:00
Themaister f121f8d2bc Style nits. 2012-05-26 15:59:58 +02:00
Twinaphex 6000bd33e9 (PS3) Cleaned up ps3_video_psgl.c code - added some PS3-specific
ifdefs to gl.c
2012-05-26 15:45:36 +02:00
Themaister 04f325dcc9 Refactor texture init. 2012-05-26 15:46:37 +02:00
Themaister a10a5badcc Move font code to gl_font. 2012-05-26 15:22:48 +02:00
Themaister 8f74b1a555 Build fixes for Win32. 2012-05-26 10:20:06 +02:00
Twinaphex 1386e2ee90 Restructuring of sdlwrap.c for portability reasons -
could need a code review
2012-05-26 04:47:24 +02:00
Twinaphex c3cb3ba876 Add some HAVE_SDL ifdefs to gl.c 2012-05-25 23:18:38 +02:00
Themaister a2e7805524 Move more SDL specifics to sdlwrap. 2012-05-25 22:28:20 +02:00
Themaister 1e73ba4661 Move SDL input driver init to sdlwrap. 2012-05-25 22:11:44 +02:00
Twinaphex b2c7b766ae Revert "(PS3) ps3_video_psgl.c cleanups"
This reverts commit 824d2923a5.
2012-05-25 21:40:28 +02:00
Twinaphex 417cb55a6e Revert "(PS3) ps3_video_psgl.c cleanups #2"
This reverts commit 8aafbf63b8.
2012-05-25 21:40:19 +02:00
Twinaphex 8aafbf63b8 (PS3) ps3_video_psgl.c cleanups #2 2012-05-25 17:37:48 +02:00
Twinaphex 824d2923a5 (PS3) ps3_video_psgl.c cleanups 2012-05-25 16:43:07 +02:00
Themaister c986eb3491 Remove unneeded parens. 2012-05-25 16:20:28 +02:00
Twinaphex 989731bbd0 Add HAVE_OPENGLES define to Makefile.ps3 - add HAVE_OPENGLES ifdef
to gl.c
2012-05-25 16:00:54 +02:00
Themaister ce740f8948 More fixups. 2012-04-21 23:31:57 +02:00
Themaister aab8fb6151 ssnes_* => rarch_*. 2012-04-21 23:25:32 +02:00
Themaister 9ab51ad23a SSNES => RetroArch. 2012-04-21 23:17:43 +02:00
Themaister e3a71a8c5b Fixup headers. 2012-04-09 22:05:26 +02:00
Themaister 5d51942f69 libretro fixups. 2012-04-09 22:04:43 +02:00
Themaister 62c96ea937 Change license header. 2012-04-09 22:03:57 +02:00
Themaister 9698cd7dbd Change headers. 2012-04-09 22:03:57 +02:00
Themaister 865229820a Fix edge case on rotation with multiple pass shaders. 2012-04-02 17:26:23 +02:00
Themaister 34bdea0f1c Add rotation to GL driver (PC). 2012-04-01 19:20:37 +02:00
Themaister 9ab02b12be Move compat functionality to compat/. 2012-03-16 23:26:57 +01:00
Themaister 9c861f13be Fix additional exclamation marks. 2012-02-11 21:16:01 +01:00
Themaister 02cfa3f651 Big refactor of GL routines. 2012-02-01 00:14:04 +01:00
Themaister 576855de4f Slight refactor. 2012-01-30 20:23:36 +01:00
Themaister 3c1e4c879a Integer scale is bad mmkay. 2012-01-11 23:09:22 +01:00
Themaister 4eab7c4387 Font scale option. 2012-01-11 22:52:25 +01:00
Themaister b4248038fb Update license headers. 2012-01-08 01:12:05 +01:00
Themaister 318d875981 Small cleanups. 2012-01-03 02:50:45 +01:00
Themaister 672102d377 Change asserts to ssnes_assert(). 2011-12-25 12:47:47 +01:00
Themaister eac468ba19 MSVC compat. 2011-12-25 01:38:59 +01:00
Themaister d5fca50a2f Can build for C++. 2011-12-24 15:26:01 +01:00
Themaister 02d40aa212 Drop shadows for fonts. 2011-12-03 19:48:13 +01:00
Themaister 04d0d84d01 Fix up more paths. 2011-11-30 18:31:09 +01:00
Themaister 45fa6795c3 Fixups. 2011-11-12 16:43:59 +01:00
Themaister a9d339efb4 Use glColorPointer(). 2011-11-12 15:51:37 +01:00
Themaister ad67511483 Cleanups. PREV{1-6} for GLSL as well. 2011-11-12 14:18:10 +01:00
Themaister 48e8472f9c Ring buffer of 8 textures :o 2011-11-12 12:28:07 +01:00
Themaister 51721b4cb6 video_font_enable. 2011-11-10 00:15:41 +01:00
Themaister 0f010cf3d2 Fix style nits. 2011-11-02 19:31:36 +01:00
Themaister c2a06bfa09 Replace some magic numbers. 2011-10-28 09:06:34 +02:00
Themaister 64ee13e6f4 Push window loop in .alive(). 2011-10-18 19:51:38 +02:00
Themaister fa26f6a10c Cache font rendering. Major overhead reduction. 2011-10-07 17:58:22 +02:00
Themaister db71a5cdba New font rendering code for OpenGL. 2011-10-07 17:43:39 +02:00
Themaister c996f816b8 Default font path OSX. 2011-10-06 21:12:11 +02:00
Themaister 7d33cccc8e Default fonts. 2011-10-06 19:06:38 +02:00
Themaister 3db79ab2f0 Nits. 2011-10-05 22:56:52 +02:00
Themaister c2cedb1b6f Resizing windows in 1.2 should not trigger some init code :) 2011-09-22 21:50:57 +02:00
Themaister 3f6183ff15 Updates, fixes ... 2011-09-13 19:30:22 +02:00
Themaister 642316a1e2 Somewhat haphazard. Can't find some needed API calls :\ 2011-09-13 18:50:40 +02:00
Themaister 924848fdad Start working towards SDL 1.2/1.3 compat. 2011-09-13 14:06:49 +02:00
Themaister 4c40e56060 Properly disable it :D 2011-09-11 15:41:46 +02:00
Themaister cf34444505 Disable resizing on OSX. 2011-09-11 15:33:28 +02:00
Themaister 2bd0caae2e Do not set RESIZABLE on fullscreen (really? :v) 2011-09-06 15:38:32 +02:00
Themaister 0823d72dee Add coloring to fonts. 2011-09-05 17:00:28 +02:00
Themaister b2b103362d Warn if glX VSync call isn't found. 2011-09-04 13:01:54 +02:00
Themaister dc9dd2e6bf Fix bug where shaders could crash using LUT textures. 2011-08-29 17:05:11 +02:00
Themaister bce679df78 Only use hack on X when in windowed mode. 2011-08-16 10:26:36 +02:00
Themaister 22e8c3d895 Should fix breakage of OGL on OSX. 2011-08-15 22:21:50 +02:00
Themaister 3901934d97 Add an ugly hack to try and remedy things ... 2011-08-14 23:03:48 +02:00
Themaister bc23b421e1 New resize checking code. 2011-08-12 19:02:12 +02:00
Themaister d9cb85a8d5 Add new possible workaround for tiling WMs ... 2011-08-11 15:19:30 +02:00