1
0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-07 03:13:49 +00:00
Commit Graph

55 Commits

Author SHA1 Message Date
Sergey Lipskiy
cebf20bf4a Merge remote-tracking branch 'remotes/origin/master' into refactor_graphics
Conflicts:
	projects/msvc12/GLideN64.vcxproj
	projects/msvc12/GLideN64.vcxproj.filters
	src/BufferCopy/ColorBufferToRDRAM.cpp
	src/CMakeLists.txt
	src/GLideNUI/ConfigDialog.cpp
	src/GLideNUI/configDialog.ui
	src/mupen64plus-video-gliden64.mk
2017-02-21 12:51:00 +07:00
Francisco Zurita
1319687f86 Replace ANDROID macro definition with OS_ANDROID 2017-02-09 20:38:27 +07:00
Francisco Zurita
4a330b98a8 Fix linker error when compiling GLES 2 2017-02-05 19:17:11 +07:00
Sergey Lipskiy
184ff8f017 Correct ColorBufferToRDRAM::_prepareCopy
Code cleanup.
2017-01-28 21:44:04 +07:00
Sergey Lipskiy
df4a81bfea Add special Parameter classes to make parametrs usage more safe. 2017-01-28 16:52:09 +07:00
Sergey Lipskiy
50c0c38b63 Set texture unit for initialized texture in DepthBufferToRDRAM::init() 2017-01-27 22:39:13 +07:00
Sergey Lipskiy
81702f0e5d Remove unused files from BufferCopy 2017-01-26 19:54:47 +07:00
Sergey Lipskiy
602e1dd859 Correct cmake project file. Fix compilation on Linux. 2017-01-25 21:01:21 +07:00
Sergey Lipskiy
5445dcb16f Add ColorBufferReaderWithBufferStorage 2017-01-25 20:58:11 +07:00
Sergey Lipskiy
5ba4588752 Rewrite ColorBufferToRDRAM 2017-01-25 20:58:05 +07:00
Sergey Lipskiy
a94bac0dd0 Buffers to RDRAM rewrite WIP 2017-01-23 21:20:48 +07:00
Sergey Lipskiy
86708c6dc2 Remove OpenGL from RDRAMtoColorBuffer 2017-01-23 21:20:43 +07:00
Sergey Lipskiy
57d600fc86 Remove OpenGL from DepthBufferToRDRAM 2017-01-23 21:20:36 +07:00
Sergey Lipskiy
80ed169e24 Remove use of OpenGL.h 2017-01-22 20:43:05 +07:00
Sergey Lipskiy
8460b08b09 Move struct PBOBinder from FrameBuffer.h to separate file. 2017-01-22 19:12:39 +07:00
Sergey Lipskiy
4e459c7645 Change type of CachedTexture name to graphics::ObjectHandle 2017-01-21 19:48:02 +07:00
Sergey Lipskiy
f147927af9 Remove OpenGL use from FrameBuffer 2017-01-21 16:35:00 +07:00
Sergey Lipskiy
e83c3489a3 Replace OGLVideo by DisplayWindow
Replace OGLRender by GraphicsDrawer
2017-01-16 20:56:11 +07:00
Sergey Lipskiy
09a5b414c4 Remove FBOTextureFormats usage 2017-01-16 20:56:01 +07:00
Sergey Lipskiy
43e8aef6ea Remove old-style code. 2017-01-09 11:21:06 +07:00
Sergey Lipskiy
c39b639d7c Remove unused shaders related files. 2017-01-08 20:31:38 +07:00
Sergey Lipskiy
7af25b2452 Rewrite shader cache 2017-01-08 17:49:53 +07:00
Sergey Lipskiy
dcf1065957 Add textureIndices parameters 2017-01-08 17:49:47 +07:00
Sergey Lipskiy
9725c527b9 Replace ShaderCombiner by graphics::CombinerProgram WIP 2017-01-08 17:49:37 +07:00
Francisco Zurita
893af29512 Fix runtime library loading errors with GLES 3.0.
Some devices with GLES 3.0 support only are not tolerant of GLES 3.1
specific calls.
2017-01-05 00:25:40 -05:00
Sergey Lipskiy
6356b1cb7a Init FrameBuffer in DepthBufferToRDRAM 2017-01-02 23:04:09 +07:00
Sergey Lipskiy
149fdc8238 Init FrameBuffer in ColorBufferToRDRAM 2017-01-02 22:57:23 +07:00
Sergey Lipskiy
e905f98f72 Use gfxContext in BufferCopy 2017-01-02 00:09:28 +07:00
Sergey Lipskiy
3eb11aac82 setTextureParameters WIP 2017-01-01 21:59:54 +07:00
Sergey Lipskiy
599f7b1e93 Make separate vertex shaders for triangles and rects. 2016-12-31 19:29:50 +07:00
Sergey Lipskiy
6735db1322 ColorBufferToRDRAM: re-create pixel buffers when FBO texture changed. 2016-11-28 21:17:49 +07:00
Sergey Lipskiy
3aa365d24a Rebuild pixel buffers in ColorBufferToRDRAM_BufferStorageExt when
_initBuffers called more than once.

Example: Roadster trophy chages buffer size several times on the game start.
Each time ColorBufferToRDRAM_BufferStorageExt::_initBuffers called.
The game raises GL error on the second _initBuffers call.
2016-11-26 19:25:06 +07:00
Francisco Zurita
313741d827 Use BufferStorage extension for faster glReadPixels. 2016-11-24 14:20:43 +07:00
Francisco Zurita
20e4f972aa Use glTexStorage2D for textures being attached to FBOs
But only for GLES 3.0 and 3.1, with OpenGL it causes issues for older
versions.
2016-11-23 00:23:19 -05:00
Francisco Zurita
b3b8eeb83e Use configured FBO texture formats in more places. 2016-11-23 00:14:15 -05:00
Sergey Lipskiy
cc63ed1764 Minor correction in ColorBufferToRDRAM::_prepareCopy 2016-11-21 16:52:26 +07:00
Francisco Zurita
afb7c8ccd1 Revert color format change. 2016-10-17 20:14:34 -04:00
Francisco Zurita
fd05055950 Fixes slow PBOs in Paper Mario. 2016-10-13 14:35:00 +07:00
Sergey Lipskiy
6f4f24a812 Correct read alpha from color buffer in RDRAM
Undo changes from 06da08

Fixed NBA Courtside 2 - Featuring Kobe Bryant wrong intro #1138
2016-10-01 21:30:33 +07:00
Sergey Lipskiy
6694655184 Set maximal height of buffer copied to RDRAM to 480
Pokemon Stadium 2 (PAL) - Freeze after nintendo logo with OpenGL #1150
2016-10-01 18:34:42 +07:00
Sergey Lipskiy
16406bb1b0 Fixed Majora's mask in-game pictures look incorrect with software depth buffer #1131 2016-09-23 12:05:48 +07:00
Sergey Lipskiy
1bdce5c579 Fix ColorBufferToRDRAM::_prepareCopy: blit current buffer if its scale is not 1.0
Fixed 640x480 framebuffer bug Perfect Dark (U) #844
2016-08-28 16:53:07 +07:00
Francisco Zurita
62ec0cb821 Fixes crash at GoldenEye startup 2016-07-06 10:54:27 +06:00
Sergey Lipskiy
07854d3857 Use OGLRender::copyTexturedRect in ColorBufferToRDRAM::_prepareCopy.
Enable color buffer copy for GLES2.
2016-06-23 16:15:27 +06:00
Sergey Lipskiy
4c4b1bf57d Code refactor: move struct FBOTextureFormats to separate files. 2016-06-20 15:16:15 +06:00
Sergey Lipskiy
86fbea9edc Code refactor: replace NULL by nullptr. 2016-06-10 12:40:18 +06:00
Sergey Lipskiy
0060d3ea80 Fix fb texture size for ColorBufferToRDRAM.
Fixed crash in ColorBufferToRDRAM::_initFBTexture on Perfect Dark start.
2016-06-10 12:40:12 +06:00
Logan McNaughton
3c1495de80 Update ColorBufferToRDRAMStub.cpp to match recent commits 2016-06-09 12:25:40 +06:00
Sergey Lipskiy
ffe0b61e76 Rename ColorBufferToRDRAMDesktop to ColorBufferToRDRAM_GL
and ColorBufferToRDRAMAndroid to ColorBufferToRDRAM_GLES
2016-06-08 22:06:02 +06:00
Sergey Lipskiy
2ed1dc17ad ColorBufferToRDRAM: use inner buffer for pixel data to avoid memory allocation/deallocation. 2016-06-08 21:57:50 +06:00