Commit Graph

415 Commits

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