Commit Graph

415 Commits

Author SHA1 Message Date
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